diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 7bbd91525cd5..4da87568a0cc 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -1,17271 +1,17314 @@
 #
 # $FreeBSD$
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS, MOVED_LIBS)
 # and directories (OLD_DIRS) which should get removed after an update.
 # Recently removed entries should be listed first (with the date as a
 # comment). OLD_LIBS and MOVED_LIBS should only list dynamic libraries.
 # Static libraries, links to dynamic libraries (lib*.so), and linker scripts
 # should be listed in OLD_FILES. OLD_LIBS and MOVED_LIBS are removed by the
 # delete-old-libs target, whereas OLD_FILES and OLD_DIRS are removed by the
 # delete-old target. This separation allows users to avoid deleting old
 # dynamic libraries still required by existing binaries.
 #
 # MOVED_LIBS should be used instead of OLD_LIBS when a library is moved
 # from usr/lib to lib or vice versa.  This avoids removing libraries for
 # alternate ABIs (such as lib32) which store all libraries in a single
 # directory (e.g. usr/lib32).
 #
 # For files listed in OLD_FILES, OLD_LIBS, and MOVED_LIBS, the check-old*
 # and delete-old* targets will also delete associated debug symbols from
 # usr/lib/debug.
 #
 # In case of a complete directory hierarchy the sorting is in depth first
 # order.
 #
 # Files that are installed or removed depending on some build option
 # should be listed in /usr/src/tools/build/mk/OptionalObsoleteFiles.inc
 # instead of in this file.
 #
 # Before you commit changes to this file please check if any entries in
 # tools/build/mk/OptionalObsoleteFiles.inc can be removed. The following
 # command tells which files are listed more than once regardless of some
 # architecture specific conditionals, so you can not blindly trust the
 # output:
 # ( grep '+=' /usr/src/ObsoleteFiles.inc | sort -u ; \
 # grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \
 # sort | uniq -d
 #
 # To find regular duplicates not dependent on optional components, you can
 # also use something that will not give you false positives, e.g.:
 # for t in `make -V TARGETS universe`; do
 #   __MAKE_CONF=/dev/null make -f Makefile.inc1 TARGET=$t \
 #   -V OLD_FILES -V OLD_LIBS -V MOVED_LIBS -V OLD_DIRS check-old | \
 #   xargs -n1 | sort | uniq -d;
 # done
 #
 # For optional components, you can use the following to see if some entries
 # in OptionalObsoleteFiles.inc have been obsoleted by ObsoleteFiles.inc
 # for o in tools/build/options/WITH*; do
 #   __MAKE_CONF=/dev/null make -f Makefile.inc1 -D${o##*/} \
 #   -V OLD_FILES -V OLD_LIBS -V MOVED_LIBS -V OLD_DIRS check-old | \
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20230309: remove remaining ATM support
+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_DIRS+=usr/include/netnatm
+OLD_FILES+=usr/lib/libngatm.a
+OLD_FILES+=usr/lib/libngatm.so
+OLD_LIBS+=usr/lib/libngatm.so.4
+OLD_FILES+=usr/lib/libngatm_p.a
+OLD_FILES+=usr/share/man/man1/sscop.1.gz
+OLD_FILES+=usr/share/man/man3/libngatm.3.gz
+OLD_FILES+=usr/share/man/man3/uniaddr.3.gz
+OLD_FILES+=usr/share/man/man3/unifunc.3.gz
+OLD_FILES+=usr/share/man/man3/unimsg.3.gz
+OLD_FILES+=usr/share/man/man3/unisap.3.gz
+OLD_FILES+=usr/share/man/man3/unistruct.3.gz
+OLD_FILES+=usr/share/man/man4/ng_ccatm.4.gz
+OLD_FILES+=usr/share/man/man4/ng_sscfu.4.gz
+OLD_FILES+=usr/share/man/man4/ng_sscop.4.gz
+OLD_FILES+=usr/share/man/man4/ng_uni.4.gz
+OLD_FILES+=usr/share/man/man4/ngatmbase.4.gz
+
 # 20230308: machine-id merged into hostid_save
 OLD_FILES+=etc/rc.d/machine-id
 
 # 20230306: remove tzsetwall(3)
 OLD_FILES+=usr/share/man/man3/tzsetwall.3.gz
 
 # 20230208: new clang import which bumps version from 14.0.5 to 15.0.7
 OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.5/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/14.0.5/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include/fuzzer
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.5/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/14.0.5/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/14.0.5/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/14.0.5/include/profile
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include/sanitizer
 OLD_FILES+=usr/lib/clang/14.0.5/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include/xray
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/altivec.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/armintr.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/builtins.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/cet.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/cpuid.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/float.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/immintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/inttypes.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/iso646.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/limits.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/module.modulemap
 OLD_FILES+=usr/lib/clang/14.0.5/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/msa.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/omp.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ompt.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdalign.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdarg.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdbool.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stddef.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdint.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/tgmath.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/unwind.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/vadefs.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/varargs.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.5/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.5/include
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-powerpc64.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-powerpc64le.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/14.0.5/lib/freebsd
 OLD_DIRS+=usr/lib/clang/14.0.5/lib
 OLD_FILES+=usr/lib/clang/14.0.5/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.5/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.5/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/14.0.5/share
 OLD_DIRS+=usr/lib/clang/14.0.5
 
 # 20230208: new libc++ import which bumps version from 14.0.5 to 15.0.7
 OLD_FILES+=usr/include/c++/v1/__functional_base
 OLD_FILES+=usr/include/c++/v1/__libcpp_version
 OLD_FILES+=usr/include/c++/v1/__nullptr
 OLD_FILES+=usr/include/c++/v1/__string
 OLD_FILES+=usr/include/c++/v1/experimental/filesystem
 
 # 20230203: loader help files renamed
 OLD_FILES+=boot/loader.help
 
 # 20230201: timeout moved from /usr/bin to /bin
 OLD_FILES+=usr/tests/usr.bin/timeout/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/timeout/timeout_test
 
 # 20230124: rtalloc.9 removed
 OLD_FILES+=usr/share/man/man9/rtalloc.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc_fib.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc_ign.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc_ign_fib.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc1.9.gz
 OLD_FILES+=usr/share/man/man9/rtalloc1_fib.9.gz
 OLD_FILES+=usr/share/man/man9/rtfree.9.gz
 OLD_FILES+=usr/share/man/man9/RT_ADDREF.9.gz
 OLD_FILES+=usr/share/man/man9/RT_LOCK.9.gz
 OLD_FILES+=usr/share/man/man9/RT_REMREF.9.gz
 OLD_FILES+=usr/share/man/man9/RT_RTFREE.9.gz
 OLD_FILES+=usr/share/man/man9/RT_UNLOCK.9.gz
 OLD_FILES+=usr/share/man/man9/RTFREE.9.gz
 OLD_FILES+=usr/share/man/man9/RTFREE_LOCKED.9.gz
 
 # 20230123: PCBGROUP.9 removed
 OLD_FILES+=usr/share/man/man9/PCBGROUP.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_byhash.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_byinpcb.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_destroy.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_enabled.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_init.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_remove.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_update.9.gz
 OLD_FILES+=usr/share/man/man9/in_pcbgroup_update_mbuf.9.gz
 OLD_FILES+=usr/share/man/man9/in6_pcbgroup_byhash.9.gz
 
 # 20221214: TCPDEBUG removed
 OLD_FILES+=usr/include/netinet/tcp_debug.h
 
 # 20221213: remove sync serial drivers and utilities
 OLD_FILES+=sbin/sconfig
 OLD_FILES+=usr/share/man/man4/ce.4
 OLD_FILES+=usr/share/man/man4/cp.4
 OLD_FILES+=usr/share/man/man8/sconfig.8.gz
 
 # 20221202: remove trpt(8)
 OLD_FILES+=usr/sbin/trpt
 OLD_FILES+=usr/share/man/man8/trpt.8.gz
 
 # 20221117: remove typo'd man page link
 OLD_FILES+=usr/share/man/man9/vm_map_wire_mapped.9.gz
 
 # 20221114: remove othermta
 OLD_FILES+=etc/rc.d/othermta
 
 # 20221109: remove rc.sendmail(8)
 OLD_FILES+=etc/rc.sendmail
 OLD_FILES+=usr/share/man/man8/rc.sendmail.8.gz
 
 # 20221015: update the ithread(9) man page
 OLD_FILES+=usr/share/man/man9/ithread.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_add_handler.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_create.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_destroy.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_priority.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_remove_handler.9.gz
 OLD_FILES+=usr/share/man/man9/ithread_schedule.9.gz
 
 # 20221012: remove nls support from sort
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/sort.cat
 
 # 20221003: ip6protosw.h removed
 OLD_FILES+=usr/include/netinet6/ip6protosw.h
 
 # 20221001: deorbit opie
 OLD_FILES+=etc/opieaccess
 OLD_FILES+=etc/opiekeys
 OLD_FILES+=usr/bin/opieinfo
 OLD_FILES+=usr/bin/opiekey
 OLD_FILES+=usr/bin/opiepasswd
 OLD_FILES+=usr/bin/otp-md4
 OLD_FILES+=usr/bin/otp-md5
 OLD_FILES+=usr/bin/otp-sha1
 OLD_FILES+=usr/lib/libopie.a
 OLD_FILES+=usr/lib/libopie.so
 OLD_LIBS+=usr/lib/libopie.so.8
 OLD_FILES+=usr/lib/libopie_p.a
 OLD_FILES+=usr/lib/pam_opie.so
 OLD_LIBS+=usr/lib/pam_opie.so.6
 OLD_FILES+=usr/lib/pam_opieaccess.so
 OLD_LIBS+=usr/lib/pam_opieaccess.so.6
 OLD_FILES+=usr/share/man/man1/opieinfo.1.gz
 OLD_FILES+=usr/share/man/man1/opiekey.1.gz
 OLD_FILES+=usr/share/man/man1/opiepasswd.1.gz
 OLD_FILES+=usr/share/man/man1/otp-md4.1.gz
 OLD_FILES+=usr/share/man/man1/otp-md5.1.gz
 OLD_FILES+=usr/share/man/man1/otp-sha1.1.gz
 OLD_FILES+=usr/share/man/man4/opie.4.gz
 OLD_FILES+=usr/share/man/man4/skey.4.gz
 OLD_FILES+=usr/share/man/man5/opieaccess.5.gz
 OLD_FILES+=usr/share/man/man5/opiekeys.5.gz
 OLD_FILES+=usr/share/man/man8/pam_opie.8.gz
 OLD_FILES+=usr/share/man/man8/pam_opieaccess.8.gz
 
 # 20220928: telnetd(8) removed
 OLD_FILES+=etc/pam.d/telnetd
 OLD_FILES+=usr/libexec/telnetd
 OLD_FILES+=usr/share/man/man8/telnetd.8.gz
 
 # 20220914: domain(9) updated
 OLD_FILES+=usr/share/man/man9/domain_init.9.gz
 OLD_FILES+=usr/share/man/man9/pfctlinput.9.gz
 OLD_FILES+=usr/share/man/man9/pffinddomain.9.gz
 OLD_FILES+=usr/share/man/man9/pffindproto.9.gz
 OLD_FILES+=usr/share/man/man9/pffindtype.9.gz
 
 # 20220825: awk tests moved to subdirs
 OLD_FILES+=usr/tests/usr.bin/awk/awk_test
 OLD_FILES+=usr/tests/usr.bin/awk/d_assign_NF.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_assign_NF.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_assign_NF.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_big_regexp.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_big_regexp.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_big_regexp.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_end1.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_end1.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_end1.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_end2.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_end2.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_end2.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_period.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_period.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_period.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_string1.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_string1.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_tolower.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_tolower.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_tolower.out
 OLD_FILES+=usr/tests/usr.bin/awk/d_toupper.awk
 OLD_FILES+=usr/tests/usr.bin/awk/d_toupper.in
 OLD_FILES+=usr/tests/usr.bin/awk/d_toupper.out
 
 # 20220820: remove knlist_init_rw_reader()
 OLD_FILES+=usr/share/man/man9/knlist_init_rw_reader.9.gz
 
 # 20220813: minigzip(1) removed in favor of gzip(1)
 OLD_FILES+=usr/bin/minigzip
 OLD_FILES+=usr/share/man/man1/minigzip.1.gz
 
 # 20220811: new iconv encoder trait added
 OLD_LIBS+=usr/lib/i18n/libBIG5.so.4
 OLD_LIBS+=usr/lib/i18n/libDECHanyu.so.4
 OLD_LIBS+=usr/lib/i18n/libEUC.so.4
 OLD_LIBS+=usr/lib/i18n/libEUCTW.so.4
 OLD_LIBS+=usr/lib/i18n/libGBK2K.so.4
 OLD_LIBS+=usr/lib/i18n/libHZ.so.4
 OLD_LIBS+=usr/lib/i18n/libISO2022.so.4
 OLD_LIBS+=usr/lib/i18n/libJOHAB.so.4
 OLD_LIBS+=usr/lib/i18n/libMSKanji.so.4
 OLD_LIBS+=usr/lib/i18n/libUES.so.4
 OLD_LIBS+=usr/lib/i18n/libUTF1632.so.4
 OLD_LIBS+=usr/lib/i18n/libUTF7.so.4
 OLD_LIBS+=usr/lib/i18n/libUTF8.so.4
 OLD_LIBS+=usr/lib/i18n/libVIQR.so.4
 OLD_LIBS+=usr/lib/i18n/libZW.so.4
 OLD_LIBS+=usr/lib/i18n/libiconv_none.so.4
 OLD_LIBS+=usr/lib/i18n/libiconv_std.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_646.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_none.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_parallel.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_serial.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_std.so.4
 OLD_LIBS+=usr/lib/i18n/libmapper_zone.so.4
 
 # 20220811: raw socket layer removed
 OLD_FILES+=usr/include/net/raw_cb.h
 
 # 20220721: libnv version bumps
 OLD_LIBS+=lib/libnv.so.0
 
 # 20220624: unix_passfd_test -> unix_passfd_stream/unix_passfd_dgram
 OLD_FILES+=usr/tests/sys/kern/unix_passfd_test
 
 # 20220621: ISA sound card drivers removed
 OLD_FILES+=usr/share/man/man4/snd_ad1816.4.gz
 OLD_FILES+=usr/share/man/man4/snd_ess.4.gz
 OLD_FILES+=usr/share/man/man4/snd_gusc.4.gz
 OLD_FILES+=usr/share/man/man4/snd_mss.4.gz
 OLD_FILES+=usr/share/man/man4/snd_sb16.4.gz
 OLD_FILES+=usr/share/man/man4/snd_sb8.4.gz
 OLD_FILES+=usr/share/man/man4/snd_sbc.4.gz
 
 # 20220612: new clang import which bumps version from 14.0.4 to 14.0.5
 OLD_FILES+=usr/lib/clang/14.0.4/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/14.0.4/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.4/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.4/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/14.0.4/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include/fuzzer
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.4/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/14.0.4/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/14.0.4/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/14.0.4/include/profile
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include/sanitizer
 OLD_FILES+=usr/lib/clang/14.0.4/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include/xray
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/altivec.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/armintr.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/builtins.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/cet.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/cpuid.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/float.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/immintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/inttypes.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/iso646.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/limits.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/module.modulemap
 OLD_FILES+=usr/lib/clang/14.0.4/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/msa.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/omp.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ompt.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdalign.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdarg.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdbool.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stddef.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdint.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/tgmath.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/unwind.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/vadefs.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/varargs.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.4/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.4/include
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.4/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/14.0.4/lib/freebsd
 OLD_DIRS+=usr/lib/clang/14.0.4/lib/share
 OLD_DIRS+=usr/lib/clang/14.0.4/lib
 OLD_FILES+=usr/lib/clang/14.0.4/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.4/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.4/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/14.0.4/share
 OLD_DIRS+=usr/lib/clang/14.0.4
 
 # 20220605: new clang import which bumps version from 14.0.3 to 14.0.4
 OLD_FILES+=usr/lib/clang/14.0.3/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/14.0.3/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.3/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.3/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/14.0.3/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include/fuzzer
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/14.0.3/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/14.0.3/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/14.0.3/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/14.0.3/include/profile
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include/sanitizer
 OLD_FILES+=usr/lib/clang/14.0.3/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include/xray
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/altivec.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/armintr.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/builtins.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/cet.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/cpuid.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/float.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/immintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/inttypes.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/iso646.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/limits.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/module.modulemap
 OLD_FILES+=usr/lib/clang/14.0.3/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/msa.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/omp.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ompt.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdalign.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdarg.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdbool.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stddef.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdint.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/tgmath.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/unwind.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/vadefs.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/varargs.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/14.0.3/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/14.0.3/include
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/14.0.3/lib/freebsd
 OLD_DIRS+=usr/lib/clang/14.0.3/lib/share
 OLD_DIRS+=usr/lib/clang/14.0.3/lib
 OLD_FILES+=usr/lib/clang/14.0.3/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.3/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/14.0.3/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/14.0.3/share
 OLD_DIRS+=usr/lib/clang/14.0.3
 
 # 20220524: libkqueue test updates
 OLD_FILES+=usr/tests/sys/kqueue/libkqueue/kqtest
 
 # 20220514: new clang import which bumps version from 13.0.0 to 14.0.3
 OLD_FILES+=usr/lib/clang/13.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/13.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/13.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/13.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/13.0.0/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include/fuzzer
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/13.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/13.0.0/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/13.0.0/include/profile
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/13.0.0/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include/xray
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/builtins.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/cet.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/float.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/inttypes.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/iso646.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/limits.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/13.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/omp.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ompt.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdalign.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdarg.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdbool.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stddef.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdint.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/tgmath.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/unwind.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/varargs.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/13.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/13.0.0/include
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/13.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/13.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/13.0.0/lib
 OLD_DIRS+=usr/lib/clang/13.0.0
 
 # 20220514: new libc++ import which bumps version from 13.0.0 to 14.0.3
 OLD_FILES+=usr/include/c++/v1/__function_like.h
 OLD_FILES+=usr/include/c++/v1/__memory/pointer_safety.h
 OLD_FILES+=usr/include/c++/v1/__utility/__decay_copy.h
 
 # 20220418: uudecode merged into uuencode and renamed to bintrans
 OLD_FILES+=usr/lib/debug/usr/bin/uuencode.debug
 OLD_FILES+=usr/lib/debug/usr/bin/uudecode.debug
 OLD_FILES+=usr/tests/usr.bin/uuencode/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/uuencode/legacy_test
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.base64.in
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.traditional.out
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.traditional.in
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.out
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.sh
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.in
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.153276.in
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.base64.out
 OLD_FILES+=usr/tests/usr.bin/uuencode/regress.153276.out
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.base64.in
 OLD_FILES+=usr/tests/usr.bin/uudecode/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.out
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.sh
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.153276.out
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.traditional.in
 OLD_FILES+=usr/tests/usr.bin/uudecode/legacy_test
 OLD_FILES+=usr/tests/usr.bin/uudecode/regress.153276.in
 OLD_DIRS+=usr/tests/usr.bin/uuencode
 OLD_DIRS+=usr/tests/usr.bin/uudecode
 
 # 20220318: snd_ds1 and snd_maestro drivers removed
 OLD_FILES+=usr/share/man/man4/snd_ds1.4.gz
 OLD_FILES+=usr/share/man/man4/snd_maestro.4.gz
 
 # 20220307: remove 330.news
 OLD_FILES+=etc/periodic/daily/330.news
 
 # 20220210: unwind.h moved to /usr/include
 OLD_FILES+=usr/include/c++/v1/unwind-arm.h
 OLD_FILES+=usr/include/c++/v1/unwind-itanium.h
 OLD_FILES+=usr/include/c++/v1/unwind.h
 
 # 20220128: mips pmc events removed
 OLD_FILES+=usr/share/man/man3/pmc.mips24k.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.octeon.3.gz
 
 # 20220127: terasic_mtl.4 removed
 OLD_FILES+=usr/share/man/man4/terasic_mtl.4.gz
 
 # 20211229: libc++ moved to /lib
 MOVED_LIBS+=usr/lib/libc++.so.1
 
 # 20211221: efi_set_variables_supported.3 should be efi_variables_supported.3
 OLD_FILES+=usr/share/man/man3/efi_set_variables_supported.3.gz
 
 # 20211218: meteor.4 removed, see also 20200301 entry below
 OLD_FILES+=usr/share/man/man4/meteor.4.gz
 
 # 20211125: Old SCSI drivers removed
 OLD_FILES+=usr/share/man/man4/amr.4.gz
 OLD_FILES+=usr/share/man/man4/esp.4.gz
 OLD_FILES+=usr/share/man/man4/iir.4.gz
 OLD_FILES+=usr/share/man/man4/mly.4.gz
 OLD_FILES+=usr/share/man/man4/twa.4.gz
 
 # 20211120: kernel_vmount function removed
 OLD_FILES+=usr/share/man/man9/kernel_vmount.9.gz
 
 # 20211115: vm_page busy functions removed
 OLD_FILES+=share/man/man9/vm_page_sbusy.9.gz
 OLD_FILES+=share/man/man9/vm_page_xbusy.9.gz
 OLD_FILES+=share/man/man9/vm_page_sleep_if_busy.9.gz
 
 # 20211113: new clang import which bumps version from 12.0.1 to 13.0.0
 OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/12.0.1/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/12.0.1/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include/fuzzer
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/12.0.1/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/12.0.1/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/12.0.1/include/profile
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/12.0.1/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include/xray
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/cet.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/float.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/inttypes.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/iso646.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/limits.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/12.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/omp.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ompt.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdalign.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdarg.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdbool.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stddef.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdint.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/tgmath.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/unwind.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/varargs.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/12.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/12.0.1/include
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.1/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/12.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/12.0.1/lib
 OLD_DIRS+=usr/lib/clang/12.0.1
 
 # 20211113: new libc++ import which bumps version from 12.0.1 to 13.0.0
 OLD_FILES+=usr/include/c++/v1/__functional_03
 OLD_FILES+=usr/include/c++/v1/__functional_base_03
 OLD_FILES+=usr/include/c++/v1/__memory/base.h
 OLD_FILES+=usr/include/c++/v1/__memory/utilities.h
 OLD_FILES+=usr/include/c++/v1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/tr1/__availability
 OLD_FILES+=usr/include/c++/v1/tr1/__bit_reference
 OLD_FILES+=usr/include/c++/v1/tr1/__bits
 OLD_FILES+=usr/include/c++/v1/tr1/__bsd_locale_defaults.h
 OLD_FILES+=usr/include/c++/v1/tr1/__bsd_locale_fallbacks.h
 OLD_FILES+=usr/include/c++/v1/tr1/__config
 OLD_FILES+=usr/include/c++/v1/tr1/__debug
 OLD_FILES+=usr/include/c++/v1/tr1/__errc
 OLD_FILES+=usr/include/c++/v1/tr1/__functional_03
 OLD_FILES+=usr/include/c++/v1/tr1/__functional_base
 OLD_FILES+=usr/include/c++/v1/tr1/__functional_base_03
 OLD_FILES+=usr/include/c++/v1/tr1/__hash_table
 OLD_FILES+=usr/include/c++/v1/tr1/__libcpp_version
 OLD_FILES+=usr/include/c++/v1/tr1/__locale
 OLD_FILES+=usr/include/c++/v1/tr1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/tr1/__node_handle
 OLD_FILES+=usr/include/c++/v1/tr1/__nullptr
 OLD_FILES+=usr/include/c++/v1/tr1/__split_buffer
 OLD_FILES+=usr/include/c++/v1/tr1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/tr1/__std_stream
 OLD_FILES+=usr/include/c++/v1/tr1/__string
 OLD_FILES+=usr/include/c++/v1/tr1/__threading_support
 OLD_FILES+=usr/include/c++/v1/tr1/__tree
 OLD_FILES+=usr/include/c++/v1/tr1/__tuple
 OLD_FILES+=usr/include/c++/v1/tr1/__undef_macros
 OLD_FILES+=usr/include/c++/v1/tr1/algorithm
 OLD_FILES+=usr/include/c++/v1/tr1/any
 OLD_FILES+=usr/include/c++/v1/tr1/array
 OLD_FILES+=usr/include/c++/v1/tr1/atomic
 OLD_FILES+=usr/include/c++/v1/tr1/barrier
 OLD_FILES+=usr/include/c++/v1/tr1/bit
 OLD_FILES+=usr/include/c++/v1/tr1/bitset
 OLD_FILES+=usr/include/c++/v1/tr1/cassert
 OLD_FILES+=usr/include/c++/v1/tr1/ccomplex
 OLD_FILES+=usr/include/c++/v1/tr1/cctype
 OLD_FILES+=usr/include/c++/v1/tr1/cerrno
 OLD_FILES+=usr/include/c++/v1/tr1/cfenv
 OLD_FILES+=usr/include/c++/v1/tr1/cfloat
 OLD_FILES+=usr/include/c++/v1/tr1/charconv
 OLD_FILES+=usr/include/c++/v1/tr1/chrono
 OLD_FILES+=usr/include/c++/v1/tr1/cinttypes
 OLD_FILES+=usr/include/c++/v1/tr1/ciso646
 OLD_FILES+=usr/include/c++/v1/tr1/climits
 OLD_FILES+=usr/include/c++/v1/tr1/clocale
 OLD_FILES+=usr/include/c++/v1/tr1/cmath
 OLD_FILES+=usr/include/c++/v1/tr1/codecvt
 OLD_FILES+=usr/include/c++/v1/tr1/compare
 OLD_FILES+=usr/include/c++/v1/tr1/complex
 OLD_FILES+=usr/include/c++/v1/tr1/complex.h
 OLD_FILES+=usr/include/c++/v1/tr1/concepts
 OLD_FILES+=usr/include/c++/v1/tr1/condition_variable
 OLD_FILES+=usr/include/c++/v1/tr1/csetjmp
 OLD_FILES+=usr/include/c++/v1/tr1/csignal
 OLD_FILES+=usr/include/c++/v1/tr1/cstdarg
 OLD_FILES+=usr/include/c++/v1/tr1/cstdbool
 OLD_FILES+=usr/include/c++/v1/tr1/cstddef
 OLD_FILES+=usr/include/c++/v1/tr1/cstdint
 OLD_FILES+=usr/include/c++/v1/tr1/cstdio
 OLD_FILES+=usr/include/c++/v1/tr1/cstdlib
 OLD_FILES+=usr/include/c++/v1/tr1/cstring
 OLD_FILES+=usr/include/c++/v1/tr1/ctgmath
 OLD_FILES+=usr/include/c++/v1/tr1/ctime
 OLD_FILES+=usr/include/c++/v1/tr1/ctype.h
 OLD_FILES+=usr/include/c++/v1/tr1/cwchar
 OLD_FILES+=usr/include/c++/v1/tr1/cwctype
 OLD_FILES+=usr/include/c++/v1/tr1/deque
 OLD_FILES+=usr/include/c++/v1/tr1/errno.h
 OLD_FILES+=usr/include/c++/v1/tr1/exception
 OLD_FILES+=usr/include/c++/v1/tr1/execution
 OLD_FILES+=usr/include/c++/v1/tr1/fenv.h
 OLD_FILES+=usr/include/c++/v1/tr1/filesystem
 OLD_FILES+=usr/include/c++/v1/tr1/float.h
 OLD_FILES+=usr/include/c++/v1/tr1/forward_list
 OLD_FILES+=usr/include/c++/v1/tr1/fstream
 OLD_FILES+=usr/include/c++/v1/tr1/functional
 OLD_FILES+=usr/include/c++/v1/tr1/future
 OLD_FILES+=usr/include/c++/v1/tr1/initializer_list
 OLD_FILES+=usr/include/c++/v1/tr1/inttypes.h
 OLD_FILES+=usr/include/c++/v1/tr1/iomanip
 OLD_FILES+=usr/include/c++/v1/tr1/ios
 OLD_FILES+=usr/include/c++/v1/tr1/iosfwd
 OLD_FILES+=usr/include/c++/v1/tr1/iostream
 OLD_FILES+=usr/include/c++/v1/tr1/istream
 OLD_FILES+=usr/include/c++/v1/tr1/iterator
 OLD_FILES+=usr/include/c++/v1/tr1/latch
 OLD_FILES+=usr/include/c++/v1/tr1/limits
 OLD_FILES+=usr/include/c++/v1/tr1/limits.h
 OLD_FILES+=usr/include/c++/v1/tr1/list
 OLD_FILES+=usr/include/c++/v1/tr1/locale
 OLD_FILES+=usr/include/c++/v1/tr1/locale.h
 OLD_FILES+=usr/include/c++/v1/tr1/map
 OLD_FILES+=usr/include/c++/v1/tr1/math.h
 OLD_FILES+=usr/include/c++/v1/tr1/memory
 OLD_FILES+=usr/include/c++/v1/tr1/mutex
 OLD_FILES+=usr/include/c++/v1/tr1/new
 OLD_FILES+=usr/include/c++/v1/tr1/numbers
 OLD_FILES+=usr/include/c++/v1/tr1/numeric
 OLD_FILES+=usr/include/c++/v1/tr1/optional
 OLD_FILES+=usr/include/c++/v1/tr1/ostream
 OLD_FILES+=usr/include/c++/v1/tr1/queue
 OLD_FILES+=usr/include/c++/v1/tr1/random
 OLD_FILES+=usr/include/c++/v1/tr1/ratio
 OLD_FILES+=usr/include/c++/v1/tr1/regex
 OLD_FILES+=usr/include/c++/v1/tr1/scoped_allocator
 OLD_FILES+=usr/include/c++/v1/tr1/semaphore
 OLD_FILES+=usr/include/c++/v1/tr1/set
 OLD_FILES+=usr/include/c++/v1/tr1/setjmp.h
 OLD_FILES+=usr/include/c++/v1/tr1/shared_mutex
 OLD_FILES+=usr/include/c++/v1/tr1/span
 OLD_FILES+=usr/include/c++/v1/tr1/sstream
 OLD_FILES+=usr/include/c++/v1/tr1/stack
 OLD_FILES+=usr/include/c++/v1/tr1/stdbool.h
 OLD_FILES+=usr/include/c++/v1/tr1/stddef.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdexcept
 OLD_FILES+=usr/include/c++/v1/tr1/stdint.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdio.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdlib.h
 OLD_FILES+=usr/include/c++/v1/tr1/streambuf
 OLD_FILES+=usr/include/c++/v1/tr1/string
 OLD_FILES+=usr/include/c++/v1/tr1/string.h
 OLD_FILES+=usr/include/c++/v1/tr1/string_view
 OLD_FILES+=usr/include/c++/v1/tr1/strstream
 OLD_FILES+=usr/include/c++/v1/tr1/system_error
 OLD_FILES+=usr/include/c++/v1/tr1/tgmath.h
 OLD_FILES+=usr/include/c++/v1/tr1/thread
 OLD_FILES+=usr/include/c++/v1/tr1/tuple
 OLD_FILES+=usr/include/c++/v1/tr1/type_traits
 OLD_FILES+=usr/include/c++/v1/tr1/typeindex
 OLD_FILES+=usr/include/c++/v1/tr1/typeinfo
 OLD_FILES+=usr/include/c++/v1/tr1/unordered_map
 OLD_FILES+=usr/include/c++/v1/tr1/unordered_set
 OLD_FILES+=usr/include/c++/v1/tr1/utility
 OLD_FILES+=usr/include/c++/v1/tr1/valarray
 OLD_FILES+=usr/include/c++/v1/tr1/variant
 OLD_FILES+=usr/include/c++/v1/tr1/vector
 OLD_FILES+=usr/include/c++/v1/tr1/version
 OLD_FILES+=usr/include/c++/v1/tr1/wchar.h
 OLD_FILES+=usr/include/c++/v1/tr1/wctype.h
 OLD_DIRS+=usr/include/c++/v1/tr1
 
 # 20211027: libdialog shlib bumped to version 10 for dialog 1.3
 OLD_LIBS+=usr/lib/libdialog.so.9
 OLD_LIBS+=usr/lib/libdpv.so.2
 
 # 20211026: retire obsolete iscsi initiator
 OLD_FILES+=sbin/iscontrol
 OLD_FILES+=usr/share/man/man4/iscsi_initiator.4.gz
 OLD_FILES+=usr/share/man/man8/iscontrol.8.gz
 
 # 20211022
 OLD_FILES+=etc/rc.d/sppp
 OLD_FILES+=rescue/spppcontrol
 OLD_FILES+=sbin/spppcontrol
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/cserial.h
 .endif
 OLD_FILES+=usr/include/net/if_sppp.h
 OLD_FILES+=usr/include/netgraph/ng_sppp.h
 OLD_FILES+=usr/share/man/man4/ng_sppp.4.gz
 OLD_FILES+=usr/share/man/man4/sppp.4.gz
 OLD_FILES+=usr/share/man/man8/spppcontrol.8.gz
 
 # 20211004: Removed sparc64 tests for lastcomm/sa
 OLD_FILES+=usr/tests/usr.bin/lastcomm/v1-sparc64-acct.in
 OLD_FILES+=usr/tests/usr.bin/lastcomm/v1-sparc64.out
 OLD_FILES+=usr/tests/usr.bin/lastcomm/v2-sparc64-acct.in
 OLD_FILES+=usr/tests/usr.bin/lastcomm/v2-sparc64.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-sav.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-usr.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-usr.in
 
 # 20210929:
 OLD_FILES+=usr/sbin/hcseriald
 OLD_FILES+=usr/share/man/man8/hcseriald.8.gz
 
 # 20210929: Remove ng_h4
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_h4.h
 OLD_FILES+=usr/share/man/man4/ng_h4.4.gz
 
 # 20210923: rename boot(9) to kern_reboot(9)
 OLD_FILES+=usr/share/man/man9/boot.9.gz
 
 # 20210921: remove cloudabi
 OLD_FILES+=usr/share/man/man4/cloudabi.4.gz
 OLD_FILES+=usr/share/man/man4/cloudabi32.4.gz
 OLD_FILES+=usr/share/man/man4/cloudabi64.4.gz
 
 # 20210906: stop installing {llvm,clang,lldb}-tblgen
 OLD_FILES+=usr/bin/llvm-tblgen
 OLD_FILES+=usr/bin/clang-tblgen
 OLD_FILES+=usr/bin/lldb-tblgen
 OLD_FILES+=usr/share/man/man1/llvm-tblgen.1.gz
 
 # 20210810: remove Pentium-related man pages and references
 OLD_FILES+=usr/share/man/man3/pmc.p4.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.p5.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.p6.3.gz
 
 # 20210805: C.UTF-8 installed to the wrong location
 OLD_FILES+=usr/share/C.UTF-8.LC_CTYPE
 
 # 20210619: new clang import which bumps version from 12.0.0 to 12.0.1
 OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/12.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/12.0.0/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include/fuzzer
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/12.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/12.0.0/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/12.0.0/include/profile
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/12.0.0/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include/xray
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/cet.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/float.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/inttypes.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/iso646.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/limits.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/12.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/omp.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ompt.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdalign.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdarg.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdbool.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stddef.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdint.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/tgmath.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/unwind.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/varargs.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/12.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/12.0.0/include
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/12.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/12.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/12.0.0/lib
 OLD_DIRS+=usr/lib/clang/12.0.0
 
 # 20210616: Remove crypto_cursor_seg{base,len}
 OLD_FILES+=usr/share/man/man9/crypto_cursor_segbase.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_cursor_seglen.9.gz
 
 # 20210618: rename of usr/share/certs/blacklisted
 OLD_FILES+=usr/share/certs/blacklisted/AddTrust_External_Root.pem
 OLD_FILES+=usr/share/certs/blacklisted/AddTrust_Low-Value_Services_Root.pem
 OLD_FILES+=usr/share/certs/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem
 OLD_FILES+=usr/share/certs/blacklisted/Camerfirma_Global_Chambersign_Root.pem
 OLD_FILES+=usr/share/certs/blacklisted/Certum_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Chambers_of_Commerce_Root_-_2008.pem
 OLD_FILES+=usr/share/certs/blacklisted/D-TRUST_Root_CA_3_2013.pem
 OLD_FILES+=usr/share/certs/blacklisted/EC-ACC.pem
 OLD_FILES+=usr/share/certs/blacklisted/EE_Certification_Centre_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Global_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Primary_Certification_Authority_-_G2.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Primary_Certification_Authority_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Primary_Certification_Authority.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Universal_CA_2.pem
 OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Universal_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Global_Chambersign_Root_-_2008.pem
 OLD_FILES+=usr/share/certs/blacklisted/LuxTrust_Global_Root_2.pem
 OLD_FILES+=usr/share/certs/blacklisted/OISTE_WISeKey_Global_Root_GA_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem
 OLD_FILES+=usr/share/certs/blacklisted/Staat_der_Nederlanden_Root_CA_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/SwissSign_Platinum_CA_-_G2.pem
 OLD_FILES+=usr/share/certs/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem
 OLD_FILES+=usr/share/certs/blacklisted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem
 OLD_FILES+=usr/share/certs/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem
 OLD_FILES+=usr/share/certs/blacklisted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem
 OLD_FILES+=usr/share/certs/blacklisted/Taiwan_GRCA.pem
 OLD_FILES+=usr/share/certs/blacklisted/thawte_Primary_Root_CA_-_G2.pem
 OLD_FILES+=usr/share/certs/blacklisted/thawte_Primary_Root_CA_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/thawte_Primary_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Trustis_FPS_Root_CA.pem
 OLD_FILES+=usr/share/certs/blacklisted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem
 OLD_FILES+=usr/share/certs/blacklisted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.pem
 OLD_FILES+=usr/share/certs/blacklisted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
 OLD_FILES+=usr/share/certs/blacklisted/VeriSign_Universal_Root_Certification_Authority.pem
 OLD_DIRS+=usr/share/certs/blacklisted
 
 # 20210613: new clang import which bumps version from 11.0.1 to 12.0.0
 OLD_FILES+=usr/lib/clang/11.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/11.0.1/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/11.0.1/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/11.0.1/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/11.0.1/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include/fuzzer
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/11.0.1/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/11.0.1/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/11.0.1/include/profile
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/11.0.1/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include/xray
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/cet.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/float.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/inttypes.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/iso646.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/limits.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/11.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/omp.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ompt.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdalign.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdarg.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdbool.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stddef.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdint.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/tgmath.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/unwind.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/varargs.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/11.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/11.0.1/include
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.1/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/11.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/11.0.1/lib
 OLD_DIRS+=usr/lib/clang/11.0.1
 
 # 20210613: Rename OpenZFS manual pages
 OLD_FILES+=usr/share/man/man5/spl-module-parameters.5.gz
 OLD_FILES+=usr/share/man/man5/zfs-events.5.gz
 OLD_FILES+=usr/share/man/man5/zfs-module-parameters.5.gz
 OLD_FILES+=usr/share/man/man8/zfsconcepts.8.gz
 OLD_FILES+=usr/share/man/man8/zfsprops.8.gz
 OLD_FILES+=usr/share/man/man5/zpool-features.5.gz
 OLD_FILES+=usr/share/man/man8/zpoolconcepts.8.gz
 OLD_FILES+=usr/share/man/man8/zpoolprops.8.gz
 
 # 20210611: Remove svn and svnlite
 OLD_FILES+=usr/bin/svn
 OLD_FILES+=usr/bin/svnadmin
 OLD_FILES+=usr/bin/svnbench
 OLD_FILES+=usr/bin/svndumpfilter
 OLD_FILES+=usr/bin/svnfsfs
 OLD_FILES+=usr/bin/svnlite
 OLD_FILES+=usr/bin/svnliteadmin
 OLD_FILES+=usr/bin/svnlitebench
 OLD_FILES+=usr/bin/svnlitedumpfilter
 OLD_FILES+=usr/bin/svnlitefsfs
 OLD_FILES+=usr/bin/svnlitelook
 OLD_FILES+=usr/bin/svnlitemucc
 OLD_FILES+=usr/bin/svnliterdump
 OLD_FILES+=usr/bin/svnliteserve
 OLD_FILES+=usr/bin/svnlitesync
 OLD_FILES+=usr/bin/svnliteversion
 OLD_FILES+=usr/bin/svnlook
 OLD_FILES+=usr/bin/svnmucc
 OLD_FILES+=usr/bin/svnrdump
 OLD_FILES+=usr/bin/svnserve
 OLD_FILES+=usr/bin/svnsync
 OLD_FILES+=usr/bin/svnversion
 OLD_FILES+=usr/share/man/man1/svnlite.1.gz
 
 # 20210607: remove ancontrol(8) related programs
 OLD_FILES+=usr/sbin/ancontrol
 OLD_FILES+=usr/share/man/man8/ancontrol.8.gz
 
 # 20210607: remove an(4)
 OLD_FILES+=usr/include/dev/an/if_aironet_ieee.h
 OLD_FILES+=usr/include/dev/an/if_anreg.h
 OLD_FILES+=usr/share/man/man4/an.4.gz
 
 # 20210426: remove unused libexec/rc.d/addswap
 OLD_FILES+=etc/rc.d/addswap
 
 # 20210413: Remove pfctlinput2
 OLD_FILES+=usr/share/man/man9/pfctlinput2.9.gz
 
 # 20210412: Remove kernel asymmetric crypto
 OLD_FILES+=usr/share/man/man9/crypto_asym.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_kdispatch.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_kdone.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_kregister.9.gz
 OLD_FILES+=usr/share/man/man9/CRYPTODEV_KPROCESS.9.gz
 
 # 20210410: remove unused libexec/rc.d/archdep
 OLD_FILES+=etc/rc.d/archdep
 
 # 20210408: remove tcp_hostcache.h
 OLD_FILES+=usr/include/netinet/tcp_hostcache.h
 
 # 20210403: remove kgmon(8)
 OLD_FILES+=usr/sbin/kgmon
 OLD_FILES+=usr/share/man/man8/kgmon.8.gz
 
 # 20210401: remove bt(4) man page
 OLD_FILES+=usr/share/man/man4/bt.4.gz
 
 # 20210322: retire mn(4) sync serial driver
 OLD_FILES+=usr/share/man/man4/if_mn.4.gz
 OLD_FILES+=usr/share/man/man4/mn.4.gz
 
 # 20210318: remove the terminfo database
 OLD_FILES+=usr/share/terminfo/1/1178
 OLD_FILES+=usr/share/terminfo/1/1730-lm
 OLD_DIRS+=usr/share/terminfo/1
 OLD_FILES+=usr/share/terminfo/2/2621
 OLD_FILES+=usr/share/terminfo/2/2621-wl
 OLD_FILES+=usr/share/terminfo/2/2621A
 OLD_FILES+=usr/share/terminfo/2/2621a
 OLD_DIRS+=usr/share/terminfo/2/
 OLD_FILES+=usr/share/terminfo/3/386at
 OLD_FILES+=usr/share/terminfo/3/3b1
 OLD_DIRS+=usr/share/terminfo/3/
 OLD_FILES+=usr/share/terminfo/4/4025ex
 OLD_FILES+=usr/share/terminfo/4/4027ex
 OLD_FILES+=usr/share/terminfo/4/4410-w
 OLD_DIRS+=usr/share/terminfo/4/
 OLD_FILES+=usr/share/terminfo/5/5051
 OLD_FILES+=usr/share/terminfo/5/5410-w
 OLD_FILES+=usr/share/terminfo/5/5620
 OLD_FILES+=usr/share/terminfo/5/5630-24
 OLD_FILES+=usr/share/terminfo/5/5630DMD-24
 OLD_DIRS+=usr/share/terminfo/5/
 OLD_FILES+=usr/share/terminfo/6/6053
 OLD_FILES+=usr/share/terminfo/6/6053-dg
 OLD_FILES+=usr/share/terminfo/6/605x
 OLD_FILES+=usr/share/terminfo/6/605x-dg
 OLD_FILES+=usr/share/terminfo/6/630-lm
 OLD_FILES+=usr/share/terminfo/6/630MTG-24
 OLD_DIRS+=usr/share/terminfo/6/
 OLD_FILES+=usr/share/terminfo/7/730MTG-24
 OLD_FILES+=usr/share/terminfo/7/730MTG-41
 OLD_FILES+=usr/share/terminfo/7/730MTG-41r
 OLD_FILES+=usr/share/terminfo/7/730MTGr
 OLD_FILES+=usr/share/terminfo/7/730MTGr-24
 OLD_DIRS+=usr/share/terminfo/7/
 OLD_FILES+=usr/share/terminfo/8/8510
 OLD_DIRS+=usr/share/terminfo/8/
 OLD_FILES+=usr/share/terminfo/9/955-hb
 OLD_FILES+=usr/share/terminfo/9/955-w
 OLD_FILES+=usr/share/terminfo/9/9term
 OLD_DIRS+=usr/share/terminfo/9/
 OLD_FILES+=usr/share/terminfo/A/Apple_Terminal
 OLD_DIRS+=usr/share/terminfo/A/
 OLD_FILES+=usr/share/terminfo/E/Eterm
 OLD_FILES+=usr/share/terminfo/E/Eterm-256color
 OLD_FILES+=usr/share/terminfo/E/Eterm-88color
 OLD_FILES+=usr/share/terminfo/E/Eterm-color
 OLD_DIRS+=usr/share/terminfo/E/
 OLD_FILES+=usr/share/terminfo/L/LFT-PC850
 OLD_DIRS+=usr/share/terminfo/L/
 OLD_FILES+=usr/share/terminfo/M/MtxOrb
 OLD_FILES+=usr/share/terminfo/M/MtxOrb162
 OLD_FILES+=usr/share/terminfo/M/MtxOrb204
 OLD_DIRS+=usr/share/terminfo/M/
 OLD_FILES+=usr/share/terminfo/N/NCR260VT300WPP
 OLD_FILES+=usr/share/terminfo/N/NCRVT100WPP
 OLD_DIRS+=usr/share/terminfo/N/
 OLD_FILES+=usr/share/terminfo/P/P12
 OLD_FILES+=usr/share/terminfo/P/P12-M
 OLD_FILES+=usr/share/terminfo/P/P12-M-W
 OLD_FILES+=usr/share/terminfo/P/P12-W
 OLD_FILES+=usr/share/terminfo/P/P14
 OLD_FILES+=usr/share/terminfo/P/P14-M
 OLD_FILES+=usr/share/terminfo/P/P14-M-W
 OLD_FILES+=usr/share/terminfo/P/P14-W
 OLD_FILES+=usr/share/terminfo/P/P4
 OLD_FILES+=usr/share/terminfo/P/P5
 OLD_FILES+=usr/share/terminfo/P/P7
 OLD_FILES+=usr/share/terminfo/P/P8
 OLD_FILES+=usr/share/terminfo/P/P8-W
 OLD_FILES+=usr/share/terminfo/P/P9
 OLD_FILES+=usr/share/terminfo/P/P9-8
 OLD_FILES+=usr/share/terminfo/P/P9-8-W
 OLD_FILES+=usr/share/terminfo/P/P9-W
 OLD_DIRS+=usr/share/terminfo/P/
 OLD_FILES+=usr/share/terminfo/Q/Q306-8-pc
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-H
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-H-am
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-Hw
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-w
 OLD_FILES+=usr/share/terminfo/Q/Q310-vip-w-am
 OLD_DIRS+=usr/share/terminfo/Q/
 OLD_FILES+=usr/share/terminfo/X/X-hpterm
 OLD_DIRS+=usr/share/terminfo/X/
 OLD_FILES+=usr/share/terminfo/a/a210
 OLD_FILES+=usr/share/terminfo/a/a80
 OLD_FILES+=usr/share/terminfo/a/a980
 OLD_FILES+=usr/share/terminfo/a/aa4080
 OLD_FILES+=usr/share/terminfo/a/aaa
 OLD_FILES+=usr/share/terminfo/a/aaa+dec
 OLD_FILES+=usr/share/terminfo/a/aaa+rv
 OLD_FILES+=usr/share/terminfo/a/aaa+unk
 OLD_FILES+=usr/share/terminfo/a/aaa-18
 OLD_FILES+=usr/share/terminfo/a/aaa-18-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-20
 OLD_FILES+=usr/share/terminfo/a/aaa-22
 OLD_FILES+=usr/share/terminfo/a/aaa-24
 OLD_FILES+=usr/share/terminfo/a/aaa-24-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-26
 OLD_FILES+=usr/share/terminfo/a/aaa-28
 OLD_FILES+=usr/share/terminfo/a/aaa-30
 OLD_FILES+=usr/share/terminfo/a/aaa-30-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-30-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-30-rv-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-30-s
 OLD_FILES+=usr/share/terminfo/a/aaa-30-s-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-30-s-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-30-s-rv-ct
 OLD_FILES+=usr/share/terminfo/a/aaa-36
 OLD_FILES+=usr/share/terminfo/a/aaa-36-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-40
 OLD_FILES+=usr/share/terminfo/a/aaa-40-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-48
 OLD_FILES+=usr/share/terminfo/a/aaa-48-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-60
 OLD_FILES+=usr/share/terminfo/a/aaa-60-dec-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-60-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-60-s
 OLD_FILES+=usr/share/terminfo/a/aaa-60-s-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-db
 OLD_FILES+=usr/share/terminfo/a/aaa-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-rv-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-rv-unk
 OLD_FILES+=usr/share/terminfo/a/aaa-s
 OLD_FILES+=usr/share/terminfo/a/aaa-s-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-s-rv
 OLD_FILES+=usr/share/terminfo/a/aaa-s-rv-ctxt
 OLD_FILES+=usr/share/terminfo/a/aaa-unk
 OLD_FILES+=usr/share/terminfo/a/aas1901
 OLD_FILES+=usr/share/terminfo/a/abm80
 OLD_FILES+=usr/share/terminfo/a/abm85
 OLD_FILES+=usr/share/terminfo/a/abm85e
 OLD_FILES+=usr/share/terminfo/a/abm85h
 OLD_FILES+=usr/share/terminfo/a/abm85h-old
 OLD_FILES+=usr/share/terminfo/a/absolute
 OLD_FILES+=usr/share/terminfo/a/act4
 OLD_FILES+=usr/share/terminfo/a/act5
 OLD_FILES+=usr/share/terminfo/a/addrinfo
 OLD_FILES+=usr/share/terminfo/a/adds200
 OLD_FILES+=usr/share/terminfo/a/adds980
 OLD_FILES+=usr/share/terminfo/a/addsviewpoint
 OLD_FILES+=usr/share/terminfo/a/addsvp60
 OLD_FILES+=usr/share/terminfo/a/adm+sgr
 OLD_FILES+=usr/share/terminfo/a/adm1
 OLD_FILES+=usr/share/terminfo/a/adm11
 OLD_FILES+=usr/share/terminfo/a/adm1178
 OLD_FILES+=usr/share/terminfo/a/adm12
 OLD_FILES+=usr/share/terminfo/a/adm1a
 OLD_FILES+=usr/share/terminfo/a/adm2
 OLD_FILES+=usr/share/terminfo/a/adm20
 OLD_FILES+=usr/share/terminfo/a/adm21
 OLD_FILES+=usr/share/terminfo/a/adm22
 OLD_FILES+=usr/share/terminfo/a/adm3
 OLD_FILES+=usr/share/terminfo/a/adm31
 OLD_FILES+=usr/share/terminfo/a/adm31-old
 OLD_FILES+=usr/share/terminfo/a/adm36
 OLD_FILES+=usr/share/terminfo/a/adm3a
 OLD_FILES+=usr/share/terminfo/a/adm3a+
 OLD_FILES+=usr/share/terminfo/a/adm42
 OLD_FILES+=usr/share/terminfo/a/adm42-ns
 OLD_FILES+=usr/share/terminfo/a/adm5
 OLD_FILES+=usr/share/terminfo/a/aepro
 OLD_FILES+=usr/share/terminfo/a/aixterm
 OLD_FILES+=usr/share/terminfo/a/aixterm-16color
 OLD_FILES+=usr/share/terminfo/a/aixterm-m
 OLD_FILES+=usr/share/terminfo/a/aixterm-m-old
 OLD_FILES+=usr/share/terminfo/a/aj
 OLD_FILES+=usr/share/terminfo/a/aj510
 OLD_FILES+=usr/share/terminfo/a/aj830
 OLD_FILES+=usr/share/terminfo/a/aj832
 OLD_FILES+=usr/share/terminfo/a/alacritty
 OLD_FILES+=usr/share/terminfo/a/alacritty+common
 OLD_FILES+=usr/share/terminfo/a/alacritty-direct
 OLD_FILES+=usr/share/terminfo/a/alt2
 OLD_FILES+=usr/share/terminfo/a/alt3
 OLD_FILES+=usr/share/terminfo/a/alt4
 OLD_FILES+=usr/share/terminfo/a/alt5
 OLD_FILES+=usr/share/terminfo/a/alt7
 OLD_FILES+=usr/share/terminfo/a/alt7pc
 OLD_FILES+=usr/share/terminfo/a/alto-h19
 OLD_FILES+=usr/share/terminfo/a/alto-heath
 OLD_FILES+=usr/share/terminfo/a/altoh19
 OLD_FILES+=usr/share/terminfo/a/altoheath
 OLD_FILES+=usr/share/terminfo/a/altos-2
 OLD_FILES+=usr/share/terminfo/a/altos-3
 OLD_FILES+=usr/share/terminfo/a/altos-4
 OLD_FILES+=usr/share/terminfo/a/altos-5
 OLD_FILES+=usr/share/terminfo/a/altos2
 OLD_FILES+=usr/share/terminfo/a/altos3
 OLD_FILES+=usr/share/terminfo/a/altos4
 OLD_FILES+=usr/share/terminfo/a/altos5
 OLD_FILES+=usr/share/terminfo/a/altos7
 OLD_FILES+=usr/share/terminfo/a/altos7pc
 OLD_FILES+=usr/share/terminfo/a/ambas
 OLD_FILES+=usr/share/terminfo/a/ambassador
 OLD_FILES+=usr/share/terminfo/a/amiga
 OLD_FILES+=usr/share/terminfo/a/amiga-8bit
 OLD_FILES+=usr/share/terminfo/a/amiga-h
 OLD_FILES+=usr/share/terminfo/a/amiga-vnc
 OLD_FILES+=usr/share/terminfo/a/amp219
 OLD_FILES+=usr/share/terminfo/a/amp219w
 OLD_FILES+=usr/share/terminfo/a/ampex-219
 OLD_FILES+=usr/share/terminfo/a/ampex-219w
 OLD_FILES+=usr/share/terminfo/a/ampex-232
 OLD_FILES+=usr/share/terminfo/a/ampex175
 OLD_FILES+=usr/share/terminfo/a/ampex175-b
 OLD_FILES+=usr/share/terminfo/a/ampex210
 OLD_FILES+=usr/share/terminfo/a/ampex219
 OLD_FILES+=usr/share/terminfo/a/ampex219w
 OLD_FILES+=usr/share/terminfo/a/ampex232
 OLD_FILES+=usr/share/terminfo/a/ampex232w
 OLD_FILES+=usr/share/terminfo/a/ampex80
 OLD_FILES+=usr/share/terminfo/a/annarbor4080
 OLD_FILES+=usr/share/terminfo/a/ansi
 OLD_FILES+=usr/share/terminfo/a/ansi+arrows
 OLD_FILES+=usr/share/terminfo/a/ansi+csr
 OLD_FILES+=usr/share/terminfo/a/ansi+cup
 OLD_FILES+=usr/share/terminfo/a/ansi+enq
 OLD_FILES+=usr/share/terminfo/a/ansi+erase
 OLD_FILES+=usr/share/terminfo/a/ansi+idc
 OLD_FILES+=usr/share/terminfo/a/ansi+idc1
 OLD_FILES+=usr/share/terminfo/a/ansi+idl
 OLD_FILES+=usr/share/terminfo/a/ansi+idl1
 OLD_FILES+=usr/share/terminfo/a/ansi+inittabs
 OLD_FILES+=usr/share/terminfo/a/ansi+local
 OLD_FILES+=usr/share/terminfo/a/ansi+local1
 OLD_FILES+=usr/share/terminfo/a/ansi+pp
 OLD_FILES+=usr/share/terminfo/a/ansi+rca
 OLD_FILES+=usr/share/terminfo/a/ansi+rep
 OLD_FILES+=usr/share/terminfo/a/ansi+sgr
 OLD_FILES+=usr/share/terminfo/a/ansi+sgrbold
 OLD_FILES+=usr/share/terminfo/a/ansi+sgrdim
 OLD_FILES+=usr/share/terminfo/a/ansi+sgrso
 OLD_FILES+=usr/share/terminfo/a/ansi+sgrul
 OLD_FILES+=usr/share/terminfo/a/ansi+tabs
 OLD_FILES+=usr/share/terminfo/a/ansi-color-2-emx
 OLD_FILES+=usr/share/terminfo/a/ansi-color-3-emx
 OLD_FILES+=usr/share/terminfo/a/ansi-emx
 OLD_FILES+=usr/share/terminfo/a/ansi-generic
 OLD_FILES+=usr/share/terminfo/a/ansi-m
 OLD_FILES+=usr/share/terminfo/a/ansi-mini
 OLD_FILES+=usr/share/terminfo/a/ansi-mono
 OLD_FILES+=usr/share/terminfo/a/ansi-mr
 OLD_FILES+=usr/share/terminfo/a/ansi-mtabs
 OLD_FILES+=usr/share/terminfo/a/ansi-nt
 OLD_FILES+=usr/share/terminfo/a/ansi.sys
 OLD_FILES+=usr/share/terminfo/a/ansi.sys-old
 OLD_FILES+=usr/share/terminfo/a/ansi.sysk
 OLD_FILES+=usr/share/terminfo/a/ansi43m
 OLD_FILES+=usr/share/terminfo/a/ansi77
 OLD_FILES+=usr/share/terminfo/a/ansi80x25
 OLD_FILES+=usr/share/terminfo/a/ansi80x25-mono
 OLD_FILES+=usr/share/terminfo/a/ansi80x25-raw
 OLD_FILES+=usr/share/terminfo/a/ansi80x30
 OLD_FILES+=usr/share/terminfo/a/ansi80x30-mono
 OLD_FILES+=usr/share/terminfo/a/ansi80x43
 OLD_FILES+=usr/share/terminfo/a/ansi80x43-mono
 OLD_FILES+=usr/share/terminfo/a/ansi80x50
 OLD_FILES+=usr/share/terminfo/a/ansi80x50-mono
 OLD_FILES+=usr/share/terminfo/a/ansi80x60
 OLD_FILES+=usr/share/terminfo/a/ansi80x60-mono
 OLD_FILES+=usr/share/terminfo/a/ansil
 OLD_FILES+=usr/share/terminfo/a/ansil-mono
 OLD_FILES+=usr/share/terminfo/a/ansis
 OLD_FILES+=usr/share/terminfo/a/ansis-mono
 OLD_FILES+=usr/share/terminfo/a/ansisysk
 OLD_FILES+=usr/share/terminfo/a/ansiterm
 OLD_FILES+=usr/share/terminfo/a/ansiw
 OLD_FILES+=usr/share/terminfo/a/ap-vm80
 OLD_FILES+=usr/share/terminfo/a/apl
 OLD_FILES+=usr/share/terminfo/a/apollo
 OLD_FILES+=usr/share/terminfo/a/apollo_15P
 OLD_FILES+=usr/share/terminfo/a/apollo_19L
 OLD_FILES+=usr/share/terminfo/a/apollo_color
 OLD_FILES+=usr/share/terminfo/a/apple-80
 OLD_FILES+=usr/share/terminfo/a/apple-ae
 OLD_FILES+=usr/share/terminfo/a/apple-soroc
 OLD_FILES+=usr/share/terminfo/a/apple-uterm
 OLD_FILES+=usr/share/terminfo/a/apple-uterm-vb
 OLD_FILES+=usr/share/terminfo/a/apple-videx
 OLD_FILES+=usr/share/terminfo/a/apple-videx2
 OLD_FILES+=usr/share/terminfo/a/apple-videx3
 OLD_FILES+=usr/share/terminfo/a/apple-vm80
 OLD_FILES+=usr/share/terminfo/a/apple2e
 OLD_FILES+=usr/share/terminfo/a/apple2e-p
 OLD_FILES+=usr/share/terminfo/a/apple80p
 OLD_FILES+=usr/share/terminfo/a/appleII
 OLD_FILES+=usr/share/terminfo/a/appleIIc
 OLD_FILES+=usr/share/terminfo/a/appleIIe
 OLD_FILES+=usr/share/terminfo/a/appleIIgs
 OLD_FILES+=usr/share/terminfo/a/arm100
 OLD_FILES+=usr/share/terminfo/a/arm100-am
 OLD_FILES+=usr/share/terminfo/a/arm100-w
 OLD_FILES+=usr/share/terminfo/a/arm100-wam
 OLD_FILES+=usr/share/terminfo/a/at
 OLD_FILES+=usr/share/terminfo/a/at-color
 OLD_FILES+=usr/share/terminfo/a/at-m
 OLD_FILES+=usr/share/terminfo/a/at386
 OLD_FILES+=usr/share/terminfo/a/atari
 OLD_FILES+=usr/share/terminfo/a/atari-color
 OLD_FILES+=usr/share/terminfo/a/atari-m
 OLD_FILES+=usr/share/terminfo/a/atari-old
 OLD_FILES+=usr/share/terminfo/a/atari_st
 OLD_FILES+=usr/share/terminfo/a/atari_st-color
 OLD_FILES+=usr/share/terminfo/a/atarist-m
 OLD_FILES+=usr/share/terminfo/a/aterm
 OLD_FILES+=usr/share/terminfo/a/att2300
 OLD_FILES+=usr/share/terminfo/a/att2350
 OLD_FILES+=usr/share/terminfo/a/att4410
 OLD_FILES+=usr/share/terminfo/a/att4410-w
 OLD_FILES+=usr/share/terminfo/a/att4410v1
 OLD_FILES+=usr/share/terminfo/a/att4410v1-w
 OLD_FILES+=usr/share/terminfo/a/att4415
 OLD_FILES+=usr/share/terminfo/a/att4415+nl
 OLD_FILES+=usr/share/terminfo/a/att4415-nl
 OLD_FILES+=usr/share/terminfo/a/att4415-rv
 OLD_FILES+=usr/share/terminfo/a/att4415-rv-nl
 OLD_FILES+=usr/share/terminfo/a/att4415-w
 OLD_FILES+=usr/share/terminfo/a/att4415-w-nl
 OLD_FILES+=usr/share/terminfo/a/att4415-w-rv
 OLD_FILES+=usr/share/terminfo/a/att4415-w-rv-n
 OLD_FILES+=usr/share/terminfo/a/att4418
 OLD_FILES+=usr/share/terminfo/a/att4418-w
 OLD_FILES+=usr/share/terminfo/a/att4420
 OLD_FILES+=usr/share/terminfo/a/att4424
 OLD_FILES+=usr/share/terminfo/a/att4424-1
 OLD_FILES+=usr/share/terminfo/a/att4424m
 OLD_FILES+=usr/share/terminfo/a/att4425
 OLD_FILES+=usr/share/terminfo/a/att4425-nl
 OLD_FILES+=usr/share/terminfo/a/att4425-w
 OLD_FILES+=usr/share/terminfo/a/att4426
 OLD_FILES+=usr/share/terminfo/a/att500
 OLD_FILES+=usr/share/terminfo/a/att505
 OLD_FILES+=usr/share/terminfo/a/att505-24
 OLD_FILES+=usr/share/terminfo/a/att510a
 OLD_FILES+=usr/share/terminfo/a/att510d
 OLD_FILES+=usr/share/terminfo/a/att513
 OLD_FILES+=usr/share/terminfo/a/att5310
 OLD_FILES+=usr/share/terminfo/a/att5320
 OLD_FILES+=usr/share/terminfo/a/att5410
 OLD_FILES+=usr/share/terminfo/a/att5410-w
 OLD_FILES+=usr/share/terminfo/a/att5410v1
 OLD_FILES+=usr/share/terminfo/a/att5410v1-w
 OLD_FILES+=usr/share/terminfo/a/att5418
 OLD_FILES+=usr/share/terminfo/a/att5418-w
 OLD_FILES+=usr/share/terminfo/a/att5420
 OLD_FILES+=usr/share/terminfo/a/att5420+nl
 OLD_FILES+=usr/share/terminfo/a/att5420-nl
 OLD_FILES+=usr/share/terminfo/a/att5420-rv
 OLD_FILES+=usr/share/terminfo/a/att5420-rv-nl
 OLD_FILES+=usr/share/terminfo/a/att5420-w
 OLD_FILES+=usr/share/terminfo/a/att5420-w-nl
 OLD_FILES+=usr/share/terminfo/a/att5420-w-rv
 OLD_FILES+=usr/share/terminfo/a/att5420-w-rv-n
 OLD_FILES+=usr/share/terminfo/a/att5420_2
 OLD_FILES+=usr/share/terminfo/a/att5420_2-w
 OLD_FILES+=usr/share/terminfo/a/att5425
 OLD_FILES+=usr/share/terminfo/a/att5425-nl
 OLD_FILES+=usr/share/terminfo/a/att5425-w
 OLD_FILES+=usr/share/terminfo/a/att5430
 OLD_FILES+=usr/share/terminfo/a/att5620
 OLD_FILES+=usr/share/terminfo/a/att5620-1
 OLD_FILES+=usr/share/terminfo/a/att5620-24
 OLD_FILES+=usr/share/terminfo/a/att5620-34
 OLD_FILES+=usr/share/terminfo/a/att5620-s
 OLD_FILES+=usr/share/terminfo/a/att605
 OLD_FILES+=usr/share/terminfo/a/att605-pc
 OLD_FILES+=usr/share/terminfo/a/att605-w
 OLD_FILES+=usr/share/terminfo/a/att610
 OLD_FILES+=usr/share/terminfo/a/att610+cvis
 OLD_FILES+=usr/share/terminfo/a/att610+cvis0
 OLD_FILES+=usr/share/terminfo/a/att610-103k
 OLD_FILES+=usr/share/terminfo/a/att610-103k-w
 OLD_FILES+=usr/share/terminfo/a/att610-w
 OLD_FILES+=usr/share/terminfo/a/att615
 OLD_FILES+=usr/share/terminfo/a/att615-103k
 OLD_FILES+=usr/share/terminfo/a/att615-103k-w
 OLD_FILES+=usr/share/terminfo/a/att615-w
 OLD_FILES+=usr/share/terminfo/a/att620
 OLD_FILES+=usr/share/terminfo/a/att620-103k
 OLD_FILES+=usr/share/terminfo/a/att620-103k-w
 OLD_FILES+=usr/share/terminfo/a/att620-w
 OLD_FILES+=usr/share/terminfo/a/att630
 OLD_FILES+=usr/share/terminfo/a/att630-24
 OLD_FILES+=usr/share/terminfo/a/att6386
 OLD_FILES+=usr/share/terminfo/a/att700
 OLD_FILES+=usr/share/terminfo/a/att730
 OLD_FILES+=usr/share/terminfo/a/att730-24
 OLD_FILES+=usr/share/terminfo/a/att730-41
 OLD_FILES+=usr/share/terminfo/a/att7300
 OLD_FILES+=usr/share/terminfo/a/att730r
 OLD_FILES+=usr/share/terminfo/a/att730r-24
 OLD_FILES+=usr/share/terminfo/a/att730r-41
 OLD_FILES+=usr/share/terminfo/a/avatar
 OLD_FILES+=usr/share/terminfo/a/avatar0
 OLD_FILES+=usr/share/terminfo/a/avatar0+
 OLD_FILES+=usr/share/terminfo/a/avatar1
 OLD_FILES+=usr/share/terminfo/a/avt
 OLD_FILES+=usr/share/terminfo/a/avt+s
 OLD_FILES+=usr/share/terminfo/a/avt-ns
 OLD_FILES+=usr/share/terminfo/a/avt-rv
 OLD_FILES+=usr/share/terminfo/a/avt-rv-ns
 OLD_FILES+=usr/share/terminfo/a/avt-rv-s
 OLD_FILES+=usr/share/terminfo/a/avt-s
 OLD_FILES+=usr/share/terminfo/a/avt-w
 OLD_FILES+=usr/share/terminfo/a/avt-w-ns
 OLD_FILES+=usr/share/terminfo/a/avt-w-rv
 OLD_FILES+=usr/share/terminfo/a/avt-w-rv-ns
 OLD_FILES+=usr/share/terminfo/a/avt-w-rv-s
 OLD_FILES+=usr/share/terminfo/a/avt-w-s
 OLD_FILES+=usr/share/terminfo/a/aws
 OLD_FILES+=usr/share/terminfo/a/awsc
 OLD_DIRS+=usr/share/terminfo/a/
 OLD_FILES+=usr/share/terminfo/b/b-128
 OLD_FILES+=usr/share/terminfo/b/bantam
 OLD_FILES+=usr/share/terminfo/b/basic4
 OLD_FILES+=usr/share/terminfo/b/basis
 OLD_FILES+=usr/share/terminfo/b/bct510a
 OLD_FILES+=usr/share/terminfo/b/bct510d
 OLD_FILES+=usr/share/terminfo/b/beacon
 OLD_FILES+=usr/share/terminfo/b/bee
 OLD_FILES+=usr/share/terminfo/b/beehive
 OLD_FILES+=usr/share/terminfo/b/beehive3
 OLD_FILES+=usr/share/terminfo/b/beehive4
 OLD_FILES+=usr/share/terminfo/b/beehiveIIIm
 OLD_FILES+=usr/share/terminfo/b/beterm
 OLD_FILES+=usr/share/terminfo/b/bg1.25
 OLD_FILES+=usr/share/terminfo/b/bg1.25nv
 OLD_FILES+=usr/share/terminfo/b/bg1.25rv
 OLD_FILES+=usr/share/terminfo/b/bg2.0
 OLD_FILES+=usr/share/terminfo/b/bg2.0nv
 OLD_FILES+=usr/share/terminfo/b/bg2.0rv
 OLD_FILES+=usr/share/terminfo/b/bg3.10
 OLD_FILES+=usr/share/terminfo/b/bg3.10nv
 OLD_FILES+=usr/share/terminfo/b/bg3.10rv
 OLD_FILES+=usr/share/terminfo/b/bh3m
 OLD_FILES+=usr/share/terminfo/b/bh4
 OLD_FILES+=usr/share/terminfo/b/bitgraph
 OLD_FILES+=usr/share/terminfo/b/blit
 OLD_FILES+=usr/share/terminfo/b/bobcat
 OLD_FILES+=usr/share/terminfo/b/bq300
 OLD_FILES+=usr/share/terminfo/b/bq300-8
 OLD_FILES+=usr/share/terminfo/b/bq300-8-pc
 OLD_FILES+=usr/share/terminfo/b/bq300-8-pc-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-8-pc-w
 OLD_FILES+=usr/share/terminfo/b/bq300-8-pc-w-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-8rv
 OLD_FILES+=usr/share/terminfo/b/bq300-8w
 OLD_FILES+=usr/share/terminfo/b/bq300-pc
 OLD_FILES+=usr/share/terminfo/b/bq300-pc-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-pc-w
 OLD_FILES+=usr/share/terminfo/b/bq300-pc-w-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-rv
 OLD_FILES+=usr/share/terminfo/b/bq300-w
 OLD_FILES+=usr/share/terminfo/b/bq300-w-8rv
 OLD_FILES+=usr/share/terminfo/b/bq300-w-rv
 OLD_FILES+=usr/share/terminfo/b/bsdos-pc
 OLD_FILES+=usr/share/terminfo/b/bsdos-pc-m
 OLD_FILES+=usr/share/terminfo/b/bsdos-pc-mono
 OLD_FILES+=usr/share/terminfo/b/bsdos-pc-nobold
 OLD_FILES+=usr/share/terminfo/b/bsdos-ppc
 OLD_FILES+=usr/share/terminfo/b/bsdos-sparc
 OLD_FILES+=usr/share/terminfo/b/bterm
 OLD_DIRS+=usr/share/terminfo/b/
 OLD_FILES+=usr/share/terminfo/c/c100
 OLD_FILES+=usr/share/terminfo/c/c100-1p
 OLD_FILES+=usr/share/terminfo/c/c100-4p
 OLD_FILES+=usr/share/terminfo/c/c100-rv
 OLD_FILES+=usr/share/terminfo/c/c100-rv-4p
 OLD_FILES+=usr/share/terminfo/c/c104
 OLD_FILES+=usr/share/terminfo/c/c108
 OLD_FILES+=usr/share/terminfo/c/c108-4p
 OLD_FILES+=usr/share/terminfo/c/c108-8p
 OLD_FILES+=usr/share/terminfo/c/c108-rv
 OLD_FILES+=usr/share/terminfo/c/c108-rv-4p
 OLD_FILES+=usr/share/terminfo/c/c108-rv-8p
 OLD_FILES+=usr/share/terminfo/c/c108-w
 OLD_FILES+=usr/share/terminfo/c/c108-w-8p
 OLD_FILES+=usr/share/terminfo/c/c300
 OLD_FILES+=usr/share/terminfo/c/c301
 OLD_FILES+=usr/share/terminfo/c/c321
 OLD_FILES+=usr/share/terminfo/c/ca22851
 OLD_FILES+=usr/share/terminfo/c/cad68-2
 OLD_FILES+=usr/share/terminfo/c/cad68-3
 OLD_FILES+=usr/share/terminfo/c/cbblit
 OLD_FILES+=usr/share/terminfo/c/cbunix
 OLD_FILES+=usr/share/terminfo/c/cci
 OLD_FILES+=usr/share/terminfo/c/cci1
 OLD_FILES+=usr/share/terminfo/c/cdc456
 OLD_FILES+=usr/share/terminfo/c/cdc721
 OLD_FILES+=usr/share/terminfo/c/cdc721-esc
 OLD_FILES+=usr/share/terminfo/c/cdc721ll
 OLD_FILES+=usr/share/terminfo/c/cdc752
 OLD_FILES+=usr/share/terminfo/c/cdc756
 OLD_FILES+=usr/share/terminfo/c/cg7900
 OLD_FILES+=usr/share/terminfo/c/cgc2
 OLD_FILES+=usr/share/terminfo/c/cgc3
 OLD_FILES+=usr/share/terminfo/c/chromatics
 OLD_FILES+=usr/share/terminfo/c/ci8510
 OLD_FILES+=usr/share/terminfo/c/cit-80
 OLD_FILES+=usr/share/terminfo/c/cit101
 OLD_FILES+=usr/share/terminfo/c/cit101e
 OLD_FILES+=usr/share/terminfo/c/cit101e-132
 OLD_FILES+=usr/share/terminfo/c/cit101e-n
 OLD_FILES+=usr/share/terminfo/c/cit101e-n132
 OLD_FILES+=usr/share/terminfo/c/cit101e-rv
 OLD_FILES+=usr/share/terminfo/c/cit500
 OLD_FILES+=usr/share/terminfo/c/cit80
 OLD_FILES+=usr/share/terminfo/c/citc
 OLD_FILES+=usr/share/terminfo/c/citoh
 OLD_FILES+=usr/share/terminfo/c/citoh-6lpi
 OLD_FILES+=usr/share/terminfo/c/citoh-8lpi
 OLD_FILES+=usr/share/terminfo/c/citoh-comp
 OLD_FILES+=usr/share/terminfo/c/citoh-elite
 OLD_FILES+=usr/share/terminfo/c/citoh-pica
 OLD_FILES+=usr/share/terminfo/c/citoh-prop
 OLD_FILES+=usr/share/terminfo/c/citoh-ps
 OLD_FILES+=usr/share/terminfo/c/coco3
 OLD_FILES+=usr/share/terminfo/c/coherent
 OLD_FILES+=usr/share/terminfo/c/color_xterm
 OLD_FILES+=usr/share/terminfo/c/colorscan
 OLD_FILES+=usr/share/terminfo/c/commodore
 OLD_FILES+=usr/share/terminfo/c/concept
 OLD_FILES+=usr/share/terminfo/c/concept-avt
 OLD_FILES+=usr/share/terminfo/c/concept100
 OLD_FILES+=usr/share/terminfo/c/concept100-rv
 OLD_FILES+=usr/share/terminfo/c/concept108
 OLD_FILES+=usr/share/terminfo/c/concept108-4p
 OLD_FILES+=usr/share/terminfo/c/concept108-8p
 OLD_FILES+=usr/share/terminfo/c/concept108-w-8
 OLD_FILES+=usr/share/terminfo/c/concept108-w8p
 OLD_FILES+=usr/share/terminfo/c/concept108rv4p
 OLD_FILES+=usr/share/terminfo/c/cons25
 OLD_FILES+=usr/share/terminfo/c/cons25-debian
 OLD_FILES+=usr/share/terminfo/c/cons25-iso-m
 OLD_FILES+=usr/share/terminfo/c/cons25-iso8859
 OLD_FILES+=usr/share/terminfo/c/cons25-koi8-r
 OLD_FILES+=usr/share/terminfo/c/cons25-koi8r-m
 OLD_FILES+=usr/share/terminfo/c/cons25-m
 OLD_FILES+=usr/share/terminfo/c/cons25l1
 OLD_FILES+=usr/share/terminfo/c/cons25l1-m
 OLD_FILES+=usr/share/terminfo/c/cons25r
 OLD_FILES+=usr/share/terminfo/c/cons25r-m
 OLD_FILES+=usr/share/terminfo/c/cons25w
 OLD_FILES+=usr/share/terminfo/c/cons30
 OLD_FILES+=usr/share/terminfo/c/cons30-m
 OLD_FILES+=usr/share/terminfo/c/cons43
 OLD_FILES+=usr/share/terminfo/c/cons43-m
 OLD_FILES+=usr/share/terminfo/c/cons50
 OLD_FILES+=usr/share/terminfo/c/cons50-iso-m
 OLD_FILES+=usr/share/terminfo/c/cons50-iso8859
 OLD_FILES+=usr/share/terminfo/c/cons50-koi8r
 OLD_FILES+=usr/share/terminfo/c/cons50-koi8r-m
 OLD_FILES+=usr/share/terminfo/c/cons50-m
 OLD_FILES+=usr/share/terminfo/c/cons50l1
 OLD_FILES+=usr/share/terminfo/c/cons50l1-m
 OLD_FILES+=usr/share/terminfo/c/cons50r
 OLD_FILES+=usr/share/terminfo/c/cons50r-m
 OLD_FILES+=usr/share/terminfo/c/cons60
 OLD_FILES+=usr/share/terminfo/c/cons60-iso
 OLD_FILES+=usr/share/terminfo/c/cons60-iso-m
 OLD_FILES+=usr/share/terminfo/c/cons60-koi8r
 OLD_FILES+=usr/share/terminfo/c/cons60-koi8r-m
 OLD_FILES+=usr/share/terminfo/c/cons60-m
 OLD_FILES+=usr/share/terminfo/c/cons60l1
 OLD_FILES+=usr/share/terminfo/c/cons60l1-m
 OLD_FILES+=usr/share/terminfo/c/cons60r
 OLD_FILES+=usr/share/terminfo/c/cons60r-m
 OLD_FILES+=usr/share/terminfo/c/contel300
 OLD_FILES+=usr/share/terminfo/c/contel301
 OLD_FILES+=usr/share/terminfo/c/contel320
 OLD_FILES+=usr/share/terminfo/c/contel321
 OLD_FILES+=usr/share/terminfo/c/cops
 OLD_FILES+=usr/share/terminfo/c/cops-10
 OLD_FILES+=usr/share/terminfo/c/cops10
 OLD_FILES+=usr/share/terminfo/c/crt
 OLD_FILES+=usr/share/terminfo/c/crt-vt220
 OLD_FILES+=usr/share/terminfo/c/cs10
 OLD_FILES+=usr/share/terminfo/c/cs10-w
 OLD_FILES+=usr/share/terminfo/c/ct82
 OLD_FILES+=usr/share/terminfo/c/ct8500
 OLD_FILES+=usr/share/terminfo/c/ctrm
 OLD_FILES+=usr/share/terminfo/c/cx
 OLD_FILES+=usr/share/terminfo/c/cx100
 OLD_FILES+=usr/share/terminfo/c/cyb110
 OLD_FILES+=usr/share/terminfo/c/cyb83
 OLD_FILES+=usr/share/terminfo/c/cygwin
 OLD_FILES+=usr/share/terminfo/c/cygwinB19
 OLD_FILES+=usr/share/terminfo/c/cygwinDBG
 OLD_DIRS+=usr/share/terminfo/c/
 OLD_FILES+=usr/share/terminfo/d/d132
 OLD_FILES+=usr/share/terminfo/d/d2
 OLD_FILES+=usr/share/terminfo/d/d2-dg
 OLD_FILES+=usr/share/terminfo/d/d200
 OLD_FILES+=usr/share/terminfo/d/d200-dg
 OLD_FILES+=usr/share/terminfo/d/d210
 OLD_FILES+=usr/share/terminfo/d/d210-dg
 OLD_FILES+=usr/share/terminfo/d/d211
 OLD_FILES+=usr/share/terminfo/d/d211-7b
 OLD_FILES+=usr/share/terminfo/d/d211-dg
 OLD_FILES+=usr/share/terminfo/d/d214
 OLD_FILES+=usr/share/terminfo/d/d214-dg
 OLD_FILES+=usr/share/terminfo/d/d215
 OLD_FILES+=usr/share/terminfo/d/d215-7b
 OLD_FILES+=usr/share/terminfo/d/d215-dg
 OLD_FILES+=usr/share/terminfo/d/d216+
 OLD_FILES+=usr/share/terminfo/d/d216+25
 OLD_FILES+=usr/share/terminfo/d/d216+dg
 OLD_FILES+=usr/share/terminfo/d/d216-dg
 OLD_FILES+=usr/share/terminfo/d/d216-unix
 OLD_FILES+=usr/share/terminfo/d/d216-unix-25
 OLD_FILES+=usr/share/terminfo/d/d216e+
 OLD_FILES+=usr/share/terminfo/d/d216e+dg
 OLD_FILES+=usr/share/terminfo/d/d216e-dg
 OLD_FILES+=usr/share/terminfo/d/d216e-unix
 OLD_FILES+=usr/share/terminfo/d/d217-dg
 OLD_FILES+=usr/share/terminfo/d/d217-unix
 OLD_FILES+=usr/share/terminfo/d/d217-unix-25
 OLD_FILES+=usr/share/terminfo/d/d220
 OLD_FILES+=usr/share/terminfo/d/d220-7b
 OLD_FILES+=usr/share/terminfo/d/d220-dg
 OLD_FILES+=usr/share/terminfo/d/d230
 OLD_FILES+=usr/share/terminfo/d/d230-dg
 OLD_FILES+=usr/share/terminfo/d/d230c
 OLD_FILES+=usr/share/terminfo/d/d230c-dg
 OLD_FILES+=usr/share/terminfo/d/d400
 OLD_FILES+=usr/share/terminfo/d/d400-dg
 OLD_FILES+=usr/share/terminfo/d/d410
 OLD_FILES+=usr/share/terminfo/d/d410-7b
 OLD_FILES+=usr/share/terminfo/d/d410-7b-w
 OLD_FILES+=usr/share/terminfo/d/d410-dg
 OLD_FILES+=usr/share/terminfo/d/d410-w
 OLD_FILES+=usr/share/terminfo/d/d411
 OLD_FILES+=usr/share/terminfo/d/d411-7b
 OLD_FILES+=usr/share/terminfo/d/d411-7b-w
 OLD_FILES+=usr/share/terminfo/d/d411-dg
 OLD_FILES+=usr/share/terminfo/d/d411-w
 OLD_FILES+=usr/share/terminfo/d/d412+
 OLD_FILES+=usr/share/terminfo/d/d412+25
 OLD_FILES+=usr/share/terminfo/d/d412+dg
 OLD_FILES+=usr/share/terminfo/d/d412+s
 OLD_FILES+=usr/share/terminfo/d/d412+sr
 OLD_FILES+=usr/share/terminfo/d/d412+w
 OLD_FILES+=usr/share/terminfo/d/d412-dg
 OLD_FILES+=usr/share/terminfo/d/d412-unix
 OLD_FILES+=usr/share/terminfo/d/d412-unix-25
 OLD_FILES+=usr/share/terminfo/d/d412-unix-s
 OLD_FILES+=usr/share/terminfo/d/d412-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d412-unix-w
 OLD_FILES+=usr/share/terminfo/d/d413-dg
 OLD_FILES+=usr/share/terminfo/d/d413-unix
 OLD_FILES+=usr/share/terminfo/d/d413-unix-25
 OLD_FILES+=usr/share/terminfo/d/d413-unix-s
 OLD_FILES+=usr/share/terminfo/d/d413-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d413-unix-w
 OLD_FILES+=usr/share/terminfo/d/d414-unix
 OLD_FILES+=usr/share/terminfo/d/d414-unix-25
 OLD_FILES+=usr/share/terminfo/d/d414-unix-s
 OLD_FILES+=usr/share/terminfo/d/d414-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d414-unix-w
 OLD_FILES+=usr/share/terminfo/d/d430-dg
 OLD_FILES+=usr/share/terminfo/d/d430-dg-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix
 OLD_FILES+=usr/share/terminfo/d/d430-unix-25
 OLD_FILES+=usr/share/terminfo/d/d430-unix-25-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix-s
 OLD_FILES+=usr/share/terminfo/d/d430-unix-s-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d430-unix-sr-ccc
 OLD_FILES+=usr/share/terminfo/d/d430-unix-w
 OLD_FILES+=usr/share/terminfo/d/d430-unix-w-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-dg
 OLD_FILES+=usr/share/terminfo/d/d430c-dg-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-25
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-25-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-s
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-s-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-sr-ccc
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-w
 OLD_FILES+=usr/share/terminfo/d/d430c-unix-w-ccc
 OLD_FILES+=usr/share/terminfo/d/d450
 OLD_FILES+=usr/share/terminfo/d/d450-dg
 OLD_FILES+=usr/share/terminfo/d/d460
 OLD_FILES+=usr/share/terminfo/d/d460-7b
 OLD_FILES+=usr/share/terminfo/d/d460-7b-w
 OLD_FILES+=usr/share/terminfo/d/d460-dg
 OLD_FILES+=usr/share/terminfo/d/d460-w
 OLD_FILES+=usr/share/terminfo/d/d461
 OLD_FILES+=usr/share/terminfo/d/d461-7b
 OLD_FILES+=usr/share/terminfo/d/d461-7b-w
 OLD_FILES+=usr/share/terminfo/d/d461-dg
 OLD_FILES+=usr/share/terminfo/d/d461-w
 OLD_FILES+=usr/share/terminfo/d/d462+
 OLD_FILES+=usr/share/terminfo/d/d462+25
 OLD_FILES+=usr/share/terminfo/d/d462+dg
 OLD_FILES+=usr/share/terminfo/d/d462+s
 OLD_FILES+=usr/share/terminfo/d/d462+sr
 OLD_FILES+=usr/share/terminfo/d/d462+w
 OLD_FILES+=usr/share/terminfo/d/d462-dg
 OLD_FILES+=usr/share/terminfo/d/d462-unix
 OLD_FILES+=usr/share/terminfo/d/d462-unix-25
 OLD_FILES+=usr/share/terminfo/d/d462-unix-s
 OLD_FILES+=usr/share/terminfo/d/d462-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d462-unix-w
 OLD_FILES+=usr/share/terminfo/d/d462e-dg
 OLD_FILES+=usr/share/terminfo/d/d463-dg
 OLD_FILES+=usr/share/terminfo/d/d463-unix
 OLD_FILES+=usr/share/terminfo/d/d463-unix-25
 OLD_FILES+=usr/share/terminfo/d/d463-unix-s
 OLD_FILES+=usr/share/terminfo/d/d463-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d463-unix-w
 OLD_FILES+=usr/share/terminfo/d/d464-unix
 OLD_FILES+=usr/share/terminfo/d/d464-unix-25
 OLD_FILES+=usr/share/terminfo/d/d464-unix-s
 OLD_FILES+=usr/share/terminfo/d/d464-unix-sr
 OLD_FILES+=usr/share/terminfo/d/d464-unix-w
 OLD_FILES+=usr/share/terminfo/d/d470
 OLD_FILES+=usr/share/terminfo/d/d470-7b
 OLD_FILES+=usr/share/terminfo/d/d470-dg
 OLD_FILES+=usr/share/terminfo/d/d470c
 OLD_FILES+=usr/share/terminfo/d/d470c-7b
 OLD_FILES+=usr/share/terminfo/d/d470c-dg
 OLD_FILES+=usr/share/terminfo/d/d555
 OLD_FILES+=usr/share/terminfo/d/d555-7b
 OLD_FILES+=usr/share/terminfo/d/d555-7b-w
 OLD_FILES+=usr/share/terminfo/d/d555-dg
 OLD_FILES+=usr/share/terminfo/d/d555-w
 OLD_FILES+=usr/share/terminfo/d/d577
 OLD_FILES+=usr/share/terminfo/d/d577-7b
 OLD_FILES+=usr/share/terminfo/d/d577-7b-w
 OLD_FILES+=usr/share/terminfo/d/d577-dg
 OLD_FILES+=usr/share/terminfo/d/d577-w
 OLD_FILES+=usr/share/terminfo/d/d578
 OLD_FILES+=usr/share/terminfo/d/d578-7b
 OLD_FILES+=usr/share/terminfo/d/d578-dg
 OLD_FILES+=usr/share/terminfo/d/d80
 OLD_FILES+=usr/share/terminfo/d/d800
 OLD_FILES+=usr/share/terminfo/d/darwin
 OLD_FILES+=usr/share/terminfo/d/darwin-100x37
 OLD_FILES+=usr/share/terminfo/d/darwin-100x37-m
 OLD_FILES+=usr/share/terminfo/d/darwin-112x37
 OLD_FILES+=usr/share/terminfo/d/darwin-112x37-m
 OLD_FILES+=usr/share/terminfo/d/darwin-128x40
 OLD_FILES+=usr/share/terminfo/d/darwin-128x40-m
 OLD_FILES+=usr/share/terminfo/d/darwin-128x48
 OLD_FILES+=usr/share/terminfo/d/darwin-128x48-m
 OLD_FILES+=usr/share/terminfo/d/darwin-144x48
 OLD_FILES+=usr/share/terminfo/d/darwin-144x48-m
 OLD_FILES+=usr/share/terminfo/d/darwin-160x64
 OLD_FILES+=usr/share/terminfo/d/darwin-160x64-m
 OLD_FILES+=usr/share/terminfo/d/darwin-200x64
 OLD_FILES+=usr/share/terminfo/d/darwin-200x64-m
 OLD_FILES+=usr/share/terminfo/d/darwin-200x75
 OLD_FILES+=usr/share/terminfo/d/darwin-200x75-m
 OLD_FILES+=usr/share/terminfo/d/darwin-256x96
 OLD_FILES+=usr/share/terminfo/d/darwin-256x96-m
 OLD_FILES+=usr/share/terminfo/d/darwin-80x25
 OLD_FILES+=usr/share/terminfo/d/darwin-80x25-m
 OLD_FILES+=usr/share/terminfo/d/darwin-80x30
 OLD_FILES+=usr/share/terminfo/d/darwin-80x30-m
 OLD_FILES+=usr/share/terminfo/d/darwin-90x30
 OLD_FILES+=usr/share/terminfo/d/darwin-90x30-m
 OLD_FILES+=usr/share/terminfo/d/darwin-b
 OLD_FILES+=usr/share/terminfo/d/darwin-f
 OLD_FILES+=usr/share/terminfo/d/darwin-f2
 OLD_FILES+=usr/share/terminfo/d/darwin-m
 OLD_FILES+=usr/share/terminfo/d/darwin-m-b
 OLD_FILES+=usr/share/terminfo/d/darwin-m-f
 OLD_FILES+=usr/share/terminfo/d/darwin-m-f2
 OLD_FILES+=usr/share/terminfo/d/datagraphix
 OLD_FILES+=usr/share/terminfo/d/datamedia2500
 OLD_FILES+=usr/share/terminfo/d/datapoint
 OLD_FILES+=usr/share/terminfo/d/dataspeed40
 OLD_FILES+=usr/share/terminfo/d/dd5000
 OLD_FILES+=usr/share/terminfo/d/ddr
 OLD_FILES+=usr/share/terminfo/d/ddr3180
 OLD_FILES+=usr/share/terminfo/d/dec+pp
 OLD_FILES+=usr/share/terminfo/d/dec+sl
 OLD_FILES+=usr/share/terminfo/d/dec-vt100
 OLD_FILES+=usr/share/terminfo/d/dec-vt220
 OLD_FILES+=usr/share/terminfo/d/dec-vt330
 OLD_FILES+=usr/share/terminfo/d/dec-vt340
 OLD_FILES+=usr/share/terminfo/d/dec-vt400
 OLD_FILES+=usr/share/terminfo/d/decansi
 OLD_FILES+=usr/share/terminfo/d/decpro
 OLD_FILES+=usr/share/terminfo/d/decwriter
 OLD_FILES+=usr/share/terminfo/d/delta
 OLD_FILES+=usr/share/terminfo/d/dg+ccc
 OLD_FILES+=usr/share/terminfo/d/dg+color
 OLD_FILES+=usr/share/terminfo/d/dg+color8
 OLD_FILES+=usr/share/terminfo/d/dg+fixed
 OLD_FILES+=usr/share/terminfo/d/dg-ansi
 OLD_FILES+=usr/share/terminfo/d/dg-generic
 OLD_FILES+=usr/share/terminfo/d/dg100
 OLD_FILES+=usr/share/terminfo/d/dg200
 OLD_FILES+=usr/share/terminfo/d/dg210
 OLD_FILES+=usr/share/terminfo/d/dg211
 OLD_FILES+=usr/share/terminfo/d/dg450
 OLD_FILES+=usr/share/terminfo/d/dg460-ansi
 OLD_FILES+=usr/share/terminfo/d/dg6053
 OLD_FILES+=usr/share/terminfo/d/dg6053-old
 OLD_FILES+=usr/share/terminfo/d/dg605x
 OLD_FILES+=usr/share/terminfo/d/dg6134
 OLD_FILES+=usr/share/terminfo/d/dgkeys+11
 OLD_FILES+=usr/share/terminfo/d/dgkeys+15
 OLD_FILES+=usr/share/terminfo/d/dgkeys+7b
 OLD_FILES+=usr/share/terminfo/d/dgkeys+8b
 OLD_FILES+=usr/share/terminfo/d/dgmode+color
 OLD_FILES+=usr/share/terminfo/d/dgmode+color8
 OLD_FILES+=usr/share/terminfo/d/dgunix+ccc
 OLD_FILES+=usr/share/terminfo/d/dgunix+fixed
 OLD_FILES+=usr/share/terminfo/d/diablo
 OLD_FILES+=usr/share/terminfo/d/diablo-lm
 OLD_FILES+=usr/share/terminfo/d/diablo1620
 OLD_FILES+=usr/share/terminfo/d/diablo1620-m8
 OLD_FILES+=usr/share/terminfo/d/diablo1640
 OLD_FILES+=usr/share/terminfo/d/diablo1640-lm
 OLD_FILES+=usr/share/terminfo/d/diablo1640-m8
 OLD_FILES+=usr/share/terminfo/d/diablo1720
 OLD_FILES+=usr/share/terminfo/d/diablo1730
 OLD_FILES+=usr/share/terminfo/d/diablo1740
 OLD_FILES+=usr/share/terminfo/d/diablo1740-lm
 OLD_FILES+=usr/share/terminfo/d/diablo450
 OLD_FILES+=usr/share/terminfo/d/diablo630
 OLD_FILES+=usr/share/terminfo/d/dialogue
 OLD_FILES+=usr/share/terminfo/d/dialogue80
 OLD_FILES+=usr/share/terminfo/d/digilog
 OLD_FILES+=usr/share/terminfo/d/djgpp
 OLD_FILES+=usr/share/terminfo/d/djgpp203
 OLD_FILES+=usr/share/terminfo/d/djgpp204
 OLD_FILES+=usr/share/terminfo/d/dku7003
 OLD_FILES+=usr/share/terminfo/d/dku7003-dumb
 OLD_FILES+=usr/share/terminfo/d/dku7102
 OLD_FILES+=usr/share/terminfo/d/dku7102-old
 OLD_FILES+=usr/share/terminfo/d/dku7102-sna
 OLD_FILES+=usr/share/terminfo/d/dku7103-sna
 OLD_FILES+=usr/share/terminfo/d/dku7202
 OLD_FILES+=usr/share/terminfo/d/dm1520
 OLD_FILES+=usr/share/terminfo/d/dm1521
 OLD_FILES+=usr/share/terminfo/d/dm2500
 OLD_FILES+=usr/share/terminfo/d/dm3025
 OLD_FILES+=usr/share/terminfo/d/dm3045
 OLD_FILES+=usr/share/terminfo/d/dm80
 OLD_FILES+=usr/share/terminfo/d/dm80w
 OLD_FILES+=usr/share/terminfo/d/dmchat
 OLD_FILES+=usr/share/terminfo/d/dmd
 OLD_FILES+=usr/share/terminfo/d/dmd-24
 OLD_FILES+=usr/share/terminfo/d/dmd-34
 OLD_FILES+=usr/share/terminfo/d/dmd1
 OLD_FILES+=usr/share/terminfo/d/dmdt80
 OLD_FILES+=usr/share/terminfo/d/dmdt80w
 OLD_FILES+=usr/share/terminfo/d/dmterm
 OLD_FILES+=usr/share/terminfo/d/domterm
 OLD_FILES+=usr/share/terminfo/d/dp3360
 OLD_FILES+=usr/share/terminfo/d/dp8242
 OLD_FILES+=usr/share/terminfo/d/ds40
 OLD_FILES+=usr/share/terminfo/d/ds40-2
 OLD_FILES+=usr/share/terminfo/d/dt-100
 OLD_FILES+=usr/share/terminfo/d/dt-100w
 OLD_FILES+=usr/share/terminfo/d/dt100
 OLD_FILES+=usr/share/terminfo/d/dt100w
 OLD_FILES+=usr/share/terminfo/d/dt110
 OLD_FILES+=usr/share/terminfo/d/dt80
 OLD_FILES+=usr/share/terminfo/d/dt80-sas
 OLD_FILES+=usr/share/terminfo/d/dt80w
 OLD_FILES+=usr/share/terminfo/d/dtc300s
 OLD_FILES+=usr/share/terminfo/d/dtc382
 OLD_FILES+=usr/share/terminfo/d/dtterm
 OLD_FILES+=usr/share/terminfo/d/dumb
 OLD_FILES+=usr/share/terminfo/d/dumb-emacs-ansi
 OLD_FILES+=usr/share/terminfo/d/dvtm
 OLD_FILES+=usr/share/terminfo/d/dvtm-256color
 OLD_FILES+=usr/share/terminfo/d/dw
 OLD_FILES+=usr/share/terminfo/d/dw1
 OLD_FILES+=usr/share/terminfo/d/dw2
 OLD_FILES+=usr/share/terminfo/d/dw3
 OLD_FILES+=usr/share/terminfo/d/dw4
 OLD_FILES+=usr/share/terminfo/d/dwk
 OLD_FILES+=usr/share/terminfo/d/dwk-vt
 OLD_DIRS+=usr/share/terminfo/d/
 OLD_FILES+=usr/share/terminfo/e/ecma+color
 OLD_FILES+=usr/share/terminfo/e/ecma+index
 OLD_FILES+=usr/share/terminfo/e/ecma+italics
 OLD_FILES+=usr/share/terminfo/e/ecma+sgr
 OLD_FILES+=usr/share/terminfo/e/ecma+strikeout
 OLD_FILES+=usr/share/terminfo/e/elks
 OLD_FILES+=usr/share/terminfo/e/elks-ansi
 OLD_FILES+=usr/share/terminfo/e/elks-glasstty
 OLD_FILES+=usr/share/terminfo/e/elks-vt52
 OLD_FILES+=usr/share/terminfo/e/emots
 OLD_FILES+=usr/share/terminfo/e/emu
 OLD_FILES+=usr/share/terminfo/e/emu-220
 OLD_FILES+=usr/share/terminfo/e/emx-base
 OLD_FILES+=usr/share/terminfo/e/env230
 OLD_FILES+=usr/share/terminfo/e/envision230
 OLD_FILES+=usr/share/terminfo/e/ep40
 OLD_FILES+=usr/share/terminfo/e/ep4000
 OLD_FILES+=usr/share/terminfo/e/ep4080
 OLD_FILES+=usr/share/terminfo/e/ep48
 OLD_FILES+=usr/share/terminfo/e/ergo4000
 OLD_FILES+=usr/share/terminfo/e/esprit
 OLD_FILES+=usr/share/terminfo/e/esprit-am
 OLD_FILES+=usr/share/terminfo/e/eterm
 OLD_FILES+=usr/share/terminfo/e/eterm-color
 OLD_FILES+=usr/share/terminfo/e/ex155
 OLD_FILES+=usr/share/terminfo/e/excel62
 OLD_FILES+=usr/share/terminfo/e/excel62-rv
 OLD_FILES+=usr/share/terminfo/e/excel62-w
 OLD_FILES+=usr/share/terminfo/e/excel64
 OLD_FILES+=usr/share/terminfo/e/excel64-rv
 OLD_FILES+=usr/share/terminfo/e/excel64-w
 OLD_FILES+=usr/share/terminfo/e/exec80
 OLD_DIRS+=usr/share/terminfo/e/
 OLD_FILES+=usr/share/terminfo/f/f100
 OLD_FILES+=usr/share/terminfo/f/f100-rv
 OLD_FILES+=usr/share/terminfo/f/f110
 OLD_FILES+=usr/share/terminfo/f/f110-14
 OLD_FILES+=usr/share/terminfo/f/f110-14w
 OLD_FILES+=usr/share/terminfo/f/f110-w
 OLD_FILES+=usr/share/terminfo/f/f1720
 OLD_FILES+=usr/share/terminfo/f/f1720a
 OLD_FILES+=usr/share/terminfo/f/f200
 OLD_FILES+=usr/share/terminfo/f/f200-w
 OLD_FILES+=usr/share/terminfo/f/f200vi
 OLD_FILES+=usr/share/terminfo/f/f200vi-w
 OLD_FILES+=usr/share/terminfo/f/falco
 OLD_FILES+=usr/share/terminfo/f/falco-p
 OLD_FILES+=usr/share/terminfo/f/fbterm
 OLD_FILES+=usr/share/terminfo/f/fenix
 OLD_FILES+=usr/share/terminfo/f/fenixw
 OLD_FILES+=usr/share/terminfo/f/fixterm
 OLD_FILES+=usr/share/terminfo/f/fortune
 OLD_FILES+=usr/share/terminfo/f/fos
 OLD_FILES+=usr/share/terminfo/f/fox
 OLD_FILES+=usr/share/terminfo/f/freedom
 OLD_FILES+=usr/share/terminfo/f/freedom-rv
 OLD_FILES+=usr/share/terminfo/f/freedom100
 OLD_FILES+=usr/share/terminfo/f/freedom110
 OLD_FILES+=usr/share/terminfo/f/freedom200
 OLD_DIRS+=usr/share/terminfo/f/
 OLD_FILES+=usr/share/terminfo/g/gator
 OLD_FILES+=usr/share/terminfo/g/gator-52
 OLD_FILES+=usr/share/terminfo/g/gator-52t
 OLD_FILES+=usr/share/terminfo/g/gator-t
 OLD_FILES+=usr/share/terminfo/g/gigi
 OLD_FILES+=usr/share/terminfo/g/glasstty
 OLD_FILES+=usr/share/terminfo/g/gnome
 OLD_FILES+=usr/share/terminfo/g/gnome+pcfkeys
 OLD_FILES+=usr/share/terminfo/g/gnome-2007
 OLD_FILES+=usr/share/terminfo/g/gnome-2008
 OLD_FILES+=usr/share/terminfo/g/gnome-2012
 OLD_FILES+=usr/share/terminfo/g/gnome-256color
 OLD_FILES+=usr/share/terminfo/g/gnome-fc5
 OLD_FILES+=usr/share/terminfo/g/gnome-rh62
 OLD_FILES+=usr/share/terminfo/g/gnome-rh72
 OLD_FILES+=usr/share/terminfo/g/gnome-rh80
 OLD_FILES+=usr/share/terminfo/g/gnome-rh90
 OLD_FILES+=usr/share/terminfo/g/go-225
 OLD_FILES+=usr/share/terminfo/g/go140
 OLD_FILES+=usr/share/terminfo/g/go140w
 OLD_FILES+=usr/share/terminfo/g/go225
 OLD_FILES+=usr/share/terminfo/g/graphos
 OLD_FILES+=usr/share/terminfo/g/graphos-30
 OLD_FILES+=usr/share/terminfo/g/gs5430
 OLD_FILES+=usr/share/terminfo/g/gs5430-22
 OLD_FILES+=usr/share/terminfo/g/gs5430-24
 OLD_FILES+=usr/share/terminfo/g/gs6300
 OLD_FILES+=usr/share/terminfo/g/gsi
 OLD_FILES+=usr/share/terminfo/g/gt100
 OLD_FILES+=usr/share/terminfo/g/gt100a
 OLD_FILES+=usr/share/terminfo/g/gt40
 OLD_FILES+=usr/share/terminfo/g/gt42
 OLD_FILES+=usr/share/terminfo/g/guru
 OLD_FILES+=usr/share/terminfo/g/guru+rv
 OLD_FILES+=usr/share/terminfo/g/guru+s
 OLD_FILES+=usr/share/terminfo/g/guru+unk
 OLD_FILES+=usr/share/terminfo/g/guru-24
 OLD_FILES+=usr/share/terminfo/g/guru-33
 OLD_FILES+=usr/share/terminfo/g/guru-33-rv
 OLD_FILES+=usr/share/terminfo/g/guru-33-s
 OLD_FILES+=usr/share/terminfo/g/guru-44
 OLD_FILES+=usr/share/terminfo/g/guru-44-s
 OLD_FILES+=usr/share/terminfo/g/guru-76
 OLD_FILES+=usr/share/terminfo/g/guru-76-lp
 OLD_FILES+=usr/share/terminfo/g/guru-76-s
 OLD_FILES+=usr/share/terminfo/g/guru-76-w
 OLD_FILES+=usr/share/terminfo/g/guru-76-w-s
 OLD_FILES+=usr/share/terminfo/g/guru-76-wm
 OLD_FILES+=usr/share/terminfo/g/guru-lp
 OLD_FILES+=usr/share/terminfo/g/guru-nctxt
 OLD_FILES+=usr/share/terminfo/g/guru-rv
 OLD_FILES+=usr/share/terminfo/g/guru-s
 OLD_DIRS+=usr/share/terminfo/g/
 OLD_FILES+=usr/share/terminfo/h/h-100
 OLD_FILES+=usr/share/terminfo/h/h-100bw
 OLD_FILES+=usr/share/terminfo/h/h100
 OLD_FILES+=usr/share/terminfo/h/h100bw
 OLD_FILES+=usr/share/terminfo/h/h19
 OLD_FILES+=usr/share/terminfo/h/h19-a
 OLD_FILES+=usr/share/terminfo/h/h19-b
 OLD_FILES+=usr/share/terminfo/h/h19-bs
 OLD_FILES+=usr/share/terminfo/h/h19-g
 OLD_FILES+=usr/share/terminfo/h/h19-smul
 OLD_FILES+=usr/share/terminfo/h/h19-u
 OLD_FILES+=usr/share/terminfo/h/h19-us
 OLD_FILES+=usr/share/terminfo/h/h19a
 OLD_FILES+=usr/share/terminfo/h/h19g
 OLD_FILES+=usr/share/terminfo/h/h19k
 OLD_FILES+=usr/share/terminfo/h/h19kermit
 OLD_FILES+=usr/share/terminfo/h/h19us
 OLD_FILES+=usr/share/terminfo/h/h29a-kc-bc
 OLD_FILES+=usr/share/terminfo/h/h29a-kc-uc
 OLD_FILES+=usr/share/terminfo/h/h29a-nkc-bc
 OLD_FILES+=usr/share/terminfo/h/h29a-nkc-uc
 OLD_FILES+=usr/share/terminfo/h/h80
 OLD_FILES+=usr/share/terminfo/h/ha8675
 OLD_FILES+=usr/share/terminfo/h/ha8686
 OLD_FILES+=usr/share/terminfo/h/hazel
 OLD_FILES+=usr/share/terminfo/h/hds200
 OLD_FILES+=usr/share/terminfo/h/he80
 OLD_FILES+=usr/share/terminfo/h/heath
 OLD_FILES+=usr/share/terminfo/h/heath-19
 OLD_FILES+=usr/share/terminfo/h/heath-ansi
 OLD_FILES+=usr/share/terminfo/h/heathkit
 OLD_FILES+=usr/share/terminfo/h/heathkit-a
 OLD_FILES+=usr/share/terminfo/h/hft
 OLD_FILES+=usr/share/terminfo/h/hft-c
 OLD_FILES+=usr/share/terminfo/h/hft-c-old
 OLD_FILES+=usr/share/terminfo/h/hft-old
 OLD_FILES+=usr/share/terminfo/h/hirez100
 OLD_FILES+=usr/share/terminfo/h/hirez100-w
 OLD_FILES+=usr/share/terminfo/h/hmod1
 OLD_FILES+=usr/share/terminfo/h/hp
 OLD_FILES+=usr/share/terminfo/h/hp+arrows
 OLD_FILES+=usr/share/terminfo/h/hp+color
 OLD_FILES+=usr/share/terminfo/h/hp+labels
 OLD_FILES+=usr/share/terminfo/h/hp+pfk+arrows
 OLD_FILES+=usr/share/terminfo/h/hp+pfk+cr
 OLD_FILES+=usr/share/terminfo/h/hp+pfk-cr
 OLD_FILES+=usr/share/terminfo/h/hp+printer
 OLD_FILES+=usr/share/terminfo/h/hp110
 OLD_FILES+=usr/share/terminfo/h/hp150
 OLD_FILES+=usr/share/terminfo/h/hp2
 OLD_FILES+=usr/share/terminfo/h/hp236
 OLD_FILES+=usr/share/terminfo/h/hp2382
 OLD_FILES+=usr/share/terminfo/h/hp2382a
 OLD_FILES+=usr/share/terminfo/h/hp2392
 OLD_FILES+=usr/share/terminfo/h/hp2397
 OLD_FILES+=usr/share/terminfo/h/hp2397a
 OLD_FILES+=usr/share/terminfo/h/hp2621
 OLD_FILES+=usr/share/terminfo/h/hp2621-48
 OLD_FILES+=usr/share/terminfo/h/hp2621-a
 OLD_FILES+=usr/share/terminfo/h/hp2621-ba
 OLD_FILES+=usr/share/terminfo/h/hp2621-fl
 OLD_FILES+=usr/share/terminfo/h/hp2621-k45
 OLD_FILES+=usr/share/terminfo/h/hp2621-nl
 OLD_FILES+=usr/share/terminfo/h/hp2621-nt
 OLD_FILES+=usr/share/terminfo/h/hp2621-wl
 OLD_FILES+=usr/share/terminfo/h/hp2621A
 OLD_FILES+=usr/share/terminfo/h/hp2621a
 OLD_FILES+=usr/share/terminfo/h/hp2621a-a
 OLD_FILES+=usr/share/terminfo/h/hp2621b
 OLD_FILES+=usr/share/terminfo/h/hp2621b-kx
 OLD_FILES+=usr/share/terminfo/h/hp2621b-kx-p
 OLD_FILES+=usr/share/terminfo/h/hp2621b-p
 OLD_FILES+=usr/share/terminfo/h/hp2621k45
 OLD_FILES+=usr/share/terminfo/h/hp2621p
 OLD_FILES+=usr/share/terminfo/h/hp2621p-a
 OLD_FILES+=usr/share/terminfo/h/hp2622
 OLD_FILES+=usr/share/terminfo/h/hp2622a
 OLD_FILES+=usr/share/terminfo/h/hp2623
 OLD_FILES+=usr/share/terminfo/h/hp2623a
 OLD_FILES+=usr/share/terminfo/h/hp2624
 OLD_FILES+=usr/share/terminfo/h/hp2624-10p
 OLD_FILES+=usr/share/terminfo/h/hp2624a
 OLD_FILES+=usr/share/terminfo/h/hp2624a-10p
 OLD_FILES+=usr/share/terminfo/h/hp2624b
 OLD_FILES+=usr/share/terminfo/h/hp2624b-10p
 OLD_FILES+=usr/share/terminfo/h/hp2624b-10p-p
 OLD_FILES+=usr/share/terminfo/h/hp2624b-4p
 OLD_FILES+=usr/share/terminfo/h/hp2624b-4p-p
 OLD_FILES+=usr/share/terminfo/h/hp2624b-p
 OLD_FILES+=usr/share/terminfo/h/hp2626
 OLD_FILES+=usr/share/terminfo/h/hp2626-12
 OLD_FILES+=usr/share/terminfo/h/hp2626-12-s
 OLD_FILES+=usr/share/terminfo/h/hp2626-12x40
 OLD_FILES+=usr/share/terminfo/h/hp2626-ns
 OLD_FILES+=usr/share/terminfo/h/hp2626-s
 OLD_FILES+=usr/share/terminfo/h/hp2626-x40
 OLD_FILES+=usr/share/terminfo/h/hp2626a
 OLD_FILES+=usr/share/terminfo/h/hp2626p
 OLD_FILES+=usr/share/terminfo/h/hp2627a
 OLD_FILES+=usr/share/terminfo/h/hp2627a-rev
 OLD_FILES+=usr/share/terminfo/h/hp2627c
 OLD_FILES+=usr/share/terminfo/h/hp262x
 OLD_FILES+=usr/share/terminfo/h/hp2640a
 OLD_FILES+=usr/share/terminfo/h/hp2640b
 OLD_FILES+=usr/share/terminfo/h/hp2641a
 OLD_FILES+=usr/share/terminfo/h/hp2644a
 OLD_FILES+=usr/share/terminfo/h/hp2645
 OLD_FILES+=usr/share/terminfo/h/hp2645a
 OLD_FILES+=usr/share/terminfo/h/hp2647a
 OLD_FILES+=usr/share/terminfo/h/hp2648
 OLD_FILES+=usr/share/terminfo/h/hp2648a
 OLD_FILES+=usr/share/terminfo/h/hp300h
 OLD_FILES+=usr/share/terminfo/h/hp45
 OLD_FILES+=usr/share/terminfo/h/hp700
 OLD_FILES+=usr/share/terminfo/h/hp700-wy
 OLD_FILES+=usr/share/terminfo/h/hp70092
 OLD_FILES+=usr/share/terminfo/h/hp70092A
 OLD_FILES+=usr/share/terminfo/h/hp70092a
 OLD_FILES+=usr/share/terminfo/h/hp9837
 OLD_FILES+=usr/share/terminfo/h/hp9845
 OLD_FILES+=usr/share/terminfo/h/hp98550
 OLD_FILES+=usr/share/terminfo/h/hp98550a
 OLD_FILES+=usr/share/terminfo/h/hp98720
 OLD_FILES+=usr/share/terminfo/h/hp98721
 OLD_FILES+=usr/share/terminfo/h/hpansi
 OLD_FILES+=usr/share/terminfo/h/hpex
 OLD_FILES+=usr/share/terminfo/h/hpex2
 OLD_FILES+=usr/share/terminfo/h/hpgeneric
 OLD_FILES+=usr/share/terminfo/h/hpsub
 OLD_FILES+=usr/share/terminfo/h/hpterm
 OLD_FILES+=usr/share/terminfo/h/hpterm-color
 OLD_FILES+=usr/share/terminfo/h/htx11
 OLD_FILES+=usr/share/terminfo/h/hurd
 OLD_FILES+=usr/share/terminfo/h/hz1000
 OLD_FILES+=usr/share/terminfo/h/hz1420
 OLD_FILES+=usr/share/terminfo/h/hz1500
 OLD_FILES+=usr/share/terminfo/h/hz1510
 OLD_FILES+=usr/share/terminfo/h/hz1520
 OLD_FILES+=usr/share/terminfo/h/hz1520-noesc
 OLD_FILES+=usr/share/terminfo/h/hz1552
 OLD_FILES+=usr/share/terminfo/h/hz1552-rv
 OLD_FILES+=usr/share/terminfo/h/hz2000
 OLD_DIRS+=usr/share/terminfo/h/
 OLD_FILES+=usr/share/terminfo/i/i100
 OLD_FILES+=usr/share/terminfo/i/i3101
 OLD_FILES+=usr/share/terminfo/i/i3164
 OLD_FILES+=usr/share/terminfo/i/i400
 OLD_FILES+=usr/share/terminfo/i/iTerm.app
 OLD_FILES+=usr/share/terminfo/i/iTerm2.app
 OLD_FILES+=usr/share/terminfo/i/ibcs2
 OLD_FILES+=usr/share/terminfo/i/ibm+16color
 OLD_FILES+=usr/share/terminfo/i/ibm+color
 OLD_FILES+=usr/share/terminfo/i/ibm-apl
 OLD_FILES+=usr/share/terminfo/i/ibm-pc
 OLD_FILES+=usr/share/terminfo/i/ibm-system1
 OLD_FILES+=usr/share/terminfo/i/ibm3101
 OLD_FILES+=usr/share/terminfo/i/ibm3151
 OLD_FILES+=usr/share/terminfo/i/ibm3161
 OLD_FILES+=usr/share/terminfo/i/ibm3161-C
 OLD_FILES+=usr/share/terminfo/i/ibm3162
 OLD_FILES+=usr/share/terminfo/i/ibm3163
 OLD_FILES+=usr/share/terminfo/i/ibm3164
 OLD_FILES+=usr/share/terminfo/i/ibm327x
 OLD_FILES+=usr/share/terminfo/i/ibm5051
 OLD_FILES+=usr/share/terminfo/i/ibm5081
 OLD_FILES+=usr/share/terminfo/i/ibm5081-c
 OLD_FILES+=usr/share/terminfo/i/ibm5151
 OLD_FILES+=usr/share/terminfo/i/ibm5154
 OLD_FILES+=usr/share/terminfo/i/ibm5154-c
 OLD_FILES+=usr/share/terminfo/i/ibm6153
 OLD_FILES+=usr/share/terminfo/i/ibm6153-40
 OLD_FILES+=usr/share/terminfo/i/ibm6153-90
 OLD_FILES+=usr/share/terminfo/i/ibm6154
 OLD_FILES+=usr/share/terminfo/i/ibm6154-c
 OLD_FILES+=usr/share/terminfo/i/ibm6155
 OLD_FILES+=usr/share/terminfo/i/ibm8503
 OLD_FILES+=usr/share/terminfo/i/ibm8507
 OLD_FILES+=usr/share/terminfo/i/ibm8512
 OLD_FILES+=usr/share/terminfo/i/ibm8513
 OLD_FILES+=usr/share/terminfo/i/ibm8514
 OLD_FILES+=usr/share/terminfo/i/ibm8514-c
 OLD_FILES+=usr/share/terminfo/i/ibm8604
 OLD_FILES+=usr/share/terminfo/i/ibmaed
 OLD_FILES+=usr/share/terminfo/i/ibmapa16
 OLD_FILES+=usr/share/terminfo/i/ibmapa8
 OLD_FILES+=usr/share/terminfo/i/ibmapa8c
 OLD_FILES+=usr/share/terminfo/i/ibmapa8c-c
 OLD_FILES+=usr/share/terminfo/i/ibmega
 OLD_FILES+=usr/share/terminfo/i/ibmega-c
 OLD_FILES+=usr/share/terminfo/i/ibmmono
 OLD_FILES+=usr/share/terminfo/i/ibmmpel-c
 OLD_FILES+=usr/share/terminfo/i/ibmpc
 OLD_FILES+=usr/share/terminfo/i/ibmpc3
 OLD_FILES+=usr/share/terminfo/i/ibmpc3r
 OLD_FILES+=usr/share/terminfo/i/ibmpc3r-mono
 OLD_FILES+=usr/share/terminfo/i/ibmpcx
 OLD_FILES+=usr/share/terminfo/i/ibmvga
 OLD_FILES+=usr/share/terminfo/i/ibmvga-c
 OLD_FILES+=usr/share/terminfo/i/ibmx
 OLD_FILES+=usr/share/terminfo/i/icl6402
 OLD_FILES+=usr/share/terminfo/i/icl6404
 OLD_FILES+=usr/share/terminfo/i/icl6404-w
 OLD_FILES+=usr/share/terminfo/i/ifmr
 OLD_FILES+=usr/share/terminfo/i/ims-ansi
 OLD_FILES+=usr/share/terminfo/i/ims950
 OLD_FILES+=usr/share/terminfo/i/ims950-b
 OLD_FILES+=usr/share/terminfo/i/ims950-rv
 OLD_FILES+=usr/share/terminfo/i/infoton
 OLD_FILES+=usr/share/terminfo/i/interix
 OLD_FILES+=usr/share/terminfo/i/interix-nti
 OLD_FILES+=usr/share/terminfo/i/intertec
 OLD_FILES+=usr/share/terminfo/i/intertube
 OLD_FILES+=usr/share/terminfo/i/intertube2
 OLD_FILES+=usr/share/terminfo/i/intext
 OLD_FILES+=usr/share/terminfo/i/intext2
 OLD_FILES+=usr/share/terminfo/i/intextii
 OLD_FILES+=usr/share/terminfo/i/ips
 OLD_FILES+=usr/share/terminfo/i/ipsi
 OLD_FILES+=usr/share/terminfo/i/iq120
 OLD_FILES+=usr/share/terminfo/i/iq140
 OLD_FILES+=usr/share/terminfo/i/iris-ansi
 OLD_FILES+=usr/share/terminfo/i/iris-ansi-ap
 OLD_FILES+=usr/share/terminfo/i/iris-ansi-net
 OLD_FILES+=usr/share/terminfo/i/iris-color
 OLD_FILES+=usr/share/terminfo/i/iris40
 OLD_FILES+=usr/share/terminfo/i/iterm
 OLD_FILES+=usr/share/terminfo/i/iterm2
 OLD_FILES+=usr/share/terminfo/i/iterm2-direct
 OLD_DIRS+=usr/share/terminfo/i/
 OLD_FILES+=usr/share/terminfo/j/jaixterm
 OLD_FILES+=usr/share/terminfo/j/jaixterm-m
 OLD_FILES+=usr/share/terminfo/j/jerq
 OLD_FILES+=usr/share/terminfo/j/jfbterm
 OLD_DIRS+=usr/share/terminfo/j/
 OLD_FILES+=usr/share/terminfo/k/k45
 OLD_FILES+=usr/share/terminfo/k/kaypro
 OLD_FILES+=usr/share/terminfo/k/kaypro2
 OLD_FILES+=usr/share/terminfo/k/kds6402
 OLD_FILES+=usr/share/terminfo/k/kds7372
 OLD_FILES+=usr/share/terminfo/k/kds7372-w
 OLD_FILES+=usr/share/terminfo/k/kermit
 OLD_FILES+=usr/share/terminfo/k/kermit-am
 OLD_FILES+=usr/share/terminfo/k/kitty
 OLD_FILES+=usr/share/terminfo/k/kitty+common
 OLD_FILES+=usr/share/terminfo/k/kitty-direct
 OLD_FILES+=usr/share/terminfo/k/klone+acs
 OLD_FILES+=usr/share/terminfo/k/klone+color
 OLD_FILES+=usr/share/terminfo/k/klone+koi8acs
 OLD_FILES+=usr/share/terminfo/k/klone+sgr
 OLD_FILES+=usr/share/terminfo/k/klone+sgr-dumb
 OLD_FILES+=usr/share/terminfo/k/klone+sgr8
 OLD_FILES+=usr/share/terminfo/k/kon
 OLD_FILES+=usr/share/terminfo/k/kon2
 OLD_FILES+=usr/share/terminfo/k/konsole
 OLD_FILES+=usr/share/terminfo/k/konsole+pcfkeys
 OLD_FILES+=usr/share/terminfo/k/konsole-16color
 OLD_FILES+=usr/share/terminfo/k/konsole-256color
 OLD_FILES+=usr/share/terminfo/k/konsole-base
 OLD_FILES+=usr/share/terminfo/k/konsole-direct
 OLD_FILES+=usr/share/terminfo/k/konsole-linux
 OLD_FILES+=usr/share/terminfo/k/konsole-solaris
 OLD_FILES+=usr/share/terminfo/k/konsole-vt100
 OLD_FILES+=usr/share/terminfo/k/konsole-vt420pc
 OLD_FILES+=usr/share/terminfo/k/konsole-xf3x
 OLD_FILES+=usr/share/terminfo/k/konsole-xf4x
 OLD_FILES+=usr/share/terminfo/k/kt7
 OLD_FILES+=usr/share/terminfo/k/kt7ix
 OLD_FILES+=usr/share/terminfo/k/kterm
 OLD_FILES+=usr/share/terminfo/k/kterm-co
 OLD_FILES+=usr/share/terminfo/k/kterm-color
 OLD_FILES+=usr/share/terminfo/k/ktm
 OLD_FILES+=usr/share/terminfo/k/kvt
 OLD_DIRS+=usr/share/terminfo/k/
 OLD_FILES+=usr/share/terminfo/l/la120
 OLD_FILES+=usr/share/terminfo/l/layer
 OLD_FILES+=usr/share/terminfo/l/lft
 OLD_FILES+=usr/share/terminfo/l/lft-pc850
 OLD_FILES+=usr/share/terminfo/l/linux
 OLD_FILES+=usr/share/terminfo/l/linux+decid
 OLD_FILES+=usr/share/terminfo/l/linux+sfkeys
 OLD_FILES+=usr/share/terminfo/l/linux-16color
 OLD_FILES+=usr/share/terminfo/l/linux-basic
 OLD_FILES+=usr/share/terminfo/l/linux-c
 OLD_FILES+=usr/share/terminfo/l/linux-c-nc
 OLD_FILES+=usr/share/terminfo/l/linux-koi8
 OLD_FILES+=usr/share/terminfo/l/linux-koi8r
 OLD_FILES+=usr/share/terminfo/l/linux-lat
 OLD_FILES+=usr/share/terminfo/l/linux-m
 OLD_FILES+=usr/share/terminfo/l/linux-m1
 OLD_FILES+=usr/share/terminfo/l/linux-m1b
 OLD_FILES+=usr/share/terminfo/l/linux-m2
 OLD_FILES+=usr/share/terminfo/l/linux-nic
 OLD_FILES+=usr/share/terminfo/l/linux-s
 OLD_FILES+=usr/share/terminfo/l/linux-vt
 OLD_FILES+=usr/share/terminfo/l/linux2.2
 OLD_FILES+=usr/share/terminfo/l/linux2.6
 OLD_FILES+=usr/share/terminfo/l/linux2.6.26
 OLD_FILES+=usr/share/terminfo/l/linux3.0
 OLD_FILES+=usr/share/terminfo/l/lisa
 OLD_FILES+=usr/share/terminfo/l/lisaterm
 OLD_FILES+=usr/share/terminfo/l/lisaterm-w
 OLD_FILES+=usr/share/terminfo/l/liswb
 OLD_FILES+=usr/share/terminfo/l/ln03
 OLD_FILES+=usr/share/terminfo/l/ln03-w
 OLD_FILES+=usr/share/terminfo/l/lpr
 OLD_FILES+=usr/share/terminfo/l/luna
 OLD_FILES+=usr/share/terminfo/l/luna68k
 OLD_DIRS+=usr/share/terminfo/l/
 OLD_FILES+=usr/share/terminfo/m/m2-nam
 OLD_FILES+=usr/share/terminfo/m/mac
 OLD_FILES+=usr/share/terminfo/m/mac-w
 OLD_FILES+=usr/share/terminfo/m/mach
 OLD_FILES+=usr/share/terminfo/m/mach-bold
 OLD_FILES+=usr/share/terminfo/m/mach-color
 OLD_FILES+=usr/share/terminfo/m/mach-gnu
 OLD_FILES+=usr/share/terminfo/m/mach-gnu-color
 OLD_FILES+=usr/share/terminfo/m/macintosh
 OLD_FILES+=usr/share/terminfo/m/macterminal-w
 OLD_FILES+=usr/share/terminfo/m/mai
 OLD_FILES+=usr/share/terminfo/m/masscomp
 OLD_FILES+=usr/share/terminfo/m/masscomp1
 OLD_FILES+=usr/share/terminfo/m/masscomp2
 OLD_FILES+=usr/share/terminfo/m/mdl110
 OLD_FILES+=usr/share/terminfo/m/megatek
 OLD_FILES+=usr/share/terminfo/m/memhp
 OLD_FILES+=usr/share/terminfo/m/mgr
 OLD_FILES+=usr/share/terminfo/m/mgr-linux
 OLD_FILES+=usr/share/terminfo/m/mgr-sun
 OLD_FILES+=usr/share/terminfo/m/mgt
 OLD_FILES+=usr/share/terminfo/m/mgterm
 OLD_FILES+=usr/share/terminfo/m/microb
 OLD_FILES+=usr/share/terminfo/m/microbee
 OLD_FILES+=usr/share/terminfo/m/microterm
 OLD_FILES+=usr/share/terminfo/m/microterm5
 OLD_FILES+=usr/share/terminfo/m/mime
 OLD_FILES+=usr/share/terminfo/m/mime-3ax
 OLD_FILES+=usr/share/terminfo/m/mime-fb
 OLD_FILES+=usr/share/terminfo/m/mime-hb
 OLD_FILES+=usr/share/terminfo/m/mime1
 OLD_FILES+=usr/share/terminfo/m/mime2
 OLD_FILES+=usr/share/terminfo/m/mime2a
 OLD_FILES+=usr/share/terminfo/m/mime2a-s
 OLD_FILES+=usr/share/terminfo/m/mime2a-v
 OLD_FILES+=usr/share/terminfo/m/mime314
 OLD_FILES+=usr/share/terminfo/m/mime340
 OLD_FILES+=usr/share/terminfo/m/mime3a
 OLD_FILES+=usr/share/terminfo/m/mime3ax
 OLD_FILES+=usr/share/terminfo/m/mimei
 OLD_FILES+=usr/share/terminfo/m/mimeii
 OLD_FILES+=usr/share/terminfo/m/minitel
 OLD_FILES+=usr/share/terminfo/m/minitel-2
 OLD_FILES+=usr/share/terminfo/m/minitel-2-nam
 OLD_FILES+=usr/share/terminfo/m/minitel1
 OLD_FILES+=usr/share/terminfo/m/minitel1-nb
 OLD_FILES+=usr/share/terminfo/m/minitel12-80
 OLD_FILES+=usr/share/terminfo/m/minitel1b
 OLD_FILES+=usr/share/terminfo/m/minitel1b-80
 OLD_FILES+=usr/share/terminfo/m/minitel1b-nb
 OLD_FILES+=usr/share/terminfo/m/minitel2-80
 OLD_FILES+=usr/share/terminfo/m/minix
 OLD_FILES+=usr/share/terminfo/m/minix-1.5
 OLD_FILES+=usr/share/terminfo/m/minix-1.7
 OLD_FILES+=usr/share/terminfo/m/minix-3.0
 OLD_FILES+=usr/share/terminfo/m/minix-old
 OLD_FILES+=usr/share/terminfo/m/minix-old-am
 OLD_FILES+=usr/share/terminfo/m/mintty
 OLD_FILES+=usr/share/terminfo/m/mintty+common
 OLD_FILES+=usr/share/terminfo/m/mintty-direct
 OLD_FILES+=usr/share/terminfo/m/mlterm
 OLD_FILES+=usr/share/terminfo/m/mlterm+pcfkeys
 OLD_FILES+=usr/share/terminfo/m/mlterm-256color
 OLD_FILES+=usr/share/terminfo/m/mlterm-direct
 OLD_FILES+=usr/share/terminfo/m/mlterm2
 OLD_FILES+=usr/share/terminfo/m/mlterm3
 OLD_FILES+=usr/share/terminfo/m/mm314
 OLD_FILES+=usr/share/terminfo/m/mm340
 OLD_FILES+=usr/share/terminfo/m/mod
 OLD_FILES+=usr/share/terminfo/m/mod24
 OLD_FILES+=usr/share/terminfo/m/modgraph
 OLD_FILES+=usr/share/terminfo/m/modgraph2
 OLD_FILES+=usr/share/terminfo/m/modgraph48
 OLD_FILES+=usr/share/terminfo/m/mono-emx
 OLD_FILES+=usr/share/terminfo/m/morphos
 OLD_FILES+=usr/share/terminfo/m/mouse-sun
 OLD_FILES+=usr/share/terminfo/m/mrxvt
 OLD_FILES+=usr/share/terminfo/m/mrxvt-256color
 OLD_FILES+=usr/share/terminfo/m/ms-terminal
 OLD_FILES+=usr/share/terminfo/m/ms-vt-utf8
 OLD_FILES+=usr/share/terminfo/m/ms-vt100
 OLD_FILES+=usr/share/terminfo/m/ms-vt100+
 OLD_FILES+=usr/share/terminfo/m/ms-vt100-color
 OLD_FILES+=usr/share/terminfo/m/msk227
 OLD_FILES+=usr/share/terminfo/m/msk22714
 OLD_FILES+=usr/share/terminfo/m/msk227am
 OLD_FILES+=usr/share/terminfo/m/mskermit227
 OLD_FILES+=usr/share/terminfo/m/mskermit22714
 OLD_FILES+=usr/share/terminfo/m/mskermit227am
 OLD_FILES+=usr/share/terminfo/m/mt-70
 OLD_FILES+=usr/share/terminfo/m/mt4520-rv
 OLD_FILES+=usr/share/terminfo/m/mt70
 OLD_FILES+=usr/share/terminfo/m/mterm
 OLD_FILES+=usr/share/terminfo/m/mterm-ansi
 OLD_FILES+=usr/share/terminfo/m/mvterm
 OLD_DIRS+=usr/share/terminfo/m/
 OLD_FILES+=usr/share/terminfo/n/n7900
 OLD_FILES+=usr/share/terminfo/n/nansi.sys
 OLD_FILES+=usr/share/terminfo/n/nansi.sysk
 OLD_FILES+=usr/share/terminfo/n/nansisys
 OLD_FILES+=usr/share/terminfo/n/nansisysk
 OLD_FILES+=usr/share/terminfo/n/ncr160vppp
 OLD_FILES+=usr/share/terminfo/n/ncr160vpwpp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt100an
 OLD_FILES+=usr/share/terminfo/n/ncr160vt100pp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt100wan
 OLD_FILES+=usr/share/terminfo/n/ncr160vt100wpp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt200an
 OLD_FILES+=usr/share/terminfo/n/ncr160vt200pp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt200wan
 OLD_FILES+=usr/share/terminfo/n/ncr160vt200wpp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt300an
 OLD_FILES+=usr/share/terminfo/n/ncr160vt300pp
 OLD_FILES+=usr/share/terminfo/n/ncr160vt300wan
 OLD_FILES+=usr/share/terminfo/n/ncr160vt300wpp
 OLD_FILES+=usr/share/terminfo/n/ncr160wy50+pp
 OLD_FILES+=usr/share/terminfo/n/ncr160wy50+wpp
 OLD_FILES+=usr/share/terminfo/n/ncr160wy60pp
 OLD_FILES+=usr/share/terminfo/n/ncr160wy60wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260intan
 OLD_FILES+=usr/share/terminfo/n/ncr260intpp
 OLD_FILES+=usr/share/terminfo/n/ncr260intwan
 OLD_FILES+=usr/share/terminfo/n/ncr260intwpp
 OLD_FILES+=usr/share/terminfo/n/ncr260vppp
 OLD_FILES+=usr/share/terminfo/n/ncr260vpwpp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt100an
 OLD_FILES+=usr/share/terminfo/n/ncr260vt100pp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt100wan
 OLD_FILES+=usr/share/terminfo/n/ncr260vt100wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt200an
 OLD_FILES+=usr/share/terminfo/n/ncr260vt200pp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt200wan
 OLD_FILES+=usr/share/terminfo/n/ncr260vt200wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt300an
 OLD_FILES+=usr/share/terminfo/n/ncr260vt300pp
 OLD_FILES+=usr/share/terminfo/n/ncr260vt300wan
 OLD_FILES+=usr/share/terminfo/n/ncr260vt300wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy325pp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy325wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy350pp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy350wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy50+pp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy50+wpp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy60pp
 OLD_FILES+=usr/share/terminfo/n/ncr260wy60wpp
 OLD_FILES+=usr/share/terminfo/n/ncr7900
 OLD_FILES+=usr/share/terminfo/n/ncr7900i
 OLD_FILES+=usr/share/terminfo/n/ncr7900iv
 OLD_FILES+=usr/share/terminfo/n/ncr7901
 OLD_FILES+=usr/share/terminfo/n/ncrvt100an
 OLD_FILES+=usr/share/terminfo/n/ncrvt100pp
 OLD_FILES+=usr/share/terminfo/n/ncrvt100wan
 OLD_FILES+=usr/share/terminfo/n/ncrvt100wpp
 OLD_FILES+=usr/share/terminfo/n/ncsa
 OLD_FILES+=usr/share/terminfo/n/ncsa-m
 OLD_FILES+=usr/share/terminfo/n/ncsa-m-ns
 OLD_FILES+=usr/share/terminfo/n/ncsa-ns
 OLD_FILES+=usr/share/terminfo/n/ncsa-vt220
 OLD_FILES+=usr/share/terminfo/n/ncsa-vt220-8
 OLD_FILES+=usr/share/terminfo/n/nd9500
 OLD_FILES+=usr/share/terminfo/n/ndr9500
 OLD_FILES+=usr/share/terminfo/n/ndr9500-25
 OLD_FILES+=usr/share/terminfo/n/ndr9500-25-mc
 OLD_FILES+=usr/share/terminfo/n/ndr9500-25-mc-nl
 OLD_FILES+=usr/share/terminfo/n/ndr9500-25-nl
 OLD_FILES+=usr/share/terminfo/n/ndr9500-mc
 OLD_FILES+=usr/share/terminfo/n/ndr9500-mc-nl
 OLD_FILES+=usr/share/terminfo/n/ndr9500-nl
 OLD_FILES+=usr/share/terminfo/n/nec
 OLD_FILES+=usr/share/terminfo/n/nec5520
 OLD_FILES+=usr/share/terminfo/n/netbsd6
 OLD_FILES+=usr/share/terminfo/n/newhp
 OLD_FILES+=usr/share/terminfo/n/newhpkeyboard
 OLD_FILES+=usr/share/terminfo/n/news
 OLD_FILES+=usr/share/terminfo/n/news-29
 OLD_FILES+=usr/share/terminfo/n/news-29-euc
 OLD_FILES+=usr/share/terminfo/n/news-29-sjis
 OLD_FILES+=usr/share/terminfo/n/news-33
 OLD_FILES+=usr/share/terminfo/n/news-33-euc
 OLD_FILES+=usr/share/terminfo/n/news-33-sjis
 OLD_FILES+=usr/share/terminfo/n/news-42
 OLD_FILES+=usr/share/terminfo/n/news-42-euc
 OLD_FILES+=usr/share/terminfo/n/news-42-sjis
 OLD_FILES+=usr/share/terminfo/n/news-a
 OLD_FILES+=usr/share/terminfo/n/news-o
 OLD_FILES+=usr/share/terminfo/n/news-old-unk
 OLD_FILES+=usr/share/terminfo/n/news-unk
 OLD_FILES+=usr/share/terminfo/n/news28
 OLD_FILES+=usr/share/terminfo/n/news28-a
 OLD_FILES+=usr/share/terminfo/n/news29
 OLD_FILES+=usr/share/terminfo/n/news31
 OLD_FILES+=usr/share/terminfo/n/news31-a
 OLD_FILES+=usr/share/terminfo/n/news31-o
 OLD_FILES+=usr/share/terminfo/n/news33
 OLD_FILES+=usr/share/terminfo/n/news40
 OLD_FILES+=usr/share/terminfo/n/news40-a
 OLD_FILES+=usr/share/terminfo/n/news40-o
 OLD_FILES+=usr/share/terminfo/n/news42
 OLD_FILES+=usr/share/terminfo/n/newscbm
 OLD_FILES+=usr/share/terminfo/n/newscbm-a
 OLD_FILES+=usr/share/terminfo/n/newscbm-o
 OLD_FILES+=usr/share/terminfo/n/newscbm33
 OLD_FILES+=usr/share/terminfo/n/next
 OLD_FILES+=usr/share/terminfo/n/nextshell
 OLD_FILES+=usr/share/terminfo/n/northstar
 OLD_FILES+=usr/share/terminfo/n/nsterm
 OLD_FILES+=usr/share/terminfo/n/nsterm+7
 OLD_FILES+=usr/share/terminfo/n/nsterm+acs
 OLD_FILES+=usr/share/terminfo/n/nsterm+c
 OLD_FILES+=usr/share/terminfo/n/nsterm+c41
 OLD_FILES+=usr/share/terminfo/n/nsterm+mac
 OLD_FILES+=usr/share/terminfo/n/nsterm+s
 OLD_FILES+=usr/share/terminfo/n/nsterm-16color
 OLD_FILES+=usr/share/terminfo/n/nsterm-256color
 OLD_FILES+=usr/share/terminfo/n/nsterm-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-c
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-c-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-m
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-m-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-7-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-c
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-c-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-m
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-m-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-acs-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-bce
 OLD_FILES+=usr/share/terminfo/n/nsterm-build309
 OLD_FILES+=usr/share/terminfo/n/nsterm-build326
 OLD_FILES+=usr/share/terminfo/n/nsterm-build343
 OLD_FILES+=usr/share/terminfo/n/nsterm-build361
 OLD_FILES+=usr/share/terminfo/n/nsterm-build400
 OLD_FILES+=usr/share/terminfo/n/nsterm-c
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-s-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-c-s-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-direct
 OLD_FILES+=usr/share/terminfo/n/nsterm-m
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-s-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-m-s-acs
 OLD_FILES+=usr/share/terminfo/n/nsterm-old
 OLD_FILES+=usr/share/terminfo/n/nsterm-s
 OLD_FILES+=usr/share/terminfo/n/nsterm-s-7
 OLD_FILES+=usr/share/terminfo/n/nsterm-s-acs
 OLD_FILES+=usr/share/terminfo/n/ntconsole
 OLD_FILES+=usr/share/terminfo/n/ntconsole-100
 OLD_FILES+=usr/share/terminfo/n/ntconsole-100-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-25
 OLD_FILES+=usr/share/terminfo/n/ntconsole-25-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-25-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-25-w-vt
 OLD_FILES+=usr/share/terminfo/n/ntconsole-35
 OLD_FILES+=usr/share/terminfo/n/ntconsole-35-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-35-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-50
 OLD_FILES+=usr/share/terminfo/n/ntconsole-50-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-50-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-60
 OLD_FILES+=usr/share/terminfo/n/ntconsole-60-nti
 OLD_FILES+=usr/share/terminfo/n/ntconsole-60-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-w
 OLD_FILES+=usr/share/terminfo/n/ntconsole-w-vt
 OLD_FILES+=usr/share/terminfo/n/nwe501
 OLD_FILES+=usr/share/terminfo/n/nwe501-a
 OLD_FILES+=usr/share/terminfo/n/nwe501-o
 OLD_FILES+=usr/share/terminfo/n/nwp-511
 OLD_FILES+=usr/share/terminfo/n/nwp-517
 OLD_FILES+=usr/share/terminfo/n/nwp-517-w
 OLD_FILES+=usr/share/terminfo/n/nwp251-a
 OLD_FILES+=usr/share/terminfo/n/nwp251-o
 OLD_FILES+=usr/share/terminfo/n/nwp511
 OLD_FILES+=usr/share/terminfo/n/nwp512
 OLD_FILES+=usr/share/terminfo/n/nwp512-a
 OLD_FILES+=usr/share/terminfo/n/nwp512-o
 OLD_FILES+=usr/share/terminfo/n/nwp513
 OLD_FILES+=usr/share/terminfo/n/nwp513-a
 OLD_FILES+=usr/share/terminfo/n/nwp513-o
 OLD_FILES+=usr/share/terminfo/n/nwp514
 OLD_FILES+=usr/share/terminfo/n/nwp514-a
 OLD_FILES+=usr/share/terminfo/n/nwp514-o
 OLD_FILES+=usr/share/terminfo/n/nwp517
 OLD_FILES+=usr/share/terminfo/n/nwp517-w
 OLD_FILES+=usr/share/terminfo/n/nwp518
 OLD_FILES+=usr/share/terminfo/n/nwp518-a
 OLD_FILES+=usr/share/terminfo/n/nwp518-o
 OLD_FILES+=usr/share/terminfo/n/nxterm
 OLD_DIRS+=usr/share/terminfo/n/
 OLD_FILES+=usr/share/terminfo/o/o31
 OLD_FILES+=usr/share/terminfo/o/o4112-nd
 OLD_FILES+=usr/share/terminfo/o/o85h
 OLD_FILES+=usr/share/terminfo/o/oabm85h
 OLD_FILES+=usr/share/terminfo/o/oblit
 OLD_FILES+=usr/share/terminfo/o/oc100
 OLD_FILES+=usr/share/terminfo/o/oconcept
 OLD_FILES+=usr/share/terminfo/o/ofcons
 OLD_FILES+=usr/share/terminfo/o/ojerq
 OLD_FILES+=usr/share/terminfo/o/old-st
 OLD_FILES+=usr/share/terminfo/o/oldibmpc3
 OLD_FILES+=usr/share/terminfo/o/oldpc3
 OLD_FILES+=usr/share/terminfo/o/oldsun
 OLD_FILES+=usr/share/terminfo/o/omron
 OLD_FILES+=usr/share/terminfo/o/opennt
 OLD_FILES+=usr/share/terminfo/o/opennt-100
 OLD_FILES+=usr/share/terminfo/o/opennt-100-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-25
 OLD_FILES+=usr/share/terminfo/o/opennt-25-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-25-w
 OLD_FILES+=usr/share/terminfo/o/opennt-25-w-vt
 OLD_FILES+=usr/share/terminfo/o/opennt-35
 OLD_FILES+=usr/share/terminfo/o/opennt-35-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-35-w
 OLD_FILES+=usr/share/terminfo/o/opennt-50
 OLD_FILES+=usr/share/terminfo/o/opennt-50-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-50-w
 OLD_FILES+=usr/share/terminfo/o/opennt-60
 OLD_FILES+=usr/share/terminfo/o/opennt-60-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-60-w
 OLD_FILES+=usr/share/terminfo/o/opennt-nti
 OLD_FILES+=usr/share/terminfo/o/opennt-w
 OLD_FILES+=usr/share/terminfo/o/opennt-w-vt
 OLD_FILES+=usr/share/terminfo/o/opus3n1+
 OLD_FILES+=usr/share/terminfo/o/origibmpc3
 OLD_FILES+=usr/share/terminfo/o/origpc3
 OLD_FILES+=usr/share/terminfo/o/os9LII
 OLD_FILES+=usr/share/terminfo/o/osborne
 OLD_FILES+=usr/share/terminfo/o/osborne-w
 OLD_FILES+=usr/share/terminfo/o/osborne1
 OLD_FILES+=usr/share/terminfo/o/osborne1-w
 OLD_FILES+=usr/share/terminfo/o/osexec
 OLD_FILES+=usr/share/terminfo/o/otek4112
 OLD_FILES+=usr/share/terminfo/o/otek4113
 OLD_FILES+=usr/share/terminfo/o/otek4114
 OLD_FILES+=usr/share/terminfo/o/otek4115
 OLD_FILES+=usr/share/terminfo/o/owl
 OLD_DIRS+=usr/share/terminfo/o/
 OLD_FILES+=usr/share/terminfo/p/p12
 OLD_FILES+=usr/share/terminfo/p/p12-m
 OLD_FILES+=usr/share/terminfo/p/p12-m-w
 OLD_FILES+=usr/share/terminfo/p/p12-w
 OLD_FILES+=usr/share/terminfo/p/p14
 OLD_FILES+=usr/share/terminfo/p/p14-m
 OLD_FILES+=usr/share/terminfo/p/p14-m-w
 OLD_FILES+=usr/share/terminfo/p/p14-w
 OLD_FILES+=usr/share/terminfo/p/p19
 OLD_FILES+=usr/share/terminfo/p/p4
 OLD_FILES+=usr/share/terminfo/p/p5
 OLD_FILES+=usr/share/terminfo/p/p7
 OLD_FILES+=usr/share/terminfo/p/p8
 OLD_FILES+=usr/share/terminfo/p/p8-w
 OLD_FILES+=usr/share/terminfo/p/p8gl
 OLD_FILES+=usr/share/terminfo/p/p9
 OLD_FILES+=usr/share/terminfo/p/p9-8
 OLD_FILES+=usr/share/terminfo/p/p9-8-w
 OLD_FILES+=usr/share/terminfo/p/p9-w
 OLD_FILES+=usr/share/terminfo/p/pc-coherent
 OLD_FILES+=usr/share/terminfo/p/pc-minix
 OLD_FILES+=usr/share/terminfo/p/pc-venix
 OLD_FILES+=usr/share/terminfo/p/pc3
 OLD_FILES+=usr/share/terminfo/p/pc3-bold
 OLD_FILES+=usr/share/terminfo/p/pc3r
 OLD_FILES+=usr/share/terminfo/p/pc3r-m
 OLD_FILES+=usr/share/terminfo/p/pc6300plus
 OLD_FILES+=usr/share/terminfo/p/pc7300
 OLD_FILES+=usr/share/terminfo/p/pcansi
 OLD_FILES+=usr/share/terminfo/p/pcansi-25
 OLD_FILES+=usr/share/terminfo/p/pcansi-25-m
 OLD_FILES+=usr/share/terminfo/p/pcansi-33
 OLD_FILES+=usr/share/terminfo/p/pcansi-33-m
 OLD_FILES+=usr/share/terminfo/p/pcansi-43
 OLD_FILES+=usr/share/terminfo/p/pcansi-43-m
 OLD_FILES+=usr/share/terminfo/p/pcansi-m
 OLD_FILES+=usr/share/terminfo/p/pcansi-mono
 OLD_FILES+=usr/share/terminfo/p/pcansi25
 OLD_FILES+=usr/share/terminfo/p/pcansi25m
 OLD_FILES+=usr/share/terminfo/p/pcansi33
 OLD_FILES+=usr/share/terminfo/p/pcansi33m
 OLD_FILES+=usr/share/terminfo/p/pcansi43
 OLD_FILES+=usr/share/terminfo/p/pccon
 OLD_FILES+=usr/share/terminfo/p/pccon+base
 OLD_FILES+=usr/share/terminfo/p/pccon+colors
 OLD_FILES+=usr/share/terminfo/p/pccon+keys
 OLD_FILES+=usr/share/terminfo/p/pccon+sgr+acs
 OLD_FILES+=usr/share/terminfo/p/pccon+sgr+acs0
 OLD_FILES+=usr/share/terminfo/p/pccon-m
 OLD_FILES+=usr/share/terminfo/p/pccon0
 OLD_FILES+=usr/share/terminfo/p/pccon0-m
 OLD_FILES+=usr/share/terminfo/p/pccons
 OLD_FILES+=usr/share/terminfo/p/pcconsole
 OLD_FILES+=usr/share/terminfo/p/pcix
 OLD_FILES+=usr/share/terminfo/p/pckermit
 OLD_FILES+=usr/share/terminfo/p/pckermit12
 OLD_FILES+=usr/share/terminfo/p/pckermit120
 OLD_FILES+=usr/share/terminfo/p/pcmw
 OLD_FILES+=usr/share/terminfo/p/pcplot
 OLD_FILES+=usr/share/terminfo/p/pcvt25
 OLD_FILES+=usr/share/terminfo/p/pcvt25-color
 OLD_FILES+=usr/share/terminfo/p/pcvt25w
 OLD_FILES+=usr/share/terminfo/p/pcvt28
 OLD_FILES+=usr/share/terminfo/p/pcvt28w
 OLD_FILES+=usr/share/terminfo/p/pcvt35
 OLD_FILES+=usr/share/terminfo/p/pcvt35w
 OLD_FILES+=usr/share/terminfo/p/pcvt40
 OLD_FILES+=usr/share/terminfo/p/pcvt40w
 OLD_FILES+=usr/share/terminfo/p/pcvt43
 OLD_FILES+=usr/share/terminfo/p/pcvt43w
 OLD_FILES+=usr/share/terminfo/p/pcvt50
 OLD_FILES+=usr/share/terminfo/p/pcvt50w
 OLD_FILES+=usr/share/terminfo/p/pcvtXX
 OLD_FILES+=usr/share/terminfo/p/pcz19
 OLD_FILES+=usr/share/terminfo/p/pe1100
 OLD_FILES+=usr/share/terminfo/p/pe1200
 OLD_FILES+=usr/share/terminfo/p/pe1251
 OLD_FILES+=usr/share/terminfo/p/pe550
 OLD_FILES+=usr/share/terminfo/p/pe6100
 OLD_FILES+=usr/share/terminfo/p/pe6300
 OLD_FILES+=usr/share/terminfo/p/pe6312
 OLD_FILES+=usr/share/terminfo/p/pe7000c
 OLD_FILES+=usr/share/terminfo/p/pe7000m
 OLD_FILES+=usr/share/terminfo/p/pilot
 OLD_FILES+=usr/share/terminfo/p/pmcons
 OLD_FILES+=usr/share/terminfo/p/pmconsole
 OLD_FILES+=usr/share/terminfo/p/printer
 OLD_FILES+=usr/share/terminfo/p/prism12
 OLD_FILES+=usr/share/terminfo/p/prism12-m
 OLD_FILES+=usr/share/terminfo/p/prism12-m-w
 OLD_FILES+=usr/share/terminfo/p/prism12-w
 OLD_FILES+=usr/share/terminfo/p/prism14
 OLD_FILES+=usr/share/terminfo/p/prism14-m
 OLD_FILES+=usr/share/terminfo/p/prism14-m-w
 OLD_FILES+=usr/share/terminfo/p/prism14-w
 OLD_FILES+=usr/share/terminfo/p/prism2
 OLD_FILES+=usr/share/terminfo/p/prism4
 OLD_FILES+=usr/share/terminfo/p/prism5
 OLD_FILES+=usr/share/terminfo/p/prism7
 OLD_FILES+=usr/share/terminfo/p/prism8
 OLD_FILES+=usr/share/terminfo/p/prism8-w
 OLD_FILES+=usr/share/terminfo/p/prism8gl
 OLD_FILES+=usr/share/terminfo/p/prism9
 OLD_FILES+=usr/share/terminfo/p/prism9-8
 OLD_FILES+=usr/share/terminfo/p/prism9-8-w
 OLD_FILES+=usr/share/terminfo/p/prism9-w
 OLD_FILES+=usr/share/terminfo/p/pro350
 OLD_FILES+=usr/share/terminfo/p/ps300
 OLD_FILES+=usr/share/terminfo/p/psterm
 OLD_FILES+=usr/share/terminfo/p/psterm-80x24
 OLD_FILES+=usr/share/terminfo/p/psterm-90x28
 OLD_FILES+=usr/share/terminfo/p/psterm-96x48
 OLD_FILES+=usr/share/terminfo/p/psterm-basic
 OLD_FILES+=usr/share/terminfo/p/psterm-fast
 OLD_FILES+=usr/share/terminfo/p/psx_ansi
 OLD_FILES+=usr/share/terminfo/p/pt100
 OLD_FILES+=usr/share/terminfo/p/pt100w
 OLD_FILES+=usr/share/terminfo/p/pt200
 OLD_FILES+=usr/share/terminfo/p/pt200w
 OLD_FILES+=usr/share/terminfo/p/pt210
 OLD_FILES+=usr/share/terminfo/p/pt250
 OLD_FILES+=usr/share/terminfo/p/pt250w
 OLD_FILES+=usr/share/terminfo/p/pt505
 OLD_FILES+=usr/share/terminfo/p/pt505-22
 OLD_FILES+=usr/share/terminfo/p/pt505-24
 OLD_FILES+=usr/share/terminfo/p/pty
 OLD_FILES+=usr/share/terminfo/p/putty
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+esc
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+linux
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+sco
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+vt100
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+vt400
 OLD_FILES+=usr/share/terminfo/p/putty+fnkeys+xterm
 OLD_FILES+=usr/share/terminfo/p/putty+keypad
 OLD_FILES+=usr/share/terminfo/p/putty+screen
 OLD_FILES+=usr/share/terminfo/p/putty-256color
 OLD_FILES+=usr/share/terminfo/p/putty-m1
 OLD_FILES+=usr/share/terminfo/p/putty-m1b
 OLD_FILES+=usr/share/terminfo/p/putty-m2
 OLD_FILES+=usr/share/terminfo/p/putty-noapp
 OLD_FILES+=usr/share/terminfo/p/putty-sco
 OLD_FILES+=usr/share/terminfo/p/putty-screen
 OLD_FILES+=usr/share/terminfo/p/putty-vt100
 OLD_DIRS+=usr/share/terminfo/p/
 OLD_FILES+=usr/share/terminfo/q/qansi
 OLD_FILES+=usr/share/terminfo/q/qansi-g
 OLD_FILES+=usr/share/terminfo/q/qansi-m
 OLD_FILES+=usr/share/terminfo/q/qansi-t
 OLD_FILES+=usr/share/terminfo/q/qansi-w
 OLD_FILES+=usr/share/terminfo/q/qdcons
 OLD_FILES+=usr/share/terminfo/q/qdss
 OLD_FILES+=usr/share/terminfo/q/qnx
 OLD_FILES+=usr/share/terminfo/q/qnx4
 OLD_FILES+=usr/share/terminfo/q/qnxm
 OLD_FILES+=usr/share/terminfo/q/qnxt
 OLD_FILES+=usr/share/terminfo/q/qnxt2
 OLD_FILES+=usr/share/terminfo/q/qnxt4
 OLD_FILES+=usr/share/terminfo/q/qnxtmono
 OLD_FILES+=usr/share/terminfo/q/qnxw
 OLD_FILES+=usr/share/terminfo/q/qume
 OLD_FILES+=usr/share/terminfo/q/qume5
 OLD_FILES+=usr/share/terminfo/q/qvt101
 OLD_FILES+=usr/share/terminfo/q/qvt101+
 OLD_FILES+=usr/share/terminfo/q/qvt101p
 OLD_FILES+=usr/share/terminfo/q/qvt102
 OLD_FILES+=usr/share/terminfo/q/qvt103
 OLD_FILES+=usr/share/terminfo/q/qvt103-w
 OLD_FILES+=usr/share/terminfo/q/qvt108
 OLD_FILES+=usr/share/terminfo/q/qvt119
 OLD_FILES+=usr/share/terminfo/q/qvt119+
 OLD_FILES+=usr/share/terminfo/q/qvt119+-25
 OLD_FILES+=usr/share/terminfo/q/qvt119+-25-w
 OLD_FILES+=usr/share/terminfo/q/qvt119+-w
 OLD_FILES+=usr/share/terminfo/q/qvt119-25-w
 OLD_FILES+=usr/share/terminfo/q/qvt119-w
 OLD_FILES+=usr/share/terminfo/q/qvt119p
 OLD_FILES+=usr/share/terminfo/q/qvt119p-25
 OLD_FILES+=usr/share/terminfo/q/qvt119p-25-w
 OLD_FILES+=usr/share/terminfo/q/qvt119p-w
 OLD_FILES+=usr/share/terminfo/q/qvt203
 OLD_FILES+=usr/share/terminfo/q/qvt203+
 OLD_FILES+=usr/share/terminfo/q/qvt203-25
 OLD_FILES+=usr/share/terminfo/q/qvt203-25-w
 OLD_FILES+=usr/share/terminfo/q/qvt203-w
 OLD_FILES+=usr/share/terminfo/q/qvt203-w-am
 OLD_DIRS+=usr/share/terminfo/q/
 OLD_FILES+=usr/share/terminfo/r/rbcomm
 OLD_FILES+=usr/share/terminfo/r/rbcomm-nam
 OLD_FILES+=usr/share/terminfo/r/rbcomm-w
 OLD_FILES+=usr/share/terminfo/r/rca
 OLD_FILES+=usr/share/terminfo/r/rcons
 OLD_FILES+=usr/share/terminfo/r/rcons-color
 OLD_FILES+=usr/share/terminfo/r/rebus3180
 OLD_FILES+=usr/share/terminfo/r/regent
 OLD_FILES+=usr/share/terminfo/r/regent100
 OLD_FILES+=usr/share/terminfo/r/regent20
 OLD_FILES+=usr/share/terminfo/r/regent200
 OLD_FILES+=usr/share/terminfo/r/regent25
 OLD_FILES+=usr/share/terminfo/r/regent40
 OLD_FILES+=usr/share/terminfo/r/regent40+
 OLD_FILES+=usr/share/terminfo/r/regent60
 OLD_FILES+=usr/share/terminfo/r/rt6221
 OLD_FILES+=usr/share/terminfo/r/rt6221-w
 OLD_FILES+=usr/share/terminfo/r/rtpc
 OLD_FILES+=usr/share/terminfo/r/rxvt
 OLD_FILES+=usr/share/terminfo/r/rxvt+pcfkeys
 OLD_FILES+=usr/share/terminfo/r/rxvt-16color
 OLD_FILES+=usr/share/terminfo/r/rxvt-256color
 OLD_FILES+=usr/share/terminfo/r/rxvt-88color
 OLD_FILES+=usr/share/terminfo/r/rxvt-basic
 OLD_FILES+=usr/share/terminfo/r/rxvt-color
 OLD_FILES+=usr/share/terminfo/r/rxvt-cygwin
 OLD_FILES+=usr/share/terminfo/r/rxvt-cygwin-native
 OLD_FILES+=usr/share/terminfo/r/rxvt-xpm
 OLD_DIRS+=usr/share/terminfo/r/
 OLD_FILES+=usr/share/terminfo/s/s4
 OLD_FILES+=usr/share/terminfo/s/sb1
 OLD_FILES+=usr/share/terminfo/s/sb2
 OLD_FILES+=usr/share/terminfo/s/sb3
 OLD_FILES+=usr/share/terminfo/s/sbi
 OLD_FILES+=usr/share/terminfo/s/sbobcat
 OLD_FILES+=usr/share/terminfo/s/sc410
 OLD_FILES+=usr/share/terminfo/s/sc415
 OLD_FILES+=usr/share/terminfo/s/scanset
 OLD_FILES+=usr/share/terminfo/s/scoansi
 OLD_FILES+=usr/share/terminfo/s/scoansi-new
 OLD_FILES+=usr/share/terminfo/s/scoansi-old
 OLD_FILES+=usr/share/terminfo/s/screen
 OLD_FILES+=usr/share/terminfo/s/screen+fkeys
 OLD_FILES+=usr/share/terminfo/s/screen+italics
 OLD_FILES+=usr/share/terminfo/s/screen-16color
 OLD_FILES+=usr/share/terminfo/s/screen-16color-bce
 OLD_FILES+=usr/share/terminfo/s/screen-16color-bce-s
 OLD_FILES+=usr/share/terminfo/s/screen-16color-s
 OLD_FILES+=usr/share/terminfo/s/screen-256color
 OLD_FILES+=usr/share/terminfo/s/screen-256color-bce
 OLD_FILES+=usr/share/terminfo/s/screen-256color-bce-s
 OLD_FILES+=usr/share/terminfo/s/screen-256color-s
 OLD_FILES+=usr/share/terminfo/s/screen-bce
 OLD_FILES+=usr/share/terminfo/s/screen-bce.Eterm
 OLD_FILES+=usr/share/terminfo/s/screen-bce.gnome
 OLD_FILES+=usr/share/terminfo/s/screen-bce.konsole
 OLD_FILES+=usr/share/terminfo/s/screen-bce.linux
 OLD_FILES+=usr/share/terminfo/s/screen-bce.mrxvt
 OLD_FILES+=usr/share/terminfo/s/screen-bce.rxvt
 OLD_FILES+=usr/share/terminfo/s/screen-bce.xterm-new
 OLD_FILES+=usr/share/terminfo/s/screen-s
 OLD_FILES+=usr/share/terminfo/s/screen-w
 OLD_FILES+=usr/share/terminfo/s/screen.Eterm
 OLD_FILES+=usr/share/terminfo/s/screen.gnome
 OLD_FILES+=usr/share/terminfo/s/screen.konsole
 OLD_FILES+=usr/share/terminfo/s/screen.konsole-256color
 OLD_FILES+=usr/share/terminfo/s/screen.linux
 OLD_FILES+=usr/share/terminfo/s/screen.linux-m1
 OLD_FILES+=usr/share/terminfo/s/screen.linux-m1b
 OLD_FILES+=usr/share/terminfo/s/screen.linux-m2
 OLD_FILES+=usr/share/terminfo/s/screen.linux-s
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1-nb
 OLD_FILES+=usr/share/terminfo/s/screen.minitel12-80
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1b
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1b-80
 OLD_FILES+=usr/share/terminfo/s/screen.minitel1b-nb
 OLD_FILES+=usr/share/terminfo/s/screen.minitel2-80
 OLD_FILES+=usr/share/terminfo/s/screen.mlterm
 OLD_FILES+=usr/share/terminfo/s/screen.mlterm-256color
 OLD_FILES+=usr/share/terminfo/s/screen.mrxvt
 OLD_FILES+=usr/share/terminfo/s/screen.putty
 OLD_FILES+=usr/share/terminfo/s/screen.putty-256color
 OLD_FILES+=usr/share/terminfo/s/screen.putty-m1
 OLD_FILES+=usr/share/terminfo/s/screen.putty-m1b
 OLD_FILES+=usr/share/terminfo/s/screen.putty-m2
 OLD_FILES+=usr/share/terminfo/s/screen.rxvt
 OLD_FILES+=usr/share/terminfo/s/screen.teraterm
 OLD_FILES+=usr/share/terminfo/s/screen.vte
 OLD_FILES+=usr/share/terminfo/s/screen.vte-256color
 OLD_FILES+=usr/share/terminfo/s/screen.xterm-256color
 OLD_FILES+=usr/share/terminfo/s/screen.xterm-new
 OLD_FILES+=usr/share/terminfo/s/screen.xterm-r6
 OLD_FILES+=usr/share/terminfo/s/screen.xterm-xfree86
 OLD_FILES+=usr/share/terminfo/s/screen2
 OLD_FILES+=usr/share/terminfo/s/screen3
 OLD_FILES+=usr/share/terminfo/s/screen4
 OLD_FILES+=usr/share/terminfo/s/screen5
 OLD_FILES+=usr/share/terminfo/s/screwpoint
 OLD_FILES+=usr/share/terminfo/s/scrhp
 OLD_FILES+=usr/share/terminfo/s/scrt
 OLD_FILES+=usr/share/terminfo/s/securecrt
 OLD_FILES+=usr/share/terminfo/s/sibo
 OLD_FILES+=usr/share/terminfo/s/simpleterm
 OLD_FILES+=usr/share/terminfo/s/simterm
 OLD_FILES+=usr/share/terminfo/s/soroc
 OLD_FILES+=usr/share/terminfo/s/soroc120
 OLD_FILES+=usr/share/terminfo/s/soroc140
 OLD_FILES+=usr/share/terminfo/s/spinwriter
 OLD_FILES+=usr/share/terminfo/s/st
 OLD_FILES+=usr/share/terminfo/s/st-0.6
 OLD_FILES+=usr/share/terminfo/s/st-0.7
 OLD_FILES+=usr/share/terminfo/s/st-0.8
 OLD_FILES+=usr/share/terminfo/s/st-16color
 OLD_FILES+=usr/share/terminfo/s/st-256color
 OLD_FILES+=usr/share/terminfo/s/st-direct
 OLD_FILES+=usr/share/terminfo/s/st52
 OLD_FILES+=usr/share/terminfo/s/st52-color
 OLD_FILES+=usr/share/terminfo/s/st52-m
 OLD_FILES+=usr/share/terminfo/s/st52-old
 OLD_FILES+=usr/share/terminfo/s/stterm
 OLD_FILES+=usr/share/terminfo/s/stterm-16color
 OLD_FILES+=usr/share/terminfo/s/stterm-256color
 OLD_FILES+=usr/share/terminfo/s/stv52
 OLD_FILES+=usr/share/terminfo/s/stv52pc
 OLD_FILES+=usr/share/terminfo/s/sun
 OLD_FILES+=usr/share/terminfo/s/sun+sl
 OLD_FILES+=usr/share/terminfo/s/sun-1
 OLD_FILES+=usr/share/terminfo/s/sun-12
 OLD_FILES+=usr/share/terminfo/s/sun-17
 OLD_FILES+=usr/share/terminfo/s/sun-24
 OLD_FILES+=usr/share/terminfo/s/sun-34
 OLD_FILES+=usr/share/terminfo/s/sun-48
 OLD_FILES+=usr/share/terminfo/s/sun-c
 OLD_FILES+=usr/share/terminfo/s/sun-cgsix
 OLD_FILES+=usr/share/terminfo/s/sun-cmd
 OLD_FILES+=usr/share/terminfo/s/sun-color
 OLD_FILES+=usr/share/terminfo/s/sun-e
 OLD_FILES+=usr/share/terminfo/s/sun-e-s
 OLD_FILES+=usr/share/terminfo/s/sun-il
 OLD_FILES+=usr/share/terminfo/s/sun-nic
 OLD_FILES+=usr/share/terminfo/s/sun-s
 OLD_FILES+=usr/share/terminfo/s/sun-s-e
 OLD_FILES+=usr/share/terminfo/s/sun-ss5
 OLD_FILES+=usr/share/terminfo/s/sun-type4
 OLD_FILES+=usr/share/terminfo/s/sun1
 OLD_FILES+=usr/share/terminfo/s/sun2
 OLD_FILES+=usr/share/terminfo/s/sune
 OLD_FILES+=usr/share/terminfo/s/superbee
 OLD_FILES+=usr/share/terminfo/s/superbee-xsb
 OLD_FILES+=usr/share/terminfo/s/superbeeic
 OLD_FILES+=usr/share/terminfo/s/superbrain
 OLD_FILES+=usr/share/terminfo/s/sv80
 OLD_FILES+=usr/share/terminfo/s/swtp
 OLD_FILES+=usr/share/terminfo/s/synertek
 OLD_FILES+=usr/share/terminfo/s/synertek380
 OLD_FILES+=usr/share/terminfo/s/system1
 OLD_DIRS+=usr/share/terminfo/s/
 
 OLD_FILES+=usr/share/terminfo/t/t10
 OLD_FILES+=usr/share/terminfo/t/t1061
 OLD_FILES+=usr/share/terminfo/t/t1061f
 OLD_FILES+=usr/share/terminfo/t/t16
 OLD_FILES+=usr/share/terminfo/t/t3700
 OLD_FILES+=usr/share/terminfo/t/t3800
 OLD_FILES+=usr/share/terminfo/t/t653x
 OLD_FILES+=usr/share/terminfo/t/tab
 OLD_FILES+=usr/share/terminfo/t/tab132
 OLD_FILES+=usr/share/terminfo/t/tab132-15
 OLD_FILES+=usr/share/terminfo/t/tab132-rv
 OLD_FILES+=usr/share/terminfo/t/tab132-w
 OLD_FILES+=usr/share/terminfo/t/tab132-w-rv
 OLD_FILES+=usr/share/terminfo/t/tandem6510
 OLD_FILES+=usr/share/terminfo/t/tandem653
 OLD_FILES+=usr/share/terminfo/t/tek
 OLD_FILES+=usr/share/terminfo/t/tek4012
 OLD_FILES+=usr/share/terminfo/t/tek4013
 OLD_FILES+=usr/share/terminfo/t/tek4014
 OLD_FILES+=usr/share/terminfo/t/tek4014-sm
 OLD_FILES+=usr/share/terminfo/t/tek4015
 OLD_FILES+=usr/share/terminfo/t/tek4015-sm
 OLD_FILES+=usr/share/terminfo/t/tek4023
 OLD_FILES+=usr/share/terminfo/t/tek4024
 OLD_FILES+=usr/share/terminfo/t/tek4025
 OLD_FILES+=usr/share/terminfo/t/tek4025-17
 OLD_FILES+=usr/share/terminfo/t/tek4025-17-ws
 OLD_FILES+=usr/share/terminfo/t/tek4025-cr
 OLD_FILES+=usr/share/terminfo/t/tek4025-ex
 OLD_FILES+=usr/share/terminfo/t/tek4025a
 OLD_FILES+=usr/share/terminfo/t/tek4025ex
 OLD_FILES+=usr/share/terminfo/t/tek4027
 OLD_FILES+=usr/share/terminfo/t/tek4027-ex
 OLD_FILES+=usr/share/terminfo/t/tek4105
 OLD_FILES+=usr/share/terminfo/t/tek4105-30
 OLD_FILES+=usr/share/terminfo/t/tek4105a
 OLD_FILES+=usr/share/terminfo/t/tek4106brl
 OLD_FILES+=usr/share/terminfo/t/tek4107
 OLD_FILES+=usr/share/terminfo/t/tek4107brl
 OLD_FILES+=usr/share/terminfo/t/tek4109
 OLD_FILES+=usr/share/terminfo/t/tek4109brl
 OLD_FILES+=usr/share/terminfo/t/tek4112
 OLD_FILES+=usr/share/terminfo/t/tek4112-5
 OLD_FILES+=usr/share/terminfo/t/tek4112-nd
 OLD_FILES+=usr/share/terminfo/t/tek4113
 OLD_FILES+=usr/share/terminfo/t/tek4113-34
 OLD_FILES+=usr/share/terminfo/t/tek4113-nd
 OLD_FILES+=usr/share/terminfo/t/tek4114
 OLD_FILES+=usr/share/terminfo/t/tek4115
 OLD_FILES+=usr/share/terminfo/t/tek4125
 OLD_FILES+=usr/share/terminfo/t/tek4205
 OLD_FILES+=usr/share/terminfo/t/tek4207
 OLD_FILES+=usr/share/terminfo/t/tek4207-s
 OLD_FILES+=usr/share/terminfo/t/tek4404
 OLD_FILES+=usr/share/terminfo/t/teken
 OLD_FILES+=usr/share/terminfo/t/teleray
 OLD_FILES+=usr/share/terminfo/t/teletec
 OLD_FILES+=usr/share/terminfo/t/teraterm
 OLD_FILES+=usr/share/terminfo/t/teraterm-256color
 OLD_FILES+=usr/share/terminfo/t/teraterm2.3
 OLD_FILES+=usr/share/terminfo/t/teraterm4.59
 OLD_FILES+=usr/share/terminfo/t/teraterm4.97
 OLD_FILES+=usr/share/terminfo/t/terminator
 OLD_FILES+=usr/share/terminfo/t/terminet
 OLD_FILES+=usr/share/terminfo/t/terminet1200
 OLD_FILES+=usr/share/terminfo/t/terminet300
 OLD_FILES+=usr/share/terminfo/t/terminology
 OLD_FILES+=usr/share/terminfo/t/terminology-0.6.1
 OLD_FILES+=usr/share/terminfo/t/terminology-1.0.0
 OLD_FILES+=usr/share/terminfo/t/terminology-1.8.1
 OLD_FILES+=usr/share/terminfo/t/termite
 OLD_FILES+=usr/share/terminfo/t/tgtelnet
 OLD_FILES+=usr/share/terminfo/t/ti700
 OLD_FILES+=usr/share/terminfo/t/ti703
 OLD_FILES+=usr/share/terminfo/t/ti703-w
 OLD_FILES+=usr/share/terminfo/t/ti707
 OLD_FILES+=usr/share/terminfo/t/ti707-w
 OLD_FILES+=usr/share/terminfo/t/ti733
 OLD_FILES+=usr/share/terminfo/t/ti735
 OLD_FILES+=usr/share/terminfo/t/ti745
 OLD_FILES+=usr/share/terminfo/t/ti800
 OLD_FILES+=usr/share/terminfo/t/ti916
 OLD_FILES+=usr/share/terminfo/t/ti916-132
 OLD_FILES+=usr/share/terminfo/t/ti916-220-7
 OLD_FILES+=usr/share/terminfo/t/ti916-220-8
 OLD_FILES+=usr/share/terminfo/t/ti916-8
 OLD_FILES+=usr/share/terminfo/t/ti916-8-132
 OLD_FILES+=usr/share/terminfo/t/ti924
 OLD_FILES+=usr/share/terminfo/t/ti924-8
 OLD_FILES+=usr/share/terminfo/t/ti924-8w
 OLD_FILES+=usr/share/terminfo/t/ti924w
 OLD_FILES+=usr/share/terminfo/t/ti926
 OLD_FILES+=usr/share/terminfo/t/ti926-8
 OLD_FILES+=usr/share/terminfo/t/ti928
 OLD_FILES+=usr/share/terminfo/t/ti928-8
 OLD_FILES+=usr/share/terminfo/t/ti931
 OLD_FILES+=usr/share/terminfo/t/ti_ansi
 OLD_FILES+=usr/share/terminfo/t/tkterm
 OLD_FILES+=usr/share/terminfo/t/tmux
 OLD_FILES+=usr/share/terminfo/t/tmux-256color
 OLD_FILES+=usr/share/terminfo/t/tmux-direct
 OLD_FILES+=usr/share/terminfo/t/tn1200
 OLD_FILES+=usr/share/terminfo/t/tn300
 OLD_FILES+=usr/share/terminfo/t/trs16
 OLD_FILES+=usr/share/terminfo/t/trs2
 OLD_FILES+=usr/share/terminfo/t/trs80II
 OLD_FILES+=usr/share/terminfo/t/trsII
 OLD_FILES+=usr/share/terminfo/t/ts-1
 OLD_FILES+=usr/share/terminfo/t/ts-1p
 OLD_FILES+=usr/share/terminfo/t/ts1
 OLD_FILES+=usr/share/terminfo/t/ts100
 OLD_FILES+=usr/share/terminfo/t/ts100-ctxt
 OLD_FILES+=usr/share/terminfo/t/ts100-sp
 OLD_FILES+=usr/share/terminfo/t/ts1p
 OLD_FILES+=usr/share/terminfo/t/tt
 OLD_FILES+=usr/share/terminfo/t/tt505-22
 OLD_FILES+=usr/share/terminfo/t/tt52
 OLD_FILES+=usr/share/terminfo/t/tty33
 OLD_FILES+=usr/share/terminfo/t/tty35
 OLD_FILES+=usr/share/terminfo/t/tty37
 OLD_FILES+=usr/share/terminfo/t/tty40
 OLD_FILES+=usr/share/terminfo/t/tty43
 OLD_FILES+=usr/share/terminfo/t/tty4420
 OLD_FILES+=usr/share/terminfo/t/tty4424
 OLD_FILES+=usr/share/terminfo/t/tty4424-1
 OLD_FILES+=usr/share/terminfo/t/tty4424m
 OLD_FILES+=usr/share/terminfo/t/tty4426
 OLD_FILES+=usr/share/terminfo/t/tty5410
 OLD_FILES+=usr/share/terminfo/t/tty5410-w
 OLD_FILES+=usr/share/terminfo/t/tty5410v1
 OLD_FILES+=usr/share/terminfo/t/tty5410v1-w
 OLD_FILES+=usr/share/terminfo/t/tty5420
 OLD_FILES+=usr/share/terminfo/t/tty5420+nl
 OLD_FILES+=usr/share/terminfo/t/tty5420-nl
 OLD_FILES+=usr/share/terminfo/t/tty5420-rv
 OLD_FILES+=usr/share/terminfo/t/tty5420-rv-nl
 OLD_FILES+=usr/share/terminfo/t/tty5420-w
 OLD_FILES+=usr/share/terminfo/t/tty5420-w-nl
 OLD_FILES+=usr/share/terminfo/t/tty5420-w-rv
 OLD_FILES+=usr/share/terminfo/t/tty5420-w-rv-n
 OLD_FILES+=usr/share/terminfo/t/tty5425
 OLD_FILES+=usr/share/terminfo/t/tty5425-nl
 OLD_FILES+=usr/share/terminfo/t/tty5425-w
 OLD_FILES+=usr/share/terminfo/t/tty5620
 OLD_FILES+=usr/share/terminfo/t/tty5620-1
 OLD_FILES+=usr/share/terminfo/t/tty5620-24
 OLD_FILES+=usr/share/terminfo/t/tty5620-34
 OLD_FILES+=usr/share/terminfo/t/tty5620-s
 OLD_FILES+=usr/share/terminfo/t/ttydmd
 OLD_FILES+=usr/share/terminfo/t/tvi803
 OLD_FILES+=usr/share/terminfo/t/tvi9065
 OLD_FILES+=usr/share/terminfo/t/tvi910
 OLD_FILES+=usr/share/terminfo/t/tvi910+
 OLD_FILES+=usr/share/terminfo/t/tvi912
 OLD_FILES+=usr/share/terminfo/t/tvi912b
 OLD_FILES+=usr/share/terminfo/t/tvi912b+2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b+dim
 OLD_FILES+=usr/share/terminfo/t/tvi912b+mc
 OLD_FILES+=usr/share/terminfo/t/tvi912b+printer
 OLD_FILES+=usr/share/terminfo/t/tvi912b+vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-2p-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912b-2p-p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-2p-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912b-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912b-mc-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-mc-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-p-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-p-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912b-unk-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-unk-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912b-vb-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912b-vb-p
 OLD_FILES+=usr/share/terminfo/t/tvi912b-vb-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912c
 OLD_FILES+=usr/share/terminfo/t/tvi912c-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-2p-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912c-2p-p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-2p-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912c-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912c-mc-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-mc-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912c-p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-p-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-p-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912c-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912c-unk-2p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-unk-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912c-vb
 OLD_FILES+=usr/share/terminfo/t/tvi912c-vb-mc
 OLD_FILES+=usr/share/terminfo/t/tvi912c-vb-p
 OLD_FILES+=usr/share/terminfo/t/tvi912c-vb-unk
 OLD_FILES+=usr/share/terminfo/t/tvi912cc
 OLD_FILES+=usr/share/terminfo/t/tvi914
 OLD_FILES+=usr/share/terminfo/t/tvi920
 OLD_FILES+=usr/share/terminfo/t/tvi920b
 OLD_FILES+=usr/share/terminfo/t/tvi920b+fn
 OLD_FILES+=usr/share/terminfo/t/tvi920b-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-2p-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920b-2p-p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-2p-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920b-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920b-mc-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-mc-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920b-p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-p-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-p-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920b-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920b-unk-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-unk-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920b-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920b-vb-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920b-vb-p
 OLD_FILES+=usr/share/terminfo/t/tvi920b-vb-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920c
 OLD_FILES+=usr/share/terminfo/t/tvi920c-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-2p-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920c-2p-p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-2p-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920c-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920c-mc-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-mc-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920c-p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-p-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-p-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920c-unk
 OLD_FILES+=usr/share/terminfo/t/tvi920c-unk-2p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-unk-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920c-vb
 OLD_FILES+=usr/share/terminfo/t/tvi920c-vb-mc
 OLD_FILES+=usr/share/terminfo/t/tvi920c-vb-p
 OLD_FILES+=usr/share/terminfo/t/tvi920c-vb-unk
 OLD_FILES+=usr/share/terminfo/t/tvi921
 OLD_FILES+=usr/share/terminfo/t/tvi924
 OLD_FILES+=usr/share/terminfo/t/tvi925
 OLD_FILES+=usr/share/terminfo/t/tvi925-hi
 OLD_FILES+=usr/share/terminfo/t/tvi92B
 OLD_FILES+=usr/share/terminfo/t/tvi92D
 OLD_FILES+=usr/share/terminfo/t/tvi950
 OLD_FILES+=usr/share/terminfo/t/tvi950-2p
 OLD_FILES+=usr/share/terminfo/t/tvi950-4p
 OLD_FILES+=usr/share/terminfo/t/tvi950-rv
 OLD_FILES+=usr/share/terminfo/t/tvi950-rv-2p
 OLD_FILES+=usr/share/terminfo/t/tvi950-rv-4p
 OLD_FILES+=usr/share/terminfo/t/tvi955
 OLD_FILES+=usr/share/terminfo/t/tvi955-hb
 OLD_FILES+=usr/share/terminfo/t/tvi955-w
 OLD_FILES+=usr/share/terminfo/t/tvi970
 OLD_FILES+=usr/share/terminfo/t/tvi970-2p
 OLD_FILES+=usr/share/terminfo/t/tvi970-vb
 OLD_FILES+=usr/share/terminfo/t/tvipt
 OLD_FILES+=usr/share/terminfo/t/tw100
 OLD_FILES+=usr/share/terminfo/t/tw52
 OLD_FILES+=usr/share/terminfo/t/tw52-color
 OLD_FILES+=usr/share/terminfo/t/tw52-m
 OLD_FILES+=usr/share/terminfo/t/tws-generic
 OLD_FILES+=usr/share/terminfo/t/tws2102-sna
 OLD_FILES+=usr/share/terminfo/t/tws2103
 OLD_FILES+=usr/share/terminfo/t/tws2103-sna
 OLD_DIRS+=usr/share/terminfo/t/
 OLD_FILES+=usr/share/terminfo/u/ultima2
 OLD_FILES+=usr/share/terminfo/u/ultimaII
 OLD_FILES+=usr/share/terminfo/u/uniterm
 OLD_FILES+=usr/share/terminfo/u/uniterm49
 OLD_FILES+=usr/share/terminfo/u/unixpc
 OLD_FILES+=usr/share/terminfo/u/unknown
 OLD_FILES+=usr/share/terminfo/u/uts30
 OLD_FILES+=usr/share/terminfo/u/uwin
 OLD_DIRS+=usr/share/terminfo/u/
 OLD_FILES+=usr/share/terminfo/v/v200-nam
 OLD_FILES+=usr/share/terminfo/v/v320n
 OLD_FILES+=usr/share/terminfo/v/v3220
 OLD_FILES+=usr/share/terminfo/v/v5410
 OLD_FILES+=usr/share/terminfo/v/vanilla
 OLD_FILES+=usr/share/terminfo/v/vapple
 OLD_FILES+=usr/share/terminfo/v/vc103
 OLD_FILES+=usr/share/terminfo/v/vc203
 OLD_FILES+=usr/share/terminfo/v/vc303
 OLD_FILES+=usr/share/terminfo/v/vc303a
 OLD_FILES+=usr/share/terminfo/v/vc403a
 OLD_FILES+=usr/share/terminfo/v/vc404
 OLD_FILES+=usr/share/terminfo/v/vc404-s
 OLD_FILES+=usr/share/terminfo/v/vc414
 OLD_FILES+=usr/share/terminfo/v/vc414h
 OLD_FILES+=usr/share/terminfo/v/vc415
 OLD_FILES+=usr/share/terminfo/v/venix
 OLD_FILES+=usr/share/terminfo/v/versaterm
 OLD_FILES+=usr/share/terminfo/v/vi200
 OLD_FILES+=usr/share/terminfo/v/vi200-f
 OLD_FILES+=usr/share/terminfo/v/vi200-rv
 OLD_FILES+=usr/share/terminfo/v/vi300
 OLD_FILES+=usr/share/terminfo/v/vi300-old
 OLD_FILES+=usr/share/terminfo/v/vi50
 OLD_FILES+=usr/share/terminfo/v/vi500
 OLD_FILES+=usr/share/terminfo/v/vi50adm
 OLD_FILES+=usr/share/terminfo/v/vi55
 OLD_FILES+=usr/share/terminfo/v/vi550
 OLD_FILES+=usr/share/terminfo/v/vi603
 OLD_FILES+=usr/share/terminfo/v/viewdata
 OLD_FILES+=usr/share/terminfo/v/viewdata-o
 OLD_FILES+=usr/share/terminfo/v/viewdata-rv
 OLD_FILES+=usr/share/terminfo/v/viewpoint
 OLD_FILES+=usr/share/terminfo/v/viewpoint3a+
 OLD_FILES+=usr/share/terminfo/v/viewpoint60
 OLD_FILES+=usr/share/terminfo/v/viewpoint90
 OLD_FILES+=usr/share/terminfo/v/vip
 OLD_FILES+=usr/share/terminfo/v/vip-H
 OLD_FILES+=usr/share/terminfo/v/vip-Hw
 OLD_FILES+=usr/share/terminfo/v/vip-w
 OLD_FILES+=usr/share/terminfo/v/vip7800-H
 OLD_FILES+=usr/share/terminfo/v/vip7800-Hw
 OLD_FILES+=usr/share/terminfo/v/vip7800-w
 OLD_FILES+=usr/share/terminfo/v/visa50
 OLD_FILES+=usr/share/terminfo/v/visual603
 OLD_FILES+=usr/share/terminfo/v/vitty
 OLD_FILES+=usr/share/terminfo/v/vk100
 OLD_FILES+=usr/share/terminfo/v/vp3a+
 OLD_FILES+=usr/share/terminfo/v/vp60
 OLD_FILES+=usr/share/terminfo/v/vp90
 OLD_FILES+=usr/share/terminfo/v/vremote
 OLD_FILES+=usr/share/terminfo/v/vs100
 OLD_FILES+=usr/share/terminfo/v/vs100-x10
 OLD_FILES+=usr/share/terminfo/v/vsc
 OLD_FILES+=usr/share/terminfo/v/vscode
 OLD_FILES+=usr/share/terminfo/v/vscode-direct
 OLD_FILES+=usr/share/terminfo/v/vt-61
 OLD_FILES+=usr/share/terminfo/v/vt-utf8
 OLD_FILES+=usr/share/terminfo/v/vt100
 OLD_FILES+=usr/share/terminfo/v/vt100+
 OLD_FILES+=usr/share/terminfo/v/vt100+4bsd
 OLD_FILES+=usr/share/terminfo/v/vt100+enq
 OLD_FILES+=usr/share/terminfo/v/vt100+fnkeys
 OLD_FILES+=usr/share/terminfo/v/vt100+keypad
 OLD_FILES+=usr/share/terminfo/v/vt100+pfkeys
 OLD_FILES+=usr/share/terminfo/v/vt100-am
 OLD_FILES+=usr/share/terminfo/v/vt100-bm
 OLD_FILES+=usr/share/terminfo/v/vt100-bm-o
 OLD_FILES+=usr/share/terminfo/v/vt100-bot-s
 OLD_FILES+=usr/share/terminfo/v/vt100-nam
 OLD_FILES+=usr/share/terminfo/v/vt100-nam-w
 OLD_FILES+=usr/share/terminfo/v/vt100-nav
 OLD_FILES+=usr/share/terminfo/v/vt100-nav-w
 OLD_FILES+=usr/share/terminfo/v/vt100-putty
 OLD_FILES+=usr/share/terminfo/v/vt100-s
 OLD_FILES+=usr/share/terminfo/v/vt100-s-bot
 OLD_FILES+=usr/share/terminfo/v/vt100-s-top
 OLD_FILES+=usr/share/terminfo/v/vt100-top-s
 OLD_FILES+=usr/share/terminfo/v/vt100-vb
 OLD_FILES+=usr/share/terminfo/v/vt100-w
 OLD_FILES+=usr/share/terminfo/v/vt100-w-am
 OLD_FILES+=usr/share/terminfo/v/vt100-w-nam
 OLD_FILES+=usr/share/terminfo/v/vt100-w-nav
 OLD_FILES+=usr/share/terminfo/v/vt100nam
 OLD_FILES+=usr/share/terminfo/v/vt102
 OLD_FILES+=usr/share/terminfo/v/vt102+enq
 OLD_FILES+=usr/share/terminfo/v/vt102-nsgr
 OLD_FILES+=usr/share/terminfo/v/vt102-w
 OLD_FILES+=usr/share/terminfo/v/vt125
 OLD_FILES+=usr/share/terminfo/v/vt131
 OLD_FILES+=usr/share/terminfo/v/vt132
 OLD_FILES+=usr/share/terminfo/v/vt200
 OLD_FILES+=usr/share/terminfo/v/vt200-8
 OLD_FILES+=usr/share/terminfo/v/vt200-8bit
 OLD_FILES+=usr/share/terminfo/v/vt200-js
 OLD_FILES+=usr/share/terminfo/v/vt200-old
 OLD_FILES+=usr/share/terminfo/v/vt200-w
 OLD_FILES+=usr/share/terminfo/v/vt220
 OLD_FILES+=usr/share/terminfo/v/vt220+cvis
 OLD_FILES+=usr/share/terminfo/v/vt220+cvis8
 OLD_FILES+=usr/share/terminfo/v/vt220+keypad
 OLD_FILES+=usr/share/terminfo/v/vt220+pcedit
 OLD_FILES+=usr/share/terminfo/v/vt220+vtedit
 OLD_FILES+=usr/share/terminfo/v/vt220-8
 OLD_FILES+=usr/share/terminfo/v/vt220-8bit
 OLD_FILES+=usr/share/terminfo/v/vt220-base
 OLD_FILES+=usr/share/terminfo/v/vt220-js
 OLD_FILES+=usr/share/terminfo/v/vt220-nam
 OLD_FILES+=usr/share/terminfo/v/vt220-old
 OLD_FILES+=usr/share/terminfo/v/vt220-w
 OLD_FILES+=usr/share/terminfo/v/vt220d
 OLD_FILES+=usr/share/terminfo/v/vt300
 OLD_FILES+=usr/share/terminfo/v/vt300-nam
 OLD_FILES+=usr/share/terminfo/v/vt300-w
 OLD_FILES+=usr/share/terminfo/v/vt300-w-nam
 OLD_FILES+=usr/share/terminfo/v/vt320
 OLD_FILES+=usr/share/terminfo/v/vt320-k3
 OLD_FILES+=usr/share/terminfo/v/vt320-k311
 OLD_FILES+=usr/share/terminfo/v/vt320-nam
 OLD_FILES+=usr/share/terminfo/v/vt320-w
 OLD_FILES+=usr/share/terminfo/v/vt320-w-nam
 OLD_FILES+=usr/share/terminfo/v/vt320nam
 OLD_FILES+=usr/share/terminfo/v/vt330
 OLD_FILES+=usr/share/terminfo/v/vt340
 OLD_FILES+=usr/share/terminfo/v/vt400
 OLD_FILES+=usr/share/terminfo/v/vt400-24
 OLD_FILES+=usr/share/terminfo/v/vt420
 OLD_FILES+=usr/share/terminfo/v/vt420+lrmm
 OLD_FILES+=usr/share/terminfo/v/vt420f
 OLD_FILES+=usr/share/terminfo/v/vt420pc
 OLD_FILES+=usr/share/terminfo/v/vt420pcdos
 OLD_FILES+=usr/share/terminfo/v/vt50
 OLD_FILES+=usr/share/terminfo/v/vt50h
 OLD_FILES+=usr/share/terminfo/v/vt510
 OLD_FILES+=usr/share/terminfo/v/vt510pc
 OLD_FILES+=usr/share/terminfo/v/vt510pcdos
 OLD_FILES+=usr/share/terminfo/v/vt52
 OLD_FILES+=usr/share/terminfo/v/vt52+keypad
 OLD_FILES+=usr/share/terminfo/v/vt52-basic
 OLD_FILES+=usr/share/terminfo/v/vt520
 OLD_FILES+=usr/share/terminfo/v/vt520ansi
 OLD_FILES+=usr/share/terminfo/v/vt525
 OLD_FILES+=usr/share/terminfo/v/vt61
 OLD_FILES+=usr/share/terminfo/v/vt61.5
 OLD_FILES+=usr/share/terminfo/v/vte
 OLD_FILES+=usr/share/terminfo/v/vte+pcfkeys
 OLD_FILES+=usr/share/terminfo/v/vte-2007
 OLD_FILES+=usr/share/terminfo/v/vte-2008
 OLD_FILES+=usr/share/terminfo/v/vte-2012
 OLD_FILES+=usr/share/terminfo/v/vte-2014
 OLD_FILES+=usr/share/terminfo/v/vte-2017
 OLD_FILES+=usr/share/terminfo/v/vte-2018
 OLD_FILES+=usr/share/terminfo/v/vte-256color
 OLD_FILES+=usr/share/terminfo/v/vte-direct
 OLD_FILES+=usr/share/terminfo/v/vtnt
 OLD_FILES+=usr/share/terminfo/v/vv100
 OLD_FILES+=usr/share/terminfo/v/vwmterm
 OLD_DIRS+=usr/share/terminfo/v/
 OLD_FILES+=usr/share/terminfo/w/wren
 OLD_FILES+=usr/share/terminfo/w/wrenw
 OLD_FILES+=usr/share/terminfo/w/wsiris
 OLD_FILES+=usr/share/terminfo/w/wsvt25
 OLD_FILES+=usr/share/terminfo/w/wsvt25m
 OLD_FILES+=usr/share/terminfo/w/wy-75ap
 OLD_FILES+=usr/share/terminfo/w/wy-99fgt
 OLD_FILES+=usr/share/terminfo/w/wy-99fgta
 OLD_FILES+=usr/share/terminfo/w/wy100
 OLD_FILES+=usr/share/terminfo/w/wy100q
 OLD_FILES+=usr/share/terminfo/w/wy120
 OLD_FILES+=usr/share/terminfo/w/wy120-25
 OLD_FILES+=usr/share/terminfo/w/wy120-25-w
 OLD_FILES+=usr/share/terminfo/w/wy120-vb
 OLD_FILES+=usr/share/terminfo/w/wy120-w
 OLD_FILES+=usr/share/terminfo/w/wy120-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy120-wvb
 OLD_FILES+=usr/share/terminfo/w/wy150
 OLD_FILES+=usr/share/terminfo/w/wy150-25
 OLD_FILES+=usr/share/terminfo/w/wy150-25-w
 OLD_FILES+=usr/share/terminfo/w/wy150-vb
 OLD_FILES+=usr/share/terminfo/w/wy150-w
 OLD_FILES+=usr/share/terminfo/w/wy150-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy160
 OLD_FILES+=usr/share/terminfo/w/wy160-25
 OLD_FILES+=usr/share/terminfo/w/wy160-25-w
 OLD_FILES+=usr/share/terminfo/w/wy160-42
 OLD_FILES+=usr/share/terminfo/w/wy160-42-w
 OLD_FILES+=usr/share/terminfo/w/wy160-43
 OLD_FILES+=usr/share/terminfo/w/wy160-43-w
 OLD_FILES+=usr/share/terminfo/w/wy160-tek
 OLD_FILES+=usr/share/terminfo/w/wy160-vb
 OLD_FILES+=usr/share/terminfo/w/wy160-w
 OLD_FILES+=usr/share/terminfo/w/wy160-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy160-wvb
 OLD_FILES+=usr/share/terminfo/w/wy185
 OLD_FILES+=usr/share/terminfo/w/wy185-24
 OLD_FILES+=usr/share/terminfo/w/wy185-vb
 OLD_FILES+=usr/share/terminfo/w/wy185-w
 OLD_FILES+=usr/share/terminfo/w/wy185-wvb
 OLD_FILES+=usr/share/terminfo/w/wy30
 OLD_FILES+=usr/share/terminfo/w/wy30-mc
 OLD_FILES+=usr/share/terminfo/w/wy30-vb
 OLD_FILES+=usr/share/terminfo/w/wy325
 OLD_FILES+=usr/share/terminfo/w/wy325-25
 OLD_FILES+=usr/share/terminfo/w/wy325-25w
 OLD_FILES+=usr/share/terminfo/w/wy325-42
 OLD_FILES+=usr/share/terminfo/w/wy325-42w
 OLD_FILES+=usr/share/terminfo/w/wy325-42w-vb
 OLD_FILES+=usr/share/terminfo/w/wy325-42wvb
 OLD_FILES+=usr/share/terminfo/w/wy325-43
 OLD_FILES+=usr/share/terminfo/w/wy325-43w
 OLD_FILES+=usr/share/terminfo/w/wy325-43w-vb
 OLD_FILES+=usr/share/terminfo/w/wy325-43wvb
 OLD_FILES+=usr/share/terminfo/w/wy325-80
 OLD_FILES+=usr/share/terminfo/w/wy325-vb
 OLD_FILES+=usr/share/terminfo/w/wy325-w
 OLD_FILES+=usr/share/terminfo/w/wy325-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy325-wvb
 OLD_FILES+=usr/share/terminfo/w/wy325w-24
 OLD_FILES+=usr/share/terminfo/w/wy350
 OLD_FILES+=usr/share/terminfo/w/wy350-vb
 OLD_FILES+=usr/share/terminfo/w/wy350-w
 OLD_FILES+=usr/share/terminfo/w/wy350-wvb
 OLD_FILES+=usr/share/terminfo/w/wy370
 OLD_FILES+=usr/share/terminfo/w/wy370-101k
 OLD_FILES+=usr/share/terminfo/w/wy370-105k
 OLD_FILES+=usr/share/terminfo/w/wy370-EPC
 OLD_FILES+=usr/share/terminfo/w/wy370-nk
 OLD_FILES+=usr/share/terminfo/w/wy370-rv
 OLD_FILES+=usr/share/terminfo/w/wy370-tek
 OLD_FILES+=usr/share/terminfo/w/wy370-vb
 OLD_FILES+=usr/share/terminfo/w/wy370-w
 OLD_FILES+=usr/share/terminfo/w/wy370-wvb
 OLD_FILES+=usr/share/terminfo/w/wy50
 OLD_FILES+=usr/share/terminfo/w/wy50-mc
 OLD_FILES+=usr/share/terminfo/w/wy50-vb
 OLD_FILES+=usr/share/terminfo/w/wy50-w
 OLD_FILES+=usr/share/terminfo/w/wy50-wvb
 OLD_FILES+=usr/share/terminfo/w/wy520
 OLD_FILES+=usr/share/terminfo/w/wy520-24
 OLD_FILES+=usr/share/terminfo/w/wy520-36
 OLD_FILES+=usr/share/terminfo/w/wy520-36pc
 OLD_FILES+=usr/share/terminfo/w/wy520-36w
 OLD_FILES+=usr/share/terminfo/w/wy520-36wpc
 OLD_FILES+=usr/share/terminfo/w/wy520-48
 OLD_FILES+=usr/share/terminfo/w/wy520-48pc
 OLD_FILES+=usr/share/terminfo/w/wy520-48w
 OLD_FILES+=usr/share/terminfo/w/wy520-48wpc
 OLD_FILES+=usr/share/terminfo/w/wy520-epc
 OLD_FILES+=usr/share/terminfo/w/wy520-epc-24
 OLD_FILES+=usr/share/terminfo/w/wy520-epc-vb
 OLD_FILES+=usr/share/terminfo/w/wy520-epc-w
 OLD_FILES+=usr/share/terminfo/w/wy520-epc-wvb
 OLD_FILES+=usr/share/terminfo/w/wy520-vb
 OLD_FILES+=usr/share/terminfo/w/wy520-w
 OLD_FILES+=usr/share/terminfo/w/wy520-wvb
 OLD_FILES+=usr/share/terminfo/w/wy60
 OLD_FILES+=usr/share/terminfo/w/wy60-25
 OLD_FILES+=usr/share/terminfo/w/wy60-25-w
 OLD_FILES+=usr/share/terminfo/w/wy60-316X
 OLD_FILES+=usr/share/terminfo/w/wy60-42
 OLD_FILES+=usr/share/terminfo/w/wy60-42-w
 OLD_FILES+=usr/share/terminfo/w/wy60-43
 OLD_FILES+=usr/share/terminfo/w/wy60-43-w
 OLD_FILES+=usr/share/terminfo/w/wy60-AT
 OLD_FILES+=usr/share/terminfo/w/wy60-PC
 OLD_FILES+=usr/share/terminfo/w/wy60-vb
 OLD_FILES+=usr/share/terminfo/w/wy60-w
 OLD_FILES+=usr/share/terminfo/w/wy60-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy60-wvb
 OLD_FILES+=usr/share/terminfo/w/wy75
 OLD_FILES+=usr/share/terminfo/w/wy75-mc
 OLD_FILES+=usr/share/terminfo/w/wy75-vb
 OLD_FILES+=usr/share/terminfo/w/wy75-w
 OLD_FILES+=usr/share/terminfo/w/wy75-wvb
 OLD_FILES+=usr/share/terminfo/w/wy75ap
 OLD_FILES+=usr/share/terminfo/w/wy85
 OLD_FILES+=usr/share/terminfo/w/wy85-8bit
 OLD_FILES+=usr/share/terminfo/w/wy85-vb
 OLD_FILES+=usr/share/terminfo/w/wy85-w
 OLD_FILES+=usr/share/terminfo/w/wy85-wvb
 OLD_FILES+=usr/share/terminfo/w/wy99-ansi
 OLD_FILES+=usr/share/terminfo/w/wy99a-ansi
 OLD_FILES+=usr/share/terminfo/w/wy99f
 OLD_FILES+=usr/share/terminfo/w/wy99fa
 OLD_FILES+=usr/share/terminfo/w/wy99fgt
 OLD_FILES+=usr/share/terminfo/w/wy99fgta
 OLD_FILES+=usr/share/terminfo/w/wy99gt
 OLD_FILES+=usr/share/terminfo/w/wy99gt-25
 OLD_FILES+=usr/share/terminfo/w/wy99gt-25-w
 OLD_FILES+=usr/share/terminfo/w/wy99gt-tek
 OLD_FILES+=usr/share/terminfo/w/wy99gt-vb
 OLD_FILES+=usr/share/terminfo/w/wy99gt-w
 OLD_FILES+=usr/share/terminfo/w/wy99gt-w-vb
 OLD_FILES+=usr/share/terminfo/w/wy99gt-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse-325
 OLD_FILES+=usr/share/terminfo/w/wyse-75ap
 OLD_FILES+=usr/share/terminfo/w/wyse-vp
 OLD_FILES+=usr/share/terminfo/w/wyse120
 OLD_FILES+=usr/share/terminfo/w/wyse120-25
 OLD_FILES+=usr/share/terminfo/w/wyse120-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse120-vb
 OLD_FILES+=usr/share/terminfo/w/wyse120-w
 OLD_FILES+=usr/share/terminfo/w/wyse120-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse150
 OLD_FILES+=usr/share/terminfo/w/wyse150-25
 OLD_FILES+=usr/share/terminfo/w/wyse150-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse150-vb
 OLD_FILES+=usr/share/terminfo/w/wyse150-w
 OLD_FILES+=usr/share/terminfo/w/wyse150-w-vb
 OLD_FILES+=usr/share/terminfo/w/wyse160
 OLD_FILES+=usr/share/terminfo/w/wyse160-25
 OLD_FILES+=usr/share/terminfo/w/wyse160-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse160-42
 OLD_FILES+=usr/share/terminfo/w/wyse160-42-w
 OLD_FILES+=usr/share/terminfo/w/wyse160-43
 OLD_FILES+=usr/share/terminfo/w/wyse160-43-w
 OLD_FILES+=usr/share/terminfo/w/wyse160-vb
 OLD_FILES+=usr/share/terminfo/w/wyse160-w
 OLD_FILES+=usr/share/terminfo/w/wyse160-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse185
 OLD_FILES+=usr/share/terminfo/w/wyse185-24
 OLD_FILES+=usr/share/terminfo/w/wyse185-vb
 OLD_FILES+=usr/share/terminfo/w/wyse185-w
 OLD_FILES+=usr/share/terminfo/w/wyse185-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse30
 OLD_FILES+=usr/share/terminfo/w/wyse30-mc
 OLD_FILES+=usr/share/terminfo/w/wyse30-vb
 OLD_FILES+=usr/share/terminfo/w/wyse325
 OLD_FILES+=usr/share/terminfo/w/wyse325-25
 OLD_FILES+=usr/share/terminfo/w/wyse325-25w
 OLD_FILES+=usr/share/terminfo/w/wyse325-42
 OLD_FILES+=usr/share/terminfo/w/wyse325-42w
 OLD_FILES+=usr/share/terminfo/w/wyse325-43
 OLD_FILES+=usr/share/terminfo/w/wyse325-43w
 OLD_FILES+=usr/share/terminfo/w/wyse325-vb
 OLD_FILES+=usr/share/terminfo/w/wyse325-w
 OLD_FILES+=usr/share/terminfo/w/wyse325-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse350
 OLD_FILES+=usr/share/terminfo/w/wyse350-vb
 OLD_FILES+=usr/share/terminfo/w/wyse350-w
 OLD_FILES+=usr/share/terminfo/w/wyse350-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse370
 OLD_FILES+=usr/share/terminfo/w/wyse50
 OLD_FILES+=usr/share/terminfo/w/wyse50-mc
 OLD_FILES+=usr/share/terminfo/w/wyse50-vb
 OLD_FILES+=usr/share/terminfo/w/wyse50-w
 OLD_FILES+=usr/share/terminfo/w/wyse50-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse520
 OLD_FILES+=usr/share/terminfo/w/wyse520-24
 OLD_FILES+=usr/share/terminfo/w/wyse520-36
 OLD_FILES+=usr/share/terminfo/w/wyse520-36pc
 OLD_FILES+=usr/share/terminfo/w/wyse520-36w
 OLD_FILES+=usr/share/terminfo/w/wyse520-36wpc
 OLD_FILES+=usr/share/terminfo/w/wyse520-48
 OLD_FILES+=usr/share/terminfo/w/wyse520-48pc
 OLD_FILES+=usr/share/terminfo/w/wyse520-48w
 OLD_FILES+=usr/share/terminfo/w/wyse520-48wpc
 OLD_FILES+=usr/share/terminfo/w/wyse520-epc
 OLD_FILES+=usr/share/terminfo/w/wyse520-epc-w
 OLD_FILES+=usr/share/terminfo/w/wyse520-p-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse520-pc-24
 OLD_FILES+=usr/share/terminfo/w/wyse520-pc-vb
 OLD_FILES+=usr/share/terminfo/w/wyse520-vb
 OLD_FILES+=usr/share/terminfo/w/wyse520-w
 OLD_FILES+=usr/share/terminfo/w/wyse520-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse60
 OLD_FILES+=usr/share/terminfo/w/wyse60-25
 OLD_FILES+=usr/share/terminfo/w/wyse60-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse60-316X
 OLD_FILES+=usr/share/terminfo/w/wyse60-42
 OLD_FILES+=usr/share/terminfo/w/wyse60-42-w
 OLD_FILES+=usr/share/terminfo/w/wyse60-43
 OLD_FILES+=usr/share/terminfo/w/wyse60-43-w
 OLD_FILES+=usr/share/terminfo/w/wyse60-AT
 OLD_FILES+=usr/share/terminfo/w/wyse60-PC
 OLD_FILES+=usr/share/terminfo/w/wyse60-vb
 OLD_FILES+=usr/share/terminfo/w/wyse60-w
 OLD_FILES+=usr/share/terminfo/w/wyse60-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse75
 OLD_FILES+=usr/share/terminfo/w/wyse75-mc
 OLD_FILES+=usr/share/terminfo/w/wyse75-vb
 OLD_FILES+=usr/share/terminfo/w/wyse75-w
 OLD_FILES+=usr/share/terminfo/w/wyse75-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse75ap
 OLD_FILES+=usr/share/terminfo/w/wyse85
 OLD_FILES+=usr/share/terminfo/w/wyse85-8bit
 OLD_FILES+=usr/share/terminfo/w/wyse85-vb
 OLD_FILES+=usr/share/terminfo/w/wyse85-w
 OLD_FILES+=usr/share/terminfo/w/wyse85-wvb
 OLD_FILES+=usr/share/terminfo/w/wyse99gt
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-25
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-25-w
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-vb
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-w
 OLD_FILES+=usr/share/terminfo/w/wyse99gt-wvb
 OLD_DIRS+=usr/share/terminfo/w/
 OLD_FILES+=usr/share/terminfo/x/x10term
 OLD_FILES+=usr/share/terminfo/x/x1700
 OLD_FILES+=usr/share/terminfo/x/x1700-lm
 OLD_FILES+=usr/share/terminfo/x/x1720
 OLD_FILES+=usr/share/terminfo/x/x1750
 OLD_FILES+=usr/share/terminfo/x/x68k
 OLD_FILES+=usr/share/terminfo/x/x68k-ite
 OLD_FILES+=usr/share/terminfo/x/x820
 OLD_FILES+=usr/share/terminfo/x/xdku
 OLD_FILES+=usr/share/terminfo/x/xenix
 OLD_FILES+=usr/share/terminfo/x/xerox
 OLD_FILES+=usr/share/terminfo/x/xerox-lm
 OLD_FILES+=usr/share/terminfo/x/xerox1720
 OLD_FILES+=usr/share/terminfo/x/xerox820
 OLD_FILES+=usr/share/terminfo/x/xfce
 OLD_FILES+=usr/share/terminfo/x/xiterm
 OLD_FILES+=usr/share/terminfo/x/xl83
 OLD_FILES+=usr/share/terminfo/x/xnuppc
 OLD_FILES+=usr/share/terminfo/x/xnuppc+100x37
 OLD_FILES+=usr/share/terminfo/x/xnuppc+112x37
 OLD_FILES+=usr/share/terminfo/x/xnuppc+128x40
 OLD_FILES+=usr/share/terminfo/x/xnuppc+128x48
 OLD_FILES+=usr/share/terminfo/x/xnuppc+144x48
 OLD_FILES+=usr/share/terminfo/x/xnuppc+160x64
 OLD_FILES+=usr/share/terminfo/x/xnuppc+200x64
 OLD_FILES+=usr/share/terminfo/x/xnuppc+200x75
 OLD_FILES+=usr/share/terminfo/x/xnuppc+256x96
 OLD_FILES+=usr/share/terminfo/x/xnuppc+80x25
 OLD_FILES+=usr/share/terminfo/x/xnuppc+80x30
 OLD_FILES+=usr/share/terminfo/x/xnuppc+90x30
 OLD_FILES+=usr/share/terminfo/x/xnuppc+b
 OLD_FILES+=usr/share/terminfo/x/xnuppc+basic
 OLD_FILES+=usr/share/terminfo/x/xnuppc+c
 OLD_FILES+=usr/share/terminfo/x/xnuppc+f
 OLD_FILES+=usr/share/terminfo/x/xnuppc+f2
 OLD_FILES+=usr/share/terminfo/x/xnuppc-100x37
 OLD_FILES+=usr/share/terminfo/x/xnuppc-100x37-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-112x37
 OLD_FILES+=usr/share/terminfo/x/xnuppc-112x37-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-128x40
 OLD_FILES+=usr/share/terminfo/x/xnuppc-128x40-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-128x48
 OLD_FILES+=usr/share/terminfo/x/xnuppc-128x48-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-144x48
 OLD_FILES+=usr/share/terminfo/x/xnuppc-144x48-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-160x64
 OLD_FILES+=usr/share/terminfo/x/xnuppc-160x64-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-200x64
 OLD_FILES+=usr/share/terminfo/x/xnuppc-200x64-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-200x75
 OLD_FILES+=usr/share/terminfo/x/xnuppc-200x75-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-256x96
 OLD_FILES+=usr/share/terminfo/x/xnuppc-256x96-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-80x25
 OLD_FILES+=usr/share/terminfo/x/xnuppc-80x25-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-80x30
 OLD_FILES+=usr/share/terminfo/x/xnuppc-80x30-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-90x30
 OLD_FILES+=usr/share/terminfo/x/xnuppc-90x30-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-b
 OLD_FILES+=usr/share/terminfo/x/xnuppc-f
 OLD_FILES+=usr/share/terminfo/x/xnuppc-f2
 OLD_FILES+=usr/share/terminfo/x/xnuppc-m
 OLD_FILES+=usr/share/terminfo/x/xnuppc-m-b
 OLD_FILES+=usr/share/terminfo/x/xnuppc-m-f
 OLD_FILES+=usr/share/terminfo/x/xnuppc-m-f2
 OLD_FILES+=usr/share/terminfo/x/xtalk
 OLD_FILES+=usr/share/terminfo/x/xterm
 OLD_FILES+=usr/share/terminfo/x/xterm+256color
 OLD_FILES+=usr/share/terminfo/x/xterm+256color2
 OLD_FILES+=usr/share/terminfo/x/xterm+256setaf
 OLD_FILES+=usr/share/terminfo/x/xterm+88color
 OLD_FILES+=usr/share/terminfo/x/xterm+88color2
 OLD_FILES+=usr/share/terminfo/x/xterm+alt+title
 OLD_FILES+=usr/share/terminfo/x/xterm+alt1049
 OLD_FILES+=usr/share/terminfo/x/xterm+app
 OLD_FILES+=usr/share/terminfo/x/xterm+direct
 OLD_FILES+=usr/share/terminfo/x/xterm+direct16
 OLD_FILES+=usr/share/terminfo/x/xterm+direct2
 OLD_FILES+=usr/share/terminfo/x/xterm+direct256
 OLD_FILES+=usr/share/terminfo/x/xterm+edit
 OLD_FILES+=usr/share/terminfo/x/xterm+indirect
 OLD_FILES+=usr/share/terminfo/x/xterm+kbs
 OLD_FILES+=usr/share/terminfo/x/xterm+keypad
 OLD_FILES+=usr/share/terminfo/x/xterm+meta
 OLD_FILES+=usr/share/terminfo/x/xterm+noalt
 OLD_FILES+=usr/share/terminfo/x/xterm+noapp
 OLD_FILES+=usr/share/terminfo/x/xterm+nofkeys
 OLD_FILES+=usr/share/terminfo/x/xterm+osc104
 OLD_FILES+=usr/share/terminfo/x/xterm+pc+edit
 OLD_FILES+=usr/share/terminfo/x/xterm+pcc0
 OLD_FILES+=usr/share/terminfo/x/xterm+pcc1
 OLD_FILES+=usr/share/terminfo/x/xterm+pcc2
 OLD_FILES+=usr/share/terminfo/x/xterm+pcc3
 OLD_FILES+=usr/share/terminfo/x/xterm+pce2
 OLD_FILES+=usr/share/terminfo/x/xterm+pcf0
 OLD_FILES+=usr/share/terminfo/x/xterm+pcf2
 OLD_FILES+=usr/share/terminfo/x/xterm+pcfkeys
 OLD_FILES+=usr/share/terminfo/x/xterm+r6f2
 OLD_FILES+=usr/share/terminfo/x/xterm+sl
 OLD_FILES+=usr/share/terminfo/x/xterm+sl-twm
 OLD_FILES+=usr/share/terminfo/x/xterm+sm+1002
 OLD_FILES+=usr/share/terminfo/x/xterm+sm+1003
 OLD_FILES+=usr/share/terminfo/x/xterm+sm+1005
 OLD_FILES+=usr/share/terminfo/x/xterm+sm+1006
 OLD_FILES+=usr/share/terminfo/x/xterm+titlestack
 OLD_FILES+=usr/share/terminfo/x/xterm+tmux
 OLD_FILES+=usr/share/terminfo/x/xterm+vt+edit
 OLD_FILES+=usr/share/terminfo/x/xterm+x10mouse
 OLD_FILES+=usr/share/terminfo/x/xterm+x11hilite
 OLD_FILES+=usr/share/terminfo/x/xterm+x11mouse
 OLD_FILES+=usr/share/terminfo/x/xterm-1002
 OLD_FILES+=usr/share/terminfo/x/xterm-1003
 OLD_FILES+=usr/share/terminfo/x/xterm-1005
 OLD_FILES+=usr/share/terminfo/x/xterm-1006
 OLD_FILES+=usr/share/terminfo/x/xterm-16color
 OLD_FILES+=usr/share/terminfo/x/xterm-24
 OLD_FILES+=usr/share/terminfo/x/xterm-256color
 OLD_FILES+=usr/share/terminfo/x/xterm-88color
 OLD_FILES+=usr/share/terminfo/x/xterm-8bit
 OLD_FILES+=usr/share/terminfo/x/xterm-basic
 OLD_FILES+=usr/share/terminfo/x/xterm-bold
 OLD_FILES+=usr/share/terminfo/x/xterm-color
 OLD_FILES+=usr/share/terminfo/x/xterm-direct
 OLD_FILES+=usr/share/terminfo/x/xterm-direct16
 OLD_FILES+=usr/share/terminfo/x/xterm-direct2
 OLD_FILES+=usr/share/terminfo/x/xterm-direct256
 OLD_FILES+=usr/share/terminfo/x/xterm-hp
 OLD_FILES+=usr/share/terminfo/x/xterm-mono
 OLD_FILES+=usr/share/terminfo/x/xterm-new
 OLD_FILES+=usr/share/terminfo/x/xterm-nic
 OLD_FILES+=usr/share/terminfo/x/xterm-noapp
 OLD_FILES+=usr/share/terminfo/x/xterm-old
 OLD_FILES+=usr/share/terminfo/x/xterm-pcolor
 OLD_FILES+=usr/share/terminfo/x/xterm-r5
 OLD_FILES+=usr/share/terminfo/x/xterm-r6
 OLD_FILES+=usr/share/terminfo/x/xterm-sco
 OLD_FILES+=usr/share/terminfo/x/xterm-sun
 OLD_FILES+=usr/share/terminfo/x/xterm-utf8
 OLD_FILES+=usr/share/terminfo/x/xterm-vt220
 OLD_FILES+=usr/share/terminfo/x/xterm-vt52
 OLD_FILES+=usr/share/terminfo/x/xterm-x10mouse
 OLD_FILES+=usr/share/terminfo/x/xterm-x11hilite
 OLD_FILES+=usr/share/terminfo/x/xterm-x11mouse
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v32
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v33
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v333
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v40
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v43
 OLD_FILES+=usr/share/terminfo/x/xterm-xf86-v44
 OLD_FILES+=usr/share/terminfo/x/xterm-xfree86
 OLD_FILES+=usr/share/terminfo/x/xterm-xi
 OLD_FILES+=usr/share/terminfo/x/xterm.js
 OLD_FILES+=usr/share/terminfo/x/xterm1
 OLD_FILES+=usr/share/terminfo/x/xtermc
 OLD_FILES+=usr/share/terminfo/x/xtermm
 OLD_FILES+=usr/share/terminfo/x/xterms
 OLD_FILES+=usr/share/terminfo/x/xterms-sun
 OLD_FILES+=usr/share/terminfo/x/xwsh
 OLD_DIRS+=usr/share/terminfo/x/
 OLD_FILES+=usr/share/terminfo/z/z-100
 OLD_FILES+=usr/share/terminfo/z/z-100bw
 OLD_FILES+=usr/share/terminfo/z/z100
 OLD_FILES+=usr/share/terminfo/z/z100bw
 OLD_FILES+=usr/share/terminfo/z/z110
 OLD_FILES+=usr/share/terminfo/z/z110bw
 OLD_FILES+=usr/share/terminfo/z/z19
 OLD_FILES+=usr/share/terminfo/z/z29
 OLD_FILES+=usr/share/terminfo/z/z29a
 OLD_FILES+=usr/share/terminfo/z/z29a-kc-bc
 OLD_FILES+=usr/share/terminfo/z/z29a-kc-uc
 OLD_FILES+=usr/share/terminfo/z/z29a-nkc-bc
 OLD_FILES+=usr/share/terminfo/z/z29a-nkc-uc
 OLD_FILES+=usr/share/terminfo/z/z29b
 OLD_FILES+=usr/share/terminfo/z/z30
 OLD_FILES+=usr/share/terminfo/z/z340
 OLD_FILES+=usr/share/terminfo/z/z340-nam
 OLD_FILES+=usr/share/terminfo/z/z39-a
 OLD_FILES+=usr/share/terminfo/z/z39a
 OLD_FILES+=usr/share/terminfo/z/z50
 OLD_FILES+=usr/share/terminfo/z/z8001
 OLD_FILES+=usr/share/terminfo/z/zen30
 OLD_FILES+=usr/share/terminfo/z/zen50
 OLD_FILES+=usr/share/terminfo/z/zen8001
 OLD_FILES+=usr/share/terminfo/z/zenith
 OLD_FILES+=usr/share/terminfo/z/zenith29
 OLD_FILES+=usr/share/terminfo/z/zenith39-a
 OLD_FILES+=usr/share/terminfo/z/zenith39-ansi
 OLD_FILES+=usr/share/terminfo/z/zt-1
 OLD_FILES+=usr/share/terminfo/z/ztx
 OLD_FILES+=usr/share/terminfo/z/ztx-1-a
 OLD_FILES+=usr/share/terminfo/z/ztx11
 OLD_DIRS+=usr/share/terminfo/z/
 OLD_DIRS+=usr/share/terminfo/
 
 # 20210316: remove obsolete NFS headers
 OLD_FILES+=usr/include/nfs/nfs_common.h
 OLD_FILES+=usr/include/nfsclient/nfsm_subs.h
 OLD_FILES+=usr/include/nfsclient/nlminfo.h
 OLD_FILES+=usr/include/nfsserver/nfs_fha_old.h
 OLD_FILES+=usr/include/nfsserver/nfsm_subs.h
 OLD_FILES+=usr/include/nfsserver/nfsrvcache.h
 
 # 20210315: Remove kernel-only crypto headers from /usr/include
 OLD_FILES+=usr/include/crypto/_cryptodev.h
 OLD_FILES+=usr/include/crypto/cbc_mac.h
 OLD_FILES+=usr/include/crypto/deflate.h
 OLD_FILES+=usr/include/crypto/gfmult.h
 OLD_FILES+=usr/include/crypto/gmac.h
 OLD_FILES+=usr/include/crypto/rijndael.h
 OLD_FILES+=usr/include/crypto/rmd160.h
 OLD_FILES+=usr/include/crypto/xform.h
 OLD_FILES+=usr/include/crypto/xform_auth.h
 OLD_FILES+=usr/include/crypto/xform_comp.h
 OLD_FILES+=usr/include/crypto/xform_enc.h
 
 # 20210305: removed Poly1305_* symbols
 OLD_FILES+=usr/include/crypto/xform_poly1305.h
 
 # 20210302: fmtree removed
 OLD_FILES+=usr/sbin/fmtree
 OLD_FILES+=usr/share/man/man8/fmtree.8.gz
 
 # 20210201: bump shared libraries which link against ncurses
 OLD_LIBS+=lib/libedit.so.7
 OLD_LIBS+=usr/lib/libdialog.so.8
 OLD_LIBS+=usr/lib/libdpv.so.1
 OLD_LIBS+=usr/lib/libform.so.5
 OLD_LIBS+=usr/lib/libformw.so.5
 OLD_LIBS+=usr/lib/libmenu.so.5
 OLD_LIBS+=usr/lib/libmenuw.so.5
 OLD_LIBS+=usr/lib/libpanel.so.5
 OLD_LIBS+=usr/lib/libpanelw.so.5
 
 # 20210125: ndis driver support removed
 OLD_FILES+=usr/sbin/ndis_events
 OLD_FILES+=usr/sbin/ndiscvt
 OLD_FILES+=usr/sbin/ndisgen
 OLD_FILES+=usr/share/man/man4/ndis.4.gz
 OLD_FILES+=usr/share/man/man4/if_ndis.4.gz
 OLD_FILES+=usr/share/man/man8/ndis_events.8.gz
 OLD_FILES+=usr/share/man/man8/ndiscvt.8.gz
 OLD_FILES+=usr/share/man/man8/ndisgen.8.gz
 OLD_FILES+=usr/share/misc/windrv_stub.c
 
 # 20210116: 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/if_wi.4.gz
 OLD_FILES+=usr/share/man/man4/ng_bt3c.4.gz
 OLD_FILES+=usr/share/man/man4/wi.4.gz
 OLD_FILES+=usr/share/man/man8/bt3cfw.8.gz
 
 # 20210107: retire a.out support
 OLD_DIRS+=usr/lib/aout
 OLD_DIRS+=usr/lib/compat/aout
 
 # 20210107: remove cmx(4)
 OLD_FILES+=usr/share/man/man4/cmx.4.gz
 
 # 20210105: remove non widechar version of ncurses
 OLD_LIBS+=lib/libncurses.so.9
 
 # 20210103: new clang import which bumps version from 11.0.0 to 11.0.1
 OLD_FILES+=usr/lib/clang/11.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/11.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/11.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/11.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/11.0.0/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include/fuzzer
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/11.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/11.0.0/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/11.0.0/include/profile
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/11.0.0/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include/xray
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/cet.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/11.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/11.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/11.0.0/include
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/11.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/11.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/11.0.0/lib
 OLD_DIRS+=usr/lib/clang/11.0.0
 
 # 20201225: PMC for Xscale removed
 OLD_FILES+=usr/share/man/man3/pmc.xscale.3.gz
 
 # 20201225: libregex removed
 OLD_FILES+=usr/include/gnu/posix/regex.h
 OLD_DIRS+=usr/include/gnu/posix
 OLD_FILES+=usr/include/gnu/regex.h
 OLD_DIRS+=usr/include/gnu
 OLD_FILES+=usr/include/gnuregex.h
 OLD_FILES+=usr/lib/libgnuregex.a
 OLD_FILES+=usr/lib/libgnuregex.so
 OLD_LIBS+=usr/lib/libgnuregex.so.5
 OLD_FILES+=usr/lib/libgnuregex_p.a
 
 # 20201225: gnugrep removed
 OLD_FILES+=usr/bin/bsdgrep
 OLD_FILES+=usr/bin/gnugrep
 OLD_FILES+=usr/share/man/man1/bsdgrep.1.gz
 OLD_FILES+=usr/share/man/man1/gnugrep.1.gz
 
 # 20201224: mk48txx(4) removed
 OLD_FILES+=usr/share/man/man4/mk48txx.4.gz
 
 # 20201215: in-tree gdb removed
 OLD_FILES+=usr/libexec/gdb
 OLD_FILES+=usr/libexec/kgdb
 
 # 20201211: hme(4) removed
 OLD_FILES+=usr/share/man/man4/hme.4.gz
 OLD_FILES+=usr/share/man/man4/if_hme.4.gz
 
 # 20201129: RADIX_MPATH removed
 OLD_FILES+=usr/include/net/radix_mpath.h
 
 # 20201124: ping6(8) was merged into ping(8)
 OLD_FILES+=usr/share/man/man8/ping6.8.gz
 OLD_FILES+=usr/tests/sbin/ping6/Kyuafile
 OLD_FILES+=usr/tests/sbin/ping6/ping6_c1_s8_t1.out
 OLD_FILES+=usr/tests/sbin/ping6/ping6_test
 OLD_DIRS+=usr/tests/sbin/ping6
 
 # 20201025: Remove cal data files
 OLD_FILES+=usr/share/calendar/calendar.all
 OLD_FILES+=usr/share/calendar/calendar.australia
 OLD_FILES+=usr/share/calendar/calendar.birthday
 OLD_FILES+=usr/share/calendar/calendar.brazilian
 OLD_FILES+=usr/share/calendar/calendar.christian
 OLD_FILES+=usr/share/calendar/calendar.computer
 OLD_FILES+=usr/share/calendar/calendar.croatian
 OLD_FILES+=usr/share/calendar/calendar.dutch
 OLD_FILES+=usr/share/calendar/calendar.french
 OLD_FILES+=usr/share/calendar/calendar.german
 OLD_FILES+=usr/share/calendar/calendar.history
 OLD_FILES+=usr/share/calendar/calendar.holiday
 OLD_FILES+=usr/share/calendar/calendar.hungarian
 OLD_FILES+=usr/share/calendar/calendar.judaic
 OLD_FILES+=usr/share/calendar/calendar.lotr
 OLD_FILES+=usr/share/calendar/calendar.music
 OLD_FILES+=usr/share/calendar/calendar.newzealand
 OLD_FILES+=usr/share/calendar/calendar.russian
 OLD_FILES+=usr/share/calendar/calendar.southafrica
 OLD_FILES+=usr/share/calendar/calendar.ukrainian
 OLD_FILES+=usr/share/calendar/calendar.usholiday
 OLD_FILES+=usr/share/calendar/calendar.world
 OLD_FILES+=usr/share/calendar/de_AT.ISO_8859-15/calendar.feiertag
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.feiertag
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.geschichte
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.kirche
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.literatur
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.musik
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.wissenschaft
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.fetes
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.french
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.jferies
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.proverbes
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.praznici
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.nevnapok
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.unnepek
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.commemorative
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.holidays
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.mcommemorative
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.all
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.commemorative
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.holidays
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.mcommemorative
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.military
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.pagan
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.military
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.pagan
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.all
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.holiday
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.misc
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.orthodox
 
 # 20201004: logo files renamed to type-agnostic gfx-*.lua
 OLD_FILES+=boot/lua/logo-beastie.lua
 OLD_FILES+=boot/lua/logo-beastiebw.lua
 OLD_FILES+=boot/lua/logo-fbsdbw.lua
 OLD_FILES+=boot/lua/logo-orb.lua
 OLD_FILES+=boot/lua/logo-orbbw.lua
 
 # 20200828: net/route/shared.h moved to net/route/route_var.h
 OLD_FILES+=usr/include/net/route/shared.h
 
 # 20200825: merged OpenZFS support
 OLD_LIBS+=lib/libzfs.so.3
 OLD_FILES+=usr/share/man/man1/zstreamdump.1.gz
 #OLD_FILES+=usr/share/man/man7/zpool-features.7.gz
 
 # 20200923: memfd_test moved to /usr/tests/sys/posixshm
 OLD_FILES+=usr/tests/sys/kern/memfd_test
 
 # 20200910: remove vm_map_create(9) to sync with the code
 OLD_FILES+=usr/share/man/man9/vm_map_create.9.gz
 
 # 20200820: Removal of the ufm driver
 OLD_FILES+=usr/share/man/man4/ufm.4.gz
 
 # 20200816: new clang import which bumps version from 10.0.1 to 11.0.0
 OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/10.0.1/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/10.0.1/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/10.0.1/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/fuzzer
 OLD_FILES+=usr/lib/clang/10.0.1/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/10.0.1/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/10.0.1/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/10.0.1/include/profile
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/10.0.1/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include/xray
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/10.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/10.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/10.0.1/include
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.1/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/10.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/10.0.1/lib
 OLD_DIRS+=usr/lib/clang/10.0.1
 
 # 20200803: remove free_domain(9) and uma_zfree_domain(9)
 OLD_FILES+=usr/share/man/man9/free_domain.9.gz
 OLD_FILES+=usr/share/man/man9/uma_zfree_domain.9.gz
 
 # 20200729: remove long expired serial drivers
 OLD_FILES+=usr/share/man/man4/cy.4.gz
 OLD_FILES+=usr/share/man/man4/rc.4.gz
 OLD_FILES+=usr/share/man/man4/rp.4.gz
 
 # 20200721: sys/iommu.h moved to dev/iommu/
 OLD_FILES+=usr/include/sys/iommu.h
 
 # 20200715: rework of devstat(9) man page
 OLD_FILES+=usr/share/man/man9/devstat_add_entry.9.gz
 
 # 20200714: update byacc to 20200330
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_calc1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_demo.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_destroy1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_destroy2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_destroy3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit4.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit5.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit0.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit2.y
 
 # 20200706: update of sglist(9), r360574
 OLD_FILES+=usr/share/man/man9/sglist_append_ext_pgs.9.gz
 OLD_FILES+=usr/share/man/man9/sglist_append_mb_ext_pgs.9.gz
 OLD_FILES+=usr/share/man/man9/sglist_count_ext_pgs.9.gz
 OLD_FILES+=usr/share/man/man9/sglist_count_mb_ext_pgs.9.gz
 
 # 20200617: update opencsd to 0.14.2
 OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h
 
 # 20200606: retire binutils build infrastructure
 OLD_FILES+=usr/bin/as
 OLD_FILES+=usr/bin/ld.bfd
 OLD_FILES+=usr/share/man/man1/as.1.gz
 OLD_FILES+=usr/share/man/man1/ld.bfd.1.gz
 OLD_FILES+=usr/share/man/man7/as.7.gz
 OLD_FILES+=usr/share/man/man7/ld.7.gz
 OLD_FILES+=usr/share/man/man7/ldint.7.gz
 OLD_FILES+=usr/share/man/man7/binutils.7.gz
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.x
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xbn
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xd
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xn
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xr
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xs
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsc
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw
 
 # 20200601: OpenSSL 32-bit compat engines moved to /usr/lib32/engines
 OLD_LIBS+=usr/lib32/capi.so
 OLD_LIBS+=usr/lib32/padlock.so
 
 # 20200528: libevent renamed libevent1
 OLD_FILES+=usr/include/private/event/event.h
 OLD_DIRS+=usr/include/private/event
 OLD_FILES+=usr/lib/libprivateevent.a
 OLD_FILES+=usr/lib/libprivateevent.so
 OLD_LIBS+=usr/lib/libprivateevent.so.1
 OLD_FILES+=usr/lib/libprivateevent_p.a
 
 # 20200523: new clang import which bumps version from 10.0.0 to 10.0.1
 OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/10.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/10.0.0/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/fuzzer
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/10.0.0/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/10.0.0/include/profile/InstrProfData.inc
 OLD_DIRS+=usr/lib/clang/10.0.0/include/profile
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/10.0.0/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include/xray
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/10.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/10.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/10.0.0/include
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/10.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/10.0.0/lib
 OLD_DIRS+=usr/lib/clang/10.0.0
 
 # 20200520: xform_userland.h removed
 OLD_FILES+=usr/include/crypto/xform_userland.h
 
 # 20200515: libalias cuseeme protocol support retired
 OLD_LIBS+=lib/libalias_cuseeme.so
 OLD_FILES+=usr/lib/libalias_cuseeme.a
 OLD_FILES+=usr/lib/libalias_cuseeme_p.a
 
 # 20200511: Remove deprecated crypto algorithms
 OLD_FILES+=usr/include/crypto/cast.h
 OLD_FILES+=usr/include/crypto/castsb.h
 OLD_FILES+=usr/include/crypto/skipjack.h
 
 # 20200511: Remove ubsec(4)
 OLD_FILES+=usr/share/man/man4/ubsec.4.gz
 
 # 20200428: route_var.h moved to net/route
 OLD_FILES+=usr/include/net/route_var.h
 
 # 20200418: Make libauditd private
 OLD_FILES+=usr/lib/libauditd.a
 OLD_FILES+=usr/lib/libauditd.so
 OLD_LIBS+=usr/lib/libauditd.so.5
 OLD_FILES+=usr/lib/libauditd_p.a
 
 # 20200418: Remove bogus man links
 OLD_FILES+=usr/share/man/man3/getauusernam_R.3.gz
 OLD_FILES+=usr/share/man/man3/getauclassnam_3.3.gz
 
 # 20200414: NFS file handle affinity code for the NFS server re-organized
 OLD_FILES+=usr/include/nfs/nfs_fha.h
 
 # 20200401: Remove procfs-based process debugging
 OLD_FILES+=usr/include/sys/pioctl.h
 
 # 20200330: GDB_LIBEXEC option retired (always true)
 OLD_FILES+=usr/bin/gdb
 OLD_FILES+=usr/bin/gdbserver
 OLD_FILES+=usr/bin/kgdb
 OLD_FILES+=usr/share/man/man1/gdb.1.gz
 OLD_FILES+=usr/share/man/man1/gdbserver.1.gz
 OLD_FILES+=usr/share/man/man1/kgdb.1.gz
 
 # 20200327: OCF refactoring
 OLD_FILES+=usr/include/crypto/cryptosoft.h
 OLD_FILES+=usr/share/man/man9/crypto_find_driver.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_register.9.gz
 OLD_FILES+=usr/share/man/man9/crypto_unregister.9.gz
 
 # 20200326: compat libs for libl are no longer built
 OLD_FILES+=usr/lib32/libfl.a
 OLD_FILES+=usr/lib32/libl.a
 OLD_FILES+=usr/lib32/libln.a
 
 # 20200323: INTERNALLIB don't install headers anymore
 OLD_FILES+=usr/include/libelftc.h
 OLD_FILES+=usr/include/libifconfig.h
 OLD_FILES+=usr/include/libpmcstat.h
 
 # 20200320: cx and ctau drivers retired
 OLD_FILES+=usr/share/man/man4/ctau.4.gz
 OLD_FILES+=usr/share/man/man4/cx.4.gz
 
 # 20200318: host.conf was deprecated a long time ago
 OLD_FILES+=etc/host.conf
 OLD_FILES+=etc/rc.d/nsswitch
 
 # 20200310: new clang import which bumps version from 9.0.1 to 10.0.0
 OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/9.0.1/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/9.0.1/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/9.0.1/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/9.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.1/include
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.1/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/9.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/9.0.1/lib
 OLD_DIRS+=usr/lib/clang/9.0.1
 
 # 20200309: amd(8) retired
 OLD_FILES+=etc/amd.map
 OLD_FILES+=etc/newsyslog.conf.d/amd.conf
 OLD_FILES+=etc/rc.d/amd
 OLD_FILES+=usr/bin/pawd
 OLD_FILES+=usr/sbin/amd
 OLD_FILES+=usr/sbin/amq
 OLD_FILES+=usr/sbin/fixmount
 OLD_FILES+=usr/sbin/fsinfo
 OLD_FILES+=usr/sbin/hlfsd
 OLD_FILES+=usr/sbin/mk-amd-map
 OLD_FILES+=usr/sbin/wire-test
 OLD_FILES+=usr/share/examples/etc/amd.map
 OLD_FILES+=usr/share/man/man1/pawd.1.gz
 OLD_FILES+=usr/share/man/man5/amd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/amd.8.gz
 OLD_FILES+=usr/share/man/man8/amq.8.gz
 OLD_FILES+=usr/share/man/man8/fixmount.8.gz
 OLD_FILES+=usr/share/man/man8/fsinfo.8.gz
 OLD_FILES+=usr/share/man/man8/hlfsd.8.gz
 OLD_FILES+=usr/share/man/man8/mk-amd-map.8.gz
 OLD_FILES+=usr/share/man/man8/wire-test.8.gz
 
 # 20200301: bktr removed
 OLD_DIRS+=usr/include/dev/bktr
 OLD_FILES+=usr/include/dev/bktr/ioctl_bktr.h
 OLD_FILES+=usr/include/dev/bktr/ioctl_bt848.h
 OLD_FILES+=usr/include/dev/bktr/ioctl_meteor.h
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/ioctl_bktr.h
 OLD_FILES+=usr/include/machine/ioctl_meteor.h
 .endif
 OLD_FILES+=usr/share/man/man4/bktr.4.gz
 OLD_FILES+=usr/share/man/man4/brooktree.4.gz
 
 # 20200229: GCC 4.2.1 removed
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/bin/gcc
 OLD_FILES+=usr/share/man/man1/g++.1.gz
 OLD_FILES+=usr/share/man/man1/gcc.1.gz
 OLD_FILES+=usr/bin/gcpp
 OLD_FILES+=usr/bin/gperf
 OLD_FILES+=usr/include/c++/4.2/algorithm
 OLD_FILES+=usr/include/c++/4.2/backward/algo.h
 OLD_FILES+=usr/include/c++/4.2/backward/algobase.h
 OLD_FILES+=usr/include/c++/4.2/backward/alloc.h
 OLD_FILES+=usr/include/c++/4.2/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/4.2/backward/bvector.h
 OLD_FILES+=usr/include/c++/4.2/backward/complex.h
 OLD_FILES+=usr/include/c++/4.2/backward/defalloc.h
 OLD_FILES+=usr/include/c++/4.2/backward/deque.h
 OLD_FILES+=usr/include/c++/4.2/backward/fstream.h
 OLD_FILES+=usr/include/c++/4.2/backward/function.h
 OLD_FILES+=usr/include/c++/4.2/backward/hash_map.h
 OLD_FILES+=usr/include/c++/4.2/backward/hash_set.h
 OLD_FILES+=usr/include/c++/4.2/backward/hashtable.h
 OLD_FILES+=usr/include/c++/4.2/backward/heap.h
 OLD_FILES+=usr/include/c++/4.2/backward/iomanip.h
 OLD_FILES+=usr/include/c++/4.2/backward/iostream.h
 OLD_FILES+=usr/include/c++/4.2/backward/istream.h
 OLD_FILES+=usr/include/c++/4.2/backward/iterator.h
 OLD_FILES+=usr/include/c++/4.2/backward/list.h
 OLD_FILES+=usr/include/c++/4.2/backward/map.h
 OLD_FILES+=usr/include/c++/4.2/backward/multimap.h
 OLD_FILES+=usr/include/c++/4.2/backward/multiset.h
 OLD_FILES+=usr/include/c++/4.2/backward/new.h
 OLD_FILES+=usr/include/c++/4.2/backward/ostream.h
 OLD_FILES+=usr/include/c++/4.2/backward/pair.h
 OLD_FILES+=usr/include/c++/4.2/backward/queue.h
 OLD_FILES+=usr/include/c++/4.2/backward/rope.h
 OLD_FILES+=usr/include/c++/4.2/backward/set.h
 OLD_FILES+=usr/include/c++/4.2/backward/slist.h
 OLD_FILES+=usr/include/c++/4.2/backward/stack.h
 OLD_FILES+=usr/include/c++/4.2/backward/stream.h
 OLD_FILES+=usr/include/c++/4.2/backward/streambuf.h
 OLD_FILES+=usr/include/c++/4.2/backward/strstream
 OLD_FILES+=usr/include/c++/4.2/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/4.2/backward/tree.h
 OLD_FILES+=usr/include/c++/4.2/backward/vector.h
 OLD_FILES+=usr/include/c++/4.2/bits/allocator.h
 OLD_FILES+=usr/include/c++/4.2/bits/atomic_word.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_file.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/basic_string.h
 OLD_FILES+=usr/include/c++/4.2/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++allocator.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++config.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++io.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++locale.h
 OLD_FILES+=usr/include/c++/4.2/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/4.2/bits/char_traits.h
 OLD_FILES+=usr/include/c++/4.2/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/codecvt.h
 OLD_FILES+=usr/include/c++/4.2/bits/compatibility.h
 OLD_FILES+=usr/include/c++/4.2/bits/concept_check.h
 OLD_FILES+=usr/include/c++/4.2/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/4.2/bits/cpu_defines.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/4.2/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/4.2/bits/cxxabi_tweaks.h
 OLD_FILES+=usr/include/c++/4.2/bits/deque.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/functexcept.h
 OLD_FILES+=usr/include/c++/4.2/bits/gslice.h
 OLD_FILES+=usr/include/c++/4.2/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr-tpf.h
 OLD_FILES+=usr/include/c++/4.2/bits/gthr.h
 OLD_FILES+=usr/include/c++/4.2/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/ios_base.h
 OLD_FILES+=usr/include/c++/4.2/bits/istream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/list.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/4.2/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/4.2/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/localefwd.h
 OLD_FILES+=usr/include/c++/4.2/bits/mask_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/messages_members.h
 OLD_FILES+=usr/include/c++/4.2/bits/os_defines.h
 OLD_FILES+=usr/include/c++/4.2/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/ostream_insert.h
 OLD_FILES+=usr/include/c++/4.2/bits/postypes.h
 OLD_FILES+=usr/include/c++/4.2/bits/slice_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_function.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_list.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_map.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_set.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/4.2/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/4.2/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/4.2/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/4.2/bits/time_members.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_after.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/4.2/bits/valarray_before.h
 OLD_FILES+=usr/include/c++/4.2/bits/vector.tcc
 OLD_FILES+=usr/include/c++/4.2/bitset
 OLD_FILES+=usr/include/c++/4.2/cassert
 OLD_FILES+=usr/include/c++/4.2/cctype
 OLD_FILES+=usr/include/c++/4.2/cerrno
 OLD_FILES+=usr/include/c++/4.2/cfloat
 OLD_FILES+=usr/include/c++/4.2/ciso646
 OLD_FILES+=usr/include/c++/4.2/climits
 OLD_FILES+=usr/include/c++/4.2/clocale
 OLD_FILES+=usr/include/c++/4.2/cmath
 OLD_FILES+=usr/include/c++/4.2/complex
 OLD_FILES+=usr/include/c++/4.2/csetjmp
 OLD_FILES+=usr/include/c++/4.2/csignal
 OLD_FILES+=usr/include/c++/4.2/cstdarg
 OLD_FILES+=usr/include/c++/4.2/cstddef
 OLD_FILES+=usr/include/c++/4.2/cstdio
 OLD_FILES+=usr/include/c++/4.2/cstdlib
 OLD_FILES+=usr/include/c++/4.2/cstring
 OLD_FILES+=usr/include/c++/4.2/ctime
 OLD_FILES+=usr/include/c++/4.2/cwchar
 OLD_FILES+=usr/include/c++/4.2/cwctype
 OLD_FILES+=usr/include/c++/4.2/cxxabi.h
 OLD_FILES+=usr/include/c++/4.2/debug/bitset
 OLD_FILES+=usr/include/c++/4.2/debug/debug.h
 OLD_FILES+=usr/include/c++/4.2/debug/deque
 OLD_FILES+=usr/include/c++/4.2/debug/formatter.h
 OLD_FILES+=usr/include/c++/4.2/debug/functions.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_map
 OLD_FILES+=usr/include/c++/4.2/debug/hash_map.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_multimap.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_multiset.h
 OLD_FILES+=usr/include/c++/4.2/debug/hash_set
 OLD_FILES+=usr/include/c++/4.2/debug/hash_set.h
 OLD_FILES+=usr/include/c++/4.2/debug/list
 OLD_FILES+=usr/include/c++/4.2/debug/macros.h
 OLD_FILES+=usr/include/c++/4.2/debug/map
 OLD_FILES+=usr/include/c++/4.2/debug/map.h
 OLD_FILES+=usr/include/c++/4.2/debug/multimap.h
 OLD_FILES+=usr/include/c++/4.2/debug/multiset.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_base.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_iterator.h
 OLD_FILES+=usr/include/c++/4.2/debug/safe_iterator.tcc
 OLD_FILES+=usr/include/c++/4.2/debug/safe_sequence.h
 OLD_FILES+=usr/include/c++/4.2/debug/set
 OLD_FILES+=usr/include/c++/4.2/debug/set.h
 OLD_FILES+=usr/include/c++/4.2/debug/string
 OLD_FILES+=usr/include/c++/4.2/debug/vector
 OLD_FILES+=usr/include/c++/4.2/deque
 OLD_FILES+=usr/include/c++/4.2/exception
 OLD_FILES+=usr/include/c++/4.2/exception_defines.h
 OLD_FILES+=usr/include/c++/4.2/ext/algorithm
 OLD_FILES+=usr/include/c++/4.2/ext/array_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/atomicity.h
 OLD_FILES+=usr/include/c++/4.2/ext/bitmap_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/4.2/ext/concurrence.h
 OLD_FILES+=usr/include/c++/4.2/ext/debug_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/functional
 OLD_FILES+=usr/include/c++/4.2/ext/hash_fun.h
 OLD_FILES+=usr/include/c++/4.2/ext/hash_map
 OLD_FILES+=usr/include/c++/4.2/ext/hash_set
 OLD_FILES+=usr/include/c++/4.2/ext/hashtable.h
 OLD_FILES+=usr/include/c++/4.2/ext/iterator
 OLD_FILES+=usr/include/c++/4.2/ext/malloc_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/memory
 OLD_FILES+=usr/include/c++/4.2/ext/mt_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/new_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/numeric
 OLD_FILES+=usr/include/c++/4.2/ext/numeric_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/assoc_container.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/basic_types.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/cond_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/container_base_dispatch.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/counter_lu_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/mtf_lu_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/map_debug_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/cond_dtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/child_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/cond_dtor_entry_dealtor.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/head.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/internal_node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/leaf.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/point_iterators.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/split_join_branch_bag.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/node.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_/traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/standard_policies.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/null_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/tree_trace_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/null_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/string_trie_e_access_traits_imp.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/type_utils.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/types_traits.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/exception.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/hash_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/list_update_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/priority_queue.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/tag_and_trait.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/tree_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pb_ds/trie_policy.hpp
 OLD_FILES+=usr/include/c++/4.2/ext/pod_char_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/pool_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/rb_tree
 OLD_FILES+=usr/include/c++/4.2/ext/rc_string_base.h
 OLD_FILES+=usr/include/c++/4.2/ext/rope
 OLD_FILES+=usr/include/c++/4.2/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/4.2/ext/slist
 OLD_FILES+=usr/include/c++/4.2/ext/sso_string_base.h
 OLD_FILES+=usr/include/c++/4.2/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/4.2/ext/stdio_sync_filebuf.h
 OLD_FILES+=usr/include/c++/4.2/ext/throw_allocator.h
 OLD_FILES+=usr/include/c++/4.2/ext/type_traits.h
 OLD_FILES+=usr/include/c++/4.2/ext/typelist.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring.tcc
 OLD_FILES+=usr/include/c++/4.2/ext/vstring_fwd.h
 OLD_FILES+=usr/include/c++/4.2/ext/vstring_util.h
 OLD_FILES+=usr/include/c++/4.2/fstream
 OLD_FILES+=usr/include/c++/4.2/functional
 OLD_FILES+=usr/include/c++/4.2/iomanip
 OLD_FILES+=usr/include/c++/4.2/ios
 OLD_FILES+=usr/include/c++/4.2/iosfwd
 OLD_FILES+=usr/include/c++/4.2/iostream
 OLD_FILES+=usr/include/c++/4.2/istream
 OLD_FILES+=usr/include/c++/4.2/iterator
 OLD_FILES+=usr/include/c++/4.2/limits
 OLD_FILES+=usr/include/c++/4.2/list
 OLD_FILES+=usr/include/c++/4.2/locale
 OLD_FILES+=usr/include/c++/4.2/map
 OLD_FILES+=usr/include/c++/4.2/memory
 OLD_FILES+=usr/include/c++/4.2/new
 OLD_FILES+=usr/include/c++/4.2/numeric
 OLD_FILES+=usr/include/c++/4.2/ostream
 OLD_FILES+=usr/include/c++/4.2/queue
 OLD_FILES+=usr/include/c++/4.2/set
 OLD_FILES+=usr/include/c++/4.2/sstream
 OLD_FILES+=usr/include/c++/4.2/stack
 OLD_FILES+=usr/include/c++/4.2/stdexcept
 OLD_FILES+=usr/include/c++/4.2/streambuf
 OLD_FILES+=usr/include/c++/4.2/string
 OLD_FILES+=usr/include/c++/4.2/tr1/array
 OLD_FILES+=usr/include/c++/4.2/tr1/bind_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/bind_repeat.h
 OLD_FILES+=usr/include/c++/4.2/tr1/boost_shared_ptr.h
 OLD_FILES+=usr/include/c++/4.2/tr1/cctype
 OLD_FILES+=usr/include/c++/4.2/tr1/cfenv
 OLD_FILES+=usr/include/c++/4.2/tr1/cfloat
 OLD_FILES+=usr/include/c++/4.2/tr1/cinttypes
 OLD_FILES+=usr/include/c++/4.2/tr1/climits
 OLD_FILES+=usr/include/c++/4.2/tr1/cmath
 OLD_FILES+=usr/include/c++/4.2/tr1/common.h
 OLD_FILES+=usr/include/c++/4.2/tr1/complex
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdarg
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdbool
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdint
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdio
 OLD_FILES+=usr/include/c++/4.2/tr1/cstdlib
 OLD_FILES+=usr/include/c++/4.2/tr1/ctgmath
 OLD_FILES+=usr/include/c++/4.2/tr1/ctime
 OLD_FILES+=usr/include/c++/4.2/tr1/ctype.h
 OLD_FILES+=usr/include/c++/4.2/tr1/cwchar
 OLD_FILES+=usr/include/c++/4.2/tr1/cwctype
 OLD_FILES+=usr/include/c++/4.2/tr1/fenv.h
 OLD_FILES+=usr/include/c++/4.2/tr1/float.h
 OLD_FILES+=usr/include/c++/4.2/tr1/functional
 OLD_FILES+=usr/include/c++/4.2/tr1/functional_hash.h
 OLD_FILES+=usr/include/c++/4.2/tr1/functional_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/hashtable
 OLD_FILES+=usr/include/c++/4.2/tr1/hashtable_policy.h
 OLD_FILES+=usr/include/c++/4.2/tr1/inttypes.h
 OLD_FILES+=usr/include/c++/4.2/tr1/limits.h
 OLD_FILES+=usr/include/c++/4.2/tr1/math.h
 OLD_FILES+=usr/include/c++/4.2/tr1/memory
 OLD_FILES+=usr/include/c++/4.2/tr1/mu_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/random
 OLD_FILES+=usr/include/c++/4.2/tr1/random.tcc
 OLD_FILES+=usr/include/c++/4.2/tr1/ref_fwd.h
 OLD_FILES+=usr/include/c++/4.2/tr1/ref_wrap_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/repeat.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdarg.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdbool.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdint.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdio.h
 OLD_FILES+=usr/include/c++/4.2/tr1/stdlib.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tgmath.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple_defs.h
 OLD_FILES+=usr/include/c++/4.2/tr1/tuple_iterate.h
 OLD_FILES+=usr/include/c++/4.2/tr1/type_traits
 OLD_FILES+=usr/include/c++/4.2/tr1/type_traits_fwd.h
 OLD_FILES+=usr/include/c++/4.2/tr1/unordered_map
 OLD_FILES+=usr/include/c++/4.2/tr1/unordered_set
 OLD_FILES+=usr/include/c++/4.2/tr1/utility
 OLD_FILES+=usr/include/c++/4.2/tr1/wchar.h
 OLD_FILES+=usr/include/c++/4.2/tr1/wctype.h
 OLD_FILES+=usr/include/c++/4.2/typeinfo
 OLD_FILES+=usr/include/c++/4.2/utility
 OLD_FILES+=usr/include/c++/4.2/valarray
 OLD_FILES+=usr/include/c++/4.2/vector
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_aes.h
 OLD_FILES+=usr/include/gcc/4.2/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/gcc/4.2/ammintrin.h
 OLD_FILES+=usr/include/gcc/4.2/emmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/mm3dnow.h
 OLD_FILES+=usr/include/gcc/4.2/mm_malloc.h
 OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/pmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/tmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/wmmintrin.h
 OLD_FILES+=usr/include/gcc/4.2/xmmintrin.h
 .elif ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/gcc/4.2/mmintrin.h
 .elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/include/gcc/4.2/altivec.h
 OLD_FILES+=usr/include/gcc/4.2/ppc-asm.h
 OLD_FILES+=usr/include/gcc/4.2/spe.h
 .endif
 OLD_FILES+=usr/lib/libgcov.a
 OLD_FILES+=usr/lib/libgomp.a
 OLD_FILES+=usr/lib/libstdc++.a
 OLD_FILES+=usr/lib/libstdc++.so
 OLD_LIBS+=usr/lib/libstdc++.so.6
 OLD_FILES+=usr/lib/libstdc++_p.a
 OLD_FILES+=usr/lib/libsupc++.a
 OLD_FILES+=usr/lib/libsupc++.so
 OLD_LIBS+=usr/lib/libsupc++.so.1
 OLD_FILES+=usr/lib/libsupc++_p.a
 OLD_LIBS+=usr/lib/libgomp.so.1
 OLD_FILES+=usr/lib/libgomp_p.a
 OLD_FILES+=usr/libexec/cc1
 OLD_FILES+=usr/libexec/cc1plus
 OLD_FILES+=usr/share/man/man1/gcpp.1.gz
 OLD_FILES+=usr/share/man/man1/gperf.1.gz
 OLD_FILES+=usr/share/man/man7/gperf.7.gz
 OLD_DIRS+=usr/include/c++/4.2/tr1
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/unordered_iterator
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/trie_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/tree_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/thin_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/splay_tree_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/resize_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/rc_binomial_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/rb_tree_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/pat_trie_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/pairing_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/ov_tree_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/list_update_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/left_child_next_sibling_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/hash_fn
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/gp_hash_table_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/eq_fn
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/cc_hash_table_map_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_base_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/binomial_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/binary_heap_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/bin_search_tree_
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail/basic_tree_policy
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds/detail
 OLD_DIRS+=usr/include/c++/4.2/ext/pb_ds
 OLD_DIRS+=usr/include/c++/4.2/ext
 OLD_DIRS+=usr/include/c++/4.2/debug
 OLD_DIRS+=usr/include/c++/4.2/bits
 OLD_DIRS+=usr/include/c++/4.2/backward
 OLD_DIRS+=usr/include/c++/4.2
 
 # 20200220: Upgrade of ncurses, shlib bumped to version 9
 OLD_LIBS+=lib/libncurses.so.8
 OLD_LIBS+=lib/libncursesw.so.8
 
 # 20200206: Remove elf2aout
 OLD_FILES+=usr/bin/elf2aout
 OLD_FILES+=usr/share/man/man1/elf2aout.1.gz
 
 # 20200204: simple_httpd removed
 OLD_FILES+=usr/sbin/simple_httpd
 
 # 20200127: vpo removed
 OLD_FILES+=usr/include/dev/ppbus/vpoio.h
 OLD_FILES+=usr/share/man/man4/imm.4.gz
 OLD_FILES+=usr/share/man/man4/vpo.4.gz
 
 # 20200104: gcc libssp removed
 OLD_FILES+=usr/include/ssp/ssp.h
 OLD_FILES+=usr/include/ssp/stdio.h
 OLD_FILES+=usr/include/ssp/string.h
 OLD_FILES+=usr/include/ssp/unistd.h
 OLD_DIRS+=usr/include/ssp
 OLD_FILES+=usr/lib/libssp.a
 
 # 20191229: GEOM_SCHED class and gsched tool removed
 OLD_LIBS+=lib/geom/geom_sched.so
 OLD_FILES+=sbin/gsched
 OLD_FILES+=usr/share/man/man8/gsched.8.gz
 
 # 20191222: new clang import which bumps version from 9.0.0 to 9.0.1
 OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/9.0.0/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/__clang_openmp_math.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/__clang_openmp_math_declares.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/9.0.0/include/openmp_wrappers/math.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/9.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/9.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/9.0.0/include
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/9.0.0/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/9.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/9.0.0/lib
 OLD_DIRS+=usr/lib/clang/9.0.0
 # 20191221: Update libpcap from 1.9.0 to 1.9.1
 OLD_FILES+=usr/share/man/man3/pcap_set_immediate_mode.3.gz
 OLD_FILES+=usr/share/man/man3/pcap_set_protocol.3.gz
 # 20191214: Removal of sranddev(3)
 OLD_FILES+=usr/share/man/man3/sranddev.3.gz
 # 20191213: Renamed (BIT|CPU)_NAND to (BIT|CPU)_ANDNOT
 OLD_FILES+=usr/share/man/man9/BIT_NAND.9.gz
 OLD_FILES+=usr/share/man/man9/CPU_NAND.9.gz
 # 20191213: remove timeout(9)
 OLD_FILES+=usr/share/man/man9/callout_handle_init.9.gz
 OLD_FILES+=usr/share/man/man9/timeout.9.gz
 OLD_FILES+=usr/share/man/man9/untimeout.9.gz
 # 20191128: Removal of trm(4)
 OLD_FILES+=usr/share/man/man4/trm.4.gz
 # 20191121: Removal of sio(4)
 OLD_FILES+=usr/share/man/man4/sio.4.gz
 # 20191105: picobsd(8), et al, removed
 OLD_FILES+=usr/share/man/man8/picobsd.8.gz
 # 20191017: taskqueue_start_threads_pinned became taskqueue_start_threads_cpuset
 OLD_FILES+=usr/share/man/man9/taskqueue_start_threads_pinned.9.gz
 # 20191009: new clang import which bumps version from 8.0.1 to 9.0.0
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/8.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/8.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/8.0.1/include
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/8.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/8.0.1/lib
 OLD_DIRS+=usr/lib/clang/8.0.1
 # 20191009: libc++ 9.0.0 removed some experimental files
 OLD_FILES+=usr/include/c++/v1/experimental/any
 OLD_FILES+=usr/include/c++/v1/experimental/chrono
 OLD_FILES+=usr/include/c++/v1/experimental/numeric
 OLD_FILES+=usr/include/c++/v1/experimental/optional
 OLD_FILES+=usr/include/c++/v1/experimental/ratio
 OLD_FILES+=usr/include/c++/v1/experimental/string_view
 OLD_FILES+=usr/include/c++/v1/experimental/system_error
 OLD_FILES+=usr/include/c++/v1/experimental/tuple
 OLD_FILES+=usr/lib/libc++fs.a
 # 20191003: Remove useless ZFS tests
 OLD_FILES+=usr/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_013_neg.ksh
 OLD_FILES+=usr/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_014_neg.ksh
 OLD_FILES+=usr/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_016_pos.ksh
 # 20190910: mklocale(1) and colldef(1) removed
 OLD_FILES+=usr/bin/mklocale
 OLD_FILES+=usr/share/man/man1/mklocale.1.gz
 OLD_FILES+=usr/bin/colldef
 OLD_FILES+=usr/share/man/man1/colldef.1.gz
 # 20190904: Remove boot1.efifat and gptboot.efifat (which never should have been)
 OLD_FILES+=boot/boot1.efifat
 OLD_FILES+=boot/gptboot.efifat
 # 20190903: pc-sysinstall(8) removed
 OLD_FILES+=usr/share/examples/pc-sysinstall/README
 OLD_FILES+=usr/share/examples/pc-sysinstall/pc-autoinstall.conf
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.fbsd-netinstall
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.geli
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.gmirror
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.netinstall
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.restore
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.rsync
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.upgrade
 OLD_FILES+=usr/share/examples/pc-sysinstall/pcinstall.cfg.zfs
 OLD_FILES+=usr/share/man/man8/pc-sysinstall.8.gz
 OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/create-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/delete-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-emulation.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-laptop.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-nics.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-info.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-list.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/disk-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/enable-net.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/get-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-components.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-config.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-mirrors.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-rsync-backups.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/list-tzones.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/query-langs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/send-logs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/setup-ssh-keys.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/set-mirror.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/sys-mem.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-live.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/test-netup.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/update-part-list.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-layouts.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-models.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/xkeyboard-variants.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-bsdlabel.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-cleanup.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-disk.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-extractimage.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-ftp.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installcomponents.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-installpackages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-localize.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountdisk.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-mountoptical.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-networking.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-newfs.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-parse.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-packages.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-runcommands.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-unmount.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-upgrade.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions-users.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/functions.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/installimage.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/parseconfig.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend/startautoinstall.sh
 OLD_FILES+=usr/share/pc-sysinstall/conf/avail-langs
 OLD_FILES+=usr/share/pc-sysinstall/conf/exclude-from-upgrade
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/bsd-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/intel-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/license/nvidia-en.txt
 OLD_FILES+=usr/share/pc-sysinstall/conf/pc-sysinstall.conf
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-list
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-disk-size
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-index
 OLD_FILES+=usr/share/pc-sysinstall/doc/help-start-autoinstall
 OLD_FILES+=usr/sbin/pc-sysinstall
 OLD_DIRS+=usr/share/examples/pc-sysinstall
 OLD_DIRS+=usr/share/pc-sysinstall/backend
 OLD_DIRS+=usr/share/pc-sysinstall/backend-partmanager
 OLD_DIRS+=usr/share/pc-sysinstall/backend-query
 OLD_DIRS+=usr/share/pc-sysinstall/conf/license
 OLD_DIRS+=usr/share/pc-sysinstall/conf
 OLD_DIRS+=usr/share/pc-sysinstall/doc
 OLD_DIRS+=usr/share/pc-sysinstall
 # 20190825: zlib 1.0.4 removed from kernel
 OLD_FILES+=usr/include/sys/zlib.h
 OLD_FILES+=usr/include/sys/zutil.h
 # 20190817: pft_ping.py and sniffer.py moved to /usr/tests/sys/netpfil/common
 OLD_FILES+=usr/tests/sys/netpfil/pf/sniffer.py
 OLD_FILES+=usr/tests/sys/netpfil/pf/pft_ping.py
 # 20190816: dir.h removed from POSIX
 OLD_FILES+=usr/include/sys/dir.h
 # 20190813: deprecated GEOM classes removed
 OLD_FILES+=usr/share/man/man4/geom_fox.4.gz
 # 20190729: gzip'ed a.out support removed
 OLD_FILES+=usr/include/sys/inflate.h
 # 20190722: cap_random(3) removed
 OLD_LIBS+=lib/casper/libcap_random.so.1
 OLD_FILES+=usr/include/casper/cap_random.h
 OLD_LIBS+=usr/lib/libcap_random.so
 OLD_FILES+=usr/share/man/man3/libcap_random.3.gz
 OLD_FILES+=usr/share/man/man3/cap_random.3.gz
 OLD_FILES+=usr/share/man/man3/cap_random_buf.3.gz
 # 20190708: vm_page_hold() and _unhold() removed
 OLD_FILES+=usr/share/man/man9/vm_page_hold.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_unhold.9.gz
 # 20190625: Remove NAND and NANDFS support
 OLD_FILES+=usr/share/man/man4/nand.4.gz
 OLD_FILES+=usr/share/man/man4/nandsim.4.gz
 # 20190618: sys/capability.h removed (sys/capsicum.h is the one to use)
 OLD_FILES+=usr/include/sys/capability.h
 # 20190615: sys/pwm.h renamed to dev/pwmc.h
 OLD_FILES+=usr/include/sys/pwm.h
 # 20190612: new clang import which bumps version from 8.0.0 to 8.0.1
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/8.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/8.0.0/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/8.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/8.0.0/include
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/8.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/8.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/8.0.0/lib
 OLD_DIRS+=usr/lib/clang/8.0.0
 # 20190523: Remove obsolete kgzip and support files
 OLD_FILES+=usr/sbin/kgzip
 OLD_FILES+=usr/lib/kgzldr.o
 OLD_FILES+=usr/share/man/man8/kgzip.8.gz
 # 20190517: Remove obsolete 10 and 10/100 ethernet drivers
 OLD_FILES+=usr/share/man/man4/bm.4.gz
 OLD_FILES+=usr/share/man/man4/cs.4.gz
 OLD_FILES+=usr/share/man/man4/de.4.gz
 OLD_FILES+=usr/share/man/man4/if_de.4.gz
 OLD_FILES+=usr/share/man/man4/ed.4.gz
 OLD_FILES+=usr/share/man/man4/if_ed.4.gz
 OLD_FILES+=usr/share/man/man4/ep.4.gz
 OLD_FILES+=usr/share/man/man4/ex.4.gz
 OLD_FILES+=usr/share/man/man4/fe.4.gz
 OLD_FILES+=usr/share/man/man4/pcn.4.gz
 OLD_FILES+=usr/share/man/man4/if_pcn.4.gz
 OLD_FILES+=usr/share/man/man4/sf.4.gz
 OLD_FILES+=usr/share/man/man4/if_sf.4.gz
 OLD_FILES+=usr/share/man/man4/sn.4.gz
 OLD_FILES+=usr/share/man/man4/if_sn.4.gz
 OLD_FILES+=usr/share/man/man4/tl.4.gz
 OLD_FILES+=usr/share/man/man4/if_tl.4.gz
 OLD_FILES+=usr/share/man/man4/tx.4.gz
 OLD_FILES+=usr/share/man/man4/if_tx.4.gz
 OLD_FILES+=usr/share/man/man4/txp.4.gz
 OLD_FILES+=usr/share/man/man4/if_txp.4.gz
 OLD_FILES+=usr/share/man/man4/vx.4.gz
 OLD_FILES+=usr/share/man/man4/wb.4.gz
 OLD_FILES+=usr/share/man/man4/if_wb.4.gz
 OLD_FILES+=usr/share/man/man4/xe.4.gz
 OLD_FILES+=usr/share/man/man4/if_xe.4.gz
 # 20190513: libcap_sysctl interface change
 OLD_LIBS+=lib/casper/libcap_sysctl.so.1
 # 20190509: tests/sys/opencrypto requires the net/py-dpkt package
 OLD_FILES+=usr/tests/sys/opencrypto/dpkt.py
 OLD_FILES+=usr/tests/sys/opencrypto/dpkt.pyc
 # 20190304: new libc++ import which bumps version from 7.0.1 to 8.0.0
 OLD_FILES+=usr/include/c++/v1/experimental/dynarray
 # 20190304: new clang import which bumps version from 7.0.1 to 8.0.0
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/7.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/7.0.1/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/7.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/7.0.1/include
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/7.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/7.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/7.0.1/lib
 OLD_DIRS+=usr/lib/clang/7.0.1
 # 20190227: rename seq.h to seqc.h
 OLD_FILES+=usr/include/sys/seq.h
 # 20190222: libifconfig made INTERNALLIB
 OLD_FILES+=usr/lib/libprivateifconfig.a
 OLD_FILES+=usr/lib/libprivateifconfig_p.a
 # 20190131: pfil(9) changed
 OLD_FILES+=usr/share/man/man9/pfil_hook_get.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_rlock.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_runlock.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_wlock.9.gz
 OLD_FILES+=usr/share/man/man9/pfil_wunlock.9.gz
 # 20190126: adv(4) / adw(4) removal
 OLD_FILES+=usr/share/man/man4/adv.4.gz
 OLD_FILES+=usr/share/man/man4/adw.4.gz
 # 20190123: nonexistant cred_update_thread(9) removed
 OLD_FILES+=usr/share/man/man9/cred_update_thread.9.gz
 # 20190114: old pbuf allocator removed
 OLD_FILES+=usr/share/man/man9/getpbuf.9.gz
 OLD_FILES+=usr/share/man/man9/pbuf.9.gz
 OLD_FILES+=usr/share/man/man9/relpbuf.9.gz
 OLD_FILES+=usr/share/man/man9/trypbuf.9.gz
 # 20181219: ibcs removal
 OLD_FILES+=usr/share/examples/ibcs2/hello.uu
 OLD_FILES+=usr/share/examples/ibcs2/README
 OLD_DIRS+=usr/share/examples/ibcs2
 # 20181215: Migration of CTM to ports
 OLD_FILES+=usr/sbin/ctm
 OLD_FILES+=usr/sbin/ctm_dequeue
 OLD_FILES+=usr/sbin/ctm_rmail
 OLD_FILES+=usr/sbin/ctm_smail
 OLD_FILES+=usr/share/man/man1/ctm.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_dequeue.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_rmail.1.gz
 OLD_FILES+=usr/share/man/man1/ctm_smail.1.gz
 OLD_FILES+=usr/share/man/man5/ctm.5.gz
 # 20181214: Remove timed files
 OLD_FILES+=etc/rc.d/timed
 OLD_FILES+=usr/sbin/timed
 OLD_FILES+=usr/sbin/timedc
 OLD_FILES+=usr/share/man/man8/timed.8.gz
 OLD_FILES+=usr/share/man/man8/timedc.8.gz
 # 20181211: new clang import which bumps version from 6.0.1 to 7.0.1
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/6.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/6.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/6.0.1/include
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/6.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/6.0.1/lib
 OLD_DIRS+=usr/lib/clang/6.0.1
 # 20181116: Rename test file
 OLD_FILES+=usr/tests/sys/netinet/reuseport_lb
 # 20181113: libufs version bumped to 7
 OLD_LIBS+=lib/libufs.so.6
 # 20181112: Cleanup old libcap_dns
 OLD_LIBS+=lib/casper/libcap_dns.so.1
 # 20181030: malloc_domain(9) KPI change
 OLD_FILES+=usr/share/man/man9/malloc_domain.9.gz
 # 20181026: joy(4) removal
 OLD_FILES+=usr/share/man/man4/joy.4.gz
 # 20181025: OpenSSL libraries version bump to avoid conflict with ports
 OLD_LIBS+=lib/libcrypto.so.9
 OLD_LIBS+=usr/lib/libssl.so.9
 # 20181022: aha(4) removal
 OLD_FILES+=usr/share/man/man4/aha.4.gz
 # 20181022: dpt(4) removal
 OLD_FILES+=usr/share/man/man4/dpt.4.gz
 # 20181022: ncr(4) removal
 OLD_FILES+=usr/share/man/man4/ncr.4.gz
 # 20181022: ncv(4) removal
 OLD_FILES+=usr/share/man/man4/ncv.4.gz
 # 20181022: nsp(4) removal
 OLD_FILES+=usr/share/man/man4/nsp.4.gz
 # 20181022: stg(4) removal
 OLD_FILES+=usr/share/man/man4/stg.4.gz
 # 20181021: mse(4) removal
 OLD_FILES+=usr/share/man/man4/mse.4.gz
 # 20181015: Stale libcasper(3) files following r329452
 OLD_LIBS+=lib/casper/libcap_sysctl.so.0
 OLD_LIBS+=lib/casper/libcap_grp.so.0
 OLD_LIBS+=lib/casper/libcap_pwd.so.0
 OLD_LIBS+=lib/casper/libcap_random.so.0
 OLD_LIBS+=lib/casper/libcap_dns.so.0
 OLD_LIBS+=lib/casper/libcap_syslog.so.0
 # 20181012: rename of ixlv(4) to iavf(4)
 OLD_FILES+=usr/share/man/man4/if_ixlv.4.gz
 OLD_FILES+=usr/share/man/man4/ixlv.4.gz
 # 20181009: OpenSSL 1.1.1
 OLD_FILES+=usr/include/openssl/des_old.h
 OLD_FILES+=usr/include/openssl/dso.h
 OLD_FILES+=usr/include/openssl/krb5_asn.h
 OLD_FILES+=usr/include/openssl/kssl.h
 OLD_FILES+=usr/include/openssl/pqueue.h
 OLD_FILES+=usr/include/openssl/ssl23.h
 OLD_FILES+=usr/include/openssl/ui_compat.h
 OLD_FILES+=usr/share/openssl/man/man1/dss1.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/md2.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/md4.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/md5.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/mdc2.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/ripemd160.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha1.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha224.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha256.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha384.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/sha512.1.gz
 OLD_FILES+=usr/share/openssl/man/man1/x509v3_config.1.gz
 OLD_FILES+=usr/share/openssl/man/man3/ASN1_STRING_length_set.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_get_conn_int_port.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_get_conn_ip.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_set.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_set_conn_int_port.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BIO_set_conn_ip.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_get_thread_id.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_set_thread_id.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_thread_id.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_MONT_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_RECP_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BN_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_memdup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_memdup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strdup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strlcat.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strlcpy.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/BUF_strndup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CMS_set1_signer_cert.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_cmp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_cpy.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_current.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_get_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_hash.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_set_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_destroy_dynlockid.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_get_new_dynlockid.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_lock.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_num_locks.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_create_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_destroy_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_lock_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_locking_callback.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/DES_ede3_cbcm_encrypt.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/DES_enc_read.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/DES_enc_write.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EC_KEY_get_key_method_data.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EC_KEY_insert_key_method_data.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EC_POINT_set_Jprojective_coordinates.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ERR_load_UI_strings.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_CIPHER_CTX_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_CIPHER_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MAX_MD_SIZE.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_create.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_destroy.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEVP_PKEY_CTX_set_app_data.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_get_default_digest.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_dss.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_dss1.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_sha.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/HMAC_CTX_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/HMAC_CTX_init.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/HMAC_cleanup.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/OPENSSL_ia32cap_loc.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/PEM.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/RAND_SSLeay.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/RSA_PKCS1_SSLeay.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/RSA_null_method.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_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/des.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_2passwords.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_password.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_pw.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/des_read_pw_string.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/dh.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/dsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ec.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ecdsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/engine.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/err.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/evp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/hmac.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_ECPKParameters_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_ECPKParameters_fp.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/i2d_Netscape_RSA.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_delete.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_doall.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_doall_arg.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_error.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_free.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_insert.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_new.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_stats.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_stats_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_usage_stats.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_node_usage_stats_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_retrieve.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_stats.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lh_stats_bio.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/lhash.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/md5.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/mdc2.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/pem.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/rand.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/rc4.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ripemd.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/rsa.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/sha.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ssl.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/threads.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ui.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/ui_compat.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/x509.3.gz
 OLD_LIBS+=lib/libcrypto.so.8
 OLD_LIBS+=usr/lib/engines/lib4758cca.so
 OLD_LIBS+=usr/lib/engines/libaep.so
 OLD_LIBS+=usr/lib/engines/libatalla.so
 OLD_LIBS+=usr/lib/engines/libcapi.so
 OLD_LIBS+=usr/lib/engines/libchil.so
 OLD_LIBS+=usr/lib/engines/libcswift.so
 OLD_LIBS+=usr/lib/engines/libgost.so
 OLD_LIBS+=usr/lib/engines/libnuron.so
 OLD_LIBS+=usr/lib/engines/libsureware.so
 OLD_LIBS+=usr/lib/engines/libubsec.so
 OLD_LIBS+=usr/lib/libssl.so.8
 OLD_LIBS+=usr/lib32/lib4758cca.so
 OLD_LIBS+=usr/lib32/libaep.so
 OLD_LIBS+=usr/lib32/libatalla.so
 OLD_LIBS+=usr/lib32/libcapi.so
 OLD_LIBS+=usr/lib32/libchil.so
 OLD_LIBS+=usr/lib32/libcswift.so
 OLD_LIBS+=usr/lib32/libgost.so
 OLD_LIBS+=usr/lib32/libnuron.so
 OLD_LIBS+=usr/lib32/libsureware.so
 OLD_LIBS+=usr/lib32/libubsec.so
 # 20180824: libbe(3) SHLIBDIR fixed to reflect correct location
 MOVED_LIBS+=usr/lib/libbe.so.1
 # 20180819: Remove deprecated arc4random(3) stir/addrandom interfaces
 OLD_FILES+=usr/share/man/man3/arc4random_addrandom.3.gz
 OLD_FILES+=usr/share/man/man3/arc4random_stir.3.gz
 # 20180819: send-pr(1) placeholder removal
 OLD_FILES+=usr/bin/send-pr
 # 20180801: jedec_ts(4) removed
 OLD_FILES+=usr/share/man/man4/jedec_ts.4.gz
 # 20180725: Cleanup old libcasper.so.0
 OLD_LIBS+=lib/libcasper.so.0
 # 20180722: indent(1) option renamed, test files follow
 OLD_FILES+=usr/bin/indent/tests/nsac.0
 OLD_FILES+=usr/bin/indent/tests/nsac.0.pro
 OLD_FILES+=usr/bin/indent/tests/nsac.0.stdout
 OLD_FILES+=usr/bin/indent/tests/sac.0
 OLD_FILES+=usr/bin/indent/tests/sac.0.pro
 OLD_FILES+=usr/bin/indent/tests/sac.0.stdout
 # 20180721: move of libmlx5.so.1 and libibverbs.so.1
 MOVED_LIBS+=usr/lib/libmlx5.so.1
 MOVED_LIBS+=usr/lib/libibverbs.so.1
 # 20180720: zfsloader.8 merged into loader.8
 OLD_FILES+=usr/share/man/man8/zfsloader.8.gz
 # 20180710: old numa cleanup
 OLD_FILES+=usr/include/sys/numa.h
 OLD_FILES+=usr/share/man/man2/numa_getaffinity.2.gz
 OLD_FILES+=usr/share/man/man2/numa_setaffinity.2.gz
 OLD_FILES+=usr/share/man/man1/numactl.1.gz
 OLD_FILES+=usr/bin/numactl
 # 20180630: new clang import which bumps version from 6.0.0 to 6.0.1
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/6.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/6.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/6.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/6.0.0/include
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/6.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/6.0.0/lib
 OLD_DIRS+=usr/lib/clang/6.0.0
 # 20180615: asf(8) removed
 OLD_FILES+=usr/sbin/asf
 OLD_FILES+=usr/share/man/man8/asf.8.gz
 # 20180609: obsolete libc++ files missed from the 5.0.0 import
 OLD_FILES+=usr/include/c++/v1/__refstring
 OLD_FILES+=usr/include/c++/v1/__undef_min_max
 OLD_FILES+=usr/include/c++/v1/tr1/__refstring
 OLD_FILES+=usr/include/c++/v1/tr1/__undef_min_max
 # 20180607: remove nls support from grep
 OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.SJIS/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/grep.cat
 OLD_FILES+=usr/share/nls/gl_ES.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/zh_CN.UTF-8/grep.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/grep.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/grep.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/grep.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/grep.cat
 # 20180528: libpcap update removed header file
 OLD_FILES+=usr/include/pcap/export-defs.h
 # 20180517: retire vxge
 OLD_FILES+=usr/share/man/man4/if_vxge.4.gz
 OLD_FILES+=usr/share/man/man4/vxge.4.gz
 # 20180512: Rename Unbound tools
 OLD_FILES+=usr/sbin/unbound
 OLD_FILES+=usr/sbin/unbound-anchor
 OLD_FILES+=usr/sbin/unbound-checkconf
 OLD_FILES+=usr/sbin/unbound-control
 OLD_FILES+=usr/share/man/man5/unbound.conf.5.gz
 OLD_FILES+=usr/share/man/man8/unbound-anchor.8.gz
 OLD_FILES+=usr/share/man/man8/unbound-checkconf.8.gz
 OLD_FILES+=usr/share/man/man8/unbound-control.8.gz
 OLD_FILES+=usr/share/man/man8/unbound.8.gz
 # 20180508: retire nxge
 OLD_FILES+=usr/share/man/man4/if_nxge.4.gz
 OLD_FILES+=usr/share/man/man4/nxge.4.gz
 # 20180505: rhosts
 OLD_FILES+=usr/share/skel/dot.rhosts
 # 20180502: retire ixgb
 OLD_FILES+=usr/share/man/man4/if_ixgb.4.gz
 OLD_FILES+=usr/share/man/man4/ixgb.4.gz
 # 20180501: retire lmc
 OLD_FILES+=usr/include/dev/lmc/if_lmc.h
 OLD_DIRS+=usr/include/dev/lmc
 OLD_FILES+=usr/sbin/lmcconfig
 OLD_FILES+=usr/share/man/man4/lmc.4.gz
 OLD_FILES+=usr/share/man/man4/if_lmc.4.gz
 OLD_FILES+=usr/share/man/man8/lmcconfig.8.gz
 # 20180417: remove fuswintr and suswintr
 OLD_FILES+=usr/share/man/man9/fuswintr.9.gz
 OLD_FILES+=usr/share/man/man9/suswintr.9.gz
 # 20180413: remove Arcnet support
 OLD_FILES+=usr/include/net/if_arc.h
 OLD_FILES+=usr/share/man/man4/cm.4.gz
 # 20180409: remove FDDI support
 OLD_FILES+=usr/include/net/fddi.h
 OLD_FILES+=usr/share/man/man4/fpa.4.gz
 # 20180319: remove /boot/overlays, replaced by /boot/dtb/overlays
 OLD_DIRS+=boot/overlays
 # 20180311: remove sys/sys/i386/include/pcaudioio.h
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/pcaudioio.h
 .endif
 # 20180310: remove sys/sys/dataacq.h
 OLD_FILES+=usr/include/sys/dataacq.h
 # 20180306: remove DTrace scripts made obsolete by dwatch(1)
 OLD_FILES+=usr/share/dtrace/watch_execve
 OLD_FILES+=usr/share/dtrace/watch_kill
 OLD_FILES+=usr/share/dtrace/watch_vop_remove
 # 20180212: move devmatch
 OLD_FILES+=usr/sbin/devmatch
 # 20180211: remove usb.conf
 OLD_FILES+=etc/devd/usb.conf
 # 20180208: remove c_rehash(1)
 OLD_FILES+=usr/share/openssl/man/man1/c_rehash.1.gz
 # 20180206: remove gdbtui
 OLD_FILES+=usr/bin/gdbtui
 # 20180201: Obsolete forth files
 OLD_FILES+=boot/pcibios.4th
 # 20180114: new clang import which bumps version from 5.0.1 to 6.0.0
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/5.0.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/armintr.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/5.0.1/include/msa.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/5.0.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/5.0.1/include
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/5.0.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/5.0.1/lib
 OLD_DIRS+=usr/lib/clang/5.0.1
 # 20180109: Remove vestiges of digi(4) driver
 OLD_FILES+=usr/include/sys/digiio.h
 OLD_FILES+=usr/sbin/digictl
 OLD_FILES+=usr/share/man/man8/digictl.8.gz
 # 20180107: Convert remaining geli(8) tests to ATF
 OLD_FILES+=tests/sys/geom/class/eli/nokey_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/readonly_test.sh
 # 20180106: Convert most geli(8) tests to ATF
 OLD_FILES+=tests/sys/geom/class/eli/attach_d_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/configure_b_B_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/detach_l_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_B_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_J_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_a_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_alias_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/init_i_P_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/integrity_copy_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/integrity_data_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/integrity_hmac_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/onetime_a_test.sh
 OLD_FILES+=tests/sys/geom/class/eli/onetime_d_test.sh
 # 20171230: Remove /etc/skel from mtree
 OLD_DIRS+=etc/skel
 # 20171208: Remove basename_r(3)
 OLD_FILES+=usr/share/man/man3/basename_r.3.gz
 # 20171206: Remove sponge(1)
 OLD_FILES+=usr/bin/sponge
 OLD_FILES+=usr/share/man/man1/sponge.1.gz
 # 20171204: Move fdformat man page from volume 1 to volume 8
 OLD_FILES+=usr/share/man/man1/fdformat.1.gz
 # 20171203: libproc version bump
 OLD_LIBS+=usr/lib/libproc.so.4
 # 20171203: new clang import which bumps version from 5.0.0 to 5.0.1
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/5.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/5.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/5.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/5.0.0/include
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/5.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/5.0.0/lib
 OLD_DIRS+=usr/lib/clang/5.0.0
 # 20171118: Remove old etc casper files
 OLD_FILES+=etc/casper/system.dns
 OLD_FILES+=etc/casper/system.grp
 OLD_FILES+=etc/casper/system.pwd
 OLD_FILES+=etc/casper/system.random
 OLD_FILES+=etc/casper/system.sysctl
 OLD_DIRS+=etc/casper
 # 20171116: lint(1) removal
 OLD_FILES+=usr/bin/lint
 OLD_FILES+=usr/libexec/lint1
 OLD_FILES+=usr/libexec/lint2
 OLD_FILES+=usr/libdata/lint/llib-lposix.ln
 OLD_FILES+=usr/libdata/lint/llib-lstdc.ln
 OLD_FILES+=usr/share/man/man1/lint.1.gz
 OLD_FILES+=usr/share/man/man7/lint.7.gz
 OLD_DIRS+=usr/libdata/lint
 # 20171114: Removal of all fortune datfiles other than freebsd-tips
 OLD_FILES+=usr/share/games/fortune/fortunes
 OLD_FILES+=usr/share/games/fortune/fortunes.dat
 OLD_FILES+=usr/share/games/fortune/gerrold.limerick
 OLD_FILES+=usr/share/games/fortune/gerrold.limerick.dat
 OLD_FILES+=usr/share/games/fortune/limerick
 OLD_FILES+=usr/share/games/fortune/limerick.dat
 OLD_FILES+=usr/share/games/fortune/murphy
 OLD_FILES+=usr/share/games/fortune/murphy-o
 OLD_FILES+=usr/share/games/fortune/murphy-o.dat
 OLD_FILES+=usr/share/games/fortune/murphy.dat
 OLD_FILES+=usr/share/games/fortune/startrek
 OLD_FILES+=usr/share/games/fortune/startrek.dat
 OLD_FILES+=usr/share/games/fortune/zippy
 OLD_FILES+=usr/share/games/fortune/zippy.dat
 # 20171112: Removal of eqnchar definition
 OLD_FILES+=usr/share/misc/eqnchar
 # 20171110: Removal of mailaddr man page
 OLD_FILES+=usr/share/man/man7/mailaddr.7.gz
 # 20171108: Rename of NgSendMsgReply to NgSendReplyMsg
 OLD_FILES+=usr/share/man/man3/NgSendMsgReply.3.gz
 # 20171108: badsect(8) removal
 OLD_FILES+=sbin/badsect
 OLD_FILES+=rescue/badsect
 OLD_FILES+=usr/share/man/man8/badsect.8.gz
 # 20171105: fixing lib/libclang_rt CRTARCH for arm:armv[67]
 .if ${MACHINE_ARCH:Marmv[67]*} != "" && \
     (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-arm.a
 OLD_LIBS+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.safestack-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/5.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 .endif
 # 20171104: libcap_random should be in /lib not in /usr/lib
 OLD_LIBS+=usr/lib/libcap_random.so.0
 # 20171104: Casper can work only as shared library
 OLD_FILES+=usr/lib/libcap_dns.a
 OLD_FILES+=usr/lib/libcap_dns_p.a
 OLD_FILES+=usr/lib/libcap_grp.a
 OLD_FILES+=usr/lib/libcap_grp_p.a
 OLD_FILES+=usr/lib/libcap_pwd.a
 OLD_FILES+=usr/lib/libcap_pwd_p.a
 OLD_FILES+=usr/lib/libcap_random.a
 OLD_FILES+=usr/lib/libcap_random_p.a
 OLD_FILES+=usr/lib/libcap_sysctl.a
 OLD_FILES+=usr/lib/libcap_sysctl_p.a
 OLD_FILES+=usr/lib/libcasper.a
 OLD_FILES+=usr/lib/libcasper_p.a
 # 20171031: Removal of adding_user man page
 OLD_FILES+=usr/share/man/man7/adding_user.7.gz
 # 20171031: Disconnected libpathconv tests
 OLD_DIRS+=usr/tests/lib/libpathconv
 # 20171017: Removal of mbpool(9)
 OLD_FILES+=usr/include/sys/mbpool.h
 OLD_FILES+=usr/share/man/man9/mbpool.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_destroy.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_alloc.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_ext_free.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_count.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_card_free.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_get_keep.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_free.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_get.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_create.9.gz
 OLD_FILES+=usr/share/man/man9/mbp_sync.9.gz
 # 20171010: Remove libstand
 OLD_FILES+=usr/lib/libstand.a
 OLD_FILES+=usr/lib/libstand_p.a
 OLD_FILES+=usr/include/stand.h
 OLD_FILES+=usr/share/man/man3/libstand.3.gz
 # 20171003: remove RCMDS
 OLD_FILES+=bin/rcp
 OLD_FILES+=rescue/rcp
 OLD_FILES+=usr/bin/rlogin
 OLD_FILES+=usr/bin/rsh
 OLD_FILES+=usr/libexec/rlogind
 OLD_FILES+=usr/libexec/rshd
 OLD_FILES+=usr/share/man/man1/rcp.1.gz
 OLD_FILES+=usr/share/man/man1/rlogin.1.gz
 OLD_FILES+=usr/share/man/man1/rsh.1.gz
 OLD_FILES+=usr/share/man/man8/rlogind.8.gz
 OLD_FILES+=usr/share/man/man8/rshd.8.gz
 # 20170927: crshared
 OLD_FILES+=usr/share/man/man9/crshared.9.gz
 # 20170927: procctl
 OLD_FILES+=usr/share/man/man8/procctl.8.gz
 OLD_FILES+=usr/sbin/procctl
 # 20170926: remove unneeded man aliases and locales directory
 OLD_FILES+=usr/share/man/en.ISO8859-1/man1
 OLD_FILES+=usr/share/man/en.ISO8859-1/man2
 OLD_FILES+=usr/share/man/en.ISO8859-1/man3
 OLD_FILES+=usr/share/man/en.ISO8859-1/man4
 OLD_FILES+=usr/share/man/en.ISO8859-1/man5
 OLD_FILES+=usr/share/man/en.ISO8859-1/man6
 OLD_FILES+=usr/share/man/en.ISO8859-1/man7
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8
 OLD_FILES+=usr/share/man/en.ISO8859-1/man9
 OLD_DIRS+=usr/share/man/en.ISO8859-1
 OLD_FILES+=usr/share/man/en.ISO8859-1/mandoc.db
 OLD_FILES+=usr/share/man/en.UTF-8/man1
 OLD_FILES+=usr/share/man/en.UTF-8/man2
 OLD_FILES+=usr/share/man/en.UTF-8/man3
 OLD_FILES+=usr/share/man/en.UTF-8/man4
 OLD_FILES+=usr/share/man/en.UTF-8/man5
 OLD_FILES+=usr/share/man/en.UTF-8/man6
 OLD_FILES+=usr/share/man/en.UTF-8/man7
 OLD_FILES+=usr/share/man/en.UTF-8/man8
 OLD_FILES+=usr/share/man/en.UTF-8/man9
 OLD_FILES+=usr/share/man/en.UTF-8/mandoc.db
 OLD_DIRS+=usr/share/man/en.UTF-8
 OLD_FILES+=usr/share/man/en.ISO8859-15
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/man1
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/man3
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-1/mandoc.db
 OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1
 OLD_FILES+=usr/share/openssl/man/en.ISO8859-15
 OLD_DIRS+=usr/share/man/ja/man1
 OLD_DIRS+=usr/share/man/ja/man2
 OLD_DIRS+=usr/share/man/ja/man3
 OLD_DIRS+=usr/share/man/ja/man4
 OLD_DIRS+=usr/share/man/ja/man5
 OLD_DIRS+=usr/share/man/ja/man6
 OLD_DIRS+=usr/share/man/ja/man7
 OLD_DIRS+=usr/share/man/ja/man8
 OLD_DIRS+=usr/share/man/ja/man9
 OLD_DIRS+=usr/share/man/ja
 # 20170913: remove unneeded catman utility
 OLD_FILES+=etc/periodic/weekly/330.catman
 OLD_FILES+=usr/bin/catman
 OLD_FILES+=usr/libexec/catman.local
 OLD_FILES+=usr/share/man/man1/catman.1.gz
 OLD_FILES+=usr/share/man/man8/catman.local.8.gz
 OLD_DIRS+=usr/share/man/cat1
 OLD_DIRS+=usr/share/man/cat2
 OLD_DIRS+=usr/share/man/cat3
 OLD_DIRS+=usr/share/man/cat4/amd64
 OLD_DIRS+=usr/share/man/cat4/arm
 OLD_DIRS+=usr/share/man/cat4/i386
 OLD_DIRS+=usr/share/man/cat4/powerpc
 OLD_DIRS+=usr/share/man/cat4/sparc64
 OLD_DIRS+=usr/share/man/cat4
 OLD_DIRS+=usr/share/man/cat5
 OLD_DIRS+=usr/share/man/cat6
 OLD_DIRS+=usr/share/man/cat7
 OLD_DIRS+=usr/share/man/cat8/amd64
 OLD_DIRS+=usr/share/man/cat8/arm
 OLD_DIRS+=usr/share/man/cat8/i386
 OLD_DIRS+=usr/share/man/cat8/powerpc
 OLD_DIRS+=usr/share/man/cat8/sparc64
 OLD_DIRS+=usr/share/man/cat8
 OLD_DIRS+=usr/share/man/cat9
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat2
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat3
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/amd64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/arm
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/i386
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/powerpc
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4/sparc64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat4
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat5
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat6
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat7
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/amd64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/arm
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/i386
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/powerpc
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8/sparc64
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat8
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat9
 OLD_DIRS+=usr/share/man/en.UTF-8/cat1
 OLD_DIRS+=usr/share/man/en.UTF-8/cat2
 OLD_DIRS+=usr/share/man/en.UTF-8/cat3
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/amd64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/arm
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/i386
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/powerpc
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4/sparc64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat4
 OLD_DIRS+=usr/share/man/en.UTF-8/cat5
 OLD_DIRS+=usr/share/man/en.UTF-8/cat6
 OLD_DIRS+=usr/share/man/en.UTF-8/cat7
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/amd64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/arm
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/i386
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/powerpc
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8/sparc64
 OLD_DIRS+=usr/share/man/en.UTF-8/cat8
 OLD_DIRS+=usr/share/man/en.UTF-8/cat9
 OLD_DIRS+=usr/share/man/ja/cat1
 OLD_DIRS+=usr/share/man/ja/cat2
 OLD_DIRS+=usr/share/man/ja/cat3
 OLD_DIRS+=usr/share/man/ja/cat4/amd64
 OLD_DIRS+=usr/share/man/ja/cat4/arm
 OLD_DIRS+=usr/share/man/ja/cat4/i386
 OLD_DIRS+=usr/share/man/ja/cat4/powerpc
 OLD_DIRS+=usr/share/man/ja/cat4/sparc64
 OLD_DIRS+=usr/share/man/ja/cat4
 OLD_DIRS+=usr/share/man/ja/cat5
 OLD_DIRS+=usr/share/man/ja/cat6
 OLD_DIRS+=usr/share/man/ja/cat7
 OLD_DIRS+=usr/share/man/ja/cat8/amd64
 OLD_DIRS+=usr/share/man/ja/cat8/arm
 OLD_DIRS+=usr/share/man/ja/cat8/powerpc
 OLD_DIRS+=usr/share/man/ja/cat8/sparc64
 OLD_DIRS+=usr/share/man/ja/cat8
 OLD_DIRS+=usr/share/man/ja/cat9
 OLD_DIRS+=usr/share/openssl/man/cat1
 OLD_DIRS+=usr/share/openssl/man/cat3
 OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat1
 OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat3
 # 20170830: rename ntb_hw(4) to ntb_hw_intel(4)
 OLD_FILES+=usr/share/man/man4/ntb_hw.4.gz
 # 20170802: ksyms(4) ioctl interface was removed
 OLD_FILES+=usr/include/sys/ksyms.h
 # 20170729: the iicbus/pcf8563 driver is replaced with iicbus/nxprtc
 OLD_FILES+=usr/include/dev/iicbus/pcf8563reg.h
 # 20170727: options FLOWTABLE removed
 OLD_FILES+=usr/include/net/flowtable.h
 # 20170722: new clang import which bumps version from 4.0.0 to 5.0.0
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/4.0.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/armintr.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/4.0.0/include/msa.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/4.0.0/include
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/4.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/4.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/4.0.0/lib
 OLD_DIRS+=usr/lib/clang/4.0.0
 OLD_FILES+=usr/bin/llvm-pdbdump
 # 20170717: Remove documentation of vaporware
 OLD_FILES+=usr/share/man/man2/pdwait4.2.gz
 # 20170610: chown-f_test replaced by chown_test
 OLD_FILES+=usr/tests/usr.sbin/chown/chown-f_test
 # 20170609: drop obsolete manpage link (if_rtwn.ko -> rtwn.ko)
 OLD_FILES+=usr/share/man/man4/if_rtwn.4.gz
 # 20170531: removal of groff
 OLD_FILES+=usr/bin/addftinfo
 OLD_FILES+=usr/bin/afmtodit
 OLD_FILES+=usr/bin/checknr
 OLD_FILES+=usr/bin/colcrt
 OLD_FILES+=usr/bin/eqn
 OLD_FILES+=usr/bin/grn
 OLD_FILES+=usr/bin/grodvi
 OLD_FILES+=usr/bin/groff
 OLD_FILES+=usr/bin/grog
 OLD_FILES+=usr/bin/grolbp
 OLD_FILES+=usr/bin/grolj4
 OLD_FILES+=usr/bin/grops
 OLD_FILES+=usr/bin/grotty
 OLD_FILES+=usr/bin/hpftodit
 OLD_FILES+=usr/bin/indxbib
 OLD_FILES+=usr/bin/lkbib
 OLD_FILES+=usr/bin/lookbib
 OLD_FILES+=usr/bin/mmroff
 OLD_FILES+=usr/bin/neqn
 OLD_FILES+=usr/bin/nroff
 OLD_FILES+=usr/bin/pfbtops
 OLD_FILES+=usr/bin/pic
 OLD_FILES+=usr/bin/post-grohtml
 OLD_FILES+=usr/bin/pre-grohtml
 OLD_FILES+=usr/bin/psroff
 OLD_FILES+=usr/bin/refer
 OLD_FILES+=usr/bin/tbl
 OLD_FILES+=usr/bin/tfmtodit
 OLD_FILES+=usr/bin/troff
 OLD_FILES+=usr/bin/vgrind
 OLD_FILES+=usr/libexec/vfontedpr
 OLD_FILES+=usr/share/dict/eign
 OLD_FILES+=usr/share/groff_font/devX100-12/CB
 OLD_FILES+=usr/share/groff_font/devX100-12/CBI
 OLD_FILES+=usr/share/groff_font/devX100-12/CI
 OLD_FILES+=usr/share/groff_font/devX100-12/CR
 OLD_FILES+=usr/share/groff_font/devX100-12/DESC
 OLD_FILES+=usr/share/groff_font/devX100-12/HB
 OLD_FILES+=usr/share/groff_font/devX100-12/HBI
 OLD_FILES+=usr/share/groff_font/devX100-12/HI
 OLD_FILES+=usr/share/groff_font/devX100-12/HR
 OLD_FILES+=usr/share/groff_font/devX100-12/NB
 OLD_FILES+=usr/share/groff_font/devX100-12/NBI
 OLD_FILES+=usr/share/groff_font/devX100-12/NI
 OLD_FILES+=usr/share/groff_font/devX100-12/NR
 OLD_FILES+=usr/share/groff_font/devX100-12/S
 OLD_FILES+=usr/share/groff_font/devX100-12/TB
 OLD_FILES+=usr/share/groff_font/devX100-12/TBI
 OLD_FILES+=usr/share/groff_font/devX100-12/TI
 OLD_FILES+=usr/share/groff_font/devX100-12/TR
 OLD_DIRS+=usr/share/groff_font/devX100-12
 OLD_FILES+=usr/share/groff_font/devX100/CB
 OLD_FILES+=usr/share/groff_font/devX100/CBI
 OLD_FILES+=usr/share/groff_font/devX100/CI
 OLD_FILES+=usr/share/groff_font/devX100/CR
 OLD_FILES+=usr/share/groff_font/devX100/DESC
 OLD_FILES+=usr/share/groff_font/devX100/HB
 OLD_FILES+=usr/share/groff_font/devX100/HBI
 OLD_FILES+=usr/share/groff_font/devX100/HI
 OLD_FILES+=usr/share/groff_font/devX100/HR
 OLD_FILES+=usr/share/groff_font/devX100/NB
 OLD_FILES+=usr/share/groff_font/devX100/NBI
 OLD_FILES+=usr/share/groff_font/devX100/NI
 OLD_FILES+=usr/share/groff_font/devX100/NR
 OLD_FILES+=usr/share/groff_font/devX100/S
 OLD_FILES+=usr/share/groff_font/devX100/TB
 OLD_FILES+=usr/share/groff_font/devX100/TBI
 OLD_FILES+=usr/share/groff_font/devX100/TI
 OLD_FILES+=usr/share/groff_font/devX100/TR
 OLD_DIRS+=usr/share/groff_font/devX100
 OLD_FILES+=usr/share/groff_font/devX75-12/CB
 OLD_FILES+=usr/share/groff_font/devX75-12/CBI
 OLD_FILES+=usr/share/groff_font/devX75-12/CI
 OLD_FILES+=usr/share/groff_font/devX75-12/CR
 OLD_FILES+=usr/share/groff_font/devX75-12/DESC
 OLD_FILES+=usr/share/groff_font/devX75-12/HB
 OLD_FILES+=usr/share/groff_font/devX75-12/HBI
 OLD_FILES+=usr/share/groff_font/devX75-12/HI
 OLD_FILES+=usr/share/groff_font/devX75-12/HR
 OLD_FILES+=usr/share/groff_font/devX75-12/NB
 OLD_FILES+=usr/share/groff_font/devX75-12/NBI
 OLD_FILES+=usr/share/groff_font/devX75-12/NI
 OLD_FILES+=usr/share/groff_font/devX75-12/NR
 OLD_FILES+=usr/share/groff_font/devX75-12/S
 OLD_FILES+=usr/share/groff_font/devX75-12/TB
 OLD_FILES+=usr/share/groff_font/devX75-12/TBI
 OLD_FILES+=usr/share/groff_font/devX75-12/TI
 OLD_FILES+=usr/share/groff_font/devX75-12/TR
 OLD_DIRS+=usr/share/groff_font/devX75-12
 OLD_FILES+=usr/share/groff_font/devX75/CB
 OLD_FILES+=usr/share/groff_font/devX75/CBI
 OLD_FILES+=usr/share/groff_font/devX75/CI
 OLD_FILES+=usr/share/groff_font/devX75/CR
 OLD_FILES+=usr/share/groff_font/devX75/DESC
 OLD_FILES+=usr/share/groff_font/devX75/HB
 OLD_FILES+=usr/share/groff_font/devX75/HBI
 OLD_FILES+=usr/share/groff_font/devX75/HI
 OLD_FILES+=usr/share/groff_font/devX75/HR
 OLD_FILES+=usr/share/groff_font/devX75/NB
 OLD_FILES+=usr/share/groff_font/devX75/NBI
 OLD_FILES+=usr/share/groff_font/devX75/NI
 OLD_FILES+=usr/share/groff_font/devX75/NR
 OLD_FILES+=usr/share/groff_font/devX75/S
 OLD_FILES+=usr/share/groff_font/devX75/TB
 OLD_FILES+=usr/share/groff_font/devX75/TBI
 OLD_FILES+=usr/share/groff_font/devX75/TI
 OLD_FILES+=usr/share/groff_font/devX75/TR
 OLD_DIRS+=usr/share/groff_font/devX75
 OLD_FILES+=usr/share/groff_font/devascii/B
 OLD_FILES+=usr/share/groff_font/devascii/BI
 OLD_FILES+=usr/share/groff_font/devascii/CW
 OLD_FILES+=usr/share/groff_font/devascii/DESC
 OLD_FILES+=usr/share/groff_font/devascii/I
 OLD_FILES+=usr/share/groff_font/devascii/L
 OLD_FILES+=usr/share/groff_font/devascii/R
 OLD_FILES+=usr/share/groff_font/devascii/S
 OLD_DIRS+=usr/share/groff_font/devascii
 OLD_FILES+=usr/share/groff_font/devcp1047/B
 OLD_FILES+=usr/share/groff_font/devcp1047/BI
 OLD_FILES+=usr/share/groff_font/devcp1047/CW
 OLD_FILES+=usr/share/groff_font/devcp1047/DESC
 OLD_FILES+=usr/share/groff_font/devcp1047/I
 OLD_FILES+=usr/share/groff_font/devcp1047/L
 OLD_FILES+=usr/share/groff_font/devcp1047/R
 OLD_FILES+=usr/share/groff_font/devcp1047/S
 OLD_DIRS+=usr/share/groff_font/devcp1047
 OLD_FILES+=usr/share/groff_font/devdvi/CW
 OLD_FILES+=usr/share/groff_font/devdvi/CWEC
 OLD_FILES+=usr/share/groff_font/devdvi/CWI
 OLD_FILES+=usr/share/groff_font/devdvi/CWIEC
 OLD_FILES+=usr/share/groff_font/devdvi/CWITC
 OLD_FILES+=usr/share/groff_font/devdvi/CWTC
 OLD_FILES+=usr/share/groff_font/devdvi/CompileFonts
 OLD_FILES+=usr/share/groff_font/devdvi/DESC
 OLD_FILES+=usr/share/groff_font/devdvi/EX
 OLD_FILES+=usr/share/groff_font/devdvi/HB
 OLD_FILES+=usr/share/groff_font/devdvi/HBEC
 OLD_FILES+=usr/share/groff_font/devdvi/HBI
 OLD_FILES+=usr/share/groff_font/devdvi/HBIEC
 OLD_FILES+=usr/share/groff_font/devdvi/HBITC
 OLD_FILES+=usr/share/groff_font/devdvi/HBTC
 OLD_FILES+=usr/share/groff_font/devdvi/HI
 OLD_FILES+=usr/share/groff_font/devdvi/HIEC
 OLD_FILES+=usr/share/groff_font/devdvi/HITC
 OLD_FILES+=usr/share/groff_font/devdvi/HR
 OLD_FILES+=usr/share/groff_font/devdvi/HREC
 OLD_FILES+=usr/share/groff_font/devdvi/HRTC
 OLD_FILES+=usr/share/groff_font/devdvi/MI
 OLD_FILES+=usr/share/groff_font/devdvi/Makefile
 OLD_FILES+=usr/share/groff_font/devdvi/S
 OLD_FILES+=usr/share/groff_font/devdvi/SA
 OLD_FILES+=usr/share/groff_font/devdvi/SB
 OLD_FILES+=usr/share/groff_font/devdvi/SC
 OLD_FILES+=usr/share/groff_font/devdvi/TB
 OLD_FILES+=usr/share/groff_font/devdvi/TBEC
 OLD_FILES+=usr/share/groff_font/devdvi/TBI
 OLD_FILES+=usr/share/groff_font/devdvi/TBIEC
 OLD_FILES+=usr/share/groff_font/devdvi/TBITC
 OLD_FILES+=usr/share/groff_font/devdvi/TBTC
 OLD_FILES+=usr/share/groff_font/devdvi/TI
 OLD_FILES+=usr/share/groff_font/devdvi/TIEC
 OLD_FILES+=usr/share/groff_font/devdvi/TITC
 OLD_FILES+=usr/share/groff_font/devdvi/TR
 OLD_FILES+=usr/share/groff_font/devdvi/TREC
 OLD_FILES+=usr/share/groff_font/devdvi/TRTC
 OLD_FILES+=usr/share/groff_font/devdvi/ec.map
 OLD_FILES+=usr/share/groff_font/devdvi/msam.map
 OLD_FILES+=usr/share/groff_font/devdvi/msbm.map
 OLD_FILES+=usr/share/groff_font/devdvi/tc.map
 OLD_FILES+=usr/share/groff_font/devdvi/texb.map
 OLD_FILES+=usr/share/groff_font/devdvi/texex.map
 OLD_FILES+=usr/share/groff_font/devdvi/texi.map
 OLD_FILES+=usr/share/groff_font/devdvi/texmi.map
 OLD_FILES+=usr/share/groff_font/devdvi/texr.map
 OLD_FILES+=usr/share/groff_font/devdvi/texsy.map
 OLD_FILES+=usr/share/groff_font/devdvi/textex.map
 OLD_FILES+=usr/share/groff_font/devdvi/textt.map
 OLD_DIRS+=usr/share/groff_font/devdvi
 OLD_FILES+=usr/share/groff_font/devhtml/B
 OLD_FILES+=usr/share/groff_font/devhtml/BI
 OLD_FILES+=usr/share/groff_font/devhtml/CB
 OLD_FILES+=usr/share/groff_font/devhtml/CBI
 OLD_FILES+=usr/share/groff_font/devhtml/CI
 OLD_FILES+=usr/share/groff_font/devhtml/CR
 OLD_FILES+=usr/share/groff_font/devhtml/DESC
 OLD_FILES+=usr/share/groff_font/devhtml/I
 OLD_FILES+=usr/share/groff_font/devhtml/R
 OLD_FILES+=usr/share/groff_font/devhtml/S
 OLD_DIRS+=usr/share/groff_font/devhtml
 OLD_FILES+=usr/share/groff_font/devkoi8-r/B
 OLD_FILES+=usr/share/groff_font/devkoi8-r/BI
 OLD_FILES+=usr/share/groff_font/devkoi8-r/CW
 OLD_FILES+=usr/share/groff_font/devkoi8-r/DESC
 OLD_FILES+=usr/share/groff_font/devkoi8-r/I
 OLD_FILES+=usr/share/groff_font/devkoi8-r/L
 OLD_FILES+=usr/share/groff_font/devkoi8-r/R
 OLD_FILES+=usr/share/groff_font/devkoi8-r/S
 OLD_DIRS+=usr/share/groff_font/devkoi8-r
 OLD_FILES+=usr/share/groff_font/devlatin1/B
 OLD_FILES+=usr/share/groff_font/devlatin1/BI
 OLD_FILES+=usr/share/groff_font/devlatin1/CW
 OLD_FILES+=usr/share/groff_font/devlatin1/DESC
 OLD_FILES+=usr/share/groff_font/devlatin1/I
 OLD_FILES+=usr/share/groff_font/devlatin1/L
 OLD_FILES+=usr/share/groff_font/devlatin1/R
 OLD_FILES+=usr/share/groff_font/devlatin1/S
 OLD_DIRS+=usr/share/groff_font/devlatin1
 OLD_FILES+=usr/share/groff_font/devlbp/CB
 OLD_FILES+=usr/share/groff_font/devlbp/CI
 OLD_FILES+=usr/share/groff_font/devlbp/CR
 OLD_FILES+=usr/share/groff_font/devlbp/DESC
 OLD_FILES+=usr/share/groff_font/devlbp/EB
 OLD_FILES+=usr/share/groff_font/devlbp/EI
 OLD_FILES+=usr/share/groff_font/devlbp/ER
 OLD_FILES+=usr/share/groff_font/devlbp/HB
 OLD_FILES+=usr/share/groff_font/devlbp/HBI
 OLD_FILES+=usr/share/groff_font/devlbp/HI
 OLD_FILES+=usr/share/groff_font/devlbp/HNB
 OLD_FILES+=usr/share/groff_font/devlbp/HNBI
 OLD_FILES+=usr/share/groff_font/devlbp/HNI
 OLD_FILES+=usr/share/groff_font/devlbp/HNR
 OLD_FILES+=usr/share/groff_font/devlbp/HR
 OLD_FILES+=usr/share/groff_font/devlbp/TB
 OLD_FILES+=usr/share/groff_font/devlbp/TBI
 OLD_FILES+=usr/share/groff_font/devlbp/TI
 OLD_FILES+=usr/share/groff_font/devlbp/TR
 OLD_DIRS+=usr/share/groff_font/devlbp
 OLD_FILES+=usr/share/groff_font/devlj4/AB
 OLD_FILES+=usr/share/groff_font/devlj4/ABI
 OLD_FILES+=usr/share/groff_font/devlj4/AI
 OLD_FILES+=usr/share/groff_font/devlj4/ALBB
 OLD_FILES+=usr/share/groff_font/devlj4/ALBR
 OLD_FILES+=usr/share/groff_font/devlj4/AOB
 OLD_FILES+=usr/share/groff_font/devlj4/AOI
 OLD_FILES+=usr/share/groff_font/devlj4/AOR
 OLD_FILES+=usr/share/groff_font/devlj4/AR
 OLD_FILES+=usr/share/groff_font/devlj4/CB
 OLD_FILES+=usr/share/groff_font/devlj4/CBI
 OLD_FILES+=usr/share/groff_font/devlj4/CI
 OLD_FILES+=usr/share/groff_font/devlj4/CLARENDON
 OLD_FILES+=usr/share/groff_font/devlj4/CORONET
 OLD_FILES+=usr/share/groff_font/devlj4/CR
 OLD_FILES+=usr/share/groff_font/devlj4/DESC
 OLD_FILES+=usr/share/groff_font/devlj4/GB
 OLD_FILES+=usr/share/groff_font/devlj4/GBI
 OLD_FILES+=usr/share/groff_font/devlj4/GI
 OLD_FILES+=usr/share/groff_font/devlj4/GR
 OLD_FILES+=usr/share/groff_font/devlj4/LGB
 OLD_FILES+=usr/share/groff_font/devlj4/LGI
 OLD_FILES+=usr/share/groff_font/devlj4/LGR
 OLD_FILES+=usr/share/groff_font/devlj4/MARIGOLD
 OLD_FILES+=usr/share/groff_font/devlj4/OB
 OLD_FILES+=usr/share/groff_font/devlj4/OBI
 OLD_FILES+=usr/share/groff_font/devlj4/OI
 OLD_FILES+=usr/share/groff_font/devlj4/OR
 OLD_FILES+=usr/share/groff_font/devlj4/S
 OLD_FILES+=usr/share/groff_font/devlj4/SYMBOL
 OLD_FILES+=usr/share/groff_font/devlj4/TB
 OLD_FILES+=usr/share/groff_font/devlj4/TBI
 OLD_FILES+=usr/share/groff_font/devlj4/TI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRB
 OLD_FILES+=usr/share/groff_font/devlj4/TNRBI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRI
 OLD_FILES+=usr/share/groff_font/devlj4/TNRR
 OLD_FILES+=usr/share/groff_font/devlj4/TR
 OLD_FILES+=usr/share/groff_font/devlj4/UB
 OLD_FILES+=usr/share/groff_font/devlj4/UBI
 OLD_FILES+=usr/share/groff_font/devlj4/UCB
 OLD_FILES+=usr/share/groff_font/devlj4/UCBI
 OLD_FILES+=usr/share/groff_font/devlj4/UCI
 OLD_FILES+=usr/share/groff_font/devlj4/UCR
 OLD_FILES+=usr/share/groff_font/devlj4/UI
 OLD_FILES+=usr/share/groff_font/devlj4/UR
 OLD_FILES+=usr/share/groff_font/devlj4/WINGDINGS
 OLD_DIRS+=usr/share/groff_font/devlj4
 OLD_FILES+=usr/share/groff_font/devps/AB
 OLD_FILES+=usr/share/groff_font/devps/ABI
 OLD_FILES+=usr/share/groff_font/devps/AI
 OLD_FILES+=usr/share/groff_font/devps/AR
 OLD_FILES+=usr/share/groff_font/devps/BMB
 OLD_FILES+=usr/share/groff_font/devps/BMBI
 OLD_FILES+=usr/share/groff_font/devps/BMI
 OLD_FILES+=usr/share/groff_font/devps/BMR
 OLD_FILES+=usr/share/groff_font/devps/CB
 OLD_FILES+=usr/share/groff_font/devps/CBI
 OLD_FILES+=usr/share/groff_font/devps/CI
 OLD_FILES+=usr/share/groff_font/devps/CR
 OLD_FILES+=usr/share/groff_font/devps/DESC
 OLD_FILES+=usr/share/groff_font/devps/EURO
 OLD_FILES+=usr/share/groff_font/devps/HB
 OLD_FILES+=usr/share/groff_font/devps/HBI
 OLD_FILES+=usr/share/groff_font/devps/HI
 OLD_FILES+=usr/share/groff_font/devps/HNB
 OLD_FILES+=usr/share/groff_font/devps/HNBI
 OLD_FILES+=usr/share/groff_font/devps/HNI
 OLD_FILES+=usr/share/groff_font/devps/HNR
 OLD_FILES+=usr/share/groff_font/devps/HR
 OLD_FILES+=usr/share/groff_font/devps/Makefile
 OLD_FILES+=usr/share/groff_font/devps/NB
 OLD_FILES+=usr/share/groff_font/devps/NBI
 OLD_FILES+=usr/share/groff_font/devps/NI
 OLD_FILES+=usr/share/groff_font/devps/NR
 OLD_FILES+=usr/share/groff_font/devps/PB
 OLD_FILES+=usr/share/groff_font/devps/PBI
 OLD_FILES+=usr/share/groff_font/devps/PI
 OLD_FILES+=usr/share/groff_font/devps/PR
 OLD_FILES+=usr/share/groff_font/devps/S
 OLD_FILES+=usr/share/groff_font/devps/SS
 OLD_FILES+=usr/share/groff_font/devps/TB
 OLD_FILES+=usr/share/groff_font/devps/TBI
 OLD_FILES+=usr/share/groff_font/devps/TI
 OLD_FILES+=usr/share/groff_font/devps/TR
 OLD_FILES+=usr/share/groff_font/devps/ZCMI
 OLD_FILES+=usr/share/groff_font/devps/ZD
 OLD_FILES+=usr/share/groff_font/devps/ZDR
 OLD_FILES+=usr/share/groff_font/devps/afmname
 OLD_FILES+=usr/share/groff_font/devps/dingbats.map
 OLD_FILES+=usr/share/groff_font/devps/dingbats.rmap
 OLD_FILES+=usr/share/groff_font/devps/download
 OLD_FILES+=usr/share/groff_font/devps/freeeuro.pfa
 OLD_FILES+=usr/share/groff_font/devps/lgreekmap
 OLD_FILES+=usr/share/groff_font/devps/prologue
 OLD_FILES+=usr/share/groff_font/devps/symbol.sed
 OLD_FILES+=usr/share/groff_font/devps/symbolchars
 OLD_FILES+=usr/share/groff_font/devps/symbolsl.afm
 OLD_FILES+=usr/share/groff_font/devps/symbolsl.pfa
 OLD_FILES+=usr/share/groff_font/devps/text.enc
 OLD_FILES+=usr/share/groff_font/devps/textmap
 OLD_FILES+=usr/share/groff_font/devps/zapfdr.pfa
 OLD_DIRS+=usr/share/groff_font/devps
 OLD_FILES+=usr/share/groff_font/devutf8/B
 OLD_FILES+=usr/share/groff_font/devutf8/BI
 OLD_FILES+=usr/share/groff_font/devutf8/CW
 OLD_FILES+=usr/share/groff_font/devutf8/DESC
 OLD_FILES+=usr/share/groff_font/devutf8/I
 OLD_FILES+=usr/share/groff_font/devutf8/L
 OLD_FILES+=usr/share/groff_font/devutf8/R
 OLD_FILES+=usr/share/groff_font/devutf8/S
 OLD_DIRS+=usr/share/groff_font/devutf8
 OLD_DIRS+=usr/share/groff_font
 OLD_FILES+=usr/share/man/man1/addftinfo.1.gz
 OLD_FILES+=usr/share/man/man1/afmtodit.1.gz
 OLD_FILES+=usr/share/man/man1/checknr.1.gz
 OLD_FILES+=usr/share/man/man1/colcrt.1.gz
 OLD_FILES+=usr/share/man/man1/eqn.1.gz
 OLD_FILES+=usr/share/man/man1/grn.1.gz
 OLD_FILES+=usr/share/man/man1/grodvi.1.gz
 OLD_FILES+=usr/share/man/man1/groff.1.gz
 OLD_FILES+=usr/share/man/man1/grog.1.gz
 OLD_FILES+=usr/share/man/man1/grolbp.1.gz
 OLD_FILES+=usr/share/man/man1/grolj4.1.gz
 OLD_FILES+=usr/share/man/man1/grops.1.gz
 OLD_FILES+=usr/share/man/man1/grotty.1.gz
 OLD_FILES+=usr/share/man/man1/hpftodit.1.gz
 OLD_FILES+=usr/share/man/man1/indxbib.1.gz
 OLD_FILES+=usr/share/man/man1/lkbib.1.gz
 OLD_FILES+=usr/share/man/man1/lookbib.1.gz
 OLD_FILES+=usr/share/man/man1/mmroff.1.gz
 OLD_FILES+=usr/share/man/man1/neqn.1.gz
 OLD_FILES+=usr/share/man/man1/nroff.1.gz
 OLD_FILES+=usr/share/man/man1/pfbtops.1.gz
 OLD_FILES+=usr/share/man/man1/pic.1.gz
 OLD_FILES+=usr/share/man/man1/psroff.1.gz
 OLD_FILES+=usr/share/man/man1/refer.1.gz
 OLD_FILES+=usr/share/man/man1/tbl.1.gz
 OLD_FILES+=usr/share/man/man1/tfmtodit.1.gz
 OLD_FILES+=usr/share/man/man1/troff.1.gz
 OLD_FILES+=usr/share/man/man1/vgrind.1.gz
 OLD_FILES+=usr/share/man/man5/groff_font.5.gz
 OLD_FILES+=usr/share/man/man5/groff_out.5.gz
 OLD_FILES+=usr/share/man/man5/groff_tmac.5.gz
 OLD_FILES+=usr/share/man/man5/lj4_font.5.gz
 OLD_FILES+=usr/share/man/man5/tmac.5.gz
 OLD_FILES+=usr/share/man/man5/vgrindefs.5.gz
 OLD_FILES+=usr/share/man/man7/ditroff.7.gz
 OLD_FILES+=usr/share/man/man7/groff.7.gz
 OLD_FILES+=usr/share/man/man7/groff_char.7.gz
 OLD_FILES+=usr/share/man/man7/groff_diff.7.gz
 OLD_FILES+=usr/share/man/man7/groff_man.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mdoc.7.gz
 OLD_FILES+=usr/share/man/man7/groff_me.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mm.7.gz
 OLD_FILES+=usr/share/man/man7/groff_mmse.7.gz
 OLD_FILES+=usr/share/man/man7/groff_ms.7.gz
 OLD_FILES+=usr/share/man/man7/groff_trace.7.gz
 OLD_FILES+=usr/share/man/man7/groff_www.7.gz
 OLD_FILES+=usr/share/man/man7/mdoc.samples.7.gz
 OLD_FILES+=usr/share/man/man7/me.7.gz
 OLD_FILES+=usr/share/man/man7/mm.7.gz
 OLD_FILES+=usr/share/man/man7/mmse.7.gz
 OLD_FILES+=usr/share/man/man7/ms.7.gz
 OLD_FILES+=usr/share/man/man7/orig_me.7.gz
 OLD_FILES+=usr/share/me/acm.me
 OLD_FILES+=usr/share/me/chars.me
 OLD_FILES+=usr/share/me/deltext.me
 OLD_FILES+=usr/share/me/eqn.me
 OLD_FILES+=usr/share/me/float.me
 OLD_FILES+=usr/share/me/footnote.me
 OLD_FILES+=usr/share/me/index.me
 OLD_FILES+=usr/share/me/letterhead.me
 OLD_FILES+=usr/share/me/local.me
 OLD_FILES+=usr/share/me/null.me
 OLD_FILES+=usr/share/me/refer.me
 OLD_FILES+=usr/share/me/revisions
 OLD_FILES+=usr/share/me/sh.me
 OLD_FILES+=usr/share/me/tbl.me
 OLD_FILES+=usr/share/me/thesis.me
 OLD_DIRS+=usr/share/me
 OLD_FILES+=usr/share/misc/vgrindefs
 OLD_FILES+=usr/share/misc/vgrindefs.db
 OLD_FILES+=usr/share/tmac/X.tmac
 OLD_FILES+=usr/share/tmac/Xps.tmac
 OLD_FILES+=usr/share/tmac/a4.tmac
 OLD_FILES+=usr/share/tmac/an-old.tmac
 OLD_FILES+=usr/share/tmac/an.tmac
 OLD_FILES+=usr/share/tmac/andoc.tmac
 OLD_FILES+=usr/share/tmac/composite.tmac
 OLD_FILES+=usr/share/tmac/cp1047.tmac
 OLD_FILES+=usr/share/tmac/devtag.tmac
 OLD_FILES+=usr/share/tmac/doc.tmac
 OLD_FILES+=usr/share/tmac/dvi.tmac
 OLD_FILES+=usr/share/tmac/e.tmac
 OLD_FILES+=usr/share/tmac/ec.tmac
 OLD_FILES+=usr/share/tmac/eqnrc
 OLD_FILES+=usr/share/tmac/europs.tmac
 OLD_FILES+=usr/share/tmac/html-end.tmac
 OLD_FILES+=usr/share/tmac/html.tmac
 OLD_FILES+=usr/share/tmac/hyphen.ru
 OLD_FILES+=usr/share/tmac/hyphen.us
 OLD_FILES+=usr/share/tmac/hyphenex.us
 OLD_FILES+=usr/share/tmac/koi8-r.tmac
 OLD_FILES+=usr/share/tmac/latin1.tmac
 OLD_FILES+=usr/share/tmac/latin2.tmac
 OLD_FILES+=usr/share/tmac/latin9.tmac
 OLD_FILES+=usr/share/tmac/lbp.tmac
 OLD_FILES+=usr/share/tmac/lj4.tmac
 OLD_FILES+=usr/share/tmac/m.tmac
 OLD_FILES+=usr/share/tmac/man.local
 OLD_FILES+=usr/share/tmac/man.tmac
 OLD_FILES+=usr/share/tmac/mandoc.tmac
 OLD_FILES+=usr/share/tmac/mdoc.local
 OLD_FILES+=usr/share/tmac/mdoc.tmac
 OLD_FILES+=usr/share/tmac/mdoc/doc-common
 OLD_FILES+=usr/share/tmac/mdoc/doc-ditroff
 OLD_FILES+=usr/share/tmac/mdoc/doc-nroff
 OLD_FILES+=usr/share/tmac/mdoc/doc-syms
 OLD_FILES+=usr/share/tmac/mdoc/fr.ISO8859-1
 OLD_FILES+=usr/share/tmac/mdoc/ru.KOI8-R
 OLD_DIRS+=usr/share/tmac/mdoc
 OLD_FILES+=usr/share/tmac/me.tmac
 OLD_FILES+=usr/share/tmac/mm/0.MT
 OLD_FILES+=usr/share/tmac/mm/4.MT
 OLD_FILES+=usr/share/tmac/mm/5.MT
 OLD_FILES+=usr/share/tmac/mm/locale
 OLD_FILES+=usr/share/tmac/mm/mm.tmac
 OLD_FILES+=usr/share/tmac/mm/mmse.tmac
 OLD_FILES+=usr/share/tmac/mm/ms.cov
 OLD_FILES+=usr/share/tmac/mm/se_locale
 OLD_FILES+=usr/share/tmac/mm/se_ms.cov
 OLD_DIRS+=usr/share/tmac/mm
 OLD_FILES+=usr/share/tmac/ms.tmac
 OLD_FILES+=usr/share/tmac/mse.tmac
 OLD_FILES+=usr/share/tmac/papersize.tmac
 OLD_FILES+=usr/share/tmac/pic.tmac
 OLD_FILES+=usr/share/tmac/ps.tmac
 OLD_FILES+=usr/share/tmac/psatk.tmac
 OLD_FILES+=usr/share/tmac/psold.tmac
 OLD_FILES+=usr/share/tmac/pspic.tmac
 OLD_FILES+=usr/share/tmac/s.tmac
 OLD_FILES+=usr/share/tmac/safer.tmac
 OLD_FILES+=usr/share/tmac/tmac.orig_me
 OLD_FILES+=usr/share/tmac/tmac.vgrind
 OLD_FILES+=usr/share/tmac/trace.tmac
 OLD_FILES+=usr/share/tmac/troffrc
 OLD_FILES+=usr/share/tmac/troffrc-end
 OLD_FILES+=usr/share/tmac/tty-char.tmac
 OLD_FILES+=usr/share/tmac/tty.tmac
 OLD_FILES+=usr/share/tmac/unicode.tmac
 OLD_FILES+=usr/share/tmac/www.tmac
 OLD_DIRS+=usr/share/tmac
 # 20170607: remove incorrect atf_check(1) manpage link
 OLD_FILES+=usr/share/man/man1/atf_check.1.gz
 # 20170601: remove stale manpage
 OLD_FILES+=usr/share/man/man2/cap_rights_get.2.gz
 # 20170601: old libifconfig and libifc
 OLD_FILES+=usr/lib/libifc.a
 OLD_FILES+=usr/lib/libifc_p.a
 OLD_FILES+=usr/lib/libifconfig.a
 OLD_FILES+=usr/lib/libifconfig_p.a
 # 20170529: mount.conf(8) -> mount.conf(5)
 OLD_FILES+=usr/share/man/man8/mount.conf.8.gz
 # 20170525: remove misleading template
 OLD_FILES+=usr/share/misc/man.template
 # 20170525: disconnect the roff docs from the build
 OLD_FILES+=usr/share/doc/papers/beyond43.ascii.gz
 OLD_FILES+=usr/share/doc/papers/bio.ascii.gz
 OLD_FILES+=usr/share/doc/papers/contents.ascii.gz
 OLD_FILES+=usr/share/doc/papers/devfs.ascii.gz
 OLD_FILES+=usr/share/doc/papers/diskperf.ascii.gz
 OLD_FILES+=usr/share/doc/papers/fsinterface.ascii.gz
 OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/jail.ascii.gz
 OLD_FILES+=usr/share/doc/papers/kernmalloc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/kerntune.ascii.gz
 OLD_FILES+=usr/share/doc/papers/malloc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/newvm.ascii.gz
 OLD_FILES+=usr/share/doc/papers/releng.ascii.gz
 OLD_FILES+=usr/share/doc/papers/sysperf.ascii.gz
 OLD_FILES+=usr/share/doc/papers/timecounter.ascii.gz
 OLD_DIRS+=usr/share/doc/papers
 OLD_FILES+=usr/share/doc/psd/01.cacm/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/01.cacm
 OLD_FILES+=usr/share/doc/psd/02.implement/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/02.implement
 OLD_FILES+=usr/share/doc/psd/03.iosys/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/03.iosys
 OLD_FILES+=usr/share/doc/psd/04.uprog/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/04.uprog
 OLD_FILES+=usr/share/doc/psd/05.sysman/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/05.sysman
 OLD_FILES+=usr/share/doc/psd/06.Clang/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/06.Clang
 OLD_FILES+=usr/share/doc/psd/12.make/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/12.make
 OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/13.rcs
 OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/13.rcs
 OLD_FILES+=usr/share/doc/psd/15.yacc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/15.yacc
 OLD_FILES+=usr/share/doc/psd/16.lex/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/16.lex
 OLD_FILES+=usr/share/doc/psd/17.m4/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/17.m4
 OLD_FILES+=usr/share/doc/psd/18.gprof/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/18.gprof
 OLD_FILES+=usr/share/doc/psd/20.ipctut/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/20.ipctut
 OLD_FILES+=usr/share/doc/psd/21.ipc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/21.ipc
 OLD_FILES+=usr/share/doc/psd/22.rpcgen/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/22.rpcgen
 OLD_FILES+=usr/share/doc/psd/23.rpc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/23.rpc
 OLD_FILES+=usr/share/doc/psd/24.xdr/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/24.xdr
 OLD_FILES+=usr/share/doc/psd/25.xdrrfc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/25.xdrrfc
 OLD_FILES+=usr/share/doc/psd/26.rpcrfc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/26.rpcrfc
 OLD_FILES+=usr/share/doc/psd/27.nfsrfc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/27.nfsrfc
 OLD_FILES+=usr/share/doc/psd/Title.ascii.gz
 OLD_FILES+=usr/share/doc/psd/contents.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/
 OLD_FILES+=usr/share/doc/smm/01.setup/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/01.setup
 OLD_FILES+=usr/share/doc/smm/02.config/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/02.config
 OLD_FILES+=usr/share/doc/smm/03.fsck/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/03.fsck
 OLD_FILES+=usr/share/doc/smm/04.quotas/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/04.quotas
 OLD_FILES+=usr/share/doc/smm/05.fastfs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/05.fastfs
 OLD_FILES+=usr/share/doc/smm/06.nfs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/06.nfs
 OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/07.lpd
 OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/08.sendmailop
 OLD_FILES+=usr/share/doc/smm/11.timedop/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/11.timedop
 OLD_FILES+=usr/share/doc/smm/12.timed/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/12.timed
 OLD_FILES+=usr/share/doc/smm/18.net/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/18.net
 OLD_FILES+=usr/share/doc/smm/Title.ascii.gz
 OLD_FILES+=usr/share/doc/smm/contents.ascii.gz
 OLD_DIRS+=usr/share/doc/smm
 OLD_FILES+=usr/share/doc/usd/04.csh/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/04.csh
 OLD_FILES+=usr/share/doc/usd/05.dc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/05.dc
 OLD_FILES+=usr/share/doc/usd/06.bc/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/06.bc
 OLD_FILES+=usr/share/doc/usd/07.mail/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/07.mail
 OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/10.exref
 OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/11.edit
 OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz
 OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz
 OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/12.vi
 OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/13.viref
 OLD_FILES+=usr/share/doc/usd/18.msdiffs/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/18.msdiffs
 OLD_FILES+=usr/share/doc/usd/19.memacros/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/19.memacros
 OLD_FILES+=usr/share/doc/usd/20.meref/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/20.meref
 OLD_FILES+=usr/share/doc/usd/21.troff/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/21.troff
 OLD_FILES+=usr/share/doc/usd/22.trofftut/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/usd/22.trofftut
 OLD_FILES+=usr/share/doc/usd/Title.ascii.gz
 OLD_FILES+=usr/share/doc/usd/contents.ascii.gz
 OLD_DIRS+=usr/share/doc/usd
 # 20170523: 64-bit inode support, library version bumps
 OLD_LIBS+=lib/libzfs.so.2
 OLD_LIBS+=usr/lib/libarchive.so.6
 OLD_LIBS+=usr/lib/libmilter.so.5
 # 20170427: NATM configuration support removed
 OLD_FILES+=etc/rc.d/atm1
 OLD_FILES+=etc/rc.d/atm2
 OLD_FILES+=etc/rc.d/atm3
 OLD_FILES+=usr/share/man/man8/rc.atm.8.gz
 # 20170426: UMA_ZONE_REFCNT removed
 OLD_FILES+=usr/share/man/man9/uma_find_refcnt.9.gz
 # 20170424: NATM support removed
 OLD_FILES+=rescue/atmconfig
 OLD_FILES+=sbin/atmconfig
 OLD_FILES+=usr/include/bsnmp/snmp_atm.h
 OLD_FILES+=usr/include/dev/utopia/idtphy.h
 OLD_FILES+=usr/include/dev/utopia/suni.h
 OLD_FILES+=usr/include/dev/utopia/utopia.h
 OLD_FILES+=usr/include/dev/utopia/utopia_priv.h
 OLD_DIRS+=usr/include/dev/utopia
 OLD_FILES+=usr/include/net/if_atm.h
 OLD_FILES+=usr/include/netgraph/atm/ng_atm.h
 OLD_FILES+=usr/include/netinet/if_atm.h
 OLD_FILES+=usr/include/netnatm/natm.h
 OLD_FILES+=usr/lib/snmp_atm.so
 OLD_LIBS+=usr/lib/snmp_atm.so.6
 OLD_FILES+=usr/share/doc/atm/atmconfig.help
 OLD_FILES+=usr/share/doc/atm/atmconfig_device.help
 OLD_DIRS+=usr/share/doc/atm
 OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz
 OLD_FILES+=usr/share/man/man4/en.4.gz
 OLD_FILES+=usr/share/man/man4/fatm.4.gz
 OLD_FILES+=usr/share/man/man4/hatm.4.gz
 OLD_FILES+=usr/share/man/man4/if_en.4.gz
 OLD_FILES+=usr/share/man/man4/if_fatm.4.gz
 OLD_FILES+=usr/share/man/man4/if_hatm.4.gz
 OLD_FILES+=usr/share/man/man4/if_patm.4.gz
 OLD_FILES+=usr/share/man/man4/natm.4.gz
 OLD_FILES+=usr/share/man/man4/natmip.4.gz
 OLD_FILES+=usr/share/man/man4/ng_atm.4.gz
 OLD_FILES+=usr/share/man/man4/patm.4.gz
 OLD_FILES+=usr/share/man/man4/utopia.4.gz
 OLD_FILES+=usr/share/man/man8/atmconfig.8.gz
 OLD_FILES+=usr/share/man/man9/utopia.9.gz
 OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def
 OLD_FILES+=usr/share/snmp/defs/atm_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt
 # 20170420: remove GNU diff
 OLD_FILES+=usr/share/man/man7/diff.7.gz
 # 20170322: rename <x> to <x>_test to match the FreeBSD test suite name scheme
 OLD_FILES+=usr/tests/usr.bin/col/col
 OLD_FILES+=usr/tests/usr.bin/diff/diff
 OLD_FILES+=usr/tests/usr.bin/ident/ident
 OLD_FILES+=usr/tests/usr.bin/mkimg/mkimg
 OLD_FILES+=usr/tests/usr.bin/sdiff/sdiff
 OLD_FILES+=usr/tests/usr.bin/soelim/soelim
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_config
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_etcdir
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupadd
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupdel
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupmod
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_lock
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_useradd
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_userdel
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_usermod
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_usernext
 # 20170319: io_test requires zh_TW.Big5 locale
 OLD_FILES+=usr/tests/lib/libc/locale/io_test
 # 20170319: remove nls for non supported Big5* locales
 OLD_DIRS+=usr/share/nls/zh_HK.Big5HKSCS
 OLD_DIRS+=usr/share/nls/zh_TW.Big5
 # 20170313: move .../sys/geom/eli/... to .../sys/geom/class/eli/...
 OLD_FILES+=usr/tests/sys/geom/eli/pbkdf2/pbkdf2
 OLD_FILES+=usr/tests/sys/geom/eli/pbkdf2/Kyuafile
 OLD_FILES+=usr/tests/sys/geom/eli/Kyuafile
 OLD_DIRS+=usr/tests/sys/geom/eli/pbkdf2
 OLD_DIRS+=usr/tests/sys/geom/eli
 # 20170313: sbin/ipftest and ipresend temporarily disconnected
 OLD_FILES+=sbin/ipftest
 OLD_FILES+=sbin/ipresend
 OLD_FILES+=usr/share/man/man1/ipftest.1.gz
 OLD_FILES+=usr/share/man/man1/ipresend.1.gz
 # 20170311: Remove WITHOUT_MANDOCDB option
 OLD_FILES+=usr/share/man/man1/makewhatis.1.gz
 # 20170308: rename some tests
 OLD_FILES+=usr/tests/bin/pwait/pwait
 OLD_FILES+=usr/tests/usr.bin/timeout/timeout
 # 20170307: remove pcap-int.h
 OLD_FILES+=usr/include/pcap-int.h
 # 20170302: new libc++ import which bumps version from 3.9.1 to 4.0.0
 OLD_FILES+=usr/include/c++/v1/__undef___deallocate
 OLD_FILES+=usr/include/c++/v1/tr1/__undef___deallocate
 # 20170302: new clang import which bumps version from 3.9.1 to 4.0.0
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.9.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.9.1/include/msa.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/3.9.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.9.1/include
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.9.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.9.1/lib
 OLD_DIRS+=usr/lib/clang/3.9.1
 # 20170226: SVR4 compatibility removed
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/streams.4
 OLD_FILES+=usr/share/man/man4/svr4.4
 .endif
 # 20170219: OpenPAM RADULA upgrade removed the libpam tests
 OLD_FILES+=usr/tests/lib/libpam/Kyuafile
 OLD_FILES+=usr/tests/lib/libpam/t_openpam_ctype
 OLD_FILES+=usr/tests/lib/libpam/t_openpam_readlinev
 OLD_FILES+=usr/tests/lib/libpam/t_openpam_readword
 OLD_DIRS+=usr/test/lib/libpam
 # 20170216: remove ahb(4)
 OLD_FILES+=usr/share/man/man4/ahb.4.gz
 # 20170216: remove fea(4)
 OLD_FILES+=usr/share/man/man4/fea.4.gz
 # 20170206: remove bdes(1)
 OLD_FILES+=usr/bin/bdes
 OLD_FILES+=usr/share/man/man1/bdes.1.gz
 # 20170206: merged projects/ipsec
 OLD_FILES+=usr/include/netinet/ip_ipsec.h
 OLD_FILES+=usr/include/netinet6/ip6_ipsec.h
 # 20170128: remove pc98 support
 OLD_FILES+=usr/include/dev/ic/i8251.h
 OLD_FILES+=usr/include/dev/ic/i8255.h
 OLD_FILES+=usr/include/dev/ic/rsa.h
 OLD_FILES+=usr/include/dev/ic/wd33c93reg.h
 OLD_FILES+=usr/include/sys/disk/pc98.h
 OLD_FILES+=usr/include/sys/diskpc98.h
 OLD_FILES+=usr/share/man/man4/i386/ct.4.gz
 OLD_FILES+=usr/share/man/man4/i386/snc.4.gz
 OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.kbd
 OLD_FILES+=usr/share/vt/keymaps/jp.pc98.iso.kbd
 OLD_FILES+=usr/share/vt/keymaps/jp.pc98.kbd
 # 20170110: Four files from ggate tests consolidated into one
 OLD_FILES+=usr/tests/sys/geom/class/gate/1_test
 OLD_FILES+=usr/tests/sys/geom/class/gate/2_test
 OLD_FILES+=usr/tests/sys/geom/class/gate/3_test
 OLD_FILES+=usr/tests/sys/geom/class/gate/conf.sh
 # 20170103: libbsnmptools.so made into an INTERNALLIB
 OLD_FILES+=usr/lib/libbsnmptools.a
 OLD_FILES+=usr/lib/libbsnmptools_p.a
 OLD_LIBS+=usr/lib/libbsnmptools.so.0
 OLD_FILES+=usr/lib/libbsnmptools.so
 # 20170102: sysdecode_getfsstat_flags() renamed to sysdecode_getfsstat_mode()
 OLD_FILES+=usr/share/man/man3/sysdecode_getfsstat_flags.3.gz
 # 20161230: libarchive ACL pax test renamed to test_acl_pax_posix1e.tar.uu
 OLD_FILES+=usr/tests/lib/libarchive/test_acl_pax.tar.uu
 # 20161229: Three files from gnop tests consolidated into one
 OLD_FILES+=usr/tests/sys/geom/class/nop/1_test
 OLD_FILES+=usr/tests/sys/geom/class/nop/2_test
 OLD_FILES+=usr/tests/sys/geom/class/nop/conf.sh
 # 20161217: new clang import which bumps version from 3.9.0 to 3.9.1
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/esan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.9.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.9.0/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/3.9.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.9.0/include
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.9.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.9.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.9.0/lib
 OLD_DIRS+=usr/lib/clang/3.9.0
 # 20161205: libproc version bump
 OLD_LIBS+=usr/lib/libproc.so.3
 # 20161127: Remove vm_page_cache(9)
 OLD_FILES+=usr/share/man/man9/vm_page_cache.9.gz
 # 20161124: new clang import which bumps version from 3.8.0 to 3.9.0
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.8.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.8.0/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.8.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/3.8.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.8.0/include
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.8.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.8.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.8.0/lib
 OLD_DIRS+=usr/lib/clang/3.8.0
 # 20161121: Hyper-V manuals only apply to amd64 and i386
 .if ${TARGET_ARCH} != "amd64" && ${TARGET_ARCH} != "i386"
 OLD_FILES+=usr/share/man/man4/hv_kvp.4.gz
 OLD_FILES+=usr/share/man/man4/hv_netvsc.4.gz
 OLD_FILES+=usr/share/man/man4/hv_storvsc.4.gz
 OLD_FILES+=usr/share/man/man4/hv_utils.4.gz
 OLD_FILES+=usr/share/man/man4/hv_vmbus.4.gz
 OLD_FILES+=usr/share/man/man4/hv_vss.4.gz
 .endif
 # 20161118: Remove hv_ata_pci_disengage(4)
 OLD_FILES+=usr/share/man/man4/hv_ata_pci_disengage.4.gz
 # 20161017: urtwn(4) was merged into rtwn(4)
 OLD_FILES+=usr/share/man/man4/if_urtwn.4.gz
 OLD_FILES+=usr/share/man/man4/urtwn.4.gz
 OLD_FILES+=usr/share/man/man4/urtwnfw.4.gz
 # 20161015: Remove GNU rcs
 OLD_FILES+=usr/bin/ci
 OLD_FILES+=usr/bin/co
 OLD_FILES+=usr/bin/merge
 OLD_FILES+=usr/bin/rcs
 OLD_FILES+=usr/bin/rcsclean
 OLD_FILES+=usr/bin/rcsdiff
 OLD_FILES+=usr/bin/rcsfreeze
 OLD_FILES+=usr/bin/rcsmerge
 OLD_FILES+=usr/bin/rlog
 OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz
 OLD_DIRS+=usr/share/doc/psd/13.rcs
 OLD_FILES+=usr/share/man/man1/ci.1.gz
 OLD_FILES+=usr/share/man/man1/co.1.gz
 OLD_FILES+=usr/share/man/man1/merge.1.gz
 OLD_FILES+=usr/share/man/man1/rcs.1.gz
 OLD_FILES+=usr/share/man/man1/rcsclean.1.gz
 OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz
 OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz
 OLD_FILES+=usr/share/man/man1/rcsintro.1.gz
 OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz
 OLD_FILES+=usr/share/man/man1/rlog.1.gz
 OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
 # 20161010: remove link to removed m_getclr(9) macro
 OLD_FILES+=usr/share/man/man9/m_getclr.9.gz
 # 20161003: MK_ELFCOPY_AS_OBJCOPY option retired
 OLD_FILES+=usr/bin/elfcopy
 OLD_FILES+=usr/share/man/man1/elfcopy.1.gz
 # 20160906: libkqueue tests moved to /usr/tests/sys/kqueue/libkqueue
 OLD_FILES+=usr/tests/sys/kqueue/kqtest
 OLD_FILES+=usr/tests/sys/kqueue/kqueue_test
 # 20160903: idle page zeroing support removed
 OLD_FILES+=usr/share/man/man9/pmap_zero_idle.9.gz
 # 20160901: Remove digi(4)
 OLD_FILES+=usr/share/man/man4/digi.4.gz
 # 20160819: Remove ie(4)
 OLD_FILES+=usr/share/man/man4/i386/ie.4.gz
 # 20160819: Remove spic(4)
 OLD_FILES+=usr/share/man/man4/spic.4.gz
 # 20160819: Remove wl(4) and wlconfig(8)
 OLD_FILES+=usr/share/man/man4/i386/wl.4.gz
 OLD_FILES+=usr/sbin/wlconfig
 OLD_FILES+=usr/share/man/man8/i386/wlconfig.8.gz
 # 20160819: Remove si(4) and sicontrol(8)
 OLD_FILES+=usr/share/man/man4/si.4.gz
 OLD_FILES+=usr/sbin/sicontrol
 OLD_FILES+=usr/share/man/man8/sicontrol.8.gz
 # 20160819: Remove scd(4)
 OLD_FILES+=usr/share/man/man4/scd.4.gz
 # 20160815: Remove mcd(4)
 OLD_FILES+=usr/share/man/man4/mcd.4.gz
 # 20160805: lockmgr_waiters(9) removed
 OLD_FILES+=usr/share/man/man9/lockmgr_waiters.9.gz
 # 20160703: POSIXify locales with variants
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_TW.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_TW.UTF-8
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_TW.Big5/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_TW.Big5
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_HK.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_HK.UTF-8
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.eucCN/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.eucCN
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.UTF-8
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GBK/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.GBK
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB2312/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB2312
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hans_CN.GB18030/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hans_CN.GB18030
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Latn_RS.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Latn_RS.UTF-8
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Latn_RS.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Latn_RS.ISO8859-2
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Cyrl_RS.UTF-8
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_Cyrl_RS.ISO8859-5/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_Cyrl_RS.ISO8859-5
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/mn_Cyrl_MN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/mn_Cyrl_MN.UTF-8
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/kk_Cyrl_KZ.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/kk_Cyrl_KZ.UTF-8
 # 20160608: removed pam_verbose_error
 OLD_LIBS+=usr/lib/libpam.so.5
 OLD_LIBS+=usr/lib/pam_chroot.so.5
 OLD_LIBS+=usr/lib/pam_deny.so.5
 OLD_LIBS+=usr/lib/pam_echo.so.5
 OLD_LIBS+=usr/lib/pam_exec.so.5
 OLD_LIBS+=usr/lib/pam_ftpusers.so.5
 OLD_LIBS+=usr/lib/pam_group.so.5
 OLD_LIBS+=usr/lib/pam_guest.so.5
 OLD_LIBS+=usr/lib/pam_krb5.so.5
 OLD_LIBS+=usr/lib/pam_ksu.so.5
 OLD_LIBS+=usr/lib/pam_lastlog.so.5
 OLD_LIBS+=usr/lib/pam_login_access.so.5
 OLD_LIBS+=usr/lib/pam_nologin.so.5
 OLD_LIBS+=usr/lib/pam_opie.so.5
 OLD_LIBS+=usr/lib/pam_opieaccess.so.5
 OLD_LIBS+=usr/lib/pam_passwdqc.so.5
 OLD_LIBS+=usr/lib/pam_permit.so.5
 OLD_LIBS+=usr/lib/pam_radius.so.5
 OLD_LIBS+=usr/lib/pam_rhosts.so.5
 OLD_LIBS+=usr/lib/pam_rootok.so.5
 OLD_LIBS+=usr/lib/pam_securetty.so.5
 OLD_LIBS+=usr/lib/pam_self.so.5
 OLD_LIBS+=usr/lib/pam_ssh.so.5
 OLD_LIBS+=usr/lib/pam_tacplus.so.5
 OLD_LIBS+=usr/lib/pam_unix.so.5
 # 20160523: remove extranous ALTQ files
 OLD_FILES+=usr/include/altq/altq_codel.h
 OLD_FILES+=usr/include/altq/altq_fairq.h
 # 20160519: remove DTrace Toolkit from base
 OLD_FILES+=usr/sbin/dtruss
 OLD_FILES+=usr/share/dtrace/toolkit/execsnoop
 OLD_FILES+=usr/share/dtrace/toolkit/hotkernel
 OLD_FILES+=usr/share/dtrace/toolkit/hotuser
 OLD_FILES+=usr/share/dtrace/toolkit/opensnoop
 OLD_FILES+=usr/share/dtrace/toolkit/procsystime
 OLD_DIRS+=usr/share/dtrace/toolkit
 OLD_FILES+=usr/share/man/man1/dtruss.1.gz
 # 20160519: stale MLINK removed
 OLD_FILES+=usr/share/man/man9/rman_await_resource.9.gz
 # 20160517: ReiserFS removed
 OLD_FILES+=usr/share/man/man5/reiserfs.5.gz
 # 20160504: tests rework
 OLD_FILES+=usr/tests/lib/libc/regex/data/README
 # 20160430: kvm_getfiles(3) removed from kvm(3)
 OLD_LIBS+=lib/libkvm.so.6
 OLD_FILES+=usr/share/man/man3/kvm_getfiles.3.gz
 # 20160423: remove mroute6d
 OLD_FILES+=etc/rc.d/mroute6d
 # 20160419: rename units.lib -> definitions.units
 OLD_FILES+=usr/share/misc/units.lib
 # 20160419: remove Big5HKSCS locales
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_HK.Big5HKSCS/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_HK.Big5HKSCS
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_Hant_HK.Big5HKSCS/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_Hant_HK.Big5HKSCS
 # 20160317: rman_res_t size bump to uintmax_t
 OLD_LIBS+=usr/lib/libdevinfo.so.5
 # 20160305: new clang import which bumps version from 3.7.1 to 3.8.0
 OLD_FILES+=usr/bin/macho-dump
 OLD_FILES+=usr/bin/tblgen
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.7.1/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.7.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.7.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.7.1/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.7.1/include
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.1/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.7.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.7.1/lib
 OLD_DIRS+=usr/lib/clang/3.7.1
 OLD_FILES+=usr/share/man/man1/tblgen.1.gz
 # 20160301: Remove taskqueue_enqueue_fast
 OLD_FILES+=usr/share/man/man9/taskqueue_enqueue_fast.9.gz
 # 20160225: Remove casperd and libcapsicum
 OLD_FILES+=sbin/casperd
 OLD_FILES+=etc/rc.d/casperd
 OLD_FILES+=usr/share/man/man8/casperd.8.gz
 OLD_FILES+=usr/include/libcapsicum.h
 OLD_FILES+=usr/include/libcapsicum_service.h
 OLD_FILES+=usr/include/libcapsicum.h
 OLD_FILES+=usr/share/man/man3/libcapsicum.3.gz
 OLD_FILES+=usr/include/libcapsicum_dns.h
 OLD_FILES+=usr/include/libcapsicum_grp.h
 OLD_FILES+=usr/include/libcapsicum_impl.h
 OLD_FILES+=usr/include/libcapsicum_pwd.h
 OLD_FILES+=usr/include/libcapsicum_random.h
 OLD_FILES+=usr/include/libcapsicum_sysctl.h
 OLD_FILES+=libexec/casper/dns
 OLD_FILES+=libexec/casper/grp
 OLD_FILES+=libexec/casper/pwd
 OLD_FILES+=libexec/casper/random
 OLD_FILES+=libexec/casper/sysctl
 OLD_FILES+=libexec/casper/.debug/random.debug
 OLD_FILES+=libexec/casper/.debug/dns.debug
 OLD_FILES+=libexec/casper/.debug/sysctl.debug
 OLD_FILES+=libexec/casper/.debug/pwd.debug
 OLD_FILES+=libexec/casper/.debug/grp.debug
 OLD_DIRS+=libexec/casper/.debug
 OLD_DIRS+=libexec/casper
 OLD_FILES+=usr/lib/libcapsicum.a
 OLD_FILES+=usr/lib/libcapsicum.so
 OLD_LIBS+=lib/libcapsicum.so.0
 OLD_FILES+=usr/lib/libcapsicum_p.a
 # 20160223: functionality from mkulzma(1) merged into mkuzip(1)
 OLD_FILES+=usr/bin/mkulzma
 OLD_FILES+=usr/share/man/man4/geom_uncompress.4.gz
 OLD_FILES+=usr/share/man/man8/mkulzma.8.gz
 # 20160211: Remove obsolete unbound-control-setup
 OLD_FILES+=usr/sbin/unbound-control-setup
 # 20160121: cc.h moved
 OLD_FILES+=usr/include/netinet/cc.h
 # 20160116: Update mandoc to cvs snapshot 20160116
 OLD_FILES+=usr/share/mdocml/example.style.css
 OLD_FILES+=usr/share/mdocml/style.css
 OLD_DIRS+=usr/share/mdocml
 # 20160114: SA-16:06.snmpd
 OLD_FILES+=usr/share/examples/etc/snmpd.config
 # 20160107: GNU ld installed as ld.bfd and linked as ld
 OLD_FILES+=usr/lib/debug/usr/bin/ld.debug
 # 20151225: new clang import which bumps version from 3.7.0 to 3.7.1
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/tsan_interface_atomic.h
 OLD_DIRS+=usr/lib/clang/3.7.0/include/sanitizer
 OLD_FILES+=usr/lib/clang/3.7.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.7.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/vadefs.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/3.7.0/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/3.7.0/include
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.7.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.7.0/lib
 OLD_DIRS+=usr/lib/clang/3.7.0
 # 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406)
 MOVED_LIBS+=usr/lib/libelf.so.2
 # 20151115: Fox bad upgrade scheme
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/zh_Hans_CN.GB18030
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/zh_Hans_CN.GB2312
 OLD_FILES+=usr/share/locale/zh_CN.GBK/zh_Hans_CN.GBK
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/zh_Hans_CN.UTF-8
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/zh_Hans_CN.eucCN
 OLD_FILES+=usr/share/locale/zh_TW.Big5/zh_Hant_TW.Big5
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/zh_Hant_TW.UTF-8
 # 20151107: String collation improvements
 OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE
 OLD_DIRS+=usr/share/locale/UTF-8
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MONETARY
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_NUMERIC
 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_TIME
 OLD_DIRS+=usr/share/locale/kk_KZ.PT154/
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-1
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-13/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-13/LC_CTYPE
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-13
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-15
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-2
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.ISO8859-4
 OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/la_LN.US-ASCII
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_TIME
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_COLLATE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_MONETARY
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_CTYPE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-4/LC_NUMERIC
 OLD_DIRS+=usr/share/locale/lt_LT.ISO8859-4
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/no_NO.ISO8859-1
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/no_NO.ISO8859-15
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/no_NO.UTF-8
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_TIME
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-2/LC_MONETARY
 OLD_DIRS+=usr/share/locale/sr_YU.ISO8859-2
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_TIME
 OLD_FILES+=usr/share/locale/sr_YU.ISO8859-5/LC_MESSAGES
 OLD_DIRS+=usr/share/locale/sr_YU.ISO8859-5
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_TIME
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_YU.UTF-8/LC_MESSAGES
 OLD_DIRS+=usr/share/locale/sr_YU.UTF-8
 # 20151101: added missing _test suffix on multiple tests in lib/libc
 OLD_FILES+=usr/tests/lib/libc/c063/faccessat
 OLD_FILES+=usr/tests/lib/libc/c063/fchmodat
 OLD_FILES+=usr/tests/lib/libc/c063/fchownat
 OLD_FILES+=usr/tests/lib/libc/c063/fexecve
 OLD_FILES+=usr/tests/lib/libc/c063/fstatat
 OLD_FILES+=usr/tests/lib/libc/c063/linkat
 OLD_FILES+=usr/tests/lib/libc/c063/mkdirat
 OLD_FILES+=usr/tests/lib/libc/c063/mkfifoat
 OLD_FILES+=usr/tests/lib/libc/c063/mknodat
 OLD_FILES+=usr/tests/lib/libc/c063/openat
 OLD_FILES+=usr/tests/lib/libc/c063/readlinkat
 OLD_FILES+=usr/tests/lib/libc/c063/renameat
 OLD_FILES+=usr/tests/lib/libc/c063/symlinkat
 OLD_FILES+=usr/tests/lib/libc/c063/unlinkat
 OLD_FILES+=usr/tests/lib/libc/c063/utimensat
 OLD_FILES+=usr/tests/lib/libc/string/memchr
 OLD_FILES+=usr/tests/lib/libc/string/memcpy
 OLD_FILES+=usr/tests/lib/libc/string/memmem
 OLD_FILES+=usr/tests/lib/libc/string/memset
 OLD_FILES+=usr/tests/lib/libc/string/strcat
 OLD_FILES+=usr/tests/lib/libc/string/strchr
 OLD_FILES+=usr/tests/lib/libc/string/strcmp
 OLD_FILES+=usr/tests/lib/libc/string/strcpy
 OLD_FILES+=usr/tests/lib/libc/string/strcspn
 OLD_FILES+=usr/tests/lib/libc/string/strerror
 OLD_FILES+=usr/tests/lib/libc/string/strlen
 OLD_FILES+=usr/tests/lib/libc/string/strpbrk
 OLD_FILES+=usr/tests/lib/libc/string/strrchr
 OLD_FILES+=usr/tests/lib/libc/string/strspn
 OLD_FILES+=usr/tests/lib/libc/string/swab
 # 20151101: 430.status-rwho was renamed to 430.status-uptime
 OLD_FILES+=etc/periodic/daily/430.status-rwho
 # 20151030: OpenSSL 1.0.2d import
 OLD_FILES+=usr/share/openssl/man/man3/CMS_set1_signer_certs.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_ctrl.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_ctrl_str.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/d2i_509_CRL_fp.3.gz
 OLD_LIBS+=lib/libcrypto.so.7
 OLD_LIBS+=usr/lib/libssl.so.7
 # 20151029: LinuxKPI moved to sys/compat/linuxkpi
 OLD_FILES+=usr/include/dev/usb/usb_compat_linux.h
 # 20151015: test symbols moved to /usr/lib/debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c++/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/atf_c++_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/build_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/check_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/config_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/macros_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/tests_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/.debug/utils_test.debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c++/detail/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/application_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/env_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/exceptions_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/fs_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/process_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/sanity_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/text_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/.debug/version_helper.debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/atf_c_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/build_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/check_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/config_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/error_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/macros_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/tc_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/tp_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/.debug/utils_test.debug
 OLD_DIRS+=usr/tests/lib/atf/libatf-c/detail/.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/dynstr_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/env_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/fs_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/list_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/map_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/process_helpers.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/process_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/sanity_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/text_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/user_test.debug
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/.debug/version_helper.debug
 OLD_DIRS+=usr/tests/lib/atf/test-programs/.debug
 OLD_FILES+=usr/tests/lib/atf/test-programs/.debug/c_helpers.debug
 OLD_FILES+=usr/tests/lib/atf/test-programs/.debug/cpp_helpers.debug
 OLD_DIRS+=usr/tests/lib/libc/c063/.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/faccessat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fchmodat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fchownat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fexecve.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/fstatat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/linkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/mkdirat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/mkfifoat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/mknodat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/openat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/readlinkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/renameat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/symlinkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/unlinkat.debug
 OLD_FILES+=usr/tests/lib/libc/c063/.debug/utimensat.debug
 OLD_DIRS+=usr/tests/lib/libc/db/.debug
 OLD_FILES+=usr/tests/lib/libc/db/.debug/h_db.debug
 OLD_DIRS+=usr/tests/lib/libc/gen/.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/alarm_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/arc4random_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/assert_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/basedirname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/dir_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/floatunditf_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fnmatch_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpclassify2_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpclassify_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpsetmask_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/fpsetround_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/ftok_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/getcwd_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/getgrent_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/glob_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/humanize_number_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/isnan_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/nice_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/pause_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/raise_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/realpath_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/setdomainname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/sethostname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/sleep_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/syslog_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/time_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/ttyname_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/.debug/vis_test.debug
 OLD_DIRS+=usr/tests/lib/libc/gen/execve/.debug
 OLD_FILES+=usr/tests/lib/libc/gen/execve/.debug/execve_test.debug
 OLD_DIRS+=usr/tests/lib/libc/gen/posix_spawn/.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/fileactions_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_fileactions.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_spawn.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/h_spawnattr.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/spawn_test.debug
 OLD_FILES+=usr/tests/lib/libc/gen/posix_spawn/.debug/spawnattr_test.debug
 OLD_DIRS+=usr/tests/lib/libc/hash/.debug
 OLD_FILES+=usr/tests/lib/libc/hash/.debug/h_hash.debug
 OLD_FILES+=usr/tests/lib/libc/hash/.debug/sha2_test.debug
 OLD_DIRS+=usr/tests/lib/libc/inet/.debug
 OLD_FILES+=usr/tests/lib/libc/inet/.debug/inet_network_test.debug
 OLD_DIRS+=usr/tests/lib/libc/locale/.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/io_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbrtowc_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbsnrtowcs_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbstowcs_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/mbtowc_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcscspn_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcspbrk_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcsspn_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wcstod_test.debug
 OLD_FILES+=usr/tests/lib/libc/locale/.debug/wctomb_test.debug
 OLD_DIRS+=usr/tests/lib/libc/net/.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/ether_aton_test.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/getprotoent_test.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_dns_server.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_nsd_recurse.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_protoent.debug
 OLD_FILES+=usr/tests/lib/libc/net/.debug/h_servent.debug
 OLD_DIRS+=usr/tests/lib/libc/regex/.debug
 OLD_FILES+=usr/tests/lib/libc/regex/.debug/exhaust_test.debug
 OLD_FILES+=usr/tests/lib/libc/regex/.debug/h_regex.debug
 OLD_FILES+=usr/tests/lib/libc/regex/.debug/regex_att_test.debug
 OLD_DIRS+=usr/tests/lib/libc/ssp/.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_fgets.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_getcwd.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_gets.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memcpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memmove.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_memset.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_raw.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_read.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_readlink.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_snprintf.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_sprintf.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_stpcpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_stpncpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strcat.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strcpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strncat.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_strncpy.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_vsnprintf.debug
 OLD_FILES+=usr/tests/lib/libc/ssp/.debug/h_vsprintf.debug
 OLD_DIRS+=usr/tests/lib/libc/stdio/.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/clearerr_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fflush_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fmemopen2_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fmemopen_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fopen_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/fputc_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/mktemp_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/popen_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/printf_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdio/.debug/scanf_test.debug
 OLD_DIRS+=usr/tests/lib/libc/stdlib/.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/abs_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/atoi_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/div_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/exit_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/getenv_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/h_getopt.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/h_getopt_long.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/hsearch_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/posix_memalign_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/random_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/strtod_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/strtol_test.debug
 OLD_FILES+=usr/tests/lib/libc/stdlib/.debug/system_test.debug
 OLD_DIRS+=usr/tests/lib/libc/string/.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memchr.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memcpy.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memmem.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/memset.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcat.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strchr.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcmp.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcpy.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strcspn.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strerror.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strlen.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strpbrk.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strrchr.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/strspn.debug
 OLD_FILES+=usr/tests/lib/libc/string/.debug/swab.debug
 OLD_DIRS+=usr/tests/lib/libc/sys/.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/access_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/chroot_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/clock_gettime_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/connect_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/dup_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/fsync_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getcontext_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getgroups_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getitimer_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getlogin_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getpid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getrusage_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/getsid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/gettimeofday_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/issetugid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/kevent_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/kill_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/link_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/listen_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mincore_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mkdir_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mkfifo_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mknod_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mlock_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mmap_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/mprotect_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgctl_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgget_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgrcv_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msgsnd_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/msync_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/nanosleep_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/pipe2_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/pipe_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/poll_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/revoke_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/select_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/setrlimit_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/setuid_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigaction_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigqueue_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/sigtimedwait_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/socketpair_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/stat_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/timer_create_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/truncate_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/ucontext_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/umask_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/unlink_test.debug
 OLD_FILES+=usr/tests/lib/libc/sys/.debug/write_test.debug
 OLD_DIRS+=usr/tests/lib/libc/termios/.debug
 OLD_FILES+=usr/tests/lib/libc/termios/.debug/tcsetpgrp_test.debug
 OLD_DIRS+=usr/tests/lib/libc/tls/.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/h_tls_dlopen.so.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/libh_tls_dynamic.so.1.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/tls_dlopen_test.debug
 OLD_FILES+=usr/tests/lib/libc/tls/.debug/tls_dynamic_test.debug
 OLD_DIRS+=usr/tests/lib/libc/ttyio/.debug
 OLD_FILES+=usr/tests/lib/libc/ttyio/.debug/ttyio_test.debug
 OLD_DIRS+=usr/tests/lib/libcrypt/.debug
 OLD_FILES+=usr/tests/lib/libcrypt/.debug/crypt_tests.debug
 OLD_DIRS+=usr/tests/lib/libmp/.debug
 OLD_FILES+=usr/tests/lib/libmp/.debug/legacy_test.debug
 OLD_DIRS+=usr/tests/lib/libnv/.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/dnv_tests.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nv_array_tests.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nv_tests.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_add_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_exists_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_free_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_get_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_move_test.debug
 OLD_FILES+=usr/tests/lib/libnv/.debug/nvlist_send_recv_test.debug
 OLD_DIRS+=usr/tests/lib/libpam/.debug
 OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_ctype.debug
 OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_readlinev.debug
 OLD_FILES+=usr/tests/lib/libpam/.debug/t_openpam_readword.debug
 OLD_DIRS+=usr/tests/lib/libproc/.debug
 OLD_FILES+=usr/tests/lib/libproc/.debug/proc_test.debug
 OLD_FILES+=usr/tests/lib/libproc/.debug/target_prog.debug
 OLD_DIRS+=usr/tests/lib/librt/.debug
 OLD_FILES+=usr/tests/lib/librt/.debug/sched_test.debug
 OLD_FILES+=usr/tests/lib/librt/.debug/sem_test.debug
 OLD_DIRS+=usr/tests/lib/libthr/.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/barrier_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/cond_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/condwait_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/detach_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/equal_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/fork_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/fpu_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_atexit.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_cancel.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_exit.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/h_resolv.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/join_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/kill_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/mutex_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/once_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/preempt_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/rwlock_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sem_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/siglongjmp_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sigmask_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sigsuspend_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/sleep_test.debug
 OLD_FILES+=usr/tests/lib/libthr/.debug/swapcontext_test.debug
 OLD_DIRS+=usr/tests/lib/libthr/dlopen/.debug
 OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/dlopen_test.debug
 OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/h_pthread_dlopen.so.1.debug
 OLD_FILES+=usr/tests/lib/libthr/dlopen/.debug/main_pthread_create_test.debug
 OLD_DIRS+=usr/tests/lib/libutil/.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/flopen_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/grp_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/humanize_number_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/pidfile_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/trimdomain-nodomain_test.debug
 OLD_FILES+=usr/tests/lib/libutil/.debug/trimdomain_test.debug
 OLD_DIRS+=usr/tests/lib/libxo/.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/libenc_test.so.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_01.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_02.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_03.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_04.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_05.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_06.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_07.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_08.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_09.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_10.debug
 OLD_FILES+=usr/tests/lib/libxo/.debug/test_11.debug
 OLD_DIRS+=usr/tests/lib/msun/.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/acos_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/asin_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/atan_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/cbrt_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/ceil_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/cos_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/cosh_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/erf_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/exp_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/fmod_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/infinity_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/ldexp_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/log_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/pow_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/precision_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/round_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/scalbn_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/sin_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/sinh_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/sqrt_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/tan_test.debug
 OLD_FILES+=usr/tests/lib/msun/.debug/tanh_test.debug
 OLD_DIRS+=usr/tests/libexec/rtld-elf/.debug
 OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/ld_library_pathfds.debug
 OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/libpythagoras.so.0.debug
 OLD_FILES+=usr/tests/libexec/rtld-elf/.debug/target.debug
 OLD_DIRS+=usr/tests/sbin/devd/.debug
 OLD_FILES+=usr/tests/sbin/devd/.debug/client_test.debug
 OLD_DIRS+=usr/tests/sbin/dhclient/.debug
 OLD_FILES+=usr/tests/sbin/dhclient/.debug/option-domain-search_test.debug
 OLD_DIRS+=usr/tests/share/examples/tests/atf/.debug
 OLD_FILES+=usr/tests/share/examples/tests/atf/.debug/printf_test.debug
 OLD_DIRS+=usr/tests/share/examples/tests/plain/.debug
 OLD_FILES+=usr/tests/share/examples/tests/plain/.debug/printf_test.debug
 OLD_DIRS+=usr/tests/sys/aio/.debug
 OLD_FILES+=usr/tests/sys/aio/.debug/aio_kqueue_test.debug
 OLD_FILES+=usr/tests/sys/aio/.debug/aio_test.debug
 OLD_FILES+=usr/tests/sys/aio/.debug/lio_kqueue_test.debug
 OLD_DIRS+=usr/tests/sys/fifo/.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_create.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_io.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_misc.debug
 OLD_FILES+=usr/tests/sys/fifo/.debug/fifo_open.debug
 OLD_DIRS+=usr/tests/sys/file/.debug
 OLD_FILES+=usr/tests/sys/file/.debug/closefrom_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/dup_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/fcntlflags_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/flock_helper.debug
 OLD_FILES+=usr/tests/sys/file/.debug/ftruncate_test.debug
 OLD_FILES+=usr/tests/sys/file/.debug/newfileops_on_fork_test.debug
 OLD_DIRS+=usr/tests/sys/kern/.debug
 OLD_FILES+=usr/tests/sys/kern/.debug/kern_descrip_test.debug
 OLD_FILES+=usr/tests/sys/kern/.debug/ptrace_test.debug
 OLD_FILES+=usr/tests/sys/kern/.debug/unix_seqpacket_test.debug
 OLD_DIRS+=usr/tests/sys/kern/execve/.debug
 OLD_FILES+=usr/tests/sys/kern/execve/.debug/execve_helper.debug
 OLD_FILES+=usr/tests/sys/kern/execve/.debug/good_aout.debug
 OLD_DIRS+=usr/tests/sys/kqueue/.debug
 OLD_FILES+=usr/tests/sys/kqueue/.debug/kqtest.debug
 OLD_DIRS+=usr/tests/sys/mqueue/.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest1.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest2.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest3.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest4.debug
 OLD_FILES+=usr/tests/sys/mqueue/.debug/mqtest5.debug
 OLD_DIRS+=usr/tests/sys/netinet/.debug
 OLD_FILES+=usr/tests/sys/netinet/.debug/udp_dontroute.debug
 OLD_DIRS+=usr/tests/sys/pjdfstest/.debug
 OLD_FILES+=usr/tests/sys/pjdfstest/.debug/pjdfstest.debug
 OLD_DIRS+=usr/tests/sys/vm/.debug
 OLD_FILES+=usr/tests/sys/vm/.debug/mmap_test.debug
 # 20151015: Rename files due to file-installed-as-dir bug
 OLD_FILES+=usr/share/doc/legal/realtek
 OLD_FILES+=usr/share/doc/legal/realtek/LICENSE
 OLD_DIRS+=usr/share/doc/legal/realtek
 OLD_DIRS+=usr/share/doc/legal/intel_ipw
 OLD_FILES+=usr/share/doc/legal/intel_ipw/LICENSE
 OLD_FILES+=usr/share/doc/legal/intel_iwn
 OLD_FILES+=usr/share/doc/legal/intel_iwn/LICENSE
 OLD_DIRS+=usr/share/doc/legal/intel_iwn
 OLD_DIRS+=usr/share/doc/legal/intel_iwi
 OLD_FILES+=usr/share/doc/legal/intel_iwi/LICENSE
 OLD_DIRS+=usr/share/doc/legal/intel_wpi
 OLD_FILES+=usr/share/doc/legal/intel_wpi/LICENSE
 # 20151006: new libc++ import
 OLD_FILES+=usr/include/c++/__tuple_03
 OLD_FILES+=usr/include/c++/v1/__tuple_03
 OLD_FILES+=usr/include/c++/v1/tr1/__tuple_03
 # 20151006: new clang import which bumps version from 3.6.1 to 3.7.0
 OLD_FILES+=usr/lib/clang/3.6.1/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.6.1/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.1/include/xopintrin.h
 OLD_DIRS+=usr/lib/clang/3.6.1/include
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.1/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.6.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.6.1/lib
 OLD_DIRS+=usr/lib/clang/3.6.1
 # 20150928: unused sgsmsg utility is removed
 OLD_FILES+=usr/bin/sgsmsg
 # 20150926: remove links to removed/unimplemented mbuf(9) macros
 OLD_FILES+=usr/share/man/man9/MEXT_ADD_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MEXTFREE.9.gz
 OLD_FILES+=usr/share/man/man9/MEXT_IS_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MEXT_REM_REF.9.gz
 OLD_FILES+=usr/share/man/man9/MFREE.9.gz
 # 20150818: *allocm() are gone in jemalloc 4.0.0
 OLD_FILES+=usr/share/man/man3/allocm.3.gz
 OLD_FILES+=usr/share/man/man3/dallocm.3.gz
 OLD_FILES+=usr/share/man/man3/nallocm.3.gz
 OLD_FILES+=usr/share/man/man3/rallocm.3.gz
 OLD_FILES+=usr/share/man/man3/sallocm.3.gz
 # 20150802: Remove netbsd's test on pw(8)
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_test
 # 20150719: Remove libarchive.pc
 OLD_FILES+=usr/libdata/pkgconfig/libarchive.pc
 # 20150705: Rename DTrace provider man pages
 OLD_FILES+=usr/share/man/man4/dtrace-io.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-ip.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-proc.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-sched.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-tcp.4.gz
 OLD_FILES+=usr/share/man/man4/dtrace-udp.4.gz
 # 20150704: nvlist private headers no longer installed
 OLD_FILES+=usr/include/sys/nv_impl.h
 OLD_FILES+=usr/include/sys/nvlist_impl.h
 OLD_FILES+=usr/include/sys/nvpair_impl.h
 # 20150624
 OLD_LIBS+=usr/lib/libugidfw.so.4
 # 20150604: Move nvlist man pages to section 9
 OLD_FILES+=usr/share/man/man3/libnv.3.gz
 OLD_FILES+=usr/share/man/man3/nv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_stringf.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_add_stringv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_clone.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_create.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_dump.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_empty.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_error.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_exists_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_fdump.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_flags.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_free_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_parent.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_get_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_move_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_next.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_pack.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_recv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_send.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_set_error.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_size.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_take_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_unpack.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_xfer.3.gz
 # 20150702: Remove duplicated nvlist includes
 OLD_FILES+=usr/include/dnv.h
 OLD_FILES+=usr/include/nv.h
 # 20150528: PCI IOV device driver methods moved to a separate kobj interface
 OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9.gz
 OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9.gz
 OLD_FILES+=usr/share/man/man9/PCI_UNINIT_IOV.9.gz
 # 20150525: new clang import which bumps version from 3.6.0 to 3.6.1
 OLD_FILES+=usr/lib/clang/3.6.0/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/altivec.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/cpuid.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/immintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/module.modulemap
 OLD_FILES+=usr/lib/clang/3.6.0/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/3.6.0/include/xopintrin.h
 OLD_DIRS+=usr/lib/clang/3.6.0/include
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.6.0/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.6.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.6.0/lib
 OLD_DIRS+=usr/lib/clang/3.6.0
 # 20150521
 OLD_FILES+=usr/bin/demandoc
 OLD_FILES+=usr/share/man/man1/demandoc.1.gz
 OLD_FILES+=usr/share/man/man3/mandoc.3.gz
 OLD_FILES+=usr/share/man/man3/mandoc_headers.3.gz
 # 20150520
 OLD_FILES+=usr/lib/libheimsqlite.a
 OLD_FILES+=usr/lib/libheimsqlite.so
 OLD_LIBS+=usr/lib/libheimsqlite.so.11
 OLD_FILES+=usr/lib/libheimsqlite_p.a
 # 20150506
 OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz
 # 20150504
 OLD_FILES+=usr/share/examples/etc/libmap32.conf
 OLD_FILES+=usr/include/bsdstat.h
 OLD_DIRS+=usr/lib32/private
 OLD_LIBS+=usr/lib/private/libatf-c++.so.2
 OLD_LIBS+=usr/lib/private/libbsdstat.so.1
 OLD_LIBS+=usr/lib/private/libheimipcs.so.11
 OLD_LIBS+=usr/lib/private/libsqlite3.so.0
 OLD_LIBS+=usr/lib/private/libunbound.so.5
 OLD_LIBS+=usr/lib/private/libatf-c.so.1
 OLD_LIBS+=usr/lib/private/libheimipcc.so.11
 OLD_LIBS+=usr/lib/private/libldns.so.5
 OLD_LIBS+=usr/lib/private/libssh.so.5
 OLD_LIBS+=usr/lib/private/libucl.so.1
 OLD_DIRS+=usr/lib/private
 # 20150501
 OLD_FILES+=usr/bin/soeliminate
 OLD_FILES+=usr/share/man/man1/soeliminate.1.gz
 # 20150501: Remove the nvlist_.*[vf] functions manpages
 OLD_FILES+=usr/share/man/man3/nvlist_addf_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addf_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_addv_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsf_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_existsv_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freef_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_null.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_freev_type.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getf_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_getv_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movef_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_movev_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takef_string.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_binary.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_bool.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_number.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_nvlist.3.gz
 OLD_FILES+=usr/share/man/man3/nvlist_takev_string.3.gz
 # 20150429: remove never written documentation
 OLD_FILES+=usr/share/doc/papers/hwpmc.ascii.gz
 # 20150427: test/sys/kern/mmap_test moved to test/sys/vm/mmap_test
 OLD_FILES+=usr/tests/sys/kern/mmap_test
 # 20150422: zlib.c moved from net to libkern
 OLD_FILES+=usr/include/net/zlib.h
 OLD_FILES+=usr/include/net/zutil.h
 # 20150418
 OLD_FILES+=sbin/mount_oldnfs
 OLD_FILES+=usr/share/man/man8/mount_oldnfs.8.gz
 # 20150416: ALTQ moved to net/altq
 OLD_FILES+=usr/include/altq/altq_rmclass_debug.h
 OLD_FILES+=usr/include/altq/altq.h
 OLD_FILES+=usr/include/altq/altq_cdnr.h
 OLD_FILES+=usr/include/altq/altq_hfsc.h
 OLD_FILES+=usr/include/altq/altq_priq.h
 OLD_FILES+=usr/include/altq/altqconf.h
 OLD_FILES+=usr/include/altq/altq_classq.h
 OLD_FILES+=usr/include/altq/altq_red.h
 OLD_FILES+=usr/include/altq/if_altq.h
 OLD_FILES+=usr/include/altq/altq_var.h
 OLD_FILES+=usr/include/altq/altq_rmclass.h
 OLD_FILES+=usr/include/altq/altq_cbq.h
 OLD_FILES+=usr/include/altq/altq_rio.h
 OLD_DIRS+=usr/include/altq
 # 20150330: ntp 4.2.8p1
 OLD_FILES+=usr/share/doc/ntp/driver1.html
 OLD_FILES+=usr/share/doc/ntp/driver10.html
 OLD_FILES+=usr/share/doc/ntp/driver11.html
 OLD_FILES+=usr/share/doc/ntp/driver12.html
 OLD_FILES+=usr/share/doc/ntp/driver16.html
 OLD_FILES+=usr/share/doc/ntp/driver18.html
 OLD_FILES+=usr/share/doc/ntp/driver19.html
 OLD_FILES+=usr/share/doc/ntp/driver2.html
 OLD_FILES+=usr/share/doc/ntp/driver20.html
 OLD_FILES+=usr/share/doc/ntp/driver22.html
 OLD_FILES+=usr/share/doc/ntp/driver26.html
 OLD_FILES+=usr/share/doc/ntp/driver27.html
 OLD_FILES+=usr/share/doc/ntp/driver28.html
 OLD_FILES+=usr/share/doc/ntp/driver29.html
 OLD_FILES+=usr/share/doc/ntp/driver3.html
 OLD_FILES+=usr/share/doc/ntp/driver30.html
 OLD_FILES+=usr/share/doc/ntp/driver32.html
 OLD_FILES+=usr/share/doc/ntp/driver33.html
 OLD_FILES+=usr/share/doc/ntp/driver34.html
 OLD_FILES+=usr/share/doc/ntp/driver35.html
 OLD_FILES+=usr/share/doc/ntp/driver36.html
 OLD_FILES+=usr/share/doc/ntp/driver37.html
 OLD_FILES+=usr/share/doc/ntp/driver4.html
 OLD_FILES+=usr/share/doc/ntp/driver5.html
 OLD_FILES+=usr/share/doc/ntp/driver6.html
 OLD_FILES+=usr/share/doc/ntp/driver7.html
 OLD_FILES+=usr/share/doc/ntp/driver8.html
 OLD_FILES+=usr/share/doc/ntp/driver9.html
 OLD_FILES+=usr/share/doc/ntp/ldisc.html
 OLD_FILES+=usr/share/doc/ntp/measure.html
 OLD_FILES+=usr/share/doc/ntp/mx4200data.html
 OLD_FILES+=usr/share/doc/ntp/notes.html
 OLD_FILES+=usr/share/doc/ntp/patches.html
 OLD_FILES+=usr/share/doc/ntp/porting.html
 OLD_FILES+=usr/share/man/man1/sntp.1.gz
 # 20150329
 .if ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/bootconfig.h
 .endif
 # 20150326
 OLD_FILES+=usr/share/man/man1/pmcstudy.1.gz
 # 20150315: new clang import which bumps version from 3.5.1 to 3.6.0
 OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.5.1/altivec.h
 OLD_FILES+=usr/include/clang/3.5.1/ammintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/arm_acle.h
 OLD_FILES+=usr/include/clang/3.5.1/arm_neon.h
 OLD_FILES+=usr/include/clang/3.5.1/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/avxintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/cpuid.h
 OLD_FILES+=usr/include/clang/3.5.1/emmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/ia32intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/immintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.5.1/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.5.1/mmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/module.modulemap
 OLD_FILES+=usr/include/clang/3.5.1/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/shaintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/smmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.5.1/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.1/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.5.1
 OLD_DIRS+=usr/include/clang
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.1/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.5.1/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.5.1/lib
 OLD_DIRS+=usr/lib/clang/3.5.1
 # 20150302: binutils documentation distributed as a manpage
 OLD_FILES+=usr/share/doc/binutils/as.txt
 OLD_FILES+=usr/share/doc/binutils/ld.txt
 OLD_DIRS+=usr/share/doc/binutils
 # 20150222: Removed bcd(6) and ppt(6)
 OLD_FILES+=usr/bin/bcd
 OLD_FILES+=usr/bin/ppt
 OLD_FILES+=usr/share/man/man6/bcd.6.gz
 OLD_FILES+=usr/share/man/man6/ppt.6.gz
 # 20150217: Removed remnants of ar(4) driver
 OLD_FILES+=usr/include/dev/ic/hd64570.h
 # 20150212: /usr/games moving into /usr/bin
 OLD_FILES+=usr/games/bcd
 OLD_FILES+=usr/games/caesar
 OLD_FILES+=usr/games/factor
 OLD_FILES+=usr/games/fortune
 OLD_FILES+=usr/games/grdc
 OLD_FILES+=usr/games/morse
 OLD_FILES+=usr/games/number
 OLD_FILES+=usr/games/pom
 OLD_FILES+=usr/games/ppt
 OLD_FILES+=usr/games/primes
 OLD_FILES+=usr/games/random
 OLD_FILES+=usr/games/rot13
 OLD_FILES+=usr/games/strfile
 OLD_FILES+=usr/games/unstr
 OLD_DIRS+=usr/games
 # 20150209: liblzma header
 OLD_FILES+=usr/include/lzma/lzma.h
 # 20150124: spl.9 and friends
 OLD_FILES+=usr/share/man/man9/spl.9.gz
 OLD_FILES+=usr/share/man/man9/spl0.9.gz
 OLD_FILES+=usr/share/man/man9/splbio.9.gz
 OLD_FILES+=usr/share/man/man9/splclock.9.gz
 OLD_FILES+=usr/share/man/man9/splhigh.9.gz
 OLD_FILES+=usr/share/man/man9/splimp.9.gz
 OLD_FILES+=usr/share/man/man9/splnet.9.gz
 OLD_FILES+=usr/share/man/man9/splsoftclock.9.gz
 OLD_FILES+=usr/share/man/man9/splsofttty.9.gz
 OLD_FILES+=usr/share/man/man9/splstatclock.9.gz
 OLD_FILES+=usr/share/man/man9/spltty.9.gz
 OLD_FILES+=usr/share/man/man9/splvm.9.gz
 OLD_FILES+=usr/share/man/man9/splx.9.gz
 # 20150118: toeplitz.c moved from netinet to net
 OLD_FILES+=usr/include/netinet/toeplitz.h
 # 20150118: new clang import which bumps version from 3.5.0 to 3.5.1
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.5.0/altivec.h
 OLD_FILES+=usr/include/clang/3.5.0/ammintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/arm_acle.h
 OLD_FILES+=usr/include/clang/3.5.0/arm_neon.h
 OLD_FILES+=usr/include/clang/3.5.0/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/avxintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/cpuid.h
 OLD_FILES+=usr/include/clang/3.5.0/emmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/ia32intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/immintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.5.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.5.0/mmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/module.modulemap
 OLD_FILES+=usr/include/clang/3.5.0/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/shaintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/smmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/x86intrin.h
 OLD_FILES+=usr/include/clang/3.5.0/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.5.0/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.5.0
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.san-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.san-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan-x86_64.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
 OLD_DIRS+=usr/lib/clang/3.5.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/3.5.0/lib
 OLD_DIRS+=usr/lib/clang/3.5.0
 # 20150102: removal of asr(4)
 OLD_FILES+=usr/share/man/man4/asr.4.gz
 # 20150102: removal of texinfo
 OLD_FILES+=usr/bin/info
 OLD_FILES+=usr/bin/infokey
 OLD_FILES+=usr/bin/install-info
 OLD_FILES+=usr/bin/makeinfo
 OLD_FILES+=usr/bin/texindex
 OLD_FILES+=usr/share/info/am-utils.info.gz
 OLD_FILES+=usr/share/info/as.info.gz
 OLD_FILES+=usr/share/info/binutils.info.gz
 OLD_FILES+=usr/share/info/com_err.info.gz
 OLD_FILES+=usr/share/info/cpp.info.gz
 OLD_FILES+=usr/share/info/cppinternals.info.gz
 OLD_FILES+=usr/share/info/diff.info.gz
 OLD_FILES+=usr/share/info/dir
 OLD_FILES+=usr/share/info/gcc.info.gz
 OLD_FILES+=usr/share/info/gccint.info.gz
 OLD_FILES+=usr/share/info/gdb.info.gz
 OLD_FILES+=usr/share/info/gdbint.info.gz
 OLD_FILES+=usr/share/info/gperf.info.gz
 OLD_FILES+=usr/share/info/grep.info.gz
 OLD_FILES+=usr/share/info/groff.info.gz
 OLD_FILES+=usr/share/info/heimdal.info.gz
 OLD_FILES+=usr/share/info/history.info.gz
 OLD_FILES+=usr/share/info/info-stnd.info.gz
 OLD_FILES+=usr/share/info/info.info.gz
 OLD_FILES+=usr/share/info/ld.info.gz
 OLD_FILES+=usr/share/info/regex.info.gz
 OLD_FILES+=usr/share/info/rluserman.info.gz
 OLD_FILES+=usr/share/info/stabs.info.gz
 OLD_FILES+=usr/share/info/texinfo.info.gz
 OLD_FILES+=usr/share/man/man1/info.1.gz
 OLD_FILES+=usr/share/man/man1/infokey.1.gz
 OLD_FILES+=usr/share/man/man1/install-info.1.gz
 OLD_FILES+=usr/share/man/man1/makeinfo.1.gz
 OLD_FILES+=usr/share/man/man1/texindex.1.gz
 OLD_FILES+=usr/share/man/man5/info.5.gz
 OLD_FILES+=usr/share/man/man5/texinfo.5.gz
 OLD_DIRS+=usr/share/info
 # 20141231: new clang import which bumps version from 3.4.1 to 3.5.0
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.4.1/altivec.h
 OLD_FILES+=usr/include/clang/3.4.1/ammintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/arm_neon.h
 OLD_FILES+=usr/include/clang/3.4.1/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/avxintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/cpuid.h
 OLD_FILES+=usr/include/clang/3.4.1/emmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/immintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.4.1/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.4.1/mmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/module.map
 OLD_FILES+=usr/include/clang/3.4.1/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/shaintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/smmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.4.1/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.4.1/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.4.1
 # 20141225: Remove gpib/ieee488
 OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h
 OLD_FILES+=usr/include/dev/ieee488/tnt4882.h
 OLD_FILES+=usr/include/dev/ieee488/ugpib.h
 OLD_FILES+=usr/include/dev/ieee488/upd7210.h
 OLD_DIRS+=usr/include/dev/ieee488
 OLD_FILES+=usr/include/gpib/gpib.h
 OLD_DIRS+=usr/include/gpib
 OLD_FILES+=usr/lib/libgpib.a
 OLD_FILES+=usr/lib/libgpib_p.a
 OLD_FILES+=usr/lib/libgpib.so
 OLD_LIBS+=usr/lib/libgpib.so.3
 OLD_FILES+=usr/share/man/man3/gpib.3.gz
 OLD_FILES+=usr/share/man/man3/ibclr.3.gz
 OLD_FILES+=usr/share/man/man3/ibdev.3.gz
 OLD_FILES+=usr/share/man/man3/ibdma.3.gz
 OLD_FILES+=usr/share/man/man3/ibeos.3.gz
 OLD_FILES+=usr/share/man/man3/ibeot.3.gz
 OLD_FILES+=usr/share/man/man3/ibloc.3.gz
 OLD_FILES+=usr/share/man/man3/ibonl.3.gz
 OLD_FILES+=usr/share/man/man3/ibpad.3.gz
 OLD_FILES+=usr/share/man/man3/ibrd.3.gz
 OLD_FILES+=usr/share/man/man3/ibsad.3.gz
 OLD_FILES+=usr/share/man/man3/ibsic.3.gz
 OLD_FILES+=usr/share/man/man3/ibtmo.3.gz
 OLD_FILES+=usr/share/man/man3/ibtrg.3.gz
 OLD_FILES+=usr/share/man/man3/ibwrt.3.gz
 OLD_FILES+=usr/share/man/man4/gpib.4.gz
 OLD_FILES+=usr/share/man/man4/pcii.4.gz
 OLD_FILES+=usr/share/man/man4/tnt4882.4.gz
 # 20141224: libxo moved to /lib
 MOVED_LIBS+=usr/lib/libxo.so.0
 # 20141223: remove in6_gif.h and in_gif.h
 OLD_FILES+=usr/include/netinet/in_gif.h
 OLD_FILES+=usr/include/netinet6/in6_gif.h
 # 20141209: pw tests broken into a file per command
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_delete
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_modify
 # 20141202: update to mandoc CVS 20141201
 OLD_FILES+=usr.bin/preconv
 OLD_FILES+=usr/share/man/man1/preconv.1.gz
 # 20141129: mrouted rc.d scripts removed from base
 OLD_FILES+=etc/rc.d/mrouted
 # 20141126: convert sbin/mdconfig/tests to ATF format tests
 OLD_FILES+=usr/tests/sbin/mdconfig/legacy_test
 OLD_FILES+=usr/tests/sbin/mdconfig/mdconfig.test
 OLD_FILES+=usr/tests/sbin/mdconfig/run.pl
 # 20141126: remove xform_ipip decapsulation fallback
 OLD_FILES+=usr/include/netipsec/ipip_var.h
 # 20141122: mandoc updated to 1.13.1
 OLD_FILES+=usr/share/mdocml/external.png
 # 20141111: SF_KQUEUE code removed
 OLD_FILES+=usr/include/sys/sf_base.h
 OLD_FILES+=usr/include/sys/sf_sync.h
 # 20141109: faith/faithd removal
 OLD_FILES+=etc/rc.d/faith
 OLD_FILES+=usr/share/man/man4/faith.4.gz
 OLD_FILES+=usr/share/man/man4/if_faith.4.gz
 OLD_FILES+=usr/sbin/faithd
 OLD_FILES+=usr/share/man/man8/faithd.8.gz
 # 20141107: overhaul if_gre(4)
 OLD_FILES+=usr/include/netinet/ip_gre.h
 # 20141102: postrandom obsoleted by new /dev/random code
 OLD_FILES+=etc/rc.d/postrandom
 # 20141031: initrandom obsoleted by new /dev/random code
 OLD_FILES+=etc/rc.d/initrandom
 # 20141030: atf 0.21 import
 OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz
 # 20141028: debug files accidentally installed as directory name
 OLD_FILES+=usr/lib/debug/usr/lib/i18n
 OLD_FILES+=usr/lib/debug/usr/lib/private
 OLD_FILES+=usr/lib/debug/usr/lib32/i18n
 OLD_FILES+=usr/lib/debug/usr/lib32/private
 # 20141015: OpenSSL 1.0.1j import
 OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz
 # 20141003: libproc version bump
 OLD_LIBS+=usr/lib/libproc.so.2
 # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed
 OLD_FILES+=usr/share/man/man9/sleepq_calc_signal_retval.9.gz
 OLD_FILES+=usr/share/man/man9/sleepq_catch_signals.9.gz
 # 20140917: hv_kvpd rc.d script removed in favor of devd configuration
 OLD_FILES+=etc/rc.d/hv_kvpd
 # 20140917: libnv was accidentally being installed to /usr/lib instead of /lib
 MOVED_LIBS+=usr/lib/libnv.so.0
 # 20140829: rc.d/kerberos removed
 OLD_FILES+=etc/rc.d/kerberos
 # 20140814: libopie version bump
 OLD_LIBS+=usr/lib/libopie.so.7
 # 20140811: otp-sha renamed to otp-sha1
 OLD_FILES+=usr/bin/otp-sha
 OLD_FILES+=usr/share/man/man1/otp-sha.1.gz
 # 20140807: Remove private lib files that should not be installed
 OLD_FILES+=usr/lib/private/libatf-c.a
 OLD_FILES+=usr/lib/private/libatf-c.so
 OLD_FILES+=usr/lib/private/libatf-c_p.a
 OLD_FILES+=usr/lib/private/libatf-c++.a
 OLD_FILES+=usr/lib/private/libatf-c++.so
 OLD_FILES+=usr/lib/private/libatf-c++_p.a
 OLD_FILES+=usr/lib/private/libbsdstat.a
 OLD_FILES+=usr/lib/private/libbsdstat.so
 OLD_FILES+=usr/lib/private/libbsdstat_p.a
 OLD_FILES+=usr/lib/private/libheimipcc.a
 OLD_FILES+=usr/lib/private/libheimipcc.so
 OLD_FILES+=usr/lib/private/libheimipcc_p.a
 OLD_FILES+=usr/lib/private/libheimipcs.a
 OLD_FILES+=usr/lib/private/libheimipcs.so
 OLD_FILES+=usr/lib/private/libheimipcs_p.a
 OLD_FILES+=usr/lib/private/libldns.a
 OLD_FILES+=usr/lib/private/libldns.so
 OLD_FILES+=usr/lib/private/libldns_p.a
 OLD_FILES+=usr/lib/private/libssh.a
 OLD_FILES+=usr/lib/private/libssh.so
 OLD_FILES+=usr/lib/private/libssh_p.a
 OLD_FILES+=usr/lib/private/libunbound.a
 OLD_FILES+=usr/lib/private/libunbound.so
 OLD_FILES+=usr/lib/private/libunbound_p.a
 OLD_FILES+=usr/lib/private/libucl.a
 OLD_FILES+=usr/lib/private/libucl.so
 OLD_FILES+=usr/lib/private/libucl_p.a
 # 20140803: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_change_wiring.9.gz
 # 20140731
 OLD_FILES+=usr/share/man/man9/SYSCTL_ADD_OID.9.gz
 # 20140728: libsbuf restored to old version
 OLD_LIBS+=lib/libsbuf.so.7
 # 20140728: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/VOP_GETVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_CREATEVOBJECT.9.gz
 OLD_FILES+=usr/share/man/man9/VOP_DESTROYVOBJECT.9.gz
 # 20140723: renamed to PCBGROUP.9
 OLD_FILES+=usr/share/man/man9/PCBGROUPS.9.gz
 # 20140722: browse_packages_ftp.sh removed
 OLD_FILES+=usr/share/examples/bsdconfig/browse_packages_ftp.sh
 # 20140718: Remove obsolete man pages
 OLD_FILES+=usr/share/man/man9/zero_copy.9.gz
 OLD_FILES+=usr/share/man/man9/zero_copy_sockets.9.gz
 # 20140718: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_page_protect.9.gz
 # 20140717: Remove an obsolete man page
 OLD_FILES+=usr/share/man/man9/pmap_clear_reference.9.gz
 # 20140716: Remove an incorrectly named man page
 OLD_FILES+=usr/share/man/man9/pmap_ts_modified.9.gz
 # 20140712: Removal of bsd.dtrace.mk
 OLD_FILES+=usr/share/mk/bsd.dtrace.mk
 # 20140705: turn libreadline into an internal lib
 OLD_LIBS+=lib/libreadline.so.8
 OLD_FILES+=usr/lib/libreadline.a
 OLD_FILES+=usr/lib/libreadline_p.a
 OLD_FILES+=usr/lib/libreadline.so
 OLD_FILES+=usr/lib/libhistory.a
 OLD_FILES+=usr/lib/libhistory_p.a
 OLD_FILES+=usr/lib/libhistory.so
 OLD_LIBS+=usr/lib/libhistory.so.8
 OLD_FILES+=usr/include/readline/chardefs.h
 OLD_FILES+=usr/include/readline/history.h
 OLD_FILES+=usr/include/readline/keymaps.h
 OLD_FILES+=usr/include/readline/readline.h
 OLD_FILES+=usr/include/readline/tilde.h
 OLD_FILES+=usr/include/readline/rlconf.h
 OLD_FILES+=usr/include/readline/rlstdc.h
 OLD_FILES+=usr/include/readline/rltypedefs.h
 OLD_FILES+=usr/include/readline/rltypedefs.h
 OLD_DIRS+=usr/include/readline
 OLD_FILES+=usr/share/info/readline.info.gz
 OLD_FILES+=usr/share/man/man3/readline.3.gz
 OLD_FILES+=usr/share/man/man3/rlhistory.3.gz
 # 20140625: csup removal
 OLD_FILES+=usr/bin/csup
 OLD_FILES+=usr/bin/cpasswd
 OLD_FILES+=usr/share/man/man1/csup.1.gz
 OLD_FILES+=usr/share/man/man1/cpasswd.1.gz
 OLD_FILES+=usr/share/examples/cvsup/README
 OLD_FILES+=usr/share/examples/cvsup/cvs-supfile
 OLD_FILES+=usr/share/examples/cvsup/stable-supfile
 OLD_FILES+=usr/share/examples/cvsup/standard-supfile
 OLD_DIRS+=usr/share/examples/cvsup
 # 20140614: send-pr removal
 OLD_FILES+=usr/bin/sendbug
 OLD_FILES+=usr/share/info/send-pr.info.gz
 OLD_FILES+=usr/share/man/man1/send-pr.1.gz
 OLD_FILES+=usr/share/man/man1/sendbug.1.gz
 OLD_FILES+=etc/gnats/freefall
 OLD_DIRS+=etc/gnats
 # 20140512: new clang import which bumps version from 3.4 to 3.4.1
 OLD_FILES+=usr/include/clang/3.4/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.4/altivec.h
 OLD_FILES+=usr/include/clang/3.4/ammintrin.h
 OLD_FILES+=usr/include/clang/3.4/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.4/avxintrin.h
 OLD_FILES+=usr/include/clang/3.4/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.4/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.4/cpuid.h
 OLD_FILES+=usr/include/clang/3.4/emmintrin.h
 OLD_FILES+=usr/include/clang/3.4/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.4/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.4/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.4/immintrin.h
 OLD_FILES+=usr/include/clang/3.4/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.4/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.4/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.4/mmintrin.h
 OLD_FILES+=usr/include/clang/3.4/module.map
 OLD_FILES+=usr/include/clang/3.4/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.4/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.4/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.4/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.4/shaintrin.h
 OLD_FILES+=usr/include/clang/3.4/smmintrin.h
 OLD_FILES+=usr/include/clang/3.4/tbmintrin.h
 OLD_FILES+=usr/include/clang/3.4/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/x86intrin.h
 OLD_FILES+=usr/include/clang/3.4/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.4/xopintrin.h
 OLD_FILES+=usr/include/clang/3.4/arm_neon.h
 OLD_FILES+=usr/include/clang/3.4/module.map
 OLD_DIRS+=usr/include/clang/3.4
 # 20140505: Bogusly installing src.opts.mk
 OLD_FILES+=usr/share/mk/src.opts.mk
 # 20140505: Reject PR kern/187551
 OLD_FILES+=usr/tests/sbin/ifconfig/fibs_test
 # 20140502: Removal of lindev(4)
 OLD_FILES+=usr/share/man/man4/lindev.4.gz
 # 20140425
 OLD_FILES+=usr/lib/libssp_p.a
 OLD_FILES+=usr/lib/libstand_p.a
 # 20140413: Removed NO_MANCOMPRESS from mount_fusefs
 OLD_FILES+=usr/share/man/man8/mount_fusefs.8
 # 20140314: AppleTalk
 OLD_DIRS+=usr/include/netatalk
 OLD_FILES+=usr/include/netatalk/aarp.h
 OLD_FILES+=usr/include/netatalk/at.h
 OLD_FILES+=usr/include/netatalk/at_extern.h
 OLD_FILES+=usr/include/netatalk/at_var.h
 OLD_FILES+=usr/include/netatalk/ddp.h
 OLD_FILES+=usr/include/netatalk/ddp_pcb.h
 OLD_FILES+=usr/include/netatalk/ddp_var.h
 OLD_FILES+=usr/include/netatalk/endian.h
 OLD_FILES+=usr/include/netatalk/phase2.h
 # 20140314: Remove IPX/SPX
 OLD_LIBS+=lib/libipx.so.5
 OLD_FILES+=usr/include/netipx/ipx.h
 OLD_FILES+=usr/include/netipx/ipx_if.h
 OLD_FILES+=usr/include/netipx/ipx_pcb.h
 OLD_FILES+=usr/include/netipx/ipx_var.h
 OLD_FILES+=usr/include/netipx/spx.h
 OLD_FILES+=usr/include/netipx/spx_debug.h
 OLD_FILES+=usr/include/netipx/spx_timer.h
 OLD_FILES+=usr/include/netipx/spx_var.h
 OLD_DIRS+=usr/include/netipx
 OLD_FILES+=usr/lib/libipx.a
 OLD_FILES+=usr/lib/libipx.so
 OLD_FILES+=usr/lib/libipx_p.a
 OLD_FILES+=usr/sbin/IPXrouted
 OLD_FILES+=usr/share/man/man3/ipx.3.gz
 OLD_FILES+=usr/share/man/man3/ipx_addr.3.gz
 OLD_FILES+=usr/share/man/man3/ipx_ntoa.3.gz
 OLD_FILES+=usr/share/man/man4/ef.4.gz
 OLD_FILES+=usr/share/man/man4/if_ef.4.gz
 OLD_FILES+=usr/share/man/man8/IPXrouted.8.gz
 # 20140314: bsdconfig usermgmt rewrite
 OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/userinput
 # 20140307: bsdconfig groupmgmt rewrite
 OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/groupinput
 # 20140223: Remove libyaml
 OLD_FILES+=usr/lib/private/libyaml.a
 OLD_FILES+=usr/lib/private/libyaml.so
 OLD_LIBS+=usr/lib/private/libyaml.so.1
 OLD_FILES+=usr/lib/private/libyaml_p.a
 # 20140216: new clang import which bumps version from 3.3 to 3.4
 OLD_FILES+=usr/bin/llvm-prof
 OLD_FILES+=usr/include/clang/3.3/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.3/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.3/altivec.h
 OLD_FILES+=usr/include/clang/3.3/ammintrin.h
 OLD_FILES+=usr/include/clang/3.3/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.3/avxintrin.h
 OLD_FILES+=usr/include/clang/3.3/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.3/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.3/cpuid.h
 OLD_FILES+=usr/include/clang/3.3/emmintrin.h
 OLD_FILES+=usr/include/clang/3.3/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.3/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.3/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.3/immintrin.h
 OLD_FILES+=usr/include/clang/3.3/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.3/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.3/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.3/mmintrin.h
 OLD_FILES+=usr/include/clang/3.3/module.map
 OLD_FILES+=usr/include/clang/3.3/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.3/prfchwintrin.h
 OLD_FILES+=usr/include/clang/3.3/rdseedintrin.h
 OLD_FILES+=usr/include/clang/3.3/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.3/smmintrin.h
 OLD_FILES+=usr/include/clang/3.3/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/x86intrin.h
 OLD_FILES+=usr/include/clang/3.3/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.3/xopintrin.h
 OLD_FILES+=usr/share/man/man1/llvm-prof.1.gz
 OLD_DIRS+=usr/include/clang/3.3
 # 20140216: nve(4) removed
 OLD_FILES+=usr/share/man/man4/if_nve.4.gz
 OLD_FILES+=usr/share/man/man4/nve.4.gz
 # 20140205: Open Firmware device moved
 OLD_FILES+=usr/include/dev/ofw/ofw_nexus.h
 # 20140128: libelf and libdwarf import
 OLD_LIBS+=usr/lib/libelf.so.1
 OLD_LIBS+=usr/lib/libdwarf.so.3
 # 20140123: apicvar header moved to x86
 OLD_FILES+=usr/include/machine/apicvar.h
 # 20131215: libcam version bumped
 OLD_LIBS+=lib/libcam.so.6
 # 20131202: libcapsicum and libcasper moved to /lib/
 MOVED_LIBS+=usr/lib/libcapsicum.so.0
 MOVED_LIBS+=usr/lib/libcasper.so.0
 # 20131109: extattr(2) mlinks fixed
 OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz
 OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz
 # 20131107: example files removed
 OLD_FILES+=usr/share/examples/libusb20/aux.c
 OLD_FILES+=usr/share/examples/libusb20/aux.h
 # 20131103: WITH_LIBICONV_COMPAT removal
 OLD_FILES+=usr/include/_libiconv_compat.h
 OLD_FILES+=usr/lib/libiconv.a
 OLD_FILES+=usr/lib/libiconv.so
 OLD_LIBS+=usr/lib/libiconv.so.3
 OLD_FILES+=usr/lib/libiconv_p.a
 # 20131103: removal of utxrm(8), use 'utx rm' instead
 OLD_FILES+=usr/sbin/utxrm
 OLD_FILES+=usr/share/man/man8/utxrm.8.gz
 # 20131031: pkg_install has been removed
 OLD_FILES+=etc/periodic/daily/220.backup-pkgdb
 OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
 OLD_FILES+=etc/periodic/security/460.chkportsum
 OLD_FILES+=etc/periodic/weekly/400.status-pkg
 OLD_FILES+=usr/sbin/pkg_add
 OLD_FILES+=usr/sbin/pkg_create
 OLD_FILES+=usr/sbin/pkg_delete
 OLD_FILES+=usr/sbin/pkg_info
 OLD_FILES+=usr/sbin/pkg_updating
 OLD_FILES+=usr/sbin/pkg_version
 OLD_FILES+=usr/share/man/man1/pkg_add.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_create.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_delete.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_info.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_updating.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_version.1.gz
 # 20131030: /etc/keys moved to /usr/share/keys
 OLD_DIRS+=etc/keys
 OLD_DIRS+=etc/keys/pkg
 OLD_DIRS+=etc/keys/pkg/revoked
 OLD_DIRS+=etc/keys/pkg/trusted
 OLD_FILES+=etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
 # 20131028: ng_fec(4) removed
 OLD_FILES+=usr/include/netgraph/ng_fec.h
 OLD_FILES+=usr/share/man/man4/ng_fec.4.gz
 # 20131027: header moved
 OLD_FILES+=usr/include/net/pf_mtag.h
 # 20131023: remove never used iscsi directory
 OLD_DIRS+=usr/share/examples/iscsi
 # 20131021: isf(4) removed
 OLD_FILES+=usr/sbin/isfctl
 OLD_FILES+=usr/share/man/man4/isf.4.gz
 OLD_FILES+=usr/share/man/man8/isfctl.8.gz
 # 20131014: libbsdyml becomes private
 OLD_FILES+=usr/lib/libbsdyml.a
 OLD_FILES+=usr/lib/libbsdyml.so
 OLD_LIBS+=usr/lib/libbsdyml.so.0
 OLD_FILES+=usr/lib/libbsdyml_p.a
 OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz
 OLD_FILES+=usr/include/bsdyml.h
 # 20131013: Removal of the ATF tools
 OLD_FILES+=etc/atf/FreeBSD.conf
 OLD_FILES+=etc/atf/atf-run.hooks
 OLD_FILES+=etc/atf/common.conf
 OLD_FILES+=usr/bin/atf-config
 OLD_FILES+=usr/bin/atf-report
 OLD_FILES+=usr/bin/atf-run
 OLD_FILES+=usr/bin/atf-version
 OLD_FILES+=usr/share/atf/atf-run.hooks
 OLD_FILES+=usr/share/examples/atf/atf-run.hooks
 OLD_FILES+=usr/share/examples/atf/tests-results.css
 OLD_FILES+=usr/share/man/man1/atf-config.1.gz
 OLD_FILES+=usr/share/man/man1/atf-report.1.gz
 OLD_FILES+=usr/share/man/man1/atf-run.1.gz
 OLD_FILES+=usr/share/man/man1/atf-version.1.gz
 OLD_FILES+=usr/share/man/man5/atf-formats.5.gz
 OLD_FILES+=usr/share/xml/atf/tests-results.dtd
 OLD_FILES+=usr/share/xsl/atf/tests-results.xsl
 OLD_DIRS+=etc/atf
 OLD_DIRS+=usr/share/examples/atf
 OLD_DIRS+=usr/share/xml/atf
 OLD_DIRS+=usr/share/xml
 OLD_DIRS+=usr/share/xsl/atf
 OLD_DIRS+=usr/share/xsl
 # 20131009: freebsd-version moved from /libexec to /bin
 OLD_FILES+=libexec/freebsd-version
 # 20131001: ar and ranlib from binutils not used
 OLD_FILES+=usr/bin/gnu-ar
 OLD_FILES+=usr/bin/gnu-ranlib
 OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz
 OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz
 # 20130930: BIND removed from base
 OLD_FILES+=etc/mtree/BIND.chroot.dist
 OLD_FILES+=etc/namedb
 OLD_FILES+=etc/periodic/daily/470.status-named
 OLD_FILES+=usr/bin/dig
 OLD_FILES+=usr/bin/nslookup
 OLD_FILES+=usr/bin/nsupdate
 OLD_DIRS+=usr/include/lwres
 OLD_FILES+=usr/include/lwres/context.h
 OLD_FILES+=usr/include/lwres/int.h
 OLD_FILES+=usr/include/lwres/ipv6.h
 OLD_FILES+=usr/include/lwres/lang.h
 OLD_FILES+=usr/include/lwres/list.h
 OLD_FILES+=usr/include/lwres/lwbuffer.h
 OLD_FILES+=usr/include/lwres/lwpacket.h
 OLD_FILES+=usr/include/lwres/lwres.h
 OLD_FILES+=usr/include/lwres/net.h
 OLD_FILES+=usr/include/lwres/netdb.h
 OLD_FILES+=usr/include/lwres/platform.h
 OLD_FILES+=usr/include/lwres/result.h
 OLD_FILES+=usr/include/lwres/string.h
 OLD_FILES+=usr/include/lwres/version.h
 OLD_FILES+=usr/lib/liblwres.a
 OLD_FILES+=usr/lib/liblwres.so
 OLD_LIBS+=usr/lib/liblwres.so.90
 OLD_FILES+=usr/lib/liblwres_p.a
 OLD_FILES+=usr/sbin/arpaname
 OLD_FILES+=usr/sbin/ddns-confgen
 OLD_FILES+=usr/sbin/dnssec-dsfromkey
 OLD_FILES+=usr/sbin/dnssec-keyfromlabel
 OLD_FILES+=usr/sbin/dnssec-keygen
 OLD_FILES+=usr/sbin/dnssec-revoke
 OLD_FILES+=usr/sbin/dnssec-settime
 OLD_FILES+=usr/sbin/dnssec-signzone
 OLD_FILES+=usr/sbin/dnssec-verify
 OLD_FILES+=usr/sbin/genrandom
 OLD_FILES+=usr/sbin/isc-hmac-fixup
 OLD_FILES+=usr/sbin/lwresd
 OLD_FILES+=usr/sbin/named
 OLD_FILES+=usr/sbin/named-checkconf
 OLD_FILES+=usr/sbin/named-checkzone
 OLD_FILES+=usr/sbin/named-compilezone
 OLD_FILES+=usr/sbin/named-journalprint
 OLD_FILES+=usr/sbin/named.reconfig
 OLD_FILES+=usr/sbin/named.reload
 OLD_FILES+=usr/sbin/nsec3hash
 OLD_FILES+=usr/sbin/rndc
 OLD_FILES+=usr/sbin/rndc-confgen
 OLD_DIRS+=usr/share/doc/bind9
 OLD_FILES+=usr/share/doc/bind9/CHANGES
 OLD_FILES+=usr/share/doc/bind9/COPYRIGHT
 OLD_FILES+=usr/share/doc/bind9/FAQ
 OLD_FILES+=usr/share/doc/bind9/HISTORY
 OLD_FILES+=usr/share/doc/bind9/README
 OLD_DIRS+=usr/share/doc/bind9/arm
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch01.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch02.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch03.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch04.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch05.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch06.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch07.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch08.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch09.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.ch10.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.html
 OLD_FILES+=usr/share/doc/bind9/arm/Bv9ARM.pdf
 OLD_FILES+=usr/share/doc/bind9/arm/man.arpaname.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.ddns-confgen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dig.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-dsfromkey.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keyfromlabel.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-keygen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-revoke.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-settime.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-signzone.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.dnssec-verify.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.genrandom.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.host.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.isc-hmac-fixup.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkconf.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-checkzone.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named-journalprint.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.named.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.nsec3hash.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.nsupdate.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc-confgen.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.conf.html
 OLD_FILES+=usr/share/doc/bind9/arm/man.rndc.html
 OLD_DIRS+=usr/share/doc/bind9/misc
 OLD_FILES+=usr/share/doc/bind9/misc/dnssec
 OLD_FILES+=usr/share/doc/bind9/misc/format-options.pl
 OLD_FILES+=usr/share/doc/bind9/misc/ipv6
 OLD_FILES+=usr/share/doc/bind9/misc/migration
 OLD_FILES+=usr/share/doc/bind9/misc/migration-4to9
 OLD_FILES+=usr/share/doc/bind9/misc/options
 OLD_FILES+=usr/share/doc/bind9/misc/rfc-compliance
 OLD_FILES+=usr/share/doc/bind9/misc/roadmap
 OLD_FILES+=usr/share/doc/bind9/misc/sdb
 OLD_FILES+=usr/share/doc/bind9/misc/sort-options.pl
 OLD_FILES+=usr/share/man/man1/arpaname.1.gz
 OLD_FILES+=usr/share/man/man1/dig.1.gz
 OLD_FILES+=usr/share/man/man1/nslookup.1.gz
 OLD_FILES+=usr/share/man/man1/nsupdate.1.gz
 OLD_FILES+=usr/share/man/man3/lwres.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_addr_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_add.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_back.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_clear.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_first.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_forward.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint16.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint32.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_getuint8.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_init.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_invalidate.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint16.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint32.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_putuint8.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_buffer_subtract.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_clear.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_get.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_init.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_conf_print.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_config.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_allocmem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_create.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_freemem.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_initserial.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_nextserial.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_context_sendrecv.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_endhostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_endhostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_freeaddrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_freehostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabn.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnrequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gabnresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gai_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getaddrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getaddrsbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyaddr_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname2.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostbyname_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gethostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnode.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnodebyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getipnodebyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getnamebyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getnameinfo.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_getrrsetbyname.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnba.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbarequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_gnbaresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_herror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_hstrerror.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_inetntop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_lwpacket_parseheader.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_lwpacket_renderheader.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_net_ntop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noop.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_nooprequest_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_free.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_parse.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_noopresponse_render.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_packet.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_resutil.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_sethostent.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_sethostent_r.3.gz
 OLD_FILES+=usr/share/man/man3/lwres_string_parse.3.gz
 OLD_FILES+=usr/share/man/man5/named.conf.5.gz
 OLD_FILES+=usr/share/man/man5/rndc.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ddns-confgen.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-dsfromkey.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-keyfromlabel.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-verify.8.gz
 OLD_FILES+=usr/share/man/man8/genrandom.8.gz
 OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz
 OLD_FILES+=usr/share/man/man8/lwresd.8.gz
 OLD_FILES+=usr/share/man/man8/named-checkconf.8.gz
 OLD_FILES+=usr/share/man/man8/named-checkzone.8.gz
 OLD_FILES+=usr/share/man/man8/named-compilezone.8.gz
 OLD_FILES+=usr/share/man/man8/named-journalprint.8.gz
 OLD_FILES+=usr/share/man/man8/named.8.gz
 OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz
 OLD_FILES+=usr/share/man/man8/named.reload.8.gz
 OLD_FILES+=usr/share/man/man8/nsec3hash.8.gz
 OLD_FILES+=usr/share/man/man8/rndc-confgen.8.gz
 OLD_FILES+=usr/share/man/man8/rndc.8.gz
 OLD_DIRS+=var/named/dev
 OLD_DIRS+=var/named/etc
 OLD_DIRS+=var/named/etc/namedb
 OLD_FILES+=var/named/etc/namedb/PROTO.localhost-v6.rev
 OLD_FILES+=var/named/etc/namedb/PROTO.localhost.rev
 OLD_DIRS+=var/named/etc/namedb/dynamic
 OLD_FILES+=var/named/etc/namedb/make-localhost
 OLD_DIRS+=var/named/etc/namedb/master
 OLD_FILES+=var/named/etc/namedb/master/empty.db
 OLD_FILES+=var/named/etc/namedb/master/localhost-forward.db
 OLD_FILES+=var/named/etc/namedb/master/localhost-reverse.db
 #OLD_FILES+=var/named/etc/namedb/named.conf	# intentionally left out
 OLD_FILES+=var/named/etc/namedb/named.root
 OLD_DIRS+=var/named/etc/namedb/working
 OLD_DIRS+=var/named/etc/namedb/slave
 OLD_DIRS+=var/named/var
 OLD_DIRS+=var/named/var/dump
 OLD_DIRS+=var/named/var/log
 OLD_DIRS+=var/named/var/run
 OLD_DIRS+=var/named/var/run/named
 OLD_DIRS+=var/named/var/stats
 OLD_DIRS+=var/run/named
 # 20130923: example moved
 OLD_FILES+=usr/share/examples/bsdconfig/browse_packages.sh
 # 20130908: libssh becomes private
 OLD_FILES+=usr/lib/libssh.a
 OLD_FILES+=usr/lib/libssh.so
 OLD_LIBS+=usr/lib/libssh.so.5
 OLD_FILES+=usr/lib/libssh_p.a
 # 20130903: gnupatch is no more
 OLD_FILES+=usr/bin/gnupatch
 OLD_FILES+=usr/share/man/man1/gnupatch.1.gz
 # 20130829: bsdpatch is patch unconditionally
 OLD_FILES+=usr/bin/bsdpatch
 OLD_FILES+=usr/share/man/man1/bsdpatch.1.gz
 # 20130822: bind 9.9.3-P2 import
 OLD_LIBS+=usr/lib/liblwres.so.80
 # 20130814: vm_page_busy(9)
 OLD_FILES+=usr/share/man/man9/vm_page_flash.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_io.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_io_finish.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_io_start.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_wakeup.9.gz
 # 20130710: libkvm version bump
 OLD_LIBS+=lib/libkvm.so.5
 # 20130623: dialog update from 1.1 to 1.2
 OLD_LIBS+=usr/lib/libdialog.so.7
 # 20130616: vfs_mount.9 removed
 OLD_FILES+=usr/share/man/man9/vfs_mount.9.gz
 # 20130614: remove CVS from base
 OLD_FILES+=usr/bin/cvs
 OLD_FILES+=usr/bin/cvsbug
 OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ascii.gz
 OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ps.gz
 OLD_DIRS+=usr/share/doc/psd/28.cvs
 OLD_FILES+=usr/share/examples/cvs/contrib/README
 OLD_FILES+=usr/share/examples/cvs/contrib/clmerge
 OLD_FILES+=usr/share/examples/cvs/contrib/cln_hist
 OLD_FILES+=usr/share/examples/cvs/contrib/commit_prep
 OLD_FILES+=usr/share/examples/cvs/contrib/cvs2vendor
 OLD_FILES+=usr/share/examples/cvs/contrib/cvs_acls
 OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck
 OLD_FILES+=usr/share/examples/cvs/contrib/cvscheck.man
 OLD_FILES+=usr/share/examples/cvs/contrib/cvshelp.man
 OLD_FILES+=usr/share/examples/cvs/contrib/descend.man
 OLD_FILES+=usr/share/examples/cvs/contrib/easy-import
 OLD_FILES+=usr/share/examples/cvs/contrib/intro.doc
 OLD_FILES+=usr/share/examples/cvs/contrib/log
 OLD_FILES+=usr/share/examples/cvs/contrib/log_accum
 OLD_FILES+=usr/share/examples/cvs/contrib/mfpipe
 OLD_FILES+=usr/share/examples/cvs/contrib/rcs-to-cvs
 OLD_FILES+=usr/share/examples/cvs/contrib/rcs2log
 OLD_FILES+=usr/share/examples/cvs/contrib/rcslock
 OLD_FILES+=usr/share/examples/cvs/contrib/sccs2rcs
 OLD_DIRS+=usr/share/examples/cvs/contrib
 OLD_DIRS+=usr/share/examples/cvs
 OLD_FILES+=usr/share/info/cvs.info.gz
 OLD_FILES+=usr/share/info/cvsclient.info.gz
 OLD_FILES+=usr/share/man/man1/cvs.1.gz
 OLD_FILES+=usr/share/man/man5/cvs.5.gz
 OLD_FILES+=usr/share/man/man8/cvsbug.8.gz
 # 20130607: WITH_DEBUG_FILES added
 OLD_FILES+=lib/libufs.so.6.symbols
 # 20130417: nfs fha moved from nfsserver to nfs
 OLD_FILES+=usr/include/nfsserver/nfs_fha.h
 # 20130411: new clang import which bumps version from 3.2 to 3.3
 OLD_FILES+=usr/include/clang/3.2/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.2/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.2/altivec.h
 OLD_FILES+=usr/include/clang/3.2/ammintrin.h
 OLD_FILES+=usr/include/clang/3.2/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.2/avxintrin.h
 OLD_FILES+=usr/include/clang/3.2/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.2/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.2/cpuid.h
 OLD_FILES+=usr/include/clang/3.2/emmintrin.h
 OLD_FILES+=usr/include/clang/3.2/f16cintrin.h
 OLD_FILES+=usr/include/clang/3.2/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.2/fmaintrin.h
 OLD_FILES+=usr/include/clang/3.2/immintrin.h
 OLD_FILES+=usr/include/clang/3.2/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.2/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.2/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.2/mmintrin.h
 OLD_FILES+=usr/include/clang/3.2/module.map
 OLD_FILES+=usr/include/clang/3.2/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.2/rtmintrin.h
 OLD_FILES+=usr/include/clang/3.2/smmintrin.h
 OLD_FILES+=usr/include/clang/3.2/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/x86intrin.h
 OLD_FILES+=usr/include/clang/3.2/xmmintrin.h
 OLD_FILES+=usr/include/clang/3.2/xopintrin.h
 OLD_DIRS+=usr/include/clang/3.2
 # 20130404: legacy ATA stack removed
 OLD_FILES+=etc/periodic/daily/405.status-ata-raid
 OLD_FILES+=rescue/atacontrol
 OLD_FILES+=sbin/atacontrol
 OLD_FILES+=usr/share/man/man8/atacontrol.8.gz
 OLD_FILES+=usr/share/man/man4/atapicam.4.gz
 OLD_FILES+=usr/share/man/man4/ataraid.4.gz
 OLD_FILES+=usr/sbin/burncd
 OLD_FILES+=usr/share/man/man8/burncd.8.gz
 # 20130316: vinum.4 removed
 OLD_FILES+=usr/share/man/man4/vinum.4.gz
 # 20130312: fortunes-o removed
 OLD_FILES+=usr/share/games/fortune/fortunes-o
 OLD_FILES+=usr/share/games/fortune/fortunes-o.dat
 # 20130311: Ports are no more available via cvsup
 OLD_FILES+=usr/share/examples/cvsup/ports-supfile
 OLD_FILES+=usr/share/examples/cvsup/refuse
 OLD_FILES+=usr/share/examples/cvsup/refuse.README
 # 20130309: NWFS and NCP supports removed
 OLD_FILES+=usr/bin/ncplist
 OLD_FILES+=usr/bin/ncplogin
 OLD_FILES+=usr/bin/ncplogout
 OLD_FILES+=usr/include/fs/nwfs/nwfs.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_mount.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_node.h
 OLD_FILES+=usr/include/fs/nwfs/nwfs_subr.h
 OLD_DIRS+=usr/include/fs/nwfs
 OLD_FILES+=usr/include/netncp/ncp.h
 OLD_FILES+=usr/include/netncp/ncp_cfg.h
 OLD_FILES+=usr/include/netncp/ncp_conn.h
 OLD_FILES+=usr/include/netncp/ncp_file.h
 OLD_FILES+=usr/include/netncp/ncp_lib.h
 OLD_FILES+=usr/include/netncp/ncp_ncp.h
 OLD_FILES+=usr/include/netncp/ncp_nls.h
 OLD_FILES+=usr/include/netncp/ncp_rcfile.h
 OLD_FILES+=usr/include/netncp/ncp_rq.h
 OLD_FILES+=usr/include/netncp/ncp_sock.h
 OLD_FILES+=usr/include/netncp/ncp_subr.h
 OLD_FILES+=usr/include/netncp/ncp_user.h
 OLD_FILES+=usr/include/netncp/ncpio.h
 OLD_FILES+=usr/include/netncp/nwerror.h
 OLD_DIRS+=usr/include/netncp
 OLD_FILES+=usr/lib/libncp.a
 OLD_FILES+=usr/lib/libncp.so
 OLD_LIBS+=usr/lib/libncp.so.4
 OLD_FILES+=usr/lib/libncp_p.a
 OLD_FILES+=usr/sbin/mount_nwfs
 OLD_FILES+=usr/share/examples/nwclient/dot.nwfsrc
 OLD_FILES+=usr/share/examples/nwclient/nwfs.sh.sample
 OLD_DIRS+=usr/share/examples/nwclient
 OLD_FILES+=usr/share/man/man1/ncplist.1.gz
 OLD_FILES+=usr/share/man/man1/ncplogin.1.gz
 OLD_FILES+=usr/share/man/man1/ncplogout.1.gz
 OLD_FILES+=usr/share/man/man8/mount_nwfs.8.gz
 # 20130302: NTFS support removed
 OLD_FILES+=rescue/mount_ntfs
 OLD_FILES+=sbin/mount_ntfs
 OLD_FILES+=usr/include/fs/ntfs/ntfs.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_compr.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_ihash.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_inode.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_subr.h
 OLD_FILES+=usr/include/fs/ntfs/ntfs_vfsops.h
 OLD_FILES+=usr/include/fs/ntfs/ntfsmount.h
 OLD_DIRS+=usr/include/fs/ntfs
 OLD_FILES+=usr/share/man/man8/mount_ntfs.8.gz
 # 20130302: PORTALFS support removed
 OLD_FILES+=usr/include/fs/portalfs/portal.h
 OLD_DIRS+=usr/include/fs/portalfs
 OLD_FILES+=usr/sbin/mount_portalfs
 OLD_FILES+=usr/share/examples/portal/README
 OLD_FILES+=usr/share/examples/portal/portal.conf
 OLD_DIRS+=usr/share/examples/portal
 OLD_FILES+=usr/share/man/man8/mount_portalfs.8.gz
 # 20130302: CODAFS support removed
 OLD_FILES+=usr/share/man/man4/coda.4.gz
 # 20130302: XFS support removed
 OLD_FILES+=usr/share/man/man5/xfs.5.gz
 # 20130302: Capsicum overhaul
 OLD_FILES+=usr/share/man/man2/cap_getrights.2.gz
 OLD_FILES+=usr/share/man/man2/cap_new.2.gz
 # 20130213: OpenSSL 1.0.1e import
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_verifyrecover.3.gz
 OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_verifyrecover_init.3.gz
 # 20130116: removed long unused directories for .1aout section manpages
 OLD_FILES+=usr/share/man/en.ISO8859-1/man1aout
 OLD_FILES+=usr/share/man/en.UTF-8/man1aout
 OLD_DIRS+=usr/share/man/man1aout
 OLD_DIRS+=usr/share/man/cat1aout
 OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1aout
 OLD_DIRS+=usr/share/man/en.UTF-8/cat1aout
 # 20130103: gnats-supfile removed
 OLD_FILES+=usr/share/examples/cvsup/gnats-supfile
 # 20121230: libdisk removed
 OLD_FILES+=usr/share/man/man3/libdisk.3.gz usr/include/libdisk.h
 OLD_FILES+=usr/lib/libdisk.a
 # 20121230: remove wrongly created directories for auditdistd
 OLD_DIRS+=var/dist
 OLD_DIRS+=var/remote
 # 20121022: remove harp, hfa and idt man page
 OLD_FILES+=usr/share/man/man4/harp.4.gz
 OLD_FILES+=usr/share/man/man4/hfa.4.gz
 OLD_FILES+=usr/share/man/man4/idt.4.gz
 OLD_FILES+=usr/share/man/man4/if_idt.4.gz
 # 20121022: VFS_LOCK_GIANT elimination
 OLD_FILES+=usr/share/man/man9/VFS_LOCK_GIANT.9.gz
 OLD_FILES+=usr/share/man/man9/VFS_UNLOCK_GIANT.9.gz
 # 20121004: remove incomplete unwind.h
 OLD_FILES+=usr/include/clang/3.2/unwind.h
 # 20120910: NetBSD compat shims removed
 OLD_FILES+=usr/include/cam/scsi/scsi_low_pisa.h
 OLD_FILES+=usr/include/sys/device_port.h
 # 20120909: doc and www supfiles removed
 OLD_FILES+=usr/share/examples/cvsup/doc-supfile
 OLD_FILES+=usr/share/examples/cvsup/www-supfile
 # 20120908: pf cleanup
 OLD_FILES+=usr/include/net/if_pflow.h
 # 20120816: new clang import which bumps version from 3.1 to 3.2
 OLD_FILES+=usr/bin/llvm-ld
 OLD_FILES+=usr/bin/llvm-stub
 OLD_FILES+=usr/include/clang/3.1/altivec.h
 OLD_FILES+=usr/include/clang/3.1/avx2intrin.h
 OLD_FILES+=usr/include/clang/3.1/avxintrin.h
 OLD_FILES+=usr/include/clang/3.1/bmi2intrin.h
 OLD_FILES+=usr/include/clang/3.1/bmiintrin.h
 OLD_FILES+=usr/include/clang/3.1/cpuid.h
 OLD_FILES+=usr/include/clang/3.1/emmintrin.h
 OLD_FILES+=usr/include/clang/3.1/fma4intrin.h
 OLD_FILES+=usr/include/clang/3.1/immintrin.h
 OLD_FILES+=usr/include/clang/3.1/lzcntintrin.h
 OLD_FILES+=usr/include/clang/3.1/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.1/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.1/mmintrin.h
 OLD_FILES+=usr/include/clang/3.1/module.map
 OLD_FILES+=usr/include/clang/3.1/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/popcntintrin.h
 OLD_FILES+=usr/include/clang/3.1/smmintrin.h
 OLD_FILES+=usr/include/clang/3.1/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/unwind.h
 OLD_FILES+=usr/include/clang/3.1/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.1/x86intrin.h
 OLD_FILES+=usr/include/clang/3.1/xmmintrin.h
 OLD_DIRS+=usr/include/clang/3.1
 OLD_FILES+=usr/share/man/man1/llvm-ld.1.gz
 # 20120712: OpenSSL 1.0.1c import
 OLD_LIBS+=lib/libcrypto.so.6
 OLD_LIBS+=usr/lib/libssl.so.6
 OLD_FILES+=usr/include/openssl/aes_locl.h
 OLD_FILES+=usr/include/openssl/bio_lcl.h
 OLD_FILES+=usr/include/openssl/e_os.h
 OLD_FILES+=usr/include/openssl/fips.h
 OLD_FILES+=usr/include/openssl/fips_rand.h
 OLD_FILES+=usr/include/openssl/pq_compat.h
 OLD_FILES+=usr/include/openssl/tmdiff.h
 OLD_FILES+=usr/include/openssl/ui_locl.h
 OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_id_callback.3.gz
 # 20120621: remove old man page
 OLD_FILES+=usr/share/man/man8/vnconfig.8.gz
 # 20120619: TOE support updated
 OLD_FILES+=usr/include/netinet/toedev.h
 # 20120613: auth.conf removed
 OLD_FILES+=etc/auth.conf
 OLD_FILES+=usr/share/examples/etc/auth.conf
 OLD_FILES+=usr/share/man/man3/auth.3.gz
 OLD_FILES+=usr/share/man/man3/auth_getval.3.gz
 OLD_FILES+=usr/share/man/man5/auth.conf.5.gz
 # 20120530: kde pam lives now in ports
 OLD_FILES+=etc/pam.d/kde
 # 20120521: byacc import
 OLD_FILES+=usr/bin/yyfix
 OLD_FILES+=usr/share/man/man1/yyfix.1.gz
 # 20120505: new clang import installed a redundant internal header
 OLD_FILES+=usr/include/clang/3.1/stdalign.h
 # 20120428: MD2 removed from libmd
 OLD_LIBS+=lib/libmd.so.5
 OLD_FILES+=usr/include/md2.h
 OLD_FILES+=usr/share/man/man3/MD2Data.3.gz
 OLD_FILES+=usr/share/man/man3/MD2End.3.gz
 OLD_FILES+=usr/share/man/man3/MD2File.3.gz
 OLD_FILES+=usr/share/man/man3/MD2FileChunk.3.gz
 OLD_FILES+=usr/share/man/man3/MD2Final.3.gz
 OLD_FILES+=usr/share/man/man3/MD2Init.3.gz
 OLD_FILES+=usr/share/man/man3/MD2Update.3.gz
 OLD_FILES+=usr/share/man/man3/md2.3.gz
 # 20120425: libusb version bump (r234684)
 OLD_LIBS+=usr/lib/libusb.so.2
 OLD_FILES+=usr/share/man/man3/libsub_get_active_config_descriptor.3.gz
 # 20120415: new clang import which bumps version from 3.0 to 3.1
 OLD_FILES+=usr/include/clang/3.0/altivec.h
 OLD_FILES+=usr/include/clang/3.0/avxintrin.h
 OLD_FILES+=usr/include/clang/3.0/emmintrin.h
 OLD_FILES+=usr/include/clang/3.0/immintrin.h
 OLD_FILES+=usr/include/clang/3.0/mm3dnow.h
 OLD_FILES+=usr/include/clang/3.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/3.0/mmintrin.h
 OLD_FILES+=usr/include/clang/3.0/nmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/smmintrin.h
 OLD_FILES+=usr/include/clang/3.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/wmmintrin.h
 OLD_FILES+=usr/include/clang/3.0/x86intrin.h
 OLD_FILES+=usr/include/clang/3.0/xmmintrin.h
 OLD_DIRS+=usr/include/clang/3.0
 # 20120412: BIND 9.8.1 release notes removed
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.pdf
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.txt
 OLD_FILES+=usr/share/doc/bind9/RELEASE-NOTES-BIND-9.8.1.html
 OLD_FILES+=usr/share/doc/bind9/release-notes.css
 # 20120330: legacy(4) moved to x86
 OLD_FILES+=usr/include/machine/legacyvar.h
 # 20120324: MPI headers updated
 OLD_FILES+=usr/include/dev/mpt/mpilib/mpi_inb.h
 # 20120322: hwpmc_mips24k.h removed
 OLD_FILES+=usr/include/dev/hwpmc/hwpmc_mips24k.h
 # 20120322: Update heimdal to 1.5.1
 OLD_FILES+=usr/include/krb5-v4compat.h \
 	usr/include/krb_err.h \
 	usr/include/hdb-private.h \
         usr/share/man/man3/krb5_addresses.3.gz \
         usr/share/man/man3/krb5_cc_cursor.3.gz \
         usr/share/man/man3/krb5_cc_ops.3.gz \
         usr/share/man/man3/krb5_config.3.gz \
         usr/share/man/man3/krb5_config_get_int_default.3.gz \
         usr/share/man/man3/krb5_context.3.gz \
         usr/share/man/man3/krb5_data.3.gz \
         usr/share/man/man3/krb5_err.3.gz \
         usr/share/man/man3/krb5_errx.3.gz \
         usr/share/man/man3/krb5_keyblock.3.gz \
         usr/share/man/man3/krb5_keytab_entry.3.gz \
         usr/share/man/man3/krb5_kt_cursor.3.gz \
         usr/share/man/man3/krb5_kt_ops.3.gz \
         usr/share/man/man3/krb5_set_warn_dest.3.gz \
         usr/share/man/man3/krb5_verr.3.gz \
         usr/share/man/man3/krb5_verrx.3.gz \
         usr/share/man/man3/krb5_vwarnx.3.gz \
         usr/share/man/man3/krb5_warn.3.gz \
         usr/share/man/man3/krb5_warnx.3.gz
 OLD_LIBS+=usr/lib/libasn1.so.10 \
 	usr/lib/libhdb.so.10 \
 	usr/lib/libheimntlm.so.10 \
 	usr/lib/libhx509.so.10 \
 	usr/lib/libkadm5clnt.so.10 \
 	usr/lib/libkadm5srv.so.10 \
 	usr/lib/libkafs5.so.10 \
 	usr/lib/libkrb5.so.10 \
 	usr/lib/libroken.so.10
 # 20120309: Remove fifofs header files
 OLD_FILES+=usr/include/fs/fifofs/fifo.h
 OLD_DIRS+=usr/include/fs/fifofs
 # 20120304: xlocale cleanup
 OLD_FILES+=usr/include/_xlocale_ctype.h
 # 20120225: libarchive 3.0.3
 OLD_FILES+=usr/share/man/man3/archive_read_data_into_buffer.3.gz \
 	usr/share/man/man3/archive_read_support_compression_all.3.gz \
 	usr/share/man/man3/archive_read_support_compression_bzip2.3.gz \
 	usr/share/man/man3/archive_read_support_compression_compress.3.gz \
 	usr/share/man/man3/archive_read_support_compression_gzip.3.gz \
 	usr/share/man/man3/archive_read_support_compression_lzma.3.gz \
 	usr/share/man/man3/archive_read_support_compression_none.3.gz \
 	usr/share/man/man3/archive_read_support_compression_program.3.gz \
 	usr/share/man/man3/archive_read_support_compression_program_signature.3.gz \
 	usr/share/man/man3/archive_read_support_compression_xz.3.gz \
 	usr/share/man/man3/archive_write_set_callbacks.3.gz \
 	usr/share/man/man3/archive_write_set_compression_bzip2.3.gz \
 	usr/share/man/man3/archive_write_set_compression_compress.3.gz \
 	usr/share/man/man3/archive_write_set_compression_gzip.3.gz \
 	usr/share/man/man3/archive_write_set_compression_none.3.gz \
 	usr/share/man/man3/archive_write_set_compression_program.3.gz
 OLD_LIBS+=usr/lib/libarchive.so.5
 # 20120113: removal of wtmpcvt(1)
 OLD_FILES+=usr/bin/wtmpcvt
 OLD_FILES+=usr/share/man/man1/wtmpcvt.1.gz
 # 20111214: eventtimers(7) moved to eventtimers(4)
 OLD_FILES+=usr/share/man/man7/eventtimers.7.gz
 # 20111125: amd(4) removed
 OLD_FILES+=usr/share/man/man4/amd.4.gz
 # 20111125: libodialog removed
 OLD_FILES+=usr/lib/libodialog.a
 OLD_FILES+=usr/lib/libodialog.so
 OLD_LIBS+=usr/lib/libodialog.so.7
 OLD_FILES+=usr/lib/libodialog_p.a
 # 20110930: sysinstall removed
 OLD_FILES+=usr/sbin/sysinstall
 OLD_FILES+=usr/share/man/man8/sysinstall.8.gz
 OLD_FILES+=usr/lib/libftpio.a
 OLD_FILES+=usr/lib/libftpio.so
 OLD_LIBS+=usr/lib/libftpio.so.8
 OLD_FILES+=usr/lib/libftpio_p.a
 OLD_FILES+=usr/include/ftpio.h
 OLD_FILES+=usr/share/man/man3/ftpio.3.gz
 # 20110915: rename congestion control manpages
 OLD_FILES+=usr/share/man/man9/cc.9.gz
 # 20110831: atomic page flags operations
 OLD_FILES+=usr/share/man/man9/vm_page_flag.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_flag_clear.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_flag_set.9.gz
 # 20110828: library version bump for 9.0
 OLD_LIBS+=lib/libcam.so.5
 OLD_LIBS+=lib/libpcap.so.7
 OLD_LIBS+=lib/libufs.so.5
 OLD_LIBS+=usr/lib/libbsnmp.so.5
 OLD_LIBS+=usr/lib/libdwarf.so.2
 OLD_LIBS+=usr/lib/libopie.so.6
 OLD_LIBS+=usr/lib/librtld_db.so.1
 OLD_LIBS+=usr/lib/libtacplus.so.4
 # 20110817: no more acd.4, ad.4, afd.4 and ast.4
 OLD_FILES+=usr/share/man/man4/acd.4.gz
 OLD_FILES+=usr/share/man/man4/ad.4.gz
 OLD_FILES+=usr/share/man/man4/afd.4.gz
 OLD_FILES+=usr/share/man/man4/ast.4.gz
 # 20110718: no longer useful in the age of rc.d
 OLD_FILES+=usr/sbin/named.reconfig
 OLD_FILES+=usr/sbin/named.reload
 OLD_FILES+=usr/share/man/man8/named.reconfig.8.gz
 OLD_FILES+=usr/share/man/man8/named.reload.8.gz
 # 20110716: bind 9.8.0 import
 OLD_LIBS+=usr/lib/liblwres.so.50
 OLD_FILES+=usr/share/doc/bind9/KNOWN-DEFECTS
 OLD_FILES+=usr/share/doc/bind9/NSEC3-NOTES
 OLD_FILES+=usr/share/doc/bind9/README.idnkit
 OLD_FILES+=usr/share/doc/bind9/README.pkcs11
 # 20110709: vm_map_clean.9 -> vm_map_sync.9
 OLD_FILES+=usr/share/man/man9/vm_map_clean.9.gz
 # 20110709: Catch up with removal of these functions
 OLD_FILES+=usr/share/man/man9/vm_page_copy.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_protect.9.gz
 OLD_FILES+=usr/share/man/man9/vm_page_zero_fill.9.gz
 # 20110707: script no longer needed by /etc/rc.d/nfsd
 OLD_FILES+=etc/rc.d/nfsserver
 # 20110705: files moved so both NFS clients can share them
 OLD_FILES+=usr/include/nfsclient/krpc.h
 OLD_FILES+=usr/include/nfsclient/nfsdiskless.h
 # 20110705: the switch of default NFS client to the new one
 OLD_FILES+=sbin/mount_newnfs
 OLD_FILES+=usr/share/man/man8/mount_newnfs.8.gz
 OLD_FILES+=usr/include/nfsclient/nfs_kdtrace.h
 # 20110628: calendar.msk removed
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.msk
 # 20110517: libpkg removed
 OLD_FILES+=usr/include/pkg.h
 OLD_FILES+=usr/lib/libpkg.a
 OLD_FILES+=usr/lib/libpkg.so
 OLD_LIBS+=usr/lib/libpkg.so.0
 OLD_FILES+=usr/lib/libpkg_p.a
 # 20110517: libsbuf version bump
 OLD_LIBS+=lib/libsbuf.so.5
 # 20110502: new clang import which bumps version from 2.9 to 3.0
 OLD_FILES+=usr/include/clang/2.9/emmintrin.h
 OLD_FILES+=usr/include/clang/2.9/mm_malloc.h
 OLD_FILES+=usr/include/clang/2.9/mmintrin.h
 OLD_FILES+=usr/include/clang/2.9/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.9/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.9/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.9
 # 20110417: removal of Objective-C support
 OLD_FILES+=usr/include/objc/encoding.h
 OLD_FILES+=usr/include/objc/hash.h
 OLD_FILES+=usr/include/objc/NXConstStr.h
 OLD_FILES+=usr/include/objc/objc-api.h
 OLD_FILES+=usr/include/objc/objc-decls.h
 OLD_FILES+=usr/include/objc/objc-list.h
 OLD_FILES+=usr/include/objc/objc.h
 OLD_FILES+=usr/include/objc/Object.h
 OLD_FILES+=usr/include/objc/Protocol.h
 OLD_FILES+=usr/include/objc/runtime.h
 OLD_FILES+=usr/include/objc/sarray.h
 OLD_FILES+=usr/include/objc/thr.h
 OLD_FILES+=usr/include/objc/typedstream.h
 OLD_FILES+=usr/lib/libobjc.a
 OLD_FILES+=usr/lib/libobjc.so
 OLD_FILES+=usr/lib/libobjc_p.a
 OLD_FILES+=usr/libexec/cc1obj
 OLD_LIBS+=usr/lib/libobjc.so.4
 OLD_DIRS+=usr/include/objc
 # 20110331: firmware.img created at build time
 OLD_FILES+=usr/share/examples/kld/firmware/fwimage/firmware.img
 # 20110224: sticky.8 -> sticky.7
 OLD_FILES+=usr/share/man/man8/sticky.8.gz
 # 20110220: new clang import which bumps version from 2.8 to 2.9
 OLD_FILES+=usr/include/clang/2.8/emmintrin.h
 OLD_FILES+=usr/include/clang/2.8/mm_malloc.h
 OLD_FILES+=usr/include/clang/2.8/mmintrin.h
 OLD_FILES+=usr/include/clang/2.8/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.8/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.8/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.8
 # 20110119: netinet/sctp_cc_functions.h removed
 OLD_FILES+=usr/include/netinet/sctp_cc_functions.h
 # 20110119: Remove SYSCTL_*X* sysctl additions
 OLD_FILES+=usr/share/man/man9/SYSCTL_XINT.9.gz \
     usr/share/man/man9/SYSCTL_XLONG.9.gz
 
 # 20110112: Update dialog to new version, rename old libdialog to libodialog,
 #     removing associated man pages and header files.
 OLD_FILES+=usr/share/man/man3/draw_shadow.3.gz \
     usr/share/man/man3/draw_box.3.gz usr/share/man/man3/line_edit.3.gz \
     usr/share/man/man3/strheight.3.gz usr/share/man/man3/strwidth.3.gz \
     usr/share/man/man3/dialog_create_rc.3.gz \
     usr/share/man/man3/dialog_yesno.3.gz usr/share/man/man3/dialog_noyes.3.gz \
     usr/share/man/man3/dialog_prgbox.3.gz \
     usr/share/man/man3/dialog_textbox.3.gz usr/share/man/man3/dialog_menu.3.gz \
     usr/share/man/man3/dialog_checklist.3.gz \
     usr/share/man/man3/dialog_radiolist.3.gz \
     usr/share/man/man3/dialog_inputbox.3.gz \
     usr/share/man/man3/dialog_clear_norefresh.3.gz \
     usr/share/man/man3/dialog_clear.3.gz usr/share/man/man3/dialog_update.3.gz \
     usr/share/man/man3/dialog_fselect.3.gz \
     usr/share/man/man3/dialog_notify.3.gz \
     usr/share/man/man3/dialog_mesgbox.3.gz \
     usr/share/man/man3/dialog_gauge.3.gz usr/share/man/man3/init_dialog.3.gz \
     usr/share/man/man3/end_dialog.3.gz usr/share/man/man3/use_helpfile.3.gz \
     usr/share/man/man3/use_helpline.3.gz usr/share/man/man3/get_helpline.3.gz \
     usr/share/man/man3/restore_helpline.3.gz \
     usr/share/man/man3/dialog_msgbox.3.gz \
     usr/share/man/man3/dialog_ftree.3.gz usr/share/man/man3/dialog_tree.3.gz \
     usr/share/examples/dialog/README usr/share/examples/dialog/checklist \
     usr/share/examples/dialog/ftreebox usr/share/examples/dialog/infobox \
     usr/share/examples/dialog/inputbox usr/share/examples/dialog/menubox \
     usr/share/examples/dialog/msgbox usr/share/examples/dialog/prgbox \
     usr/share/examples/dialog/radiolist usr/share/examples/dialog/textbox \
     usr/share/examples/dialog/treebox usr/share/examples/dialog/yesno \
     usr/share/examples/libdialog/Makefile usr/share/examples/libdialog/check1.c\
     usr/share/examples/libdialog/check2.c usr/share/examples/libdialog/check3.c\
     usr/share/examples/libdialog/dselect.c \
     usr/share/examples/libdialog/fselect.c \
     usr/share/examples/libdialog/ftree1.c \
     usr/share/examples/libdialog/ftree1.test \
     usr/share/examples/libdialog/ftree2.c \
     usr/share/examples/libdialog/ftree2.test \
     usr/share/examples/libdialog/gauge.c usr/share/examples/libdialog/input1.c \
     usr/share/examples/libdialog/input2.c usr/share/examples/libdialog/menu1.c \
     usr/share/examples/libdialog/menu2.c usr/share/examples/libdialog/menu3.c \
     usr/share/examples/libdialog/msg.c usr/share/examples/libdialog/prgbox.c \
     usr/share/examples/libdialog/radio1.c usr/share/examples/libdialog/radio2.c\
     usr/share/examples/libdialog/radio3.c usr/share/examples/libdialog/text.c \
     usr/share/examples/libdialog/tree.c usr/share/examples/libdialog/yesno.c
 OLD_DIRS+=usr/share/examples/libdialog usr/share/examples/dialog
 # 20101114: Remove long-obsolete MAKEDEV.8
 OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz
 # 20101112: vgonel(9) has gone to private API a while ago
 OLD_FILES+=usr/share/man/man9/vgonel.9.gz
 # 20101112: removed gasp.info
 OLD_FILES+=usr/share/info/gasp.info.gz
 # 20101109: machine/mutex.h removed
 OLD_FILES+=usr/include/machine/mutex.h
 # 20101109: headers moved from machine/ to x86/
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/mptable.h
 .endif
 # 20101101: headers moved from machine/ to x86/
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/apicreg.h
 OLD_FILES+=usr/include/machine/mca.h
 .endif
 # 20101020: catch up with vm_page_sleep_if_busy rename
 OLD_FILES+=usr/share/man/man9/vm_page_sleep_busy.9.gz
 # 20101018: taskqueue(9) updates
 OLD_FILES+=usr/share/man/man9/taskqueue_find.9.gz
 # 20101011: removed subblock.h from liblzma
 OLD_FILES+=usr/include/lzma/subblock.h
 # 20101002: removed manpath.config
 OLD_FILES+=etc/manpath.config
 OLD_FILES+=usr/share/examples/etc/manpath.config
 # 20100910: renamed sbuf_overflowed to sbuf_error
 OLD_FILES+=usr/share/man/man9/sbuf_overflowed.9.gz
 # 20100815: retired last traces of chooseproc(9)
 OLD_FILES+=usr/share/man/man9/chooseproc.9.gz
 # 20100806: removal of unused libcompat routines
 OLD_FILES+=usr/share/man/man3/ascftime.3.gz
 OLD_FILES+=usr/share/man/man3/cfree.3.gz
 OLD_FILES+=usr/share/man/man3/cftime.3.gz
 OLD_FILES+=usr/share/man/man3/getpw.3.gz
 # 20100725: acpi_aiboost(4) removal
 OLD_FILES+=usr/share/man/man4/acpi_aiboost.4.gz
 # 20100724: nfsclient/nfs_lock.h moved to nfs/nfs_lock.h
 OLD_FILES+=usr/include/nfsclient/nfs_lock.h
 # 20100720: new clang import which bumps version from 2.0 to 2.8
 OLD_FILES+=usr/include/clang/2.0/emmintrin.h
 OLD_FILES+=usr/include/clang/2.0/mm_malloc.h
 OLD_FILES+=usr/include/clang/2.0/mmintrin.h
 OLD_FILES+=usr/include/clang/2.0/pmmintrin.h
 OLD_FILES+=usr/include/clang/2.0/tmmintrin.h
 OLD_FILES+=usr/include/clang/2.0/xmmintrin.h
 OLD_DIRS+=usr/include/clang/2.0
 # 20100706: removed pc-sysinstall's detect-vmware.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-query/detect-vmware.sh
 # 20100701: [powerpc] removed <machine/intr.h>
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/intr.h
 .endif
 # 20100514: library version bump for versioned symbols for liblzma
 OLD_LIBS+=usr/lib/liblzma.so.0
 # 20100511: move GCC-specific headers to /usr/include/gcc
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/emmintrin.h
 OLD_FILES+=usr/include/mm_malloc.h
 OLD_FILES+=usr/include/pmmintrin.h
 OLD_FILES+=usr/include/xmmintrin.h
 .endif
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/mmintrin.h
 .endif
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/altivec.h
 OLD_FILES+=usr/include/ppc-asm.h
 OLD_FILES+=usr/include/spe.h
 .endif
 # 20100416: [mips] removed <machine/psl.h>
 .if ${TARGET_ARCH} == "mips"
 OLD_FILES+=usr/include/machine/psl.h
 .endif
 # 20100415: [mips] removed unused headers
 .if ${TARGET_ARCH} == "mips"
 OLD_FILES+=usr/include/machine/archtype.h
 OLD_FILES+=usr/include/machine/segments.h
 OLD_FILES+=usr/include/machine/rm7000.h
 OLD_FILES+=usr/include/machine/defs.h
 OLD_FILES+=usr/include/machine/queue.h
 .endif
 # 20100326: gcpio removal
 OLD_FILES+=usr/bin/gcpio
 OLD_FILES+=usr/share/info/cpio.info.gz
 OLD_FILES+=usr/share/man/man1/gcpio.1.gz
 # 20100322: libz update
 OLD_LIBS+=lib/libz.so.5
 # 20100314: removal of regexp.h
 OLD_FILES+=usr/include/regexp.h
 OLD_FILES+=usr/share/man/man3/regexp.3.gz
 OLD_FILES+=usr/share/man/man3/regsub.3.gz
 # 20100303: actual removal of utmp.h
 OLD_FILES+=usr/include/utmp.h
 # 20100208: man pages moved
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/alpm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/amdpm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/mcd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/padlock.4.gz
 OLD_FILES+=usr/share/man/man4/i386/pcf.4.gz
 OLD_FILES+=usr/share/man/man4/i386/scd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/viapm.4.gz
 .endif
 # 20100122: move BSDL bc/dc USD documents to /usr/share/doc/usd
 OLD_FILES+=usr/share/doc/papers/bc.ascii.gz
 OLD_FILES+=usr/share/doc/papers/dc.ascii.gz
 # 20100120: replacing GNU bc/dc with BSDL versions
 OLD_FILES+=usr/share/examples/bc/ckbook.b
 OLD_FILES+=usr/share/examples/bc/pi.b
 OLD_FILES+=usr/share/examples/bc/primes.b
 OLD_FILES+=usr/share/examples/bc/twins.b
 OLD_FILES+=usr/share/info/dc.info.gz
 OLD_DIRS+=usr/share/examples/bc
 # 20100114: removal of ttyslot(3)
 OLD_FILES+=usr/share/man/man3/ttyslot.3.gz
 # 20100113: remove utmp.h, replace it by utmpx.h
 OLD_FILES+=usr/share/man/man3/login.3.gz
 OLD_FILES+=usr/share/man/man3/logout.3.gz
 OLD_FILES+=usr/share/man/man3/logwtmp.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_endutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxline.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_getutxuser.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_pututxline.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_setutxent.3.gz
 OLD_FILES+=usr/share/man/man3/ulog_setutxfile.3.gz
 OLD_FILES+=usr/share/man/man5/lastlog.5.gz
 OLD_FILES+=usr/share/man/man5/utmp.5.gz
 OLD_FILES+=usr/share/man/man5/wtmp.5.gz
 OLD_LIBS+=lib/libutil.so.8
 # 20100105: new userland semaphore implementation
 OLD_FILES+=usr/include/sys/semaphore.h
 # 20100103: ntptrace(8) removed
 OLD_FILES+=usr/sbin/ntptrace
 OLD_FILES+=usr/share/man/man8/ntptrace.8.gz
 # 20091229: remove no longer relevant examples
 OLD_FILES+=usr/share/examples/pppd/auth-down.sample
 OLD_FILES+=usr/share/examples/pppd/auth-up.sample
 OLD_FILES+=usr/share/examples/pppd/chap-secrets.sample
 OLD_FILES+=usr/share/examples/pppd/chat.sh.sample
 OLD_FILES+=usr/share/examples/pppd/ip-down.sample
 OLD_FILES+=usr/share/examples/pppd/ip-up.sample
 OLD_FILES+=usr/share/examples/pppd/options.sample
 OLD_FILES+=usr/share/examples/pppd/pap-secrets.sample
 OLD_FILES+=usr/share/examples/pppd/ppp.deny.sample
 OLD_FILES+=usr/share/examples/pppd/ppp.shells.sample
 OLD_DIRS+=usr/share/examples/pppd
 OLD_FILES+=usr/share/examples/slattach/unit-command.sh
 OLD_DIRS+=usr/share/examples/slattach
 OLD_FILES+=usr/share/examples/sliplogin/slip.hosts
 OLD_FILES+=usr/share/examples/sliplogin/slip.login
 OLD_FILES+=usr/share/examples/sliplogin/slip.logout
 OLD_FILES+=usr/share/examples/sliplogin/slip.slparms
 OLD_DIRS+=usr/share/examples/sliplogin
 OLD_FILES+=usr/share/examples/startslip/sldown.sh
 OLD_FILES+=usr/share/examples/startslip/slip.sh
 OLD_FILES+=usr/share/examples/startslip/slup.sh
 OLD_DIRS+=usr/share/examples/startslip
 # 20091202: unify rc.firewall and rc.firewall6
 OLD_FILES+=etc/rc.d/ip6fw
 OLD_FILES+=etc/rc.firewall6
 OLD_FILES+=usr/share/examples/etc/rc.firewall6
 # 20091117: removal of rc.early(8) link
 OLD_FILES+=usr/share/man/man8/rc.early.8.gz
 # 20091027: pselect.3 implemented as syscall
 OLD_FILES+=usr/share/man/man3/pselect.3.gz
 # 20091005: fusword.9 and susword.9 removed
 OLD_FILES+=usr/share/man/man9/fusword.9.gz
 OLD_FILES+=usr/share/man/man9/susword.9.gz
 # 20090909: vesa and dpms promoted to be i386/amd64 common
 OLD_FILES+=usr/include/machine/pc/vesa.h
 OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz
 # 20090904: remove lukemftpd
 OLD_FILES+=usr/libexec/lukemftpd
 OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ftpusers.5.gz
 OLD_FILES+=usr/share/man/man8/lukemftpd.8.gz
 # 20090902: BSD.{x11,x11-4}.dist are dead and BSD.local.dist lives in ports/
 OLD_FILES+=etc/mtree/BSD.local.dist
 OLD_FILES+=etc/mtree/BSD.x11.dist
 OLD_FILES+=etc/mtree/BSD.x11-4.dist
 # 20090812: net80211 documentation overhaul
 OLD_FILES+=usr/share/man/man9/ieee80211_add_rates.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_add_xrates.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_alloc_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_begin_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_cfgget.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_cfgset.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_chan2ieee.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_chan2mode.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_create_ibss.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_crypto_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_crypto_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_decap.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_dump_pkt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_dup_bss.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_encap.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_end_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_find_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_fix_rate.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_free_allnodes.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_ieee2mhz.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_ioctl.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_lookup_node.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media2rate.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_change.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_init.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_media_status.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_mhz2ieee.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_next_scan.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_node_lateattach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_print_essid.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_proto_attach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_proto_detach.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_rate2media.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_recv_mgmt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_send_mgmt.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_setmode.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_timeout_nodes.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_watchdog.9.gz
 OLD_FILES+=usr/share/man/man9/ieee80211_wep_crypt.9.gz
 # 20090801: vimage.h removed in favour of vnet.h
 OLD_FILES+=usr/include/sys/vimage.h
 # 20101208: libbsnmp was moved to usr/lib
 MOVED_LIBS+=lib/libbsnmp.so.5
 # 20090719: library version bump for 8.0
 OLD_LIBS+=lib/libalias.so.6
 OLD_LIBS+=lib/libavl.so.1
 OLD_LIBS+=lib/libbegemot.so.3
 OLD_LIBS+=lib/libbsdxml.so.3
 OLD_LIBS+=lib/libbsnmp.so.4
 OLD_LIBS+=lib/libcam.so.4
 OLD_LIBS+=lib/libcrypt.so.4
 OLD_LIBS+=lib/libcrypto.so.5
 OLD_LIBS+=lib/libctf.so.1
 OLD_LIBS+=lib/libdevstat.so.6
 OLD_LIBS+=lib/libdtrace.so.1
 OLD_LIBS+=lib/libedit.so.6
 OLD_LIBS+=lib/libgeom.so.4
 OLD_LIBS+=lib/libipsec.so.3
 OLD_LIBS+=lib/libipx.so.4
 OLD_LIBS+=lib/libkiconv.so.3
 OLD_LIBS+=lib/libkvm.so.4
 OLD_LIBS+=lib/libmd.so.4
 OLD_LIBS+=lib/libncurses.so.7
 OLD_LIBS+=lib/libncursesw.so.7
 OLD_LIBS+=lib/libnvpair.so.1
 OLD_LIBS+=lib/libpcap.so.6
 OLD_LIBS+=lib/libreadline.so.7
 OLD_LIBS+=lib/libsbuf.so.4
 OLD_LIBS+=lib/libufs.so.4
 OLD_LIBS+=lib/libumem.so.1
 OLD_LIBS+=lib/libutil.so.7
 OLD_LIBS+=lib/libuutil.so.1
 OLD_LIBS+=lib/libz.so.4
 OLD_LIBS+=lib/libzfs.so.1
 OLD_LIBS+=lib/libzpool.so.1
 OLD_LIBS+=usr/lib/libarchive.so.4
 OLD_LIBS+=usr/lib/libauditd.so.4
 OLD_LIBS+=usr/lib/libbluetooth.so.3
 OLD_LIBS+=usr/lib/libbsm.so.2
 OLD_LIBS+=usr/lib/libbz2.so.3
 OLD_LIBS+=usr/lib/libcalendar.so.4
 OLD_LIBS+=usr/lib/libcom_err.so.4
 OLD_LIBS+=usr/lib/libdevinfo.so.4
 OLD_LIBS+=usr/lib/libdialog.so.6
 OLD_LIBS+=usr/lib/libdwarf.so.1
 OLD_LIBS+=usr/lib/libfetch.so.5
 OLD_LIBS+=usr/lib/libform.so.4
 OLD_LIBS+=usr/lib/libformw.so.4
 OLD_LIBS+=usr/lib/libftpio.so.7
 OLD_LIBS+=usr/lib/libgnuregex.so.4
 OLD_LIBS+=usr/lib/libgpib.so.2
 OLD_LIBS+=usr/lib/libhistory.so.7
 OLD_LIBS+=usr/lib/libmagic.so.3
 OLD_LIBS+=usr/lib/libmemstat.so.2
 OLD_LIBS+=usr/lib/libmenu.so.4
 OLD_LIBS+=usr/lib/libmenuw.so.4
 OLD_LIBS+=usr/lib/libmilter.so.4
 OLD_LIBS+=usr/lib/libncp.so.3
 OLD_LIBS+=usr/lib/libnetgraph.so.3
 OLD_LIBS+=usr/lib/libngatm.so.3
 OLD_LIBS+=usr/lib/libobjc.so.3
 OLD_LIBS+=usr/lib/libopie.so.5
 OLD_LIBS+=usr/lib/libpam.so.4
 OLD_LIBS+=usr/lib/libpanel.so.4
 OLD_LIBS+=usr/lib/libpanelw.so.4
 OLD_LIBS+=usr/lib/libpmc.so.4
 OLD_LIBS+=usr/lib/libproc.so.1
 OLD_LIBS+=usr/lib/libradius.so.3
 OLD_LIBS+=usr/lib/librpcsvc.so.4
 OLD_LIBS+=usr/lib/libsdp.so.3
 OLD_LIBS+=usr/lib/libsmb.so.3
 OLD_LIBS+=usr/lib/libssh.so.4
 OLD_LIBS+=usr/lib/libssl.so.5
 OLD_LIBS+=usr/lib/libtacplus.so.3
 OLD_LIBS+=usr/lib/libugidfw.so.3
 OLD_LIBS+=usr/lib/libusb.so.1
 OLD_LIBS+=usr/lib/libusbhid.so.3
 OLD_LIBS+=usr/lib/libvgl.so.5
 OLD_LIBS+=usr/lib/libwrap.so.5
 OLD_LIBS+=usr/lib/libypclnt.so.3
 OLD_LIBS+=usr/lib/pam_chroot.so.4
 OLD_LIBS+=usr/lib/pam_deny.so.4
 OLD_LIBS+=usr/lib/pam_echo.so.4
 OLD_LIBS+=usr/lib/pam_exec.so.4
 OLD_LIBS+=usr/lib/pam_ftpusers.so.4
 OLD_LIBS+=usr/lib/pam_group.so.4
 OLD_LIBS+=usr/lib/pam_guest.so.4
 OLD_LIBS+=usr/lib/pam_krb5.so.4
 OLD_LIBS+=usr/lib/pam_ksu.so.4
 OLD_LIBS+=usr/lib/pam_lastlog.so.4
 OLD_LIBS+=usr/lib/pam_login_access.so.4
 OLD_LIBS+=usr/lib/pam_nologin.so.4
 OLD_LIBS+=usr/lib/pam_opie.so.4
 OLD_LIBS+=usr/lib/pam_opieaccess.so.4
 OLD_LIBS+=usr/lib/pam_passwdqc.so.4
 OLD_LIBS+=usr/lib/pam_permit.so.4
 OLD_LIBS+=usr/lib/pam_radius.so.4
 OLD_LIBS+=usr/lib/pam_rhosts.so.4
 OLD_LIBS+=usr/lib/pam_rootok.so.4
 OLD_LIBS+=usr/lib/pam_securetty.so.4
 OLD_LIBS+=usr/lib/pam_self.so.4
 OLD_LIBS+=usr/lib/pam_ssh.so.4
 OLD_LIBS+=usr/lib/pam_tacplus.so.4
 OLD_LIBS+=usr/lib/pam_unix.so.4
 OLD_LIBS+=usr/lib/snmp_atm.so.5
 OLD_LIBS+=usr/lib/snmp_bridge.so.5
 OLD_LIBS+=usr/lib/snmp_hostres.so.5
 OLD_LIBS+=usr/lib/snmp_mibII.so.5
 OLD_LIBS+=usr/lib/snmp_netgraph.so.5
 OLD_LIBS+=usr/lib/snmp_pf.so.5
 # 20090718: the gdm pam.d file is no longer required
 OLD_FILES+=etc/pam.d/gdm
 # 20090714: net_add_domain(9) renamed to domain_add(9)
 OLD_FILES+=usr/share/man/man9/net_add_domain.9.gz
 # 20090713: vimage container structs removed
 OLD_FILES+=usr/include/netinet/vinet.h
 OLD_FILES+=usr/include/netinet6/vinet6.h
 OLD_FILES+=usr/include/netipsec/vipsec.h
 # 20090712: ieee80211.4 -> net80211.4
 OLD_FILES+=usr/share/man/man4/ieee80211.4.gz
 # 20090711: typo fixed, kproc_resume,.9 -> kproc_resume.9
 OLD_FILES+=usr/share/man/man9/kproc_resume,.9.gz
 # 20090709: msgctl.3 msgget.3 msgrcv.3 msgsnd.3 manual pages moved
 OLD_FILES+=usr/share/man/man3/msgctl.3.gz
 OLD_FILES+=usr/share/man/man3/msgget.3.gz
 OLD_FILES+=usr/share/man/man3/msgrcv.3.gz
 OLD_FILES+=usr/share/man/man3/msgsnd.3.gz
 # 20090630: old kernel RPC implementation removal
 OLD_FILES+=usr/include/nfs/rpcv2.h
 # 20090624: update usbdi(9)
 OLD_FILES+=usr/share/man/man9/usbd_abort_default_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_abort_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_alloc_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_alloc_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_stall_async.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_clear_endpoint_toggle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_close_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_device2interface_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request_async.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request_flags_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_endpoint_count.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_find_edesc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_find_idesc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_free_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_free_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_desc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_desc_full.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_config_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_device_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_endpoint_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_interface_altindex.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_interface_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_no_alts.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_quirks.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_speed.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_string.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_string_desc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_get_xfer_status.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface2device_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface2endpoint_descriptor.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_interface_count.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_open_pipe.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_open_pipe_intr.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_pipe2device_handle.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_config_index.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_config_no.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_set_interface.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_default_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_isoc_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_setup_xfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_sync_transfer.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_find_desc.9.gz
 # 20090623: number of headers needed for a usb driver reduced
 OLD_FILES+=usr/include/dev/usb/usb_defs.h
 OLD_FILES+=usr/include/dev/usb/usb_error.h
 OLD_FILES+=usr/include/dev/usb/usb_handle_request.h
 OLD_FILES+=usr/include/dev/usb/usb_hid.h
 OLD_FILES+=usr/include/dev/usb/usb_lookup.h
 OLD_FILES+=usr/include/dev/usb/usb_mfunc.h
 OLD_FILES+=usr/include/dev/usb/usb_parse.h
 OLD_FILES+=usr/include/dev/usb/usb_revision.h
 # 20090609: devclass_add_driver is no longer public
 OLD_FILES+=usr/share/man/man9/devclass_add_driver.9.gz
 OLD_FILES+=usr/share/man/man9/devclass_delete_driver.9.gz
 OLD_FILES+=usr/share/man/man9/devclass_find_driver.9.gz
 # 20090605: removal of clists
 OLD_FILES+=usr/include/sys/clist.h
 # 20090602: removal of window(1)
 OLD_FILES+=usr/bin/window
 OLD_FILES+=usr/share/man/man1/window.1.gz
 # 20090531: bind 9.6.1rc1 import
 OLD_LIBS+=usr/lib/liblwres.so.30
 # 20090530: removal of early.sh
 OLD_FILES+=etc/rc.d/early.sh
 # 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER()
 OLD_FILES+=usr/share/man/man3/SLIST_REMOVE_NEXT.3.gz
 OLD_FILES+=usr/share/man/man3/STAILQ_REMOVE_NEXT.3.gz
 # 20090527: removal of legacy USB stack
 OLD_FILES+=usr/include/legacy/dev/usb/dsbr100io.h
 OLD_FILES+=usr/include/legacy/dev/usb/ehcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ehcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/hid.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_urtwreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_urtwvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/ohcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ohcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/rio500_usb.h
 OLD_FILES+=usr/include/legacy/dev/usb/rt2573_ucode.h
 OLD_FILES+=usr/include/legacy/dev/usb/sl811hsreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/sl811hsvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/ubser.h
 OLD_FILES+=usr/include/legacy/dev/usb/ucomvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/udbp.h
 OLD_FILES+=usr/include/legacy/dev/usb/uftdireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/ugraphire_rdesc.h
 OLD_FILES+=usr/include/legacy/dev/usb/uhcireg.h
 OLD_FILES+=usr/include/legacy/dev/usb/uhcivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_mem.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_port.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_quirks.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbcdc.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdi.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdi_util.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbdivar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usbhid.h
 OLD_FILES+=usr/include/legacy/dev/usb/uxb360gp_rdesc.h
 OLD_DIRS+=usr/include/legacy/dev/usb
 OLD_DIRS+=usr/include/legacy/dev
 OLD_DIRS+=usr/include/legacy
 # 20090526: removal of makekey(8)
 OLD_FILES+=usr/libexec/makekey
 OLD_FILES+=usr/share/man/man8/makekey.8.gz
 # 20090522: removal of University of Michigan NFSv4 client
 OLD_FILES+=etc/rc.d/idmapd
 OLD_FILES+=sbin/idmapd
 OLD_FILES+=sbin/mount_nfs4
 OLD_FILES+=usr/share/man/man8/idmapd.8.gz
 OLD_FILES+=usr/share/man/man8/mount_nfs4.8.gz
 # 20090513: removal of legacy versions of USB network interface drivers
 OLD_FILES+=usr/include/legacy/dev/usb/if_upgtvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/usb_ethersubr.h
 # 20090417: removal of legacy versions of USB network interface drivers
 OLD_FILES+=usr/include/legacy/dev/usb/if_auereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_axereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_cdcereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_cuereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_kuereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_ruereg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_rumreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_rumvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_udavreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_uralreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_uralvar.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_zydfw.h
 OLD_FILES+=usr/include/legacy/dev/usb/if_zydreg.h
 OLD_FILES+=usr/include/legacy/dev/usb/kue_fw.h
 # 20090416: removal of ar(4), ray(4), sr(4), raycontrol(8)
 OLD_FILES+=usr/sbin/raycontrol
 OLD_FILES+=usr/share/man/man4/i386/ar.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ray.4.gz
 OLD_FILES+=usr/share/man/man4/i386/sr.4.gz
 OLD_FILES+=usr/share/man/man8/raycontrol.8.gz
 # 20090410: VOP_LEASE.9 removed
 OLD_FILES+=usr/share/man/man9/VOP_LEASE.9.gz
 # 20090406: usb_sw_transfer.h removed
 OLD_FILES+=usr/include/dev/usb/usb_sw_transfer.h
 # 20090405: removal of if_ppp(4) and if_sl(4)
 OLD_FILES+=sbin/slattach rescue/slattach
 OLD_FILES+=sbin/startslip rescue/startslip
 OLD_FILES+=usr/include/net/if_ppp.h
 OLD_FILES+=usr/include/net/if_pppvar.h
 OLD_FILES+=usr/include/net/if_slvar.h
 OLD_FILES+=usr/include/net/ppp_comp.h
 OLD_FILES+=usr/include/net/slip.h
 OLD_FILES+=usr/sbin/sliplogin
 OLD_FILES+=usr/sbin/slstat
 OLD_FILES+=usr/sbin/pppd
 OLD_FILES+=usr/sbin/pppstats
 OLD_FILES+=usr/share/man/man1/startslip.1.gz
 OLD_FILES+=usr/share/man/man4/if_ppp.4.gz
 OLD_FILES+=usr/share/man/man4/if_sl.4.gz
 OLD_FILES+=usr/share/man/man4/ppp.4.gz
 OLD_FILES+=usr/share/man/man4/sl.4.gz
 OLD_FILES+=usr/share/man/man8/pppd.8.gz
 OLD_FILES+=usr/share/man/man8/pppstats.8.gz
 OLD_FILES+=usr/share/man/man8/slattach.8.gz
 OLD_FILES+=usr/share/man/man8/slip.8.gz
 OLD_FILES+=usr/share/man/man8/sliplogin.8.gz
 OLD_FILES+=usr/share/man/man8/slstat.8.gz
 # 20090321: libpcap upgraded to 1.0.0
 OLD_LIBS+=lib/libpcap.so.5
 # 20090319: uscanner(4) has been removed
 OLD_FILES+=usr/share/man/man4/uscanner.4.gz
 # 20090313: k8temp(4) renamed to amdtemp(4)
 OLD_FILES+=usr/share/man/man4/k8temp.4.gz
 # 20090308: libusb.so.1 renamed
 OLD_LIBS+=usr/lib/libusb20.so.1
 OLD_FILES+=usr/lib/libusb20.a
 OLD_FILES+=usr/lib/libusb20.so
 OLD_FILES+=usr/lib/libusb20_p.a
 OLD_FILES+=usr/include/libusb20_compat01.h
 OLD_FILES+=usr/include/libusb20_compat10.h
 # 20090226: libmp(3) functions renamed
 OLD_LIBS+=usr/lib/libmp.so.6
 # 20090223: changeover of USB stacks
 OLD_FILES+=usr/include/dev/usb2/include/ufm2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/urio2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_cdc.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_defs.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_devid.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_devtable.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_endian.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_error.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_hid.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_ioctl.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_mfunc.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_revision.h
 OLD_FILES+=usr/include/dev/usb2/include/usb2_standard.h
 OLD_DIRS+=usr/include/dev/usb2/include
 OLD_DIRS+=usr/include/dev/usb2
 OLD_FILES+=usr/include/dev/usb/dsbr100io.h
 OLD_FILES+=usr/include/dev/usb/ehcireg.h
 OLD_FILES+=usr/include/dev/usb/ehcivar.h
 OLD_FILES+=usr/include/dev/usb/hid.h
 OLD_FILES+=usr/include/dev/usb/if_auereg.h
 OLD_FILES+=usr/include/dev/usb/if_axereg.h
 OLD_FILES+=usr/include/dev/usb/if_cdcereg.h
 OLD_FILES+=usr/include/dev/usb/if_cuereg.h
 OLD_FILES+=usr/include/dev/usb/if_kuereg.h
 OLD_FILES+=usr/include/dev/usb/if_ruereg.h
 OLD_FILES+=usr/include/dev/usb/if_rumreg.h
 OLD_FILES+=usr/include/dev/usb/if_rumvar.h
 OLD_FILES+=usr/include/dev/usb/if_udavreg.h
 OLD_FILES+=usr/include/dev/usb/if_upgtvar.h
 OLD_FILES+=usr/include/dev/usb/if_uralreg.h
 OLD_FILES+=usr/include/dev/usb/if_uralvar.h
 OLD_FILES+=usr/include/dev/usb/if_urtwreg.h
 OLD_FILES+=usr/include/dev/usb/if_urtwvar.h
 OLD_FILES+=usr/include/dev/usb/if_zydfw.h
 OLD_FILES+=usr/include/dev/usb/if_zydreg.h
 OLD_FILES+=usr/include/dev/usb/kue_fw.h
 OLD_FILES+=usr/include/dev/usb/ohcireg.h
 OLD_FILES+=usr/include/dev/usb/ohcivar.h
 OLD_FILES+=usr/include/dev/usb/rio500_usb.h
 OLD_FILES+=usr/include/dev/usb/rt2573_ucode.h
 OLD_FILES+=usr/include/dev/usb/sl811hsreg.h
 OLD_FILES+=usr/include/dev/usb/sl811hsvar.h
 OLD_FILES+=usr/include/dev/usb/ubser.h
 OLD_FILES+=usr/include/dev/usb/ucomvar.h
 OLD_FILES+=usr/include/dev/usb/udbp.h
 OLD_FILES+=usr/include/dev/usb/uftdireg.h
 OLD_FILES+=usr/include/dev/usb/ugraphire_rdesc.h
 OLD_FILES+=usr/include/dev/usb/uhcireg.h
 OLD_FILES+=usr/include/dev/usb/uhcivar.h
 OLD_FILES+=usr/include/dev/usb/usb_ethersubr.h
 OLD_FILES+=usr/include/dev/usb/usb_mem.h
 OLD_FILES+=usr/include/dev/usb/usb_port.h
 OLD_FILES+=usr/include/dev/usb/usb_quirks.h
 OLD_FILES+=usr/include/dev/usb/usbcdc.h
 OLD_FILES+=usr/include/dev/usb/usbdivar.h
 OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h
 OLD_FILES+=usr/sbin/usbdevs
 OLD_FILES+=usr/share/man/man8/usbdevs.8.gz
 # 20090203: removal of pccard header files
 OLD_FILES+=usr/include/pccard/cardinfo.h
 OLD_FILES+=usr/include/pccard/cis.h
 OLD_DIRS+=usr/include/pccard
 # 20090203: adding_user.8 moved to adding_user.7
 OLD_FILES+=usr/share/man/man8/adding_user.8.gz
 # 20090102: file 4.26 import
 OLD_FILES+=usr/share/misc/magic.mime
 OLD_FILES+=usr/share/misc/magic.mime.mgc
 # 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1
 OLD_FILES+=usr/share/man/man8/nsupdate.8.gz
 # 20081223: ipprotosw.h removed
 OLD_FILES+=usr/include/netinet/ipprotosw.h
 # 20081123: vfs_mountedon.9 removed
 OLD_FILES+=usr/share/man/man9/vfs_mountedon.9.gz
 # 20081023: FREE.9 and MALLOC.9 removed
 OLD_FILES+=usr/share/man/man9/FREE.9.gz
 OLD_FILES+=usr/share/man/man9/MALLOC.9.gz
 # 20080928: removal of inaccurate device_ids(9) manual page
 OLD_FILES+=usr/share/man/man9/device_ids.9.gz
 OLD_FILES+=usr/share/man/man9/major.9.gz
 OLD_FILES+=usr/share/man/man9/minor.9.gz
 OLD_FILES+=usr/share/man/man9/umajor.9.gz
 OLD_FILES+=usr/share/man/man9/uminor.9.gz
 # 20080917: removal of manpage for axed kernel primitive suser(9)
 OLD_FILES+=usr/share/man/man9/suser.9.gz
 OLD_FILES+=usr/share/man/man9/suser_cred.9.gz
 # 20080913: pax removed from rescue
 OLD_FILES+=rescue/pax
 # 20080823: removal of unneeded pt_chown, to implement grantpt(3)
 OLD_FILES+=usr/libexec/pt_chown
 # 20080822: ntp 4.2.4p5 import
 OLD_FILES+=usr/share/doc/ntp/driver23.html
 OLD_FILES+=usr/share/doc/ntp/driver24.html
 # 20080821: several man pages moved from man4.i386 to man4
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/acpi_aiboost.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_asus.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_fujitsu.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_ibm.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_panasonic.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_sony.4.gz
 OLD_FILES+=usr/share/man/man4/i386/acpi_toshiba.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ichwd.4.gz
 OLD_FILES+=usr/share/man/man4/i386/if_ndis.4.gz
 OLD_FILES+=usr/share/man/man4/i386/io.4.gz
 OLD_FILES+=usr/share/man/man4/i386/linux.4.gz
 OLD_FILES+=usr/share/man/man4/i386/ndis.4.gz
 .endif
 # 20080820: MPSAFE TTY layer integrated
 OLD_FILES+=usr/include/sys/linedisc.h
 OLD_FILES+=usr/share/man/man3/posix_openpt.3.gz
 # 20080725: sgtty.h removed
 OLD_FILES+=usr/include/sgtty.h
 # 20080706: bsdlabel(8) removed on powerpc
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=sbin/bsdlabel
 OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz
 .endif
 # 20080704: sbsh(4) removed
 OLD_FILES+=usr/share/man/man4/if_sbsh.4.gz
 OLD_FILES+=usr/share/man/man4/sbsh.4.gz
 # 20080704: cnw(4) removed
 OLD_FILES+=usr/share/man/man4/if_cnw.4.gz
 OLD_FILES+=usr/share/man/man4/cnw.4.gz
 # 20080704: oltr(4) removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/if_oltr.4.gz
 OLD_FILES+=usr/share/man/man4/i386/oltr.4.gz
 .endif
 # 20080704: arl(4) removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/sbin/arlcontrol
 OLD_FILES+=usr/share/man/man4/i386/arl.4.gz
 OLD_FILES+=usr/share/man/man8/arlcontrol.8.gz
 .endif
 # 20080703: sunlabel only for sparc64
 .if ${TARGET_ARCH} != "sparc64"
 OLD_FILES+=sbin/sunlabel
 OLD_FILES+=usr/share/man/man8/sunlabel.8.gz
 .endif
 # 20080701: wpa_supplicant.conf moved to share/examples/etc/
 OLD_FILES+=usr/share/examples/wpa_supplicant/wpa_supplicant.conf
 OLD_DIRS+=usr/share/examples/wpa_supplicant
 # 20080614: pecoff image activator removed
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/pecoff_machdep.h
 .endif
 # 20080614: sgtty removed
 OLD_FILES+=usr/include/sys/ttychars.h
 OLD_FILES+=usr/include/sys/ttydev.h
 OLD_FILES+=usr/share/man/man3/gtty.3.gz
 OLD_FILES+=usr/share/man/man3/stty.3.gz
 # 20080609: gpt(8) removed
 OLD_FILES+=sbin/gpt
 OLD_FILES+=usr/share/man/man8/gpt.8.gz
 # 20080525: I4B removed
 OLD_FILES+=etc/isdn/answer
 OLD_FILES+=etc/isdn/isdntel
 OLD_FILES+=etc/isdn/record
 OLD_FILES+=etc/isdn/tell
 OLD_FILES+=etc/isdn/tell-record
 OLD_FILES+=etc/isdn/unknown_incoming
 OLD_FILES+=etc/isdn/holidays.D
 OLD_FILES+=etc/isdn/isdnd.rates.A
 OLD_FILES+=etc/isdn/isdnd.rates.D
 OLD_FILES+=etc/isdn/isdnd.rates.F
 OLD_FILES+=etc/isdn/isdnd.rates.L
 OLD_FILES+=etc/isdn/isdnd.rates.UK.BT
 OLD_FILES+=etc/isdn/isdnd.rc.sample
 OLD_FILES+=etc/isdn/isdntel.alias.sample
 OLD_DIRS+=etc/isdn
 OLD_FILES+=etc/rc.d/isdnd
 OLD_FILES+=usr/include/i4b/i4b_cause.h
 OLD_FILES+=usr/include/i4b/i4b_debug.h
 OLD_FILES+=usr/include/i4b/i4b_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_rbch_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_tel_ioctl.h
 OLD_FILES+=usr/include/i4b/i4b_trace.h
 OLD_DIRS+=usr/include/i4b
 OLD_FILES+=usr/sbin/dtmfdecode
 OLD_FILES+=usr/sbin/g711conv
 OLD_FILES+=usr/sbin/isdnd
 OLD_FILES+=usr/sbin/isdndebug
 OLD_FILES+=usr/sbin/isdndecode
 OLD_FILES+=usr/sbin/isdnmonitor
 OLD_FILES+=usr/sbin/isdnphone
 OLD_FILES+=usr/sbin/isdntel
 OLD_FILES+=usr/sbin/isdntelctl
 OLD_FILES+=usr/sbin/isdntrace
 OLD_FILES+=usr/share/isdn/0.al
 OLD_FILES+=usr/share/isdn/1.al
 OLD_FILES+=usr/share/isdn/2.al
 OLD_FILES+=usr/share/isdn/3.al
 OLD_FILES+=usr/share/isdn/4.al
 OLD_FILES+=usr/share/isdn/5.al
 OLD_FILES+=usr/share/isdn/6.al
 OLD_FILES+=usr/share/isdn/7.al
 OLD_FILES+=usr/share/isdn/8.al
 OLD_FILES+=usr/share/isdn/9.al
 OLD_FILES+=usr/share/isdn/beep.al
 OLD_FILES+=usr/share/isdn/msg.al
 OLD_DIRS+=usr/share/isdn
 OLD_FILES+=usr/share/man/man1/dtmfdecode.1.gz
 OLD_FILES+=usr/share/man/man1/g711conv.1.gz
 OLD_FILES+=usr/share/man/man4/i4b.4.gz
 OLD_FILES+=usr/share/man/man4/i4bcapi.4.gz
 OLD_FILES+=usr/share/man/man4/i4bctl.4.gz
 OLD_FILES+=usr/share/man/man4/i4bing.4.gz
 OLD_FILES+=usr/share/man/man4/i4bipr.4.gz
 OLD_FILES+=usr/share/man/man4/i4bisppp.4.gz
 OLD_FILES+=usr/share/man/man4/i4bq921.4.gz
 OLD_FILES+=usr/share/man/man4/i4bq931.4.gz
 OLD_FILES+=usr/share/man/man4/i4brbch.4.gz
 OLD_FILES+=usr/share/man/man4/i4btel.4.gz
 OLD_FILES+=usr/share/man/man4/i4btrc.4.gz
 OLD_FILES+=usr/share/man/man4/iavc.4.gz
 OLD_FILES+=usr/share/man/man4/isic.4.gz
 OLD_FILES+=usr/share/man/man4/ifpi.4.gz
 OLD_FILES+=usr/share/man/man4/ifpi2.4.gz
 OLD_FILES+=usr/share/man/man4/ifpnp.4.gz
 OLD_FILES+=usr/share/man/man4/ihfc.4.gz
 OLD_FILES+=usr/share/man/man4/itjc.4.gz
 OLD_FILES+=usr/share/man/man4/iwic.4.gz
 OLD_FILES+=usr/share/man/man5/isdnd.rc.5.gz
 OLD_FILES+=usr/share/man/man5/isdnd.rates.5.gz
 OLD_FILES+=usr/share/man/man5/isdnd.acct.5.gz
 OLD_FILES+=usr/share/man/man8/isdnd.8.gz
 OLD_FILES+=usr/share/man/man8/isdndebug.8.gz
 OLD_FILES+=usr/share/man/man8/isdndecode.8.gz
 OLD_FILES+=usr/share/man/man8/isdnmonitor.8.gz
 OLD_FILES+=usr/share/man/man8/isdnphone.8.gz
 OLD_FILES+=usr/share/man/man8/isdntel.8.gz
 OLD_FILES+=usr/share/man/man8/isdntelctl.8.gz
 OLD_FILES+=usr/share/man/man8/isdntrace.8.gz
 OLD_FILES+=usr/share/examples/isdn/contrib/README
 OLD_FILES+=usr/share/examples/isdn/contrib/anleitung.ppp
 OLD_FILES+=usr/share/examples/isdn/contrib/answer.c
 OLD_FILES+=usr/share/examples/isdn/contrib/answer.sh
 OLD_FILES+=usr/share/examples/isdn/contrib/convert.sh
 OLD_FILES+=usr/share/examples/isdn/contrib/hplay.c
 OLD_FILES+=usr/share/examples/isdn/contrib/i4b-ppp-newbie.txt
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnctl
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnd_acct
 OLD_FILES+=usr/share/examples/isdn/contrib/isdnd_acct.pl
 OLD_FILES+=usr/share/examples/isdn/contrib/isdntelmux.c
 OLD_FILES+=usr/share/examples/isdn/contrib/mrtg-isp0.sh
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/Makefile
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/README
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp-isdnd.rc
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp.8
 OLD_FILES+=usr/share/examples/isdn/i4brunppp/i4brunppp.c
 OLD_FILES+=usr/share/examples/isdn/v21/Makefile
 OLD_FILES+=usr/share/examples/isdn/v21/README
 OLD_FILES+=usr/share/examples/isdn/v21/v21modem.c
 OLD_FILES+=usr/share/examples/isdn/FAQ
 OLD_FILES+=usr/share/examples/isdn/KERNEL
 OLD_FILES+=usr/share/examples/isdn/Overview
 OLD_FILES+=usr/share/examples/isdn/README
 OLD_FILES+=usr/share/examples/isdn/ROADMAP
 OLD_FILES+=usr/share/examples/isdn/ReleaseNotes
 OLD_FILES+=usr/share/examples/isdn/Resources
 OLD_FILES+=usr/share/examples/isdn/SupportedCards
 OLD_FILES+=usr/share/examples/isdn/ThankYou
 OLD_DIRS+=usr/share/examples/isdn/contrib
 OLD_DIRS+=usr/share/examples/isdn/i4brunppp
 OLD_DIRS+=usr/share/examples/isdn/v21
 OLD_DIRS+=usr/share/examples/isdn
 OLD_FILES+=usr/share/examples/ppp/isdnd.rc
 OLD_FILES+=usr/share/examples/ppp/ppp.conf.isdn
 # 20080525: ng_atmpif removed
 OLD_FILES+=usr/include/netgraph/atm/ng_atmpif.h
 OLD_FILES+=usr/share/man/man4/ng_atmpif.4.gz
 # 20080522: pmap_addr_hint removed
 OLD_FILES+=usr/share/man/man9/pmap_addr_hint.9.gz
 # 20080517: ipsec_osdep.h removed
 OLD_FILES+=usr/include/netipsec/ipsec_osdep.h
 # 20080507: heimdal 1.1 import
 OLD_LIBS+=usr/lib/libasn1.so.9
 OLD_LIBS+=usr/lib/libgssapi.so.9
 OLD_LIBS+=usr/lib/libgssapi_krb5.so.9
 OLD_LIBS+=usr/lib/libhdb.so.9
 OLD_LIBS+=usr/lib/libkadm5clnt.so.9
 OLD_LIBS+=usr/lib/libkadm5srv.so.9
 OLD_LIBS+=usr/lib/libkafs5.so.9
 OLD_LIBS+=usr/lib/libkrb5.so.9
 OLD_LIBS+=usr/lib/libroken.so.9
 # 20080420: Symbol card support dropped
 OLD_FILES+=usr/include/dev/wi/spectrum24t_cf.h
 # 20080420: awi removal
 OLD_FILES+=usr/share/man/man4/awi.4.gz
 OLD_FILES+=usr/share/man/man4/if_awi.4.gz
 # 20080331: pkg_sign has been removed
 OLD_FILES+=usr/sbin/pkg_check
 OLD_FILES+=usr/sbin/pkg_sign
 OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
 OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
 # 20080314: stack_print(9) mlink fixed
 OLD_FILES+=usr/share/man/man9/stack_printf.9.gz
 # 20080312: libkse removal
 OLD_FILES+=usr/include/sys/kse.h
 OLD_FILES+=usr/lib/libkse.so
 OLD_LIBS+=usr/lib/libkse.so.3
 OLD_FILES+=usr/share/man/man2/kse.2.gz
 OLD_FILES+=usr/share/man/man2/kse_create.2.gz
 OLD_FILES+=usr/share/man/man2/kse_exit.2.gz
 OLD_FILES+=usr/share/man/man2/kse_release.2.gz
 OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz
 OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz
 OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
 # 20080225: bsdar/bsdranlib rename to ar/ranlib
 OLD_FILES+=usr/bin/bsdar
 OLD_FILES+=usr/bin/bsdranlib
 OLD_FILES+=usr/share/man/man1/bsdar.1.gz
 OLD_FILES+=usr/share/man/man1/bsdranlib.1.gz
 # 20080220: geom_lvm rename to geom_linux_lvm
 OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
 # 20080126: oldcard.4 removal
 OLD_FILES+=usr/share/man/man4/card.4.gz
 OLD_FILES+=usr/share/man/man4/oldcard.4.gz
 # 20080122: Removed from the tree
 OLD_FILES+=usr/share/man/man9/BUF_REFCNT.9.gz
 # 20080108: Moved to section 2
 OLD_FILES+=usr/share/man/man3/shm_open.3.gz
 OLD_FILES+=usr/share/man/man3/shm_unlink.3.gz
 # 20071207: Merged with fortunes-o.real
 OLD_FILES+=usr/share/games/fortune/fortunes2-o
 OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat
 # 20071201: Removal of XRPU driver
 OLD_FILES+=usr/include/sys/xrpuio.h
 # 20071129: Disabled static versions of libkse by default
 OLD_FILES+=usr/lib/libkse.a
 OLD_FILES+=usr/lib/libkse_p.a
 OLD_FILES+=usr/lib/libkse_pic.a
 # 20071129: Removed a Solaris compatibility header
 OLD_FILES+=usr/include/sys/_elf_solaris.h
 # 20071125: Renamed to pmc_get_msr()
 OLD_FILES+=usr/share/man/man3/pmc_x86_get_msr.3.gz
 # 20071108: Removed very crunch OLDCARD support file
 OLD_FILES+=etc/defaults/pccard.conf
 # 20071025: rc.d/nfslocking superseded by rc.d/lockd and rc.d/statd
 OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd
 OLD_FILES+=etc/cached.conf
 OLD_FILES+=etc/rc.d/cached
 OLD_FILES+=usr/sbin/cached
 OLD_FILES+=usr/share/man/man5/cached.conf.5.gz
 OLD_FILES+=usr/share/man/man8/cached.8.gz
 # 20070807: removal of PowerPC specific header file
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/interruptvar.h
 .endif
 # 20070801: fast_ipsec.4 gone
 OLD_FILES+=usr/share/man/man4/fast_ipsec.4.gz
 # 20070715: netatm temporarily disconnected (removed 20080525)
 OLD_FILES+=rescue/atm
 OLD_FILES+=rescue/fore_dnld
 OLD_FILES+=rescue/ilmid
 OLD_FILES+=sbin/atm
 OLD_FILES+=sbin/fore_dnld
 OLD_FILES+=sbin/ilmid
 OLD_FILES+=usr/include/libatm.h
 OLD_FILES+=usr/include/netatm/atm.h
 OLD_FILES+=usr/include/netatm/atm_cm.h
 OLD_FILES+=usr/include/netatm/atm_if.h
 OLD_FILES+=usr/include/netatm/atm_ioctl.h
 OLD_FILES+=usr/include/netatm/atm_pcb.h
 OLD_FILES+=usr/include/netatm/atm_sap.h
 OLD_FILES+=usr/include/netatm/atm_sigmgr.h
 OLD_FILES+=usr/include/netatm/atm_stack.h
 OLD_FILES+=usr/include/netatm/atm_sys.h
 OLD_FILES+=usr/include/netatm/atm_var.h
 OLD_FILES+=usr/include/netatm/atm_vc.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm_serv.h
 OLD_FILES+=usr/include/netatm/ipatm/ipatm_var.h
 OLD_FILES+=usr/include/netatm/port.h
 OLD_FILES+=usr/include/netatm/queue.h
 OLD_FILES+=usr/include/netatm/sigpvc/sigpvc_var.h
 OLD_FILES+=usr/include/netatm/spans/spans_cls.h
 OLD_FILES+=usr/include/netatm/spans/spans_kxdr.h
 OLD_FILES+=usr/include/netatm/spans/spans_var.h
 OLD_FILES+=usr/include/netatm/uni/sscf_uni.h
 OLD_FILES+=usr/include/netatm/uni/sscf_uni_var.h
 OLD_FILES+=usr/include/netatm/uni/sscop.h
 OLD_FILES+=usr/include/netatm/uni/sscop_misc.h
 OLD_FILES+=usr/include/netatm/uni/sscop_pdu.h
 OLD_FILES+=usr/include/netatm/uni/sscop_var.h
 OLD_FILES+=usr/include/netatm/uni/uni.h
 OLD_FILES+=usr/include/netatm/uni/uniip_var.h
 OLD_FILES+=usr/include/netatm/uni/unisig.h
 OLD_FILES+=usr/include/netatm/uni/unisig_decode.h
 OLD_FILES+=usr/include/netatm/uni/unisig_mbuf.h
 OLD_FILES+=usr/include/netatm/uni/unisig_msg.h
 OLD_FILES+=usr/include/netatm/uni/unisig_print.h
 OLD_FILES+=usr/include/netatm/uni/unisig_var.h
 OLD_FILES+=usr/lib/libatm.a
 OLD_FILES+=usr/lib/libatm_p.a
 OLD_FILES+=usr/sbin/atmarpd
 OLD_FILES+=usr/sbin/scspd
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atm.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atmarpd.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/fore_dnld.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/ilmid.8.gz
 OLD_FILES+=usr/share/man/en.ISO8859-1/man8/scspd.8.gz
 OLD_FILES+=usr/share/man/man8/atm.8.gz
 OLD_FILES+=usr/share/man/man8/atmarpd.8.gz
 OLD_FILES+=usr/share/man/man8/fore_dnld.8.gz
 OLD_FILES+=usr/share/man/man8/ilmid.8.gz
 OLD_FILES+=usr/share/man/man8/scspd.8.gz
 OLD_FILES+=usr/share/examples/atm/NOTES
 OLD_FILES+=usr/share/examples/atm/README
 OLD_FILES+=usr/share/examples/atm/Startup
 OLD_FILES+=usr/share/examples/atm/atm-config.sh
 OLD_FILES+=usr/share/examples/atm/atm-sockets.txt
 OLD_FILES+=usr/share/examples/atm/cpcs-design.txt
 OLD_FILES+=usr/share/examples/atm/fore-microcode.txt
 OLD_FILES+=usr/share/examples/atm/sscf-design.txt
 OLD_FILES+=usr/share/examples/atm/sscop-design.txt
 OLD_LIBS+=lib/libatm.so.5
 OLD_FILES+=usr/lib/libatm.so
 OLD_DIRS+=usr/include/netatm/sigpvc
 OLD_DIRS+=usr/include/netatm/spans
 OLD_DIRS+=usr/include/netatm/ipatm
 OLD_DIRS+=usr/include/netatm/uni
 OLD_DIRS+=usr/include/netatm
 OLD_DIRS+=usr/share/examples/atm
 # 20070705: I4B headers repo-copied to include/i4b/
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/include/machine/i4b_cause.h
 OLD_FILES+=usr/include/machine/i4b_debug.h
 OLD_FILES+=usr/include/machine/i4b_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_rbch_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h
 OLD_FILES+=usr/include/machine/i4b_trace.h
 .endif
 # 20070703: pf 4.1 import
 OLD_FILES+=usr/libexec/ftp-proxy
 # 20070701: KAME IPSec removal
 OLD_FILES+=usr/include/netinet6/ah.h
 OLD_FILES+=usr/include/netinet6/ah6.h
 OLD_FILES+=usr/include/netinet6/ah_aesxcbcmac.h
 OLD_FILES+=usr/include/netinet6/esp.h
 OLD_FILES+=usr/include/netinet6/esp6.h
 OLD_FILES+=usr/include/netinet6/esp_aesctr.h
 OLD_FILES+=usr/include/netinet6/esp_camellia.h
 OLD_FILES+=usr/include/netinet6/esp_rijndael.h
 OLD_FILES+=usr/include/netinet6/ipsec.h
 OLD_FILES+=usr/include/netinet6/ipsec6.h
 OLD_FILES+=usr/include/netinet6/ipcomp.h
 OLD_FILES+=usr/include/netinet6/ipcomp6.h
 OLD_FILES+=usr/include/netkey/key.h
 OLD_FILES+=usr/include/netkey/key_debug.h
 OLD_FILES+=usr/include/netkey/key_var.h
 OLD_FILES+=usr/include/netkey/keydb.h
 OLD_FILES+=usr/include/netkey/keysock.h
 OLD_DIRS+=usr/include/netkey
 # 20070701: remove wicontrol
 OLD_FILES+=usr/sbin/wicontrol
 OLD_FILES+=usr/share/man/man8/wicontrol.8.gz
 # 20070625: umapfs removal
 OLD_FILES+=rescue/mount_umapfs
 OLD_FILES+=sbin/mount_umapfs
 OLD_FILES+=usr/include/fs/umapfs/umap.h
 OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz
 OLD_DIRS+=usr/include/fs/umapfs
 # 20070618: Removal of the PROTO.localhost* files
 OLD_FILES+=etc/namedb/PROTO.localhost-v6.rev
 OLD_FILES+=etc/namedb/PROTO.localhost.rev
 OLD_FILES+=etc/namedb/make-localhost
 # 20070618: shared library version bump
 OLD_LIBS+=lib/libalias.so.5
 OLD_LIBS+=lib/libbsnmp.so.3
 OLD_LIBS+=lib/libncurses.so.6
 OLD_LIBS+=lib/libncursesw.so.6
 OLD_LIBS+=lib/libreadline.so.6
 OLD_LIBS+=usr/lib/libdialog.so.5
 OLD_LIBS+=usr/lib/libgnuregex.so.3
 OLD_LIBS+=usr/lib/libhistory.so.6
 OLD_LIBS+=usr/lib/libpam.so.3
 OLD_LIBS+=usr/lib/libssh.so.3
 OLD_LIBS+=usr/lib/pam_chroot.so.3
 OLD_LIBS+=usr/lib/pam_deny.so.3
 OLD_LIBS+=usr/lib/pam_echo.so.3
 OLD_LIBS+=usr/lib/pam_exec.so.3
 OLD_LIBS+=usr/lib/pam_ftpusers.so.3
 OLD_LIBS+=usr/lib/pam_group.so.3
 OLD_LIBS+=usr/lib/pam_guest.so.3
 OLD_LIBS+=usr/lib/pam_krb5.so.3
 OLD_LIBS+=usr/lib/pam_ksu.so.3
 OLD_LIBS+=usr/lib/pam_lastlog.so.3
 OLD_LIBS+=usr/lib/pam_login_access.so.3
 OLD_LIBS+=usr/lib/pam_nologin.so.3
 OLD_LIBS+=usr/lib/pam_opie.so.3
 OLD_LIBS+=usr/lib/pam_opieaccess.so.3
 OLD_LIBS+=usr/lib/pam_passwdqc.so.3
 OLD_LIBS+=usr/lib/pam_permit.so.3
 OLD_LIBS+=usr/lib/pam_radius.so.3
 OLD_LIBS+=usr/lib/pam_rhosts.so.3
 OLD_LIBS+=usr/lib/pam_rootok.so.3
 OLD_LIBS+=usr/lib/pam_securetty.so.3
 OLD_LIBS+=usr/lib/pam_self.so.3
 OLD_LIBS+=usr/lib/pam_ssh.so.3
 OLD_LIBS+=usr/lib/pam_tacplus.so.3
 OLD_LIBS+=usr/lib/pam_unix.so.3
 OLD_LIBS+=usr/lib/snmp_atm.so.4
 OLD_LIBS+=usr/lib/snmp_bridge.so.4
 OLD_LIBS+=usr/lib/snmp_hostres.so.4
 OLD_LIBS+=usr/lib/snmp_mibII.so.4
 OLD_LIBS+=usr/lib/snmp_netgraph.so.4
 OLD_LIBS+=usr/lib/snmp_pf.so.4
 # 20070613: IPX over IP tunnel removal
 OLD_FILES+=usr/include/netipx/ipx_ip.h
 # 20070605: sched_core removal
 OLD_FILES+=usr/share/man/man4/sched_core.4.gz
 # 20070603: BIND 9.4.1 import
 OLD_LIBS+=usr/lib/liblwres.so.10
 # 20070521: shared library version bump
 OLD_LIBS+=lib/libatm.so.4
 OLD_LIBS+=lib/libbegemot.so.2
 OLD_LIBS+=lib/libbsdxml.so.2
 OLD_LIBS+=lib/libcam.so.3
 OLD_LIBS+=lib/libcrypt.so.3
 OLD_LIBS+=lib/libdevstat.so.5
 OLD_LIBS+=lib/libedit.so.5
 OLD_LIBS+=lib/libgeom.so.3
 OLD_LIBS+=lib/libipsec.so.2
 OLD_LIBS+=lib/libipx.so.3
 OLD_LIBS+=lib/libkiconv.so.2
 OLD_LIBS+=lib/libkse.so.2
 OLD_LIBS+=lib/libkvm.so.3
 OLD_LIBS+=lib/libm.so.4
 OLD_LIBS+=lib/libmd.so.3
 OLD_LIBS+=lib/libpcap.so.4
 OLD_LIBS+=lib/libpthread.so.2
 OLD_LIBS+=lib/libsbuf.so.3
 OLD_LIBS+=lib/libthr.so.2
 OLD_LIBS+=lib/libufs.so.3
 OLD_LIBS+=lib/libutil.so.6
 OLD_LIBS+=lib/libz.so.3
 OLD_LIBS+=usr/lib/libbluetooth.so.2
 OLD_LIBS+=usr/lib/libbsm.so.1
 OLD_LIBS+=usr/lib/libbz2.so.2
 OLD_LIBS+=usr/lib/libcalendar.so.3
 OLD_LIBS+=usr/lib/libcom_err.so.3
 OLD_LIBS+=usr/lib/libdevinfo.so.3
 OLD_LIBS+=usr/lib/libfetch.so.4
 OLD_LIBS+=usr/lib/libform.so.3
 OLD_LIBS+=usr/lib/libformw.so.3
 OLD_LIBS+=usr/lib/libftpio.so.6
 OLD_LIBS+=usr/lib/libgpib.so.1
 OLD_LIBS+=usr/lib/libkse.so.2
 OLD_LIBS+=usr/lib/libmagic.so.2
 OLD_LIBS+=usr/lib/libmemstat.so.1
 OLD_LIBS+=usr/lib/libmenu.so.3
 OLD_LIBS+=usr/lib/libmenuw.so.3
 OLD_LIBS+=usr/lib/libmilter.so.3
 OLD_LIBS+=usr/lib/libmp.so.5
 OLD_LIBS+=usr/lib/libncp.so.2
 OLD_LIBS+=usr/lib/libnetgraph.so.2
 OLD_LIBS+=usr/lib/libngatm.so.2
 OLD_LIBS+=usr/lib/libopie.so.4
 OLD_LIBS+=usr/lib/libpanel.so.3
 OLD_LIBS+=usr/lib/libpanelw.so.3
 OLD_LIBS+=usr/lib/libpmc.so.3
 OLD_LIBS+=usr/lib/libradius.so.2
 OLD_LIBS+=usr/lib/librpcsvc.so.3
 OLD_LIBS+=usr/lib/libsdp.so.2
 OLD_LIBS+=usr/lib/libsmb.so.2
 OLD_LIBS+=usr/lib/libstdc++.so.5
 OLD_LIBS+=usr/lib/libtacplus.so.2
 OLD_LIBS+=usr/lib/libthr.so.2
 OLD_LIBS+=usr/lib/libthread_db.so.2
 OLD_LIBS+=usr/lib/libugidfw.so.2
 OLD_LIBS+=usr/lib/libusbhid.so.2
 OLD_LIBS+=usr/lib/libvgl.so.4
 OLD_LIBS+=usr/lib/libwrap.so.4
 OLD_LIBS+=usr/lib/libypclnt.so.2
 OLD_LIBS+=usr/lib/snmp_bridge.so.3
 OLD_LIBS+=usr/lib/snmp_hostres.so.3
 # 20070519: GCC 4.2
 OLD_FILES+=usr/bin/f77
 OLD_FILES+=usr/bin/protoize
 OLD_FILES+=usr/include/g2c.h
 OLD_FILES+=usr/libexec/f771
 OLD_FILES+=usr/share/info/g77.info.gz
 OLD_FILES+=usr/share/man/man1/f77.1.gz
 OLD_FILES+=usr/include/c++/3.4/algorithm
 OLD_FILES+=usr/include/c++/3.4/backward/algo.h
 OLD_FILES+=usr/include/c++/3.4/backward/algobase.h
 OLD_FILES+=usr/include/c++/3.4/backward/alloc.h
 OLD_FILES+=usr/include/c++/3.4/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/3.4/backward/bvector.h
 OLD_FILES+=usr/include/c++/3.4/backward/complex.h
 OLD_FILES+=usr/include/c++/3.4/backward/defalloc.h
 OLD_FILES+=usr/include/c++/3.4/backward/deque.h
 OLD_FILES+=usr/include/c++/3.4/backward/fstream.h
 OLD_FILES+=usr/include/c++/3.4/backward/function.h
 OLD_FILES+=usr/include/c++/3.4/backward/hash_map.h
 OLD_FILES+=usr/include/c++/3.4/backward/hash_set.h
 OLD_FILES+=usr/include/c++/3.4/backward/hashtable.h
 OLD_FILES+=usr/include/c++/3.4/backward/heap.h
 OLD_FILES+=usr/include/c++/3.4/backward/iomanip.h
 OLD_FILES+=usr/include/c++/3.4/backward/iostream.h
 OLD_FILES+=usr/include/c++/3.4/backward/istream.h
 OLD_FILES+=usr/include/c++/3.4/backward/iterator.h
 OLD_FILES+=usr/include/c++/3.4/backward/list.h
 OLD_FILES+=usr/include/c++/3.4/backward/map.h
 OLD_FILES+=usr/include/c++/3.4/backward/multimap.h
 OLD_FILES+=usr/include/c++/3.4/backward/multiset.h
 OLD_FILES+=usr/include/c++/3.4/backward/new.h
 OLD_FILES+=usr/include/c++/3.4/backward/ostream.h
 OLD_FILES+=usr/include/c++/3.4/backward/pair.h
 OLD_FILES+=usr/include/c++/3.4/backward/queue.h
 OLD_FILES+=usr/include/c++/3.4/backward/rope.h
 OLD_FILES+=usr/include/c++/3.4/backward/set.h
 OLD_FILES+=usr/include/c++/3.4/backward/slist.h
 OLD_FILES+=usr/include/c++/3.4/backward/stack.h
 OLD_FILES+=usr/include/c++/3.4/backward/stream.h
 OLD_FILES+=usr/include/c++/3.4/backward/streambuf.h
 OLD_FILES+=usr/include/c++/3.4/backward/strstream
 OLD_FILES+=usr/include/c++/3.4/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/3.4/backward/tree.h
 OLD_FILES+=usr/include/c++/3.4/backward/vector.h
 OLD_FILES+=usr/include/c++/3.4/bits/allocator.h
 OLD_FILES+=usr/include/c++/3.4/bits/atomic_word.h
 OLD_FILES+=usr/include/c++/3.4/bits/atomicity.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_file.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/basic_string.h
 OLD_FILES+=usr/include/c++/3.4/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++allocator.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++config.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++io.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++locale.h
 OLD_FILES+=usr/include/c++/3.4/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/3.4/bits/char_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/codecvt.h
 OLD_FILES+=usr/include/c++/3.4/bits/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/3.4/bits/concept_check.h
 OLD_FILES+=usr/include/c++/3.4/bits/concurrence.h
 OLD_FILES+=usr/include/c++/3.4/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/3.4/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/3.4/bits/deque.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/functexcept.h
 OLD_FILES+=usr/include/c++/3.4/bits/gslice.h
 OLD_FILES+=usr/include/c++/3.4/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/3.4/bits/gthr.h
 OLD_FILES+=usr/include/c++/3.4/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/ios_base.h
 OLD_FILES+=usr/include/c++/3.4/bits/istream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/list.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/3.4/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/localefwd.h
 OLD_FILES+=usr/include/c++/3.4/bits/mask_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/messages_members.h
 OLD_FILES+=usr/include/c++/3.4/bits/os_defines.h
 OLD_FILES+=usr/include/c++/3.4/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/postypes.h
 OLD_FILES+=usr/include/c++/3.4/bits/slice_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_function.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_list.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_map.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_set.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_threads.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/3.4/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/3.4/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/3.4/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/3.4/bits/time_members.h
 OLD_FILES+=usr/include/c++/3.4/bits/type_traits.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_after.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/3.4/bits/valarray_before.h
 OLD_FILES+=usr/include/c++/3.4/bits/vector.tcc
 OLD_FILES+=usr/include/c++/3.4/bitset
 OLD_FILES+=usr/include/c++/3.4/cassert
 OLD_FILES+=usr/include/c++/3.4/cctype
 OLD_FILES+=usr/include/c++/3.4/cerrno
 OLD_FILES+=usr/include/c++/3.4/cfloat
 OLD_FILES+=usr/include/c++/3.4/ciso646
 OLD_FILES+=usr/include/c++/3.4/climits
 OLD_FILES+=usr/include/c++/3.4/clocale
 OLD_FILES+=usr/include/c++/3.4/cmath
 OLD_FILES+=usr/include/c++/3.4/complex
 OLD_FILES+=usr/include/c++/3.4/csetjmp
 OLD_FILES+=usr/include/c++/3.4/csignal
 OLD_FILES+=usr/include/c++/3.4/cstdarg
 OLD_FILES+=usr/include/c++/3.4/cstddef
 OLD_FILES+=usr/include/c++/3.4/cstdio
 OLD_FILES+=usr/include/c++/3.4/cstdlib
 OLD_FILES+=usr/include/c++/3.4/cstring
 OLD_FILES+=usr/include/c++/3.4/ctime
 OLD_FILES+=usr/include/c++/3.4/cwchar
 OLD_FILES+=usr/include/c++/3.4/cwctype
 OLD_FILES+=usr/include/c++/3.4/cxxabi.h
 OLD_FILES+=usr/include/c++/3.4/debug/bitset
 OLD_FILES+=usr/include/c++/3.4/debug/debug.h
 OLD_FILES+=usr/include/c++/3.4/debug/deque
 OLD_FILES+=usr/include/c++/3.4/debug/formatter.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_map
 OLD_FILES+=usr/include/c++/3.4/debug/hash_map.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_multimap.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_multiset.h
 OLD_FILES+=usr/include/c++/3.4/debug/hash_set
 OLD_FILES+=usr/include/c++/3.4/debug/hash_set.h
 OLD_FILES+=usr/include/c++/3.4/debug/list
 OLD_FILES+=usr/include/c++/3.4/debug/map
 OLD_FILES+=usr/include/c++/3.4/debug/map.h
 OLD_FILES+=usr/include/c++/3.4/debug/multimap.h
 OLD_FILES+=usr/include/c++/3.4/debug/multiset.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_base.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.h
 OLD_FILES+=usr/include/c++/3.4/debug/safe_iterator.tcc
 OLD_FILES+=usr/include/c++/3.4/debug/safe_sequence.h
 OLD_FILES+=usr/include/c++/3.4/debug/set
 OLD_FILES+=usr/include/c++/3.4/debug/set.h
 OLD_FILES+=usr/include/c++/3.4/debug/string
 OLD_FILES+=usr/include/c++/3.4/debug/vector
 OLD_FILES+=usr/include/c++/3.4/deque
 OLD_FILES+=usr/include/c++/3.4/exception
 OLD_FILES+=usr/include/c++/3.4/exception_defines.h
 OLD_FILES+=usr/include/c++/3.4/ext/algorithm
 OLD_FILES+=usr/include/c++/3.4/ext/bitmap_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/debug_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/enc_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/ext/functional
 OLD_FILES+=usr/include/c++/3.4/ext/hash_fun.h
 OLD_FILES+=usr/include/c++/3.4/ext/hash_map
 OLD_FILES+=usr/include/c++/3.4/ext/hash_set
 OLD_FILES+=usr/include/c++/3.4/ext/hashtable.h
 OLD_FILES+=usr/include/c++/3.4/ext/iterator
 OLD_FILES+=usr/include/c++/3.4/ext/malloc_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/memory
 OLD_FILES+=usr/include/c++/3.4/ext/mt_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/new_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/numeric
 OLD_FILES+=usr/include/c++/3.4/ext/pod_char_traits.h
 OLD_FILES+=usr/include/c++/3.4/ext/pool_allocator.h
 OLD_FILES+=usr/include/c++/3.4/ext/rb_tree
 OLD_FILES+=usr/include/c++/3.4/ext/rope
 OLD_FILES+=usr/include/c++/3.4/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/3.4/ext/slist
 OLD_FILES+=usr/include/c++/3.4/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/ext/stdio_sync_filebuf.h
 OLD_FILES+=usr/include/c++/3.4/fstream
 OLD_FILES+=usr/include/c++/3.4/functional
 OLD_FILES+=usr/include/c++/3.4/iomanip
 OLD_FILES+=usr/include/c++/3.4/ios
 OLD_FILES+=usr/include/c++/3.4/iosfwd
 OLD_FILES+=usr/include/c++/3.4/iostream
 OLD_FILES+=usr/include/c++/3.4/istream
 OLD_FILES+=usr/include/c++/3.4/iterator
 OLD_FILES+=usr/include/c++/3.4/limits
 OLD_FILES+=usr/include/c++/3.4/list
 OLD_FILES+=usr/include/c++/3.4/locale
 OLD_FILES+=usr/include/c++/3.4/map
 OLD_FILES+=usr/include/c++/3.4/memory
 OLD_FILES+=usr/include/c++/3.4/new
 OLD_FILES+=usr/include/c++/3.4/numeric
 OLD_FILES+=usr/include/c++/3.4/ostream
 OLD_FILES+=usr/include/c++/3.4/queue
 OLD_FILES+=usr/include/c++/3.4/set
 OLD_FILES+=usr/include/c++/3.4/sstream
 OLD_FILES+=usr/include/c++/3.4/stack
 OLD_FILES+=usr/include/c++/3.4/stdexcept
 OLD_FILES+=usr/include/c++/3.4/streambuf
 OLD_FILES+=usr/include/c++/3.4/string
 OLD_FILES+=usr/include/c++/3.4/typeinfo
 OLD_FILES+=usr/include/c++/3.4/utility
 OLD_FILES+=usr/include/c++/3.4/valarray
 OLD_FILES+=usr/include/c++/3.4/vector
 OLD_DIRS+=usr/include/c++/3.4/backward
 OLD_DIRS+=usr/include/c++/3.4/bits
 OLD_DIRS+=usr/include/c++/3.4/debug
 OLD_DIRS+=usr/include/c++/3.4/ext
 OLD_DIRS+=usr/include/c++/3.4
 # 20070510: zpool/zfs moved to /sbin
 OLD_FILES+=usr/sbin/zfs
 OLD_FILES+=usr/sbin/zpool
 # 20070423: rc.bluetooth (examples) removed
 OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth
 OLD_DIRS+=usr/share/examples/netgraph/bluetooth
 # 20070421: worm.4 removed
 OLD_FILES+=usr/share/man/man4/worm.4.gz
 # 20070417: trunk(4) renamed to lagg(4)
 OLD_FILES+=usr/include/net/if_trunk.h
 # 20070409: uuidgen moved to /bin/
 OLD_FILES+=usr/bin/uuidgen
 # 20070328: bzip2 1.0.4
 OLD_FILES+=usr/share/info/bzip2.info.gz
 # 20070303: libarchive 2.0
 OLD_LIBS+=usr/lib/libarchive.so.3
 # 20070301: remove addr2ascii and ascii2addr
 OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz
 OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz
 # 20070225: vm_page_unmanage() removed
 OLD_FILES+=usr/share/man/man9/vm_page_unmanage.9.gz
 # 20070216: VFS_VPTOFH(9) -> VOP_VPTOFH(9)
 OLD_FILES+=usr/share/man/man9/VFS_VPTOFH.9.gz
 # 20070212: kame.4 removed
 OLD_FILES+=usr/share/man/man4/kame.4.gz
 # 20070201: remove libmytinfo link
 OLD_FILES+=usr/lib/libmytinfo.a
 OLD_FILES+=usr/lib/libmytinfo.so
 OLD_FILES+=usr/lib/libmytinfo_p.a
 OLD_FILES+=usr/lib/libmytinfow.a
 OLD_FILES+=usr/lib/libmytinfow.so
 OLD_FILES+=usr/lib/libmytinfow_p.a
 # 20070128: remove vnconfig
 OLD_FILES+=usr/sbin/vnconfig
 # 20070127: remove bpf_compat.h
 OLD_FILES+=usr/include/net/bpf_compat.h
 # 20070125: objformat bites the dust
 OLD_FILES+=usr/bin/objformat
 OLD_FILES+=usr/share/man/man1/objformat.1.gz
 OLD_FILES+=usr/include/objformat.h
 OLD_FILES+=usr/share/man/man3/getobjformat.3.gz
 # 20061008: rename *.so.4 libalias modules to *.so and move to /lib
 # This uses MOVED_LIBS because the new files are libraries even though
 # the old files to remove are symlinks
 MOVED_LIBS+=usr/lib/libalias_cuseeme.so
 MOVED_LIBS+=usr/lib/libalias_dummy.so
 MOVED_LIBS+=usr/lib/libalias_ftp.so
 MOVED_LIBS+=usr/lib/libalias_irc.so
 MOVED_LIBS+=usr/lib/libalias_nbt.so
 MOVED_LIBS+=usr/lib/libalias_pptp.so
 MOVED_LIBS+=usr/lib/libalias_skinny.so
 MOVED_LIBS+=usr/lib/libalias_smedia.so
 OLD_LIBS+=lib/libalias_cuseeme.so.4
 OLD_LIBS+=lib/libalias_dummy.so.4
 OLD_LIBS+=lib/libalias_ftp.so.4
 OLD_LIBS+=lib/libalias_irc.so.4
 OLD_LIBS+=lib/libalias_nbt.so.4
 OLD_LIBS+=lib/libalias_pptp.so.4
 OLD_LIBS+=lib/libalias_skinny.so.4
 OLD_LIBS+=lib/libalias_smedia.so.4
 # 20061126: remove old man page
 OLD_FILES+=usr/share/man/man3/archive_read_set_bytes_per_block.3.gz
 # 20061125: remove old man page
 OLD_FILES+=usr/share/man/man9/devsw.9.gz
 # 20061122: remove obsolete mount programs
 OLD_FILES+=sbin/mount_devfs
 OLD_FILES+=sbin/mount_ext2fs
 OLD_FILES+=sbin/mount_fdescfs
 OLD_FILES+=sbin/mount_linprocfs
 OLD_FILES+=sbin/mount_procfs
 OLD_FILES+=sbin/mount_std
 OLD_FILES+=rescue/mount_devfs
 OLD_FILES+=rescue/mount_ext2fs
 OLD_FILES+=rescue/mount_fdescfs
 OLD_FILES+=rescue/mount_linprocfs
 OLD_FILES+=rescue/mount_procfs
 OLD_FILES+=rescue/mount_std
 OLD_FILES+=usr/share/man/man8/mount_devfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_ext2fs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_fdescfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_linprocfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_procfs.8.gz
 OLD_FILES+=usr/share/man/man8/mount_std.8.gz
 # 20061116: uhidev.4 removed
 OLD_FILES+=usr/share/man/man4/uhidev.4.gz
 # 20061106: archive_write_prepare.3 removed
 OLD_FILES+=usr/share/man/man3/archive_write_prepare.3.gz
 # 20061018: pccardc removed
 OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz
 # 20060930: demangle.h from contrib/libstdc++/include/ext/
 OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
 # 20060929: mrouted removed
 OLD_FILES+=usr/sbin/map-mbone
 OLD_FILES+=usr/sbin/mrinfo
 OLD_FILES+=usr/sbin/mrouted
 OLD_FILES+=usr/sbin/mtrace
 OLD_FILES+=usr/share/man/man8/map-mbone.8.gz
 OLD_FILES+=usr/share/man/man8/mrinfo.8.gz
 OLD_FILES+=usr/share/man/man8/mrouted.8.gz
 OLD_FILES+=usr/share/man/man8/mtrace.8.gz
 # 20060924: tcpslice removed
 OLD_FILES+=usr/sbin/tcpslice
 OLD_FILES+=usr/share/man/man1/tcpslice.1.gz
 # 20060829: kvmdb cleanup script removed
 OLD_FILES+=etc/periodic/weekly/120.clean-kvmdb
 # 20060822: ramdisk{,-own} have been replaced by mdconfig{,2}
 OLD_FILES+=etc/rc.d/ramdisk
 OLD_FILES+=etc/rc.d/ramdisk-own
 # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
 OLD_FILES+=usr/include/openssl/eng_int.h
 OLD_FILES+=usr/include/openssl/hw_4758_cca_err.h
 OLD_FILES+=usr/include/openssl/hw_aep_err.h
 OLD_FILES+=usr/include/openssl/hw_atalla_err.h
 OLD_FILES+=usr/include/openssl/hw_cswift_err.h
 OLD_FILES+=usr/include/openssl/hw_ncipher_err.h
 OLD_FILES+=usr/include/openssl/hw_nuron_err.h
 OLD_FILES+=usr/include/openssl/hw_sureware_err.h
 OLD_FILES+=usr/include/openssl/hw_ubsec_err.h
 # 20060713: mount_linsysfs(8) never existed in 7.x
 OLD_FILES+=sbin/mount_linsysfs
 OLD_FILES+=usr/share/man/man8/mount_linsysfs.8.gz
 # 20060704: KAME compat file net_osdep.h removed
 OLD_FILES+=usr/include/net/net_osdep.h
 # 20060605: man page links removed by OpenBSM 1.0 alpha 6 import
 OLD_FILES+=usr/share/man/man3/au_to_socket.3.gz
 OLD_FILES+=usr/share/man/man3/au_to_socket_ex_128.3.gz
 OLD_FILES+=usr/share/man/man3/au_to_socket_ex_32.3.gz
 # 20060517: pcvt removed
 OLD_FILES+=usr/share/pcvt/README.FIRST
 OLD_FILES+=usr/share/pcvt/Etc/xmodmap-german
 OLD_FILES+=usr/share/pcvt/Etc/pcvt.sh
 OLD_FILES+=usr/share/pcvt/Etc/pcvt.el
 OLD_FILES+=usr/share/pcvt/Etc/Terminfo
 OLD_FILES+=usr/share/pcvt/Etc/Termcap
 OLD_DIRS+=usr/share/pcvt/Etc
 OLD_FILES+=usr/share/pcvt/Doc/NotesAndHints
 OLD_FILES+=usr/share/pcvt/Doc/Keyboard.VT
 OLD_FILES+=usr/share/pcvt/Doc/Keyboard.HP
 OLD_FILES+=usr/share/pcvt/Doc/EscapeSequences
 OLD_FILES+=usr/share/pcvt/Doc/Charsets
 OLD_FILES+=usr/share/pcvt/Doc/CharGen
 OLD_FILES+=usr/share/pcvt/Doc/Bibliography
 OLD_FILES+=usr/share/pcvt/Doc/Acknowledgements
 OLD_DIRS+=usr/share/pcvt/Doc
 OLD_DIRS+=usr/share/pcvt
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.816
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.814
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.810
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220l.808
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.816
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.814
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.810
 OLD_FILES+=usr/share/misc/pcvtfonts/vt220h.808
 OLD_DIRS+=usr/share/misc/pcvtfonts
 OLD_FILES+=usr/share/misc/keycap.pcvt
 OLD_FILES+=usr/share/man/man8/ispcvt.8.gz
 OLD_FILES+=usr/share/man/man5/keycap.5.gz
 OLD_FILES+=usr/share/man/man4/pcvt.4.gz
 OLD_FILES+=usr/share/man/man3/kgetstr.3.gz
 OLD_FILES+=usr/share/man/man3/kgetnum.3.gz
 OLD_FILES+=usr/share/man/man3/kgetflag.3.gz
 OLD_FILES+=usr/share/man/man3/kgetent.3.gz
 OLD_FILES+=usr/share/man/man3/keycap.3.gz
 OLD_FILES+=usr/share/man/man1/vt220keys.1.gz
 OLD_FILES+=usr/share/man/man1/scon.1.gz
 OLD_FILES+=usr/share/man/man1/loadfont.1.gz
 OLD_FILES+=usr/share/man/man1/kcon.1.gz
 OLD_FILES+=usr/share/man/man1/fontedit.1.gz
 OLD_FILES+=usr/share/man/man1/cursor.1.gz
 OLD_FILES+=usr/sbin/vt220keys
 OLD_FILES+=usr/sbin/scon
 OLD_FILES+=usr/sbin/loadfont
 OLD_FILES+=usr/sbin/kcon
 OLD_FILES+=usr/sbin/ispcvt
 OLD_FILES+=usr/sbin/fontedit
 OLD_FILES+=usr/sbin/cursor
 OLD_FILES+=usr/lib/libkeycap_p.a
 OLD_FILES+=usr/lib/libkeycap.a
 OLD_FILES+=usr/include/machine/pcvt_ioctl.h
 # 20060514: lnc(4) replaced by le(4)
 OLD_FILES+=usr/share/man/man4/i386/lnc.4.gz
 # 20060512: remove ip6fw
 OLD_FILES+=etc/periodic/security/600.ip6fwdenied
 OLD_FILES+=etc/periodic/security/650.ip6fwlimit
 OLD_FILES+=sbin/ip6fw
 OLD_FILES+=usr/include/netinet6/ip6_fw.h
 OLD_FILES+=usr/share/man/man8/ip6fw.8.gz
 # 20060424: sab(4) removed
 OLD_FILES+=usr/share/man/man4/sab.4.gz
 # 20060328: remove redundant rc.d script
 OLD_FILES+=etc/rc.d/ike
 # 20060127: revert libdisk to static-only
 OLD_FILES+=usr/lib/libdisk.so
 # 20060115: sys/pccard includes cleanup
 OLD_FILES+=usr/include/pccard/driver.h
 OLD_FILES+=usr/include/pccard/i82365.h
 OLD_FILES+=usr/include/pccard/meciareg.h
 OLD_FILES+=usr/include/pccard/pccard_nbk.h
 OLD_FILES+=usr/include/pccard/pcic_pci.h
 OLD_FILES+=usr/include/pccard/pcicvar.h
 OLD_FILES+=usr/include/pccard/slot.h
 # 20051215: rescue/nextboot.sh renamed to rescue/nextboot
 OLD_FILES+=rescue/nextboot.sh
 # 20051214: usbd(8) removed
 OLD_FILES+=etc/rc.d/usbd
 OLD_FILES+=etc/usbd.conf
 OLD_FILES+=usr/sbin/usbd
 OLD_FILES+=usr/share/man/man8/usbd.8.gz
 # 20051029: rc.d/ppp-user renamed to rc.d/ppp for convenience
 OLD_FILES+=etc/rc.d/ppp-user
 # 20051012: setkey(8) moved to /sbin/
 OLD_FILES+=usr/sbin/setkey
 # 20050930: pccardd(8) removed
 OLD_FILES+=usr/sbin/pccardd
 OLD_FILES+=usr/share/man/man5/pccard.conf.5.gz
 OLD_FILES+=usr/share/man/man8/pccardd.8.gz
 # 20050927: bridge(4) replaced by if_bridge(4)
 OLD_FILES+=usr/include/net/bridge.h
 # 20050831: not implemented
 OLD_FILES+=usr/share/man/man3/getino.3.gz
 OLD_FILES+=usr/share/man/man3/putino.3.gz
 # 20050825: T/TCP retired several months ago
 OLD_FILES+=usr/share/man/man4/ttcp.4.gz
 # 20050805 tn3270 retired long ago
 OLD_FILES+=usr/share/misc/map3270
 # 20050801: too old to be interesting here
 OLD_FILES+=usr/share/doc/papers/px.ps.gz
 # 20050721: moved to ports
 OLD_FILES+=usr/sbin/vttest
 OLD_FILES+=usr/share/man/man1/vttest.1.gz
 # 20050617: wpa man pages moved to section 8
 OLD_FILES+=usr/share/man/man1/hostapd.1.gz
 OLD_FILES+=usr/share/man/man1/hostapd_cli.1.gz
 OLD_FILES+=usr/share/man/man1/wpa_cli.1.gz
 OLD_FILES+=usr/share/man/man1/wpa_supplicant.1.gz
 # 20050610: rexecd (insecure by design)
 OLD_FILES+=etc/pam.d/rexecd
 OLD_FILES+=usr/share/man/man8/rexecd.8.gz
 OLD_FILES+=usr/libexec/rexecd
 # 20050606: OpenBSD dhclient replaces ISC one
 OLD_FILES+=bin/omshell
 OLD_FILES+=sbin/omshell
 OLD_FILES+=usr/share/man/man1/omshell.1.gz
 OLD_FILES+=usr/share/man/man5/dhcp-eval.5.gz
 # 200504XX: ipf tools moved from /usr to /
 OLD_FILES+=rescue/ipfs
 OLD_FILES+=rescue/ipfstat
 OLD_FILES+=rescue/ipmon
 OLD_FILES+=rescue/ipnat
 OLD_FILES+=usr/sbin/ipftest
 OLD_FILES+=usr/sbin/ipresend
 OLD_FILES+=usr/sbin/ipsend
 OLD_FILES+=usr/sbin/iptest
 OLD_FILES+=usr/share/man/man1/ipnat.1.gz
 OLD_FILES+=usr/share/man/man1/ipsend.1.gz
 OLD_FILES+=usr/share/man/man1/iptest.1.gz
 OLD_FILES+=usr/share/man/man5/ipsend.5.gz
 # 200503XX: bsdtar takes over gtar
 OLD_FILES+=usr/bin/gtar
 OLD_FILES+=usr/share/man/man1/gtar.1.gz
 # 200503XX
 OLD_FILES+=usr/share/man/man3/exp10.3.gz
 OLD_FILES+=usr/share/man/man3/exp10f.3.gz
 OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
 # 20050324: updated release infrastructure
 OLD_FILES+=usr/share/man/man5/drivers.conf.5.gz
 # 20050317: removed from BIND 9 distribution
 OLD_FILES+=usr/share/doc/bind9/KNOWN_DEFECTS
 # 2005XXXX:
 OLD_FILES+=sbin/mount_autofs
 OLD_FILES+=usr/lib/libautofs.a
 OLD_FILES+=usr/lib/libautofs.so
 OLD_FILES+=usr/share/man/man8/mount_autofs.8.gz
 # 20050203: Merged with fortunes
 OLD_FILES+=usr/share/games/fortune/fortunes2
 OLD_FILES+=usr/share/games/fortune/fortunes2.dat
 # 200501XX:
 OLD_FILES+=usr/libexec/getNAME
 # 200411XX: gvinum replaces vinum
 OLD_FILES+=bin/vinum
 OLD_FILES+=rescue/vinum
 OLD_FILES+=sbin/vinum
 OLD_FILES+=usr/share/man/man8/vinum.8.gz
 # 200411XX: libxpg4 removal
 OLD_FILES+=usr/lib/libxpg4.a
 OLD_FILES+=usr/lib/libxpg4.so
 OLD_FILES+=usr/lib/libxpg4_p.a
 # 20041109: replaced by em(4)
 OLD_FILES+=usr/share/man/man4/gx.4.gz
 OLD_FILES+=usr/share/man/man4/if_gx.4.gz
 # 20041017: rune interface removed
 OLD_FILES+=usr/include/rune.h
 OLD_FILES+=usr/share/man/man3/fgetrune.3.gz
 OLD_FILES+=usr/share/man/man3/fputrune.3.gz
 OLD_FILES+=usr/share/man/man3/fungetrune.3.gz
 OLD_FILES+=usr/share/man/man3/mbrrune.3.gz
 OLD_FILES+=usr/share/man/man3/mbrune.3.gz
 OLD_FILES+=usr/share/man/man3/rune.3.gz
 OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz
 OLD_FILES+=usr/share/man/man3/sgetrune.3.gz
 OLD_FILES+=usr/share/man/man3/sputrune.3.gz
 # 20040925: bind9 import
 OLD_FILES+=usr/bin/dnskeygen
 OLD_FILES+=usr/bin/dnsquery
 OLD_FILES+=usr/lib/libisc.a
 OLD_FILES+=usr/lib/libisc.so
 OLD_FILES+=usr/lib/libisc_p.a
 OLD_FILES+=usr/libexec/named-xfer
 OLD_FILES+=usr/sbin/named.restart
 OLD_FILES+=usr/sbin/ndc
 OLD_FILES+=usr/sbin/nslookup
 OLD_FILES+=usr/sbin/nsupdate
 OLD_FILES+=usr/share/doc/bind/html/acl.html
 OLD_FILES+=usr/share/doc/bind/html/address_list.html
 OLD_FILES+=usr/share/doc/bind/html/comments.html
 OLD_FILES+=usr/share/doc/bind/html/config.html
 OLD_FILES+=usr/share/doc/bind/html/controls.html
 OLD_FILES+=usr/share/doc/bind/html/docdef.html
 OLD_FILES+=usr/share/doc/bind/html/example.html
 OLD_FILES+=usr/share/doc/bind/html/include.html
 OLD_FILES+=usr/share/doc/bind/html/index.html
 OLD_FILES+=usr/share/doc/bind/html/key.html
 OLD_FILES+=usr/share/doc/bind/html/logging.html
 OLD_FILES+=usr/share/doc/bind/html/master.html
 OLD_FILES+=usr/share/doc/bind/html/options.html
 OLD_FILES+=usr/share/doc/bind/html/server.html
 OLD_FILES+=usr/share/doc/bind/html/trusted-keys.html
 OLD_FILES+=usr/share/doc/bind/html/zone.html
 OLD_FILES+=usr/share/doc/bind/misc/DynamicUpdate
 OLD_FILES+=usr/share/doc/bind/misc/FAQ.1of2
 OLD_FILES+=usr/share/doc/bind/misc/FAQ.2of2
 OLD_FILES+=usr/share/doc/bind/misc/rfc2317-notes.txt
 OLD_FILES+=usr/share/doc/bind/misc/style.txt
 OLD_FILES+=usr/share/man/man1/dnskeygen.1.gz
 OLD_FILES+=usr/share/man/man1/dnsquery.1.gz
 OLD_FILES+=usr/share/man/man8/named-bootconf.8.gz
 OLD_FILES+=usr/share/man/man8/named-xfer.8.gz
 OLD_FILES+=usr/share/man/man8/named.restart.8.gz
 OLD_FILES+=usr/share/man/man8/ndc.8.gz
 OLD_FILES+=usr/share/man/man8/nslookup.8.gz
 # 200409XX
 OLD_FILES+=usr/share/man/man3/ENSURE.3.gz
 OLD_FILES+=usr/share/man/man3/ENSURE_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/INSIST.3.gz
 OLD_FILES+=usr/share/man/man3/INSIST_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/INVARIANT.3.gz
 OLD_FILES+=usr/share/man/man3/INVARIANT_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/REQUIRE.3.gz
 OLD_FILES+=usr/share/man/man3/REQUIRE_ERR.3.gz
 OLD_FILES+=usr/share/man/man3/assertion_type_to_text.3.gz
 OLD_FILES+=usr/share/man/man3/assertions.3.gz
 OLD_FILES+=usr/share/man/man3/bitncmp.3.gz
 OLD_FILES+=usr/share/man/man3/evAddTime.3.gz
 OLD_FILES+=usr/share/man/man3/evCancelConn.3.gz
 OLD_FILES+=usr/share/man/man3/evCancelRW.3.gz
 OLD_FILES+=usr/share/man/man3/evClearIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evClearTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evCmpTime.3.gz
 OLD_FILES+=usr/share/man/man3/evConnFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evConnect.3.gz
 OLD_FILES+=usr/share/man/man3/evConsIovec.3.gz
 OLD_FILES+=usr/share/man/man3/evConsTime.3.gz
 OLD_FILES+=usr/share/man/man3/evCreate.3.gz
 OLD_FILES+=usr/share/man/man3/evDefer.3.gz
 OLD_FILES+=usr/share/man/man3/evDeselectFD.3.gz
 OLD_FILES+=usr/share/man/man3/evDestroy.3.gz
 OLD_FILES+=usr/share/man/man3/evDispatch.3.gz
 OLD_FILES+=usr/share/man/man3/evDo.3.gz
 OLD_FILES+=usr/share/man/man3/evDrop.3.gz
 OLD_FILES+=usr/share/man/man3/evFileFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evGetNext.3.gz
 OLD_FILES+=usr/share/man/man3/evHold.3.gz
 OLD_FILES+=usr/share/man/man3/evInitID.3.gz
 OLD_FILES+=usr/share/man/man3/evLastEventTime.3.gz
 OLD_FILES+=usr/share/man/man3/evListen.3.gz
 OLD_FILES+=usr/share/man/man3/evMainLoop.3.gz
 OLD_FILES+=usr/share/man/man3/evNowTime.3.gz
 OLD_FILES+=usr/share/man/man3/evPrintf.3.gz
 OLD_FILES+=usr/share/man/man3/evRead.3.gz
 OLD_FILES+=usr/share/man/man3/evResetTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evSelectFD.3.gz
 OLD_FILES+=usr/share/man/man3/evSetDebug.3.gz
 OLD_FILES+=usr/share/man/man3/evSetIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evSetTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evStreamFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evSubTime.3.gz
 OLD_FILES+=usr/share/man/man3/evTestID.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeRW.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeSpec.3.gz
 OLD_FILES+=usr/share/man/man3/evTimeVal.3.gz
 OLD_FILES+=usr/share/man/man3/evTimerFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evTouchIdleTimer.3.gz
 OLD_FILES+=usr/share/man/man3/evTryAccept.3.gz
 OLD_FILES+=usr/share/man/man3/evUnhold.3.gz
 OLD_FILES+=usr/share/man/man3/evUntimeRW.3.gz
 OLD_FILES+=usr/share/man/man3/evUnwait.3.gz
 OLD_FILES+=usr/share/man/man3/evWaitFor.3.gz
 OLD_FILES+=usr/share/man/man3/evWaitFunc.3.gz
 OLD_FILES+=usr/share/man/man3/evWrite.3.gz
 OLD_FILES+=usr/share/man/man3/eventlib.3.gz
 OLD_FILES+=usr/share/man/man3/heap.3.gz
 OLD_FILES+=usr/share/man/man3/heap_decreased.3.gz
 OLD_FILES+=usr/share/man/man3/heap_delete.3.gz
 OLD_FILES+=usr/share/man/man3/heap_element.3.gz
 OLD_FILES+=usr/share/man/man3/heap_for_each.3.gz
 OLD_FILES+=usr/share/man/man3/heap_free.3.gz
 OLD_FILES+=usr/share/man/man3/heap_increased.3.gz
 OLD_FILES+=usr/share/man/man3/heap_insert.3.gz
 OLD_FILES+=usr/share/man/man3/heap_new.3.gz
 OLD_FILES+=usr/share/man/man3/log_add_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_category_is_active.3.gz
 OLD_FILES+=usr/share/man/man3/log_close_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_dec_references.3.gz
 OLD_FILES+=usr/share/man/man3/log_free_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_free_context.3.gz
 OLD_FILES+=usr/share/man/man3/log_get_filename.3.gz
 OLD_FILES+=usr/share/man/man3/log_get_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_inc_references.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_context.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_file_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_null_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_new_syslog_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_open_stream.3.gz
 OLD_FILES+=usr/share/man/man3/log_option.3.gz
 OLD_FILES+=usr/share/man/man3/log_remove_channel.3.gz
 OLD_FILES+=usr/share/man/man3/log_set_file_owner.3.gz
 OLD_FILES+=usr/share/man/man3/log_vwrite.3.gz
 OLD_FILES+=usr/share/man/man3/log_write.3.gz
 OLD_FILES+=usr/share/man/man3/logging.3.gz
 OLD_FILES+=usr/share/man/man3/memcluster.3.gz
 OLD_FILES+=usr/share/man/man3/memget.3.gz
 OLD_FILES+=usr/share/man/man3/memput.3.gz
 OLD_FILES+=usr/share/man/man3/memstats.3.gz
 OLD_FILES+=usr/share/man/man3/set_assertion_failure_callback.3.
 OLD_FILES+=usr/share/man/man3/sigwait.3.gz
 OLD_FILES+=usr/share/man/man3/tree_add.3.gz
 OLD_FILES+=usr/share/man/man3/tree_delete.3.gz
 OLD_FILES+=usr/share/man/man3/tree_init.3.gz
 OLD_FILES+=usr/share/man/man3/tree_mung.3.gz
 OLD_FILES+=usr/share/man/man3/tree_srch.3.gz
 OLD_FILES+=usr/share/man/man3/tree_trav.3.gz
 # 2004XXYY: OS internal libs, no ports use them, no need to use OLD_LIBS
 OLD_LIBS+=lib/geom/geom_concat.so.1
 OLD_LIBS+=lib/geom/geom_label.so.1
 OLD_LIBS+=lib/geom/geom_nop.so.1
 OLD_LIBS+=lib/geom/geom_stripe.so.1
 # 20040728: GCC 3.4.2
 OLD_DIRS+=usr/include/c++/3.3
 OLD_FILES+=usr/include/c++/3.3/FlexLexer.h
 OLD_FILES+=usr/include/c++/3.3/algorithm
 OLD_FILES+=usr/include/c++/3.3/backward/algo.h
 OLD_FILES+=usr/include/c++/3.3/backward/algobase.h
 OLD_FILES+=usr/include/c++/3.3/backward/alloc.h
 OLD_FILES+=usr/include/c++/3.3/backward/backward_warning.h
 OLD_FILES+=usr/include/c++/3.3/backward/bvector.h
 OLD_FILES+=usr/include/c++/3.3/backward/complex.h
 OLD_FILES+=usr/include/c++/3.3/backward/defalloc.h
 OLD_FILES+=usr/include/c++/3.3/backward/deque.h
 OLD_FILES+=usr/include/c++/3.3/backward/fstream.h
 OLD_FILES+=usr/include/c++/3.3/backward/function.h
 OLD_FILES+=usr/include/c++/3.3/backward/hash_map.h
 OLD_FILES+=usr/include/c++/3.3/backward/hash_set.h
 OLD_FILES+=usr/include/c++/3.3/backward/hashtable.h
 OLD_FILES+=usr/include/c++/3.3/backward/heap.h
 OLD_FILES+=usr/include/c++/3.3/backward/iomanip.h
 OLD_FILES+=usr/include/c++/3.3/backward/iostream.h
 OLD_FILES+=usr/include/c++/3.3/backward/istream.h
 OLD_FILES+=usr/include/c++/3.3/backward/iterator.h
 OLD_FILES+=usr/include/c++/3.3/backward/list.h
 OLD_FILES+=usr/include/c++/3.3/backward/map.h
 OLD_FILES+=usr/include/c++/3.3/backward/multimap.h
 OLD_FILES+=usr/include/c++/3.3/backward/multiset.h
 OLD_FILES+=usr/include/c++/3.3/backward/new.h
 OLD_FILES+=usr/include/c++/3.3/backward/ostream.h
 OLD_FILES+=usr/include/c++/3.3/backward/pair.h
 OLD_FILES+=usr/include/c++/3.3/backward/queue.h
 OLD_FILES+=usr/include/c++/3.3/backward/rope.h
 OLD_FILES+=usr/include/c++/3.3/backward/set.h
 OLD_FILES+=usr/include/c++/3.3/backward/slist.h
 OLD_FILES+=usr/include/c++/3.3/backward/stack.h
 OLD_FILES+=usr/include/c++/3.3/backward/stream.h
 OLD_FILES+=usr/include/c++/3.3/backward/streambuf.h
 OLD_FILES+=usr/include/c++/3.3/backward/strstream
 OLD_FILES+=usr/include/c++/3.3/backward/strstream.h
 OLD_FILES+=usr/include/c++/3.3/backward/tempbuf.h
 OLD_FILES+=usr/include/c++/3.3/backward/tree.h
 OLD_FILES+=usr/include/c++/3.3/backward/vector.h
 OLD_DIRS+=usr/include/c++/3.3/backward
 OLD_FILES+=usr/include/c++/3.3/bits/atomicity.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_file.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_ios.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/basic_string.h
 OLD_FILES+=usr/include/c++/3.3/bits/basic_string.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/boost_concept_check.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++config.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++io.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++locale.h
 OLD_FILES+=usr/include/c++/3.3/bits/c++locale_internal.h
 OLD_FILES+=usr/include/c++/3.3/bits/char_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/cmath.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/codecvt.h
 OLD_FILES+=usr/include/c++/3.3/bits/codecvt_specializations.h
 OLD_FILES+=usr/include/c++/3.3/bits/concept_check.h
 OLD_FILES+=usr/include/c++/3.3/bits/cpp_type_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_base.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_inline.h
 OLD_FILES+=usr/include/c++/3.3/bits/ctype_noninline.h
 OLD_FILES+=usr/include/c++/3.3/bits/deque.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/fpos.h
 OLD_FILES+=usr/include/c++/3.3/bits/fstream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/functexcept.h
 OLD_FILES+=usr/include/c++/3.3/bits/generic_shadow.h
 OLD_FILES+=usr/include/c++/3.3/bits/gslice.h
 OLD_FILES+=usr/include/c++/3.3/bits/gslice_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-default.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-posix.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr-single.h
 OLD_FILES+=usr/include/c++/3.3/bits/gthr.h
 OLD_FILES+=usr/include/c++/3.3/bits/indirect_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/ios_base.h
 OLD_FILES+=usr/include/c++/3.3/bits/istream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/list.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/locale_classes.h
 OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.h
 OLD_FILES+=usr/include/c++/3.3/bits/locale_facets.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/localefwd.h
 OLD_FILES+=usr/include/c++/3.3/bits/mask_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/messages_members.h
 OLD_FILES+=usr/include/c++/3.3/bits/os_defines.h
 OLD_FILES+=usr/include/c++/3.3/bits/ostream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/pthread_allocimpl.h
 OLD_FILES+=usr/include/c++/3.3/bits/slice.h
 OLD_FILES+=usr/include/c++/3.3/bits/slice_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/sstream.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/stl_algo.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_algobase.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_alloc.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_bvector.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_construct.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_deque.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_function.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_heap.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_funcs.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_iterator_base_types.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_list.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_map.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_multimap.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_multiset.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_numeric.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_pair.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_pthread_alloc.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_queue.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_relops.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_set.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_stack.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_tempbuf.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_threads.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_tree.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_uninitialized.h
 OLD_FILES+=usr/include/c++/3.3/bits/stl_vector.h
 OLD_FILES+=usr/include/c++/3.3/bits/stream_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/streambuf.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/streambuf_iterator.h
 OLD_FILES+=usr/include/c++/3.3/bits/stringfwd.h
 OLD_FILES+=usr/include/c++/3.3/bits/time_members.h
 OLD_FILES+=usr/include/c++/3.3/bits/type_traits.h
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.h
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_array.tcc
 OLD_FILES+=usr/include/c++/3.3/bits/valarray_meta.h
 OLD_FILES+=usr/include/c++/3.3/bits/vector.tcc
 OLD_DIRS+=usr/include/c++/3.3/bits
 OLD_FILES+=usr/include/c++/3.3/bitset
 OLD_FILES+=usr/include/c++/3.3/cassert
 OLD_FILES+=usr/include/c++/3.3/cctype
 OLD_FILES+=usr/include/c++/3.3/cerrno
 OLD_FILES+=usr/include/c++/3.3/cfloat
 OLD_FILES+=usr/include/c++/3.3/ciso646
 OLD_FILES+=usr/include/c++/3.3/climits
 OLD_FILES+=usr/include/c++/3.3/clocale
 OLD_FILES+=usr/include/c++/3.3/cmath
 OLD_FILES+=usr/include/c++/3.3/complex
 OLD_FILES+=usr/include/c++/3.3/csetjmp
 OLD_FILES+=usr/include/c++/3.3/csignal
 OLD_FILES+=usr/include/c++/3.3/cstdarg
 OLD_FILES+=usr/include/c++/3.3/cstddef
 OLD_FILES+=usr/include/c++/3.3/cstdio
 OLD_FILES+=usr/include/c++/3.3/cstdlib
 OLD_FILES+=usr/include/c++/3.3/cstring
 OLD_FILES+=usr/include/c++/3.3/ctime
 OLD_FILES+=usr/include/c++/3.3/cwchar
 OLD_FILES+=usr/include/c++/3.3/cwctype
 OLD_FILES+=usr/include/c++/3.3/cxxabi.h
 OLD_FILES+=usr/include/c++/3.3/deque
 OLD_FILES+=usr/include/c++/3.3/exception
 OLD_FILES+=usr/include/c++/3.3/exception_defines.h
 OLD_FILES+=usr/include/c++/3.3/ext/algorithm
 OLD_FILES+=usr/include/c++/3.3/ext/enc_filebuf.h
 OLD_FILES+=usr/include/c++/3.3/ext/functional
 OLD_FILES+=usr/include/c++/3.3/ext/hash_map
 OLD_FILES+=usr/include/c++/3.3/ext/hash_set
 OLD_FILES+=usr/include/c++/3.3/ext/iterator
 OLD_FILES+=usr/include/c++/3.3/ext/memory
 OLD_FILES+=usr/include/c++/3.3/ext/numeric
 OLD_FILES+=usr/include/c++/3.3/ext/rb_tree
 OLD_FILES+=usr/include/c++/3.3/ext/rope
 OLD_FILES+=usr/include/c++/3.3/ext/ropeimpl.h
 OLD_FILES+=usr/include/c++/3.3/ext/slist
 OLD_FILES+=usr/include/c++/3.3/ext/stdio_filebuf.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_hash_fun.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_hashtable.h
 OLD_FILES+=usr/include/c++/3.3/ext/stl_rope.h
 OLD_DIRS+=usr/include/c++/3.3/ext
 OLD_FILES+=usr/include/c++/3.3/fstream
 OLD_FILES+=usr/include/c++/3.3/functional
 OLD_FILES+=usr/include/c++/3.3/iomanip
 OLD_FILES+=usr/include/c++/3.3/ios
 OLD_FILES+=usr/include/c++/3.3/iosfwd
 OLD_FILES+=usr/include/c++/3.3/iostream
 OLD_FILES+=usr/include/c++/3.3/istream
 OLD_FILES+=usr/include/c++/3.3/iterator
 OLD_FILES+=usr/include/c++/3.3/limits
 OLD_FILES+=usr/include/c++/3.3/list
 OLD_FILES+=usr/include/c++/3.3/locale
 OLD_FILES+=usr/include/c++/3.3/map
 OLD_FILES+=usr/include/c++/3.3/memory
 OLD_FILES+=usr/include/c++/3.3/new
 OLD_FILES+=usr/include/c++/3.3/numeric
 OLD_FILES+=usr/include/c++/3.3/ostream
 OLD_FILES+=usr/include/c++/3.3/queue
 OLD_FILES+=usr/include/c++/3.3/set
 OLD_FILES+=usr/include/c++/3.3/sstream
 OLD_FILES+=usr/include/c++/3.3/stack
 OLD_FILES+=usr/include/c++/3.3/stdexcept
 OLD_FILES+=usr/include/c++/3.3/streambuf
 OLD_FILES+=usr/include/c++/3.3/string
 OLD_FILES+=usr/include/c++/3.3/typeinfo
 OLD_FILES+=usr/include/c++/3.3/utility
 OLD_FILES+=usr/include/c++/3.3/valarray
 OLD_FILES+=usr/include/c++/3.3/vector
 # 20040713: fla(4) removed
 OLD_FILES+=usr/share/man/man4/fla.4.gz
 # 200407XX
 OLD_FILES+=usr/sbin/kernbb
 OLD_FILES+=usr/sbin/ntp-genkeys
 OLD_FILES+=usr/sbin/ntptimeset
 OLD_FILES+=usr/share/man/man8/kernbb.8.gz
 OLD_FILES+=usr/share/man/man8/ntp-genkeys.8.gz
 # 20040627: usbdevs.h and usbdevs_data.h removal
 OLD_FILES+=usr/include/dev/usb/usbdevs.h
 OLD_FILES+=usr/include/dev/usb/usbdevs_data.h
 # 200406XX
 OLD_FILES+=usr/bin/gasp
 OLD_FILES+=usr/bin/gdbreplay
 OLD_FILES+=usr/share/man/man1/gasp.1.gz
 OLD_FILES+=sbin/mountd
 OLD_FILES+=sbin/mount_fdesc
 OLD_FILES+=sbin/mount_umap
 OLD_FILES+=sbin/mount_union
 OLD_FILES+=sbin/mount_msdos
 OLD_FILES+=sbin/mount_null
 OLD_FILES+=sbin/mount_kernfs
 # 200405XX: arl
 OLD_FILES+=usr/sbin/arlconfig
 OLD_FILES+=usr/share/man/man8/arlconfig.8.gz
 # 200403XX
 OLD_FILES+=bin/raidctl
 OLD_FILES+=sbin/raidctl
 OLD_FILES+=usr/bin/sasc
 OLD_FILES+=usr/sbin/sgsc
 OLD_FILES+=usr/sbin/stlload
 OLD_FILES+=usr/sbin/stlstats
 OLD_FILES+=usr/share/man/man1/sasc.1.gz
 OLD_FILES+=usr/share/man/man1/sgsc.1.gz
 OLD_FILES+=usr/share/man/man4/i386/stl.4.gz
 OLD_FILES+=usr/share/man/man8/raidctl.8.gz
 # 20040229: clean_environment() was removed after 3 days
 OLD_FILES+=usr/share/man/man3/clean_environment.3.gz
 # 20040119: installed as `isdntel' in newer systems
 OLD_FILES+=etc/isdn/isdntel.sh
 # 200XYYZZ: /lib transition clitches
 OLD_FILES+=lib/libalias.so
 OLD_FILES+=lib/libatm.so
 OLD_FILES+=lib/libbsdxml.so
 OLD_FILES+=lib/libc.so
 OLD_FILES+=lib/libcam.so
 OLD_FILES+=lib/libcrypt.so
 OLD_FILES+=lib/libcrypto.so
 OLD_FILES+=lib/libdevstat.so
 OLD_FILES+=lib/libedit.so
 OLD_FILES+=lib/libgeom.so
 OLD_FILES+=lib/libipsec.so
 OLD_FILES+=lib/libipx.so
 OLD_FILES+=lib/libkvm.so
 OLD_FILES+=lib/libm.so
 OLD_FILES+=lib/libmd.so
 OLD_FILES+=lib/libncurses.so
 OLD_FILES+=lib/libreadline.so
 OLD_FILES+=lib/libsbuf.so
 OLD_FILES+=lib/libufs.so
 OLD_FILES+=lib/libz.so
 # 200312XX
 OLD_FILES+=bin/cxconfig
 OLD_FILES+=sbin/cxconfig
 OLD_FILES+=usr/share/man/man8/cxconfig.8.gz
 # 20031016: MULTI_DRIVER_MODULE macro removed
 OLD_FILES+=usr/share/man/man9/MULTI_DRIVER_MODULE.9.gz
 # 200309XX
 OLD_FILES+=usr/bin/symorder
 OLD_FILES+=usr/share/man/man1/symorder.1.gz
 # 200308XX
 OLD_FILES+=usr/sbin/amldb
 OLD_FILES+=usr/share/man/man8/amldb.8.gz
 # 200307XX
 OLD_FILES+=sbin/mount_nwfs
 OLD_FILES+=sbin/mount_portalfs
 OLD_FILES+=sbin/mount_smbfs
 # 200306XX
 OLD_FILES+=usr/sbin/dev_mkdb
 OLD_FILES+=usr/share/man/man8/dev_mkdb.8.gz
 # 200304XX
 OLD_FILES+=usr/lib/libcipher.a
 OLD_FILES+=usr/lib/libcipher.so
 OLD_FILES+=usr/lib/libcipher_p.a
 OLD_FILES+=usr/lib/libgmp.a
 OLD_FILES+=usr/lib/libgmp.so
 OLD_FILES+=usr/lib/libgmp_p.a
 OLD_FILES+=usr/lib/libperl.a
 OLD_FILES+=usr/lib/libperl.so
 OLD_FILES+=usr/lib/libperl_p.a
 OLD_FILES+=usr/lib/libposix1e.a
 OLD_FILES+=usr/lib/libposix1e.so
 OLD_FILES+=usr/lib/libposix1e_p.a
 OLD_FILES+=usr/lib/libskey.a
 OLD_FILES+=usr/lib/libskey.so
 OLD_FILES+=usr/lib/libskey_p.a
 OLD_FILES+=usr/libexec/tradcpp0
 OLD_FILES+=usr/libexec/cpp0
 # 200304XX: removal of xten
 OLD_FILES+=usr/libexec/xtend
 OLD_FILES+=usr/sbin/xten
 OLD_FILES+=usr/share/man/man1/xten.1.gz
 OLD_FILES+=usr/share/man/man8/xtend.8.gz
 # 200303XX
 OLD_FILES+=usr/lib/libacl.so
 OLD_FILES+=usr/lib/libdescrypt.so
 OLD_FILES+=usr/lib/libf2c.so
 OLD_FILES+=usr/lib/libg++.so
 OLD_FILES+=usr/lib/libkdb.so
 OLD_FILES+=usr/lib/librsaINTL.so
 OLD_FILES+=usr/lib/libscrypt.so
 OLD_FILES+=usr/lib/libss.so
 # 200302XX
 OLD_FILES+=usr/lib/libacl.a
 OLD_FILES+=usr/lib/libacl_p.a
 OLD_FILES+=usr/lib/libkadm.a
 OLD_FILES+=usr/lib/libkadm.so
 OLD_FILES+=usr/lib/libkadm_p.a
 OLD_FILES+=usr/lib/libkafs.a
 OLD_FILES+=usr/lib/libkafs.so
 OLD_FILES+=usr/lib/libkafs_p.a
 OLD_FILES+=usr/lib/libkdb.a
 OLD_FILES+=usr/lib/libkdb_p.a
 OLD_FILES+=usr/lib/libkrb.a
 OLD_FILES+=usr/lib/libkrb.so
 OLD_FILES+=usr/lib/libkrb_p.a
 OLD_FILES+=usr/share/man/man3/SSL_CIPHER_get_name.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_COMP_add_compression_method.3
 OLD_FILES+=usr/share/man/man3/SSL_CTX_add_extra_chain_cert.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_add_session.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_ctrl.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_flush_sessions.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_get_verify_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_load_verify_locations.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_new.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_number.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_set_cache_size.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sess_set_get_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_sessions.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cert_store.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cert_verify_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_cipher_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_client_CA_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_client_cert_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_default_passwd_cb.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_generate_session_id.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_info_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_max_cert_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_msg_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_options.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_quiet_shutdown.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_session_cache_mode.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_session_id_context.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_ssl_version.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_tmp_dh_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_tmp_rsa_callback.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_set_verify.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_CTX_use_certificate.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_get_ex_new_index.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_SESSION_get_time.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_accept.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_alert_type_string.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_clear.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_connect.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_do_handshake.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_free.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_SSL_CTX.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_ciphers.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_client_CA_list.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_current_cipher.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_default_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_ex_data_X509_STORE_CTX_idx.3.gz
 OLD_FILES+=usr/share/man/man3/SSL_get_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/set_assertion_failure_callback.3.gz
 OLD_FILES+=usr/share/man/man3/setkey.3.gz
 OLD_FILES+=usr/share/man/man3/setvfsent.3.gz
 OLD_FILES+=usr/share/man/man3/ssl.3.gz
 OLD_FILES+=usr/share/man/man3/vfsisloadable.3.gz
 OLD_FILES+=usr/share/man/man3/vfsload.3.gz
 OLD_FILES+=usr/share/man/man4/als4000.4.gz
 OLD_FILES+=usr/share/man/man4/csa.4.gz
 OLD_FILES+=usr/share/man/man4/emu10k1.4.gz
 OLD_FILES+=usr/share/man/man4/euc.4.gz
 OLD_FILES+=usr/share/man/man4/gusc.4.gz
 OLD_FILES+=usr/share/man/man4/if_fwp.4.gz
 OLD_FILES+=usr/share/man/man4/lomac.4.gz
 OLD_FILES+=usr/share/man/man4/maestro3.4.gz
 OLD_FILES+=usr/share/man/man4/raid.4.gz
 OLD_FILES+=usr/share/man/man4/sbc.4.gz
 OLD_FILES+=usr/share/man/man4/sd.4.gz
 OLD_FILES+=usr/share/man/man4/snc.4.gz
 OLD_FILES+=usr/share/man/man4/st.4.gz
 OLD_FILES+=usr/share/man/man4/uaudio.4.gz
 OLD_FILES+=usr/share/man/man4/utf2.4.gz
 OLD_FILES+=usr/share/man/man4/vinumdebug.4.gz
 OLD_FILES+=usr/share/man/man5/disklabel.5.gz
 OLD_FILES+=usr/share/man/man5/dm.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ranlib.5.gz
 OLD_FILES+=usr/share/man/man5/utf2.5.gz
 OLD_FILES+=usr/share/man/man7/groff_mwww.7.gz
 OLD_FILES+=usr/share/man/man7/mmroff.7.gz
 OLD_FILES+=usr/share/man/man7/mwww.7.gz
 OLD_FILES+=usr/share/man/man8/dm.8.gz
 OLD_FILES+=usr/share/man/man8/pam_ftp.8.gz
 OLD_FILES+=usr/share/man/man8/pam_wheel.8.gz
 OLD_FILES+=usr/share/man/man8/ssl.8.gz
 OLD_FILES+=usr/share/man/man8/wlconfig.8.gz
 OLD_FILES+=usr/share/man/man9/CURSIG.9.gz
 OLD_FILES+=usr/share/man/man9/VFS_INIT.9.gz
 OLD_FILES+=usr/share/man/man9/at_exit.9.gz
 OLD_FILES+=usr/share/man/man9/at_fork.9.gz
 OLD_FILES+=usr/share/man/man9/cdevsw_add.9.gz
 OLD_FILES+=usr/share/man/man9/cdevsw_remove.9.gz
 OLD_FILES+=usr/share/man/man9/cv_waitq_empty.9.gz
 OLD_FILES+=usr/share/man/man9/cv_waitq_remove.9.gz
 OLD_FILES+=usr/share/man/man9/endtsleep.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_freem.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_alloc.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_free.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_pg_steal.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_phys_to_kva.9.gz
 OLD_FILES+=usr/share/man/man9/jumbo_vm_init.9.gz
 OLD_FILES+=usr/share/man/man9/mac_biba.9.gz
 OLD_FILES+=usr/share/man/man9/mac_bsdextended.9.gz
 OLD_FILES+=usr/share/man/man9/mono_time.9.gz
 OLD_FILES+=usr/share/man/man9/p1003_1b.9.gz
 OLD_FILES+=usr/share/man/man9/pmap_prefault.9.gz
 OLD_FILES+=usr/share/man/man9/posix4.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_name.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_string.9.gz
 OLD_FILES+=usr/share/man/man9/resource_query_unit.9.gz
 OLD_FILES+=usr/share/man/man9/rm_at_exit.9.gz
 OLD_FILES+=usr/share/man/man9/rm_at_fork.9.gz
 OLD_FILES+=usr/share/man/man9/runtime.9.gz
 OLD_FILES+=usr/share/man/man9/sleepinit.9.gz
 OLD_FILES+=usr/share/man/man9/unsleep.9.gz
 OLD_FILES+=usr/share/games/atc/Game_List
 OLD_FILES+=usr/share/games/atc/Killer
 OLD_FILES+=usr/share/games/atc/crossover
 OLD_FILES+=usr/share/games/atc/default
 OLD_FILES+=usr/share/games/atc/easy
 OLD_FILES+=usr/share/games/atc/game_2
 OLD_FILES+=usr/share/games/larn/larnmaze
 OLD_FILES+=usr/share/games/larn/larnopts
 OLD_FILES+=usr/share/games/larn/larn.help
 OLD_FILES+=usr/share/games/quiz.db/africa
 OLD_FILES+=usr/share/games/quiz.db/america
 OLD_FILES+=usr/share/games/quiz.db/areas
 OLD_FILES+=usr/share/games/quiz.db/arith
 OLD_FILES+=usr/share/games/quiz.db/asia
 OLD_FILES+=usr/share/games/quiz.db/babies
 OLD_FILES+=usr/share/games/quiz.db/bard
 OLD_FILES+=usr/share/games/quiz.db/chinese
 OLD_FILES+=usr/share/games/quiz.db/collectives
 OLD_FILES+=usr/share/games/quiz.db/ed
 OLD_FILES+=usr/share/games/quiz.db/elements
 OLD_FILES+=usr/share/games/quiz.db/europe
 OLD_FILES+=usr/share/games/quiz.db/flowers
 OLD_FILES+=usr/share/games/quiz.db/greek
 OLD_FILES+=usr/share/games/quiz.db/inca
 OLD_FILES+=usr/share/games/quiz.db/index
 OLD_FILES+=usr/share/games/quiz.db/latin
 OLD_FILES+=usr/share/games/quiz.db/locomotive
 OLD_FILES+=usr/share/games/quiz.db/midearth
 OLD_FILES+=usr/share/games/quiz.db/morse
 OLD_FILES+=usr/share/games/quiz.db/murders
 OLD_FILES+=usr/share/games/quiz.db/poetry
 OLD_FILES+=usr/share/games/quiz.db/posneg
 OLD_FILES+=usr/share/games/quiz.db/pres
 OLD_FILES+=usr/share/games/quiz.db/province
 OLD_FILES+=usr/share/games/quiz.db/seq-easy
 OLD_FILES+=usr/share/games/quiz.db/seq-hard
 OLD_FILES+=usr/share/games/quiz.db/sexes
 OLD_FILES+=usr/share/games/quiz.db/sov
 OLD_FILES+=usr/share/games/quiz.db/spell
 OLD_FILES+=usr/share/games/quiz.db/state
 OLD_FILES+=usr/share/games/quiz.db/trek
 OLD_FILES+=usr/share/games/quiz.db/ucc
 OLD_FILES+=usr/share/games/cribbage.instr
 OLD_FILES+=usr/share/games/fish.instr
 OLD_FILES+=usr/share/games/wump.info
 OLD_FILES+=usr/games/hide/adventure
 OLD_FILES+=usr/games/hide/arithmetic
 OLD_FILES+=usr/games/hide/atc
 OLD_FILES+=usr/games/hide/backgammon
 OLD_FILES+=usr/games/hide/teachgammon
 OLD_FILES+=usr/games/hide/battlestar
 OLD_FILES+=usr/games/hide/bs
 OLD_FILES+=usr/games/hide/canfield
 OLD_FILES+=usr/games/hide/cribbage
 OLD_FILES+=usr/games/hide/fish
 OLD_FILES+=usr/games/hide/hack
 OLD_FILES+=usr/games/hide/hangman
 OLD_FILES+=usr/games/hide/larn
 OLD_FILES+=usr/games/hide/mille
 OLD_FILES+=usr/games/hide/phantasia
 OLD_FILES+=usr/games/hide/quiz
 OLD_FILES+=usr/games/hide/robots
 OLD_FILES+=usr/games/hide/rogue
 OLD_FILES+=usr/games/hide/sail
 OLD_FILES+=usr/games/hide/snake
 OLD_FILES+=usr/games/hide/trek
 OLD_FILES+=usr/games/hide/worm
 OLD_FILES+=usr/games/hide/wump
 OLD_FILES+=usr/games/adventure
 OLD_FILES+=usr/games/arithmetic
 OLD_FILES+=usr/games/atc
 OLD_FILES+=usr/games/backgammon
 OLD_FILES+=usr/games/teachgammon
 OLD_FILES+=usr/games/battlestar
 OLD_FILES+=usr/games/bs
 OLD_FILES+=usr/games/canfield
 OLD_FILES+=usr/games/cfscores
 OLD_FILES+=usr/games/cribbage
 OLD_FILES+=usr/games/dm
 OLD_FILES+=usr/games/fish
 OLD_FILES+=usr/games/hack
 OLD_FILES+=usr/games/hangman
 OLD_FILES+=usr/games/larn
 OLD_FILES+=usr/games/mille
 OLD_FILES+=usr/games/phantasia
 OLD_FILES+=usr/games/piano
 OLD_FILES+=usr/games/pig
 OLD_FILES+=usr/games/quiz
 OLD_FILES+=usr/games/rain
 OLD_FILES+=usr/games/robots
 OLD_FILES+=usr/games/rogue
 OLD_FILES+=usr/games/sail
 OLD_FILES+=usr/games/snake
 OLD_FILES+=usr/games/snscore
 OLD_FILES+=usr/games/trek
 OLD_FILES+=usr/games/wargames
 OLD_FILES+=usr/games/worm
 OLD_FILES+=usr/games/worms
 OLD_FILES+=usr/games/wump
 OLD_FILES+=sbin/mount_reiserfs
 OLD_FILES+=usr/include/cam/cam_extend.h
 OLD_FILES+=usr/include/dev/wi/wi_hostap.h
 OLD_FILES+=usr/include/disktab.h
 OLD_FILES+=usr/include/g++/FlexLexer.h
 OLD_FILES+=usr/include/g++/PlotFile.h
 OLD_FILES+=usr/include/g++/SFile.h
 OLD_FILES+=usr/include/g++/_G_config.h
 OLD_FILES+=usr/include/g++/algo.h
 OLD_FILES+=usr/include/g++/algobase.h
 OLD_FILES+=usr/include/g++/algorithm
 OLD_FILES+=usr/include/g++/alloc.h
 OLD_FILES+=usr/include/g++/bitset
 OLD_FILES+=usr/include/g++/builtinbuf.h
 OLD_FILES+=usr/include/g++/bvector.h
 OLD_FILES+=usr/include/g++/cassert
 OLD_FILES+=usr/include/g++/cctype
 OLD_FILES+=usr/include/g++/cerrno
 OLD_FILES+=usr/include/g++/cfloat
 OLD_FILES+=usr/include/g++/ciso646
 OLD_FILES+=usr/include/g++/climits
 OLD_FILES+=usr/include/g++/clocale
 OLD_FILES+=usr/include/g++/cmath
 OLD_FILES+=usr/include/g++/complex
 OLD_FILES+=usr/include/g++/complex.h
 OLD_FILES+=usr/include/g++/csetjmp
 OLD_FILES+=usr/include/g++/csignal
 OLD_FILES+=usr/include/g++/cstdarg
 OLD_FILES+=usr/include/g++/cstddef
 OLD_FILES+=usr/include/g++/cstdio
 OLD_FILES+=usr/include/g++/cstdlib
 OLD_FILES+=usr/include/g++/cstring
 OLD_FILES+=usr/include/g++/ctime
 OLD_FILES+=usr/include/g++/cwchar
 OLD_FILES+=usr/include/g++/cwctype
 OLD_FILES+=usr/include/g++/defalloc.h
 OLD_FILES+=usr/include/g++/deque
 OLD_FILES+=usr/include/g++/deque.h
 OLD_FILES+=usr/include/g++/editbuf.h
 OLD_FILES+=usr/include/g++/exception
 OLD_FILES+=usr/include/g++/floatio.h
 OLD_FILES+=usr/include/g++/fstream
 OLD_FILES+=usr/include/g++/fstream.h
 OLD_FILES+=usr/include/g++/function.h
 OLD_FILES+=usr/include/g++/functional
 OLD_FILES+=usr/include/g++/hash_map
 OLD_FILES+=usr/include/g++/hash_map.h
 OLD_FILES+=usr/include/g++/hash_set
 OLD_FILES+=usr/include/g++/hash_set.h
 OLD_FILES+=usr/include/g++/hashtable.h
 OLD_FILES+=usr/include/g++/heap.h
 OLD_FILES+=usr/include/g++/indstream.h
 OLD_FILES+=usr/include/g++/iolibio.h
 OLD_FILES+=usr/include/g++/iomanip
 OLD_FILES+=usr/include/g++/iomanip.h
 OLD_FILES+=usr/include/g++/iosfwd
 OLD_FILES+=usr/include/g++/iostdio.h
 OLD_FILES+=usr/include/g++/iostream
 OLD_FILES+=usr/include/g++/iostream.h
 OLD_FILES+=usr/include/g++/iostreamP.h
 OLD_FILES+=usr/include/g++/istream.h
 OLD_FILES+=usr/include/g++/iterator
 OLD_FILES+=usr/include/g++/iterator.h
 OLD_FILES+=usr/include/g++/libio.h
 OLD_FILES+=usr/include/g++/libioP.h
 OLD_FILES+=usr/include/g++/list
 OLD_FILES+=usr/include/g++/list.h
 OLD_FILES+=usr/include/g++/map
 OLD_FILES+=usr/include/g++/map.h
 OLD_FILES+=usr/include/g++/memory
 OLD_FILES+=usr/include/g++/multimap.h
 OLD_FILES+=usr/include/g++/multiset.h
 OLD_FILES+=usr/include/g++/new
 OLD_FILES+=usr/include/g++/new.h
 OLD_FILES+=usr/include/g++/numeric
 OLD_FILES+=usr/include/g++/ostream.h
 OLD_FILES+=usr/include/g++/pair.h
 OLD_FILES+=usr/include/g++/parsestream.h
 OLD_FILES+=usr/include/g++/pfstream.h
 OLD_FILES+=usr/include/g++/procbuf.h
 OLD_FILES+=usr/include/g++/pthread_alloc
 OLD_FILES+=usr/include/g++/pthread_alloc.h
 OLD_FILES+=usr/include/g++/queue
 OLD_FILES+=usr/include/g++/rope
 OLD_FILES+=usr/include/g++/rope.h
 OLD_FILES+=usr/include/g++/ropeimpl.h
 OLD_FILES+=usr/include/g++/set
 OLD_FILES+=usr/include/g++/set.h
 OLD_FILES+=usr/include/g++/slist
 OLD_FILES+=usr/include/g++/slist.h
 OLD_FILES+=usr/include/g++/sstream
 OLD_FILES+=usr/include/g++/stack
 OLD_FILES+=usr/include/g++/stack.h
 OLD_FILES+=usr/include/g++/std/bastring.cc
 OLD_FILES+=usr/include/g++/std/bastring.h
 OLD_FILES+=usr/include/g++/std/complext.cc
 OLD_FILES+=usr/include/g++/std/complext.h
 OLD_FILES+=usr/include/g++/std/dcomplex.h
 OLD_FILES+=usr/include/g++/std/fcomplex.h
 OLD_FILES+=usr/include/g++/std/gslice.h
 OLD_FILES+=usr/include/g++/std/gslice_array.h
 OLD_FILES+=usr/include/g++/std/indirect_array.h
 OLD_FILES+=usr/include/g++/std/ldcomplex.h
 OLD_FILES+=usr/include/g++/std/mask_array.h
 OLD_FILES+=usr/include/g++/std/slice.h
 OLD_FILES+=usr/include/g++/std/slice_array.h
 OLD_FILES+=usr/include/g++/std/std_valarray.h
 OLD_FILES+=usr/include/g++/std/straits.h
 OLD_FILES+=usr/include/g++/std/valarray_array.h
 OLD_FILES+=usr/include/g++/std/valarray_array.tcc
 OLD_FILES+=usr/include/g++/std/valarray_meta.h
 OLD_FILES+=usr/include/g++/stdexcept
 OLD_FILES+=usr/include/g++/stdiostream.h
 OLD_FILES+=usr/include/g++/stl.h
 OLD_FILES+=usr/include/g++/stl_algo.h
 OLD_FILES+=usr/include/g++/stl_algobase.h
 OLD_FILES+=usr/include/g++/stl_alloc.h
 OLD_FILES+=usr/include/g++/stl_bvector.h
 OLD_FILES+=usr/include/g++/stl_config.h
 OLD_FILES+=usr/include/g++/stl_construct.h
 OLD_FILES+=usr/include/g++/stl_deque.h
 OLD_FILES+=usr/include/g++/stl_function.h
 OLD_FILES+=usr/include/g++/stl_hash_fun.h
 OLD_FILES+=usr/include/g++/stl_hash_map.h
 OLD_FILES+=usr/include/g++/stl_hash_set.h
 OLD_FILES+=usr/include/g++/stl_hashtable.h
 OLD_FILES+=usr/include/g++/stl_heap.h
 OLD_FILES+=usr/include/g++/stl_iterator.h
 OLD_FILES+=usr/include/g++/stl_list.h
 OLD_FILES+=usr/include/g++/stl_map.h
 OLD_FILES+=usr/include/g++/stl_multimap.h
 OLD_FILES+=usr/include/g++/stl_multiset.h
 OLD_FILES+=usr/include/g++/stl_numeric.h
 OLD_FILES+=usr/include/g++/stl_pair.h
 OLD_FILES+=usr/include/g++/stl_queue.h
 OLD_FILES+=usr/include/g++/stl_raw_storage_iter.h
 OLD_FILES+=usr/include/g++/stl_relops.h
 OLD_FILES+=usr/include/g++/stl_rope.h
 OLD_FILES+=usr/include/g++/stl_set.h
 OLD_FILES+=usr/include/g++/stl_slist.h
 OLD_FILES+=usr/include/g++/stl_stack.h
 OLD_FILES+=usr/include/g++/stl_tempbuf.h
 OLD_FILES+=usr/include/g++/stl_tree.h
 OLD_FILES+=usr/include/g++/stl_uninitialized.h
 OLD_FILES+=usr/include/g++/stl_vector.h
 OLD_FILES+=usr/include/g++/stream.h
 OLD_FILES+=usr/include/g++/streambuf.h
 OLD_FILES+=usr/include/g++/strfile.h
 OLD_FILES+=usr/include/g++/string
 OLD_FILES+=usr/include/g++/strstream
 OLD_FILES+=usr/include/g++/strstream.h
 OLD_FILES+=usr/include/g++/tempbuf.h
 OLD_FILES+=usr/include/g++/tree.h
 OLD_FILES+=usr/include/g++/type_traits.h
 OLD_FILES+=usr/include/g++/typeinfo
 OLD_FILES+=usr/include/g++/utility
 OLD_FILES+=usr/include/g++/valarray
 OLD_FILES+=usr/include/g++/vector
 OLD_FILES+=usr/include/g++/vector.h
 OLD_FILES+=usr/include/gmp.h
 OLD_FILES+=usr/include/isc/assertions.h
 OLD_FILES+=usr/include/isc/ctl.h
 OLD_FILES+=usr/include/isc/dst.h
 OLD_FILES+=usr/include/isc/eventlib.h
 OLD_FILES+=usr/include/isc/heap.h
 OLD_FILES+=usr/include/isc/irpmarshall.h
 OLD_FILES+=usr/include/isc/list.h
 OLD_FILES+=usr/include/isc/logging.h
 OLD_FILES+=usr/include/isc/memcluster.h
 OLD_FILES+=usr/include/isc/misc.h
 OLD_FILES+=usr/include/isc/tree.h
 OLD_FILES+=usr/include/machine/ansi.h
 OLD_FILES+=usr/include/machine/apic.h
 OLD_FILES+=usr/include/machine/asc_ioctl.h
 OLD_FILES+=usr/include/machine/asnames.h
 OLD_FILES+=usr/include/machine/bus_at386.h
 OLD_FILES+=usr/include/machine/bus_memio.h
 OLD_FILES+=usr/include/machine/bus_pc98.h
 OLD_FILES+=usr/include/machine/bus_pio.h
 OLD_FILES+=usr/include/machine/cdk.h
 OLD_FILES+=usr/include/machine/comstats.h
 OLD_FILES+=usr/include/machine/console.h
 OLD_FILES+=usr/include/machine/critical.h
 OLD_FILES+=usr/include/machine/cronyx.h
 OLD_FILES+=usr/include/machine/dvcfg.h
 OLD_FILES+=usr/include/machine/globaldata.h
 OLD_FILES+=usr/include/machine/globals.h
 OLD_FILES+=usr/include/machine/gsc.h
 OLD_FILES+=usr/include/machine/i4b_isppp.h
 OLD_FILES+=usr/include/machine/if_wavelan_ieee.h
 OLD_FILES+=usr/include/machine/iic.h
 OLD_FILES+=usr/include/machine/ioctl_ctx.h
 OLD_FILES+=usr/include/machine/ioctl_fd.h
 OLD_FILES+=usr/include/machine/ipl.h
 OLD_FILES+=usr/include/machine/lock.h
 OLD_FILES+=usr/include/machine/mouse.h
 OLD_FILES+=usr/include/machine/mpapic.h
 OLD_FILES+=usr/include/machine/mtpr.h
 OLD_FILES+=usr/include/machine/pc/msdos.h
 OLD_FILES+=usr/include/machine/physio_proc.h
 OLD_FILES+=usr/include/machine/smb.h
 OLD_FILES+=usr/include/machine/spigot.h
 OLD_FILES+=usr/include/machine/types.h
 OLD_FILES+=usr/include/machine/uc_device.h
 OLD_FILES+=usr/include/machine/ultrasound.h
 OLD_FILES+=usr/include/machine/wtio.h
 OLD_FILES+=usr/include/msdosfs/bootsect.h
 OLD_FILES+=usr/include/msdosfs/bpb.h
 OLD_FILES+=usr/include/msdosfs/denode.h
 OLD_FILES+=usr/include/msdosfs/direntry.h
 OLD_FILES+=usr/include/msdosfs/fat.h
 OLD_FILES+=usr/include/msdosfs/msdosfsmount.h
 OLD_FILES+=usr/include/net/hostcache.h
 OLD_FILES+=usr/include/net/if_faith.h
 OLD_FILES+=usr/include/net/if_ieee80211.h
 OLD_FILES+=usr/include/net/if_tunvar.h
 OLD_FILES+=usr/include/net/intrq.h
 OLD_FILES+=usr/include/netatm/kern_include.h
 OLD_FILES+=usr/include/netinet/if_fddi.h
 OLD_FILES+=usr/include/netinet/in_hostcache.h
 OLD_FILES+=usr/include/netinet/ip_flow.h
 OLD_FILES+=usr/include/netinet/ip_fw2.h
 OLD_FILES+=usr/include/netinet6/in6_prefix.h
 OLD_FILES+=usr/include/netns/idp.h
 OLD_FILES+=usr/include/netns/idp_var.h
 OLD_FILES+=usr/include/netns/ns.h
 OLD_FILES+=usr/include/netns/ns_error.h
 OLD_FILES+=usr/include/netns/ns_if.h
 OLD_FILES+=usr/include/netns/ns_pcb.h
 OLD_FILES+=usr/include/netns/sp.h
 OLD_FILES+=usr/include/netns/spidp.h
 OLD_FILES+=usr/include/netns/spp_debug.h
 OLD_FILES+=usr/include/netns/spp_timer.h
 OLD_FILES+=usr/include/netns/spp_var.h
 OLD_FILES+=usr/include/nfs/nfs.h
 OLD_FILES+=usr/include/nfs/nfsm_subs.h
 OLD_FILES+=usr/include/nfs/nfsmount.h
 OLD_FILES+=usr/include/nfs/nfsnode.h
 OLD_FILES+=usr/include/nfs/nfsrtt.h
 OLD_FILES+=usr/include/nfs/nfsrvcache.h
 OLD_FILES+=usr/include/nfs/nfsv2.h
 OLD_FILES+=usr/include/nfs/nqnfs.h
 OLD_FILES+=usr/include/ntfs/ntfs.h
 OLD_FILES+=usr/include/ntfs/ntfs_compr.h
 OLD_FILES+=usr/include/ntfs/ntfs_ihash.h
 OLD_FILES+=usr/include/ntfs/ntfs_inode.h
 OLD_FILES+=usr/include/ntfs/ntfs_subr.h
 OLD_FILES+=usr/include/ntfs/ntfs_vfsops.h
 OLD_FILES+=usr/include/ntfs/ntfsmount.h
 OLD_FILES+=usr/include/nwfs/nwfs.h
 OLD_FILES+=usr/include/nwfs/nwfs_mount.h
 OLD_FILES+=usr/include/nwfs/nwfs_node.h
 OLD_FILES+=usr/include/nwfs/nwfs_subr.h
 OLD_FILES+=usr/include/posix4/_semaphore.h
 OLD_FILES+=usr/include/posix4/aio.h
 OLD_FILES+=usr/include/posix4/ksem.h
 OLD_FILES+=usr/include/posix4/mqueue.h
 OLD_FILES+=usr/include/posix4/posix4.h
 OLD_FILES+=usr/include/posix4/sched.h
 OLD_FILES+=usr/include/posix4/semaphore.h
 OLD_DIRS+=usr/include/posix4
 OLD_FILES+=usr/include/security/_pam_compat.h
 OLD_FILES+=usr/include/security/_pam_macros.h
 OLD_FILES+=usr/include/security/_pam_types.h
 OLD_FILES+=usr/include/security/pam_malloc.h
 OLD_FILES+=usr/include/security/pam_misc.h
 OLD_FILES+=usr/include/skey.h
 OLD_FILES+=usr/include/strhash.h
 OLD_FILES+=usr/include/struct.h
 OLD_FILES+=usr/include/sys/_label.h
 OLD_FILES+=usr/include/sys/_posix.h
 OLD_FILES+=usr/include/sys/bus_private.h
 OLD_FILES+=usr/include/sys/ccdvar.h
 OLD_FILES+=usr/include/sys/diskslice.h
 OLD_FILES+=usr/include/sys/dmap.h
 OLD_FILES+=usr/include/sys/inttypes.h
 OLD_FILES+=usr/include/sys/jumbo.h
 OLD_FILES+=usr/include/sys/mac_policy.h
 OLD_FILES+=usr/include/sys/pbioio.h
 OLD_FILES+=usr/include/sys/syscall-hide.h
 OLD_FILES+=usr/include/sys/tprintf.h
 OLD_FILES+=usr/include/sys/vnioctl.h
 OLD_FILES+=usr/include/sys/wormio.h
 OLD_FILES+=usr/include/telnet.h
 OLD_FILES+=usr/include/ufs/mfs/mfs_extern.h
 OLD_FILES+=usr/include/ufs/mfs/mfsnode.h
 OLD_FILES+=usr/include/values.h
 OLD_FILES+=usr/include/vm/vm_zone.h
 OLD_FILES+=usr/share/examples/etc/usbd.conf
 OLD_FILES+=usr/share/examples/meteor/README
 OLD_FILES+=usr/share/examples/meteor/rgb16.c
 OLD_FILES+=usr/share/examples/meteor/rgb24.c
 OLD_FILES+=usr/share/examples/meteor/test-n.c
 OLD_FILES+=usr/share/examples/meteor/yuvpk.c
 OLD_FILES+=usr/share/examples/meteor/yuvpl.c
 OLD_FILES+=usr/share/examples/worm/README
 OLD_FILES+=usr/share/examples/worm/makecdfs.sh
 OLD_FILES+=usr/share/groff_font/devlj4/Makefile
 OLD_FILES+=usr/share/groff_font/devlj4/text.map
 OLD_FILES+=usr/share/groff_font/devlj4/special.map
 OLD_FILES+=usr/share/misc/nslookup.help
 OLD_FILES+=usr/share/sendmail/cf/feature/nodns.m4
 OLD_FILES+=usr/share/syscons/keymaps/lat-amer.kbd
 OLD_FILES+=usr/share/vi/catalog/ru_SU.KOI8-R
 OLD_FILES+=usr/share/zoneinfo/SystemV/YST9
 OLD_FILES+=usr/share/zoneinfo/SystemV/PST8
 OLD_FILES+=usr/share/zoneinfo/SystemV/EST5EDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/CST6CDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/MST7MDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/PST8PDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/YST9YDT
 OLD_FILES+=usr/share/zoneinfo/SystemV/HST10
 OLD_FILES+=usr/share/zoneinfo/SystemV/MST7
 OLD_FILES+=usr/share/zoneinfo/SystemV/EST5
 OLD_FILES+=usr/share/zoneinfo/SystemV/AST4ADT
 OLD_FILES+=usr/share/zoneinfo/SystemV/CST6
 OLD_FILES+=usr/share/zoneinfo/SystemV/AST4
 OLD_DIRS+=usr/share/zoneinfo/SystemV
 OLD_FILES+=usr/share/doc/ntp/accopt.htm
 OLD_FILES+=usr/share/doc/ntp/assoc.htm
 OLD_FILES+=usr/share/doc/ntp/audio.htm
 OLD_FILES+=usr/share/doc/ntp/authopt.htm
 OLD_FILES+=usr/share/doc/ntp/biblio.htm
 OLD_FILES+=usr/share/doc/ntp/build.htm
 OLD_FILES+=usr/share/doc/ntp/clockopt.htm
 OLD_FILES+=usr/share/doc/ntp/config.htm
 OLD_FILES+=usr/share/doc/ntp/confopt.htm
 OLD_FILES+=usr/share/doc/ntp/copyright.htm
 OLD_FILES+=usr/share/doc/ntp/debug.htm
 OLD_FILES+=usr/share/doc/ntp/driver1.htm
 OLD_FILES+=usr/share/doc/ntp/driver10.htm
 OLD_FILES+=usr/share/doc/ntp/driver11.htm
 OLD_FILES+=usr/share/doc/ntp/driver12.htm
 OLD_FILES+=usr/share/doc/ntp/driver16.htm
 OLD_FILES+=usr/share/doc/ntp/driver18.htm
 OLD_FILES+=usr/share/doc/ntp/driver19.htm
 OLD_FILES+=usr/share/doc/ntp/driver2.htm
 OLD_FILES+=usr/share/doc/ntp/driver20.htm
 OLD_FILES+=usr/share/doc/ntp/driver22.htm
 OLD_FILES+=usr/share/doc/ntp/driver23.htm
 OLD_FILES+=usr/share/doc/ntp/driver24.htm
 OLD_FILES+=usr/share/doc/ntp/driver26.htm
 OLD_FILES+=usr/share/doc/ntp/driver27.htm
 OLD_FILES+=usr/share/doc/ntp/driver28.htm
 OLD_FILES+=usr/share/doc/ntp/driver29.htm
 OLD_FILES+=usr/share/doc/ntp/driver3.htm
 OLD_FILES+=usr/share/doc/ntp/driver30.htm
 OLD_FILES+=usr/share/doc/ntp/driver32.htm
 OLD_FILES+=usr/share/doc/ntp/driver33.htm
 OLD_FILES+=usr/share/doc/ntp/driver34.htm
 OLD_FILES+=usr/share/doc/ntp/driver35.htm
 OLD_FILES+=usr/share/doc/ntp/driver36.htm
 OLD_FILES+=usr/share/doc/ntp/driver37.htm
 OLD_FILES+=usr/share/doc/ntp/driver4.htm
 OLD_FILES+=usr/share/doc/ntp/driver5.htm
 OLD_FILES+=usr/share/doc/ntp/driver6.htm
 OLD_FILES+=usr/share/doc/ntp/driver7.htm
 OLD_FILES+=usr/share/doc/ntp/driver8.htm
 OLD_FILES+=usr/share/doc/ntp/driver9.htm
 OLD_FILES+=usr/share/doc/ntp/exec.htm
 OLD_FILES+=usr/share/doc/ntp/extern.htm
 OLD_FILES+=usr/share/doc/ntp/gadget.htm
 OLD_FILES+=usr/share/doc/ntp/hints.htm
 OLD_FILES+=usr/share/doc/ntp/howto.htm
 OLD_FILES+=usr/share/doc/ntp/htmlprimer.htm
 OLD_FILES+=usr/share/doc/ntp/index.htm
 OLD_FILES+=usr/share/doc/ntp/kern.htm
 OLD_FILES+=usr/share/doc/ntp/kernpps.htm
 OLD_FILES+=usr/share/doc/ntp/ldisc.htm
 OLD_FILES+=usr/share/doc/ntp/measure.htm
 OLD_FILES+=usr/share/doc/ntp/miscopt.htm
 OLD_FILES+=usr/share/doc/ntp/monopt.htm
 OLD_FILES+=usr/share/doc/ntp/mx4200data.htm
 OLD_FILES+=usr/share/doc/ntp/notes.htm
 OLD_FILES+=usr/share/doc/ntp/ntpd.htm
 OLD_FILES+=usr/share/doc/ntp/ntpdate.htm
 OLD_FILES+=usr/share/doc/ntp/ntpdc.htm
 OLD_FILES+=usr/share/doc/ntp/ntpq.htm
 OLD_FILES+=usr/share/doc/ntp/ntptime.htm
 OLD_FILES+=usr/share/doc/ntp/ntptrace.htm
 OLD_FILES+=usr/share/doc/ntp/parsedata.htm
 OLD_FILES+=usr/share/doc/ntp/parsenew.htm
 OLD_FILES+=usr/share/doc/ntp/patches.htm
 OLD_FILES+=usr/share/doc/ntp/porting.htm
 OLD_FILES+=usr/share/doc/ntp/pps.htm
 OLD_FILES+=usr/share/doc/ntp/prefer.htm
 OLD_FILES+=usr/share/doc/ntp/qth.htm
 OLD_FILES+=usr/share/doc/ntp/quick.htm
 OLD_FILES+=usr/share/doc/ntp/rdebug.htm
 OLD_FILES+=usr/share/doc/ntp/refclock.htm
 OLD_FILES+=usr/share/doc/ntp/release.htm
 OLD_FILES+=usr/share/doc/ntp/tickadj.htm
 OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz
 OLD_FILES+=usr/share/doc/papers/px.ascii.gz
 OLD_FILES+=usr/share/man/man3/exp10.3.gz
 OLD_FILES+=usr/share/man/man3/exp10f.3.gz
 OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz
 OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz
 OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz
 OLD_FILES+=usr/share/man/man3/mbmb.3.gz
 OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz
 OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz
 .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
 OLD_FILES+=usr/share/man/man8/boot_i386.8.gz
 .endif
 .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
 # 20070519: GCC 4.2
 OLD_FILES+=usr/lib/libg2c.a
 OLD_FILES+=usr/lib/libg2c.so
 OLD_LIBS+=usr/lib/libg2c.so.2
 OLD_FILES+=usr/lib/libg2c_p.a
 OLD_FILES+=usr/lib/libgcc_pic.a
 # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
 OLD_LIBS+=lib/libcrypto.so.4
 OLD_LIBS+=usr/lib/libssl.so.4
 # 20060521: gethostbyaddr(3) ABI change
 OLD_LIBS+=usr/lib/libroken.so.8
 OLD_LIBS+=lib/libatm.so.3
 OLD_LIBS+=lib/libc.so.6
 OLD_LIBS+=lib/libutil.so.5
 # 20060413: shared library moved to /usr/lib
 MOVED_LIBS+=lib/libgpib.so.1
 # 20060413: libpcap.so.4 moved to /lib/
 MOVED_LIBS+=usr/lib/libpcap.so.4
 # 20060412: libpthread.so.2 moved to /lib/
 MOVED_LIBS+=usr/lib/libpthread.so.2
 # 20060127: revert libdisk to static-only
 OLD_LIBS+=usr/lib/libdisk.so.3
 # 20051027: libc_r discontinued (removed 20101113)
 OLD_FILES+=usr/lib/libc_r.a
 OLD_FILES+=usr/lib/libc_r.so
 OLD_LIBS+=usr/lib/libc_r.so.7
 OLD_FILES+=usr/lib/libc_r_p.a
 # 20050722: bump for 6.0-RELEASE
 OLD_LIBS+=lib/libalias.so.4
 OLD_LIBS+=lib/libatm.so.2
 OLD_LIBS+=lib/libbegemot.so.1
 OLD_LIBS+=lib/libbsdxml.so.1
 OLD_LIBS+=lib/libbsnmp.so.2
 OLD_LIBS+=lib/libc.so.5
 OLD_LIBS+=lib/libcam.so.2
 OLD_LIBS+=lib/libcrypt.so.2
 OLD_LIBS+=lib/libcrypto.so.3
 OLD_LIBS+=lib/libdevstat.so.4
 OLD_LIBS+=lib/libedit.so.4
 OLD_LIBS+=lib/libgeom.so.2
 OLD_LIBS+=lib/libgpib.so.0
 OLD_LIBS+=lib/libipsec.so.1
 OLD_LIBS+=lib/libipx.so.2
 OLD_LIBS+=lib/libkiconv.so.1
 OLD_LIBS+=lib/libkvm.so.2
 OLD_LIBS+=lib/libm.so.3
 OLD_LIBS+=lib/libmd.so.2
 OLD_LIBS+=lib/libncurses.so.5
 OLD_LIBS+=lib/libreadline.so.5
 OLD_LIBS+=lib/libsbuf.so.2
 OLD_LIBS+=lib/libufs.so.2
 OLD_LIBS+=lib/libutil.so.4
 OLD_LIBS+=lib/libz.so.2
 OLD_LIBS+=usr/lib/libarchive.so.1
 OLD_LIBS+=usr/lib/libasn1.so.7
 OLD_LIBS+=usr/lib/libbluetooth.so.1
 OLD_LIBS+=usr/lib/libbz2.so.1
 OLD_LIBS+=usr/lib/libc_r.so.5
 OLD_LIBS+=usr/lib/libcalendar.so.2
 OLD_LIBS+=usr/lib/libcom_err.so.2
 OLD_LIBS+=usr/lib/libdevinfo.so.2
 OLD_LIBS+=usr/lib/libdialog.so.4
 OLD_LIBS+=usr/lib/libfetch.so.3
 OLD_LIBS+=usr/lib/libform.so.2
 OLD_LIBS+=usr/lib/libftpio.so.5
 OLD_LIBS+=usr/lib/libg2c.so.1
 OLD_LIBS+=usr/lib/libgnuregex.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.7
 OLD_LIBS+=usr/lib/libhdb.so.7
 OLD_LIBS+=usr/lib/libhistory.so.5
 OLD_LIBS+=usr/lib/libkadm5clnt.so.7
 OLD_LIBS+=usr/lib/libkadm5srv.so.7
 OLD_LIBS+=usr/lib/libkafs5.so.7
 OLD_LIBS+=usr/lib/libkrb5.so.7
 OLD_LIBS+=usr/lib/libmagic.so.1
 OLD_LIBS+=usr/lib/libmenu.so.2
 OLD_LIBS+=usr/lib/libmilter.so.2
 OLD_LIBS+=usr/lib/libmp.so.4
 OLD_LIBS+=usr/lib/libncp.so.1
 OLD_LIBS+=usr/lib/libnetgraph.so.1
 OLD_LIBS+=usr/lib/libngatm.so.1
 OLD_LIBS+=usr/lib/libobjc.so.1
 OLD_LIBS+=usr/lib/libopie.so.3
 OLD_LIBS+=usr/lib/libpam.so.2
 OLD_LIBS+=usr/lib/libpanel.so.2
 OLD_LIBS+=usr/lib/libpcap.so.3
 OLD_LIBS+=usr/lib/libpmc.so.2
 OLD_LIBS+=usr/lib/libpthread.so.1
 OLD_LIBS+=usr/lib/libradius.so.1
 OLD_LIBS+=usr/lib/libroken.so.7
 OLD_LIBS+=usr/lib/librpcsvc.so.2
 OLD_LIBS+=usr/lib/libsdp.so.1
 OLD_LIBS+=usr/lib/libsmb.so.1
 OLD_LIBS+=usr/lib/libssh.so.2
 OLD_LIBS+=usr/lib/libssl.so.3
 OLD_LIBS+=usr/lib/libstdc++.so.4
 OLD_LIBS+=usr/lib/libtacplus.so.1
 OLD_LIBS+=usr/lib/libthr.so.1
 OLD_LIBS+=usr/lib/libthread_db.so.1
 OLD_LIBS+=usr/lib/libugidfw.so.1
 OLD_LIBS+=usr/lib/libusbhid.so.1
 OLD_LIBS+=usr/lib/libvgl.so.3
 OLD_LIBS+=usr/lib/libwrap.so.3
 OLD_LIBS+=usr/lib/libypclnt.so.1
 OLD_LIBS+=usr/lib/pam_chroot.so.2
 OLD_LIBS+=usr/lib/pam_deny.so.2
 OLD_LIBS+=usr/lib/pam_echo.so.2
 OLD_LIBS+=usr/lib/pam_exec.so.2
 OLD_LIBS+=usr/lib/pam_ftpusers.so.2
 OLD_LIBS+=usr/lib/pam_group.so.2
 OLD_LIBS+=usr/lib/pam_guest.so.2
 OLD_LIBS+=usr/lib/pam_krb5.so.2
 OLD_LIBS+=usr/lib/pam_ksu.so.2
 OLD_LIBS+=usr/lib/pam_lastlog.so.2
 OLD_LIBS+=usr/lib/pam_login_access.so.2
 OLD_LIBS+=usr/lib/pam_nologin.so.2
 OLD_LIBS+=usr/lib/pam_opie.so.2
 OLD_LIBS+=usr/lib/pam_opieaccess.so.2
 OLD_LIBS+=usr/lib/pam_passwdqc.so.2
 OLD_LIBS+=usr/lib/pam_permit.so.2
 OLD_LIBS+=usr/lib/pam_radius.so.2
 OLD_LIBS+=usr/lib/pam_rhosts.so.2
 OLD_LIBS+=usr/lib/pam_rootok.so.2
 OLD_LIBS+=usr/lib/pam_securetty.so.2
 OLD_LIBS+=usr/lib/pam_self.so.2
 OLD_LIBS+=usr/lib/pam_ssh.so.2
 OLD_LIBS+=usr/lib/pam_tacplus.so.2
 OLD_LIBS+=usr/lib/pam_unix.so.2
 OLD_LIBS+=usr/lib/snmp_atm.so.3
 OLD_LIBS+=usr/lib/snmp_mibII.so.3
 OLD_LIBS+=usr/lib/snmp_netgraph.so.3
 OLD_LIBS+=usr/lib/snmp_pf.so.3
 # 200505XX: ?
 OLD_LIBS+=usr/lib/snmp_atm.so.2
 OLD_LIBS+=usr/lib/snmp_mibII.so.2
 OLD_LIBS+=usr/lib/snmp_netgraph.so.2
 OLD_LIBS+=usr/lib/snmp_pf.so.2
 # 2005XXXX: not ready for primetime yet
 OLD_LIBS+=usr/lib/libautofs.so.1
 # 200411XX: libxpg4 removal
 OLD_LIBS+=usr/lib/libxpg4.so.3
 # 200410XX: libm compatibility fix
 OLD_LIBS+=lib/libm.so.2
 # 20041001: version bump
 OLD_LIBS+=lib/libreadline.so.4
 OLD_LIBS+=usr/lib/libhistory.so.4
 OLD_LIBS+=usr/lib/libopie.so.2
 OLD_LIBS+=usr/lib/libpcap.so.2
 # 20040925: bind9 import
 OLD_LIBS+=usr/lib/libisc.so.1
 # 200408XX
 OLD_LIBS+=usr/lib/snmp_netgraph.so.1
 # 200404XX
 OLD_LIBS+=usr/lib/libsnmp.so.1
 OLD_LIBS+=usr/lib/snmp_mibII.so.1
 # 200309XX
 OLD_LIBS+=usr/lib/libasn1.so.6
 OLD_LIBS+=usr/lib/libhdb.so.6
 OLD_LIBS+=usr/lib/libkadm5clnt.so.6
 OLD_LIBS+=usr/lib/libkadm5srv.so.6
 OLD_LIBS+=usr/lib/libkrb5.so.6
 OLD_LIBS+=usr/lib/libroken.so.6
 # 200304XX
 OLD_LIBS+=usr/lib/libc.so.4
 OLD_LIBS+=usr/lib/libc_r.so.4
 OLD_LIBS+=usr/lib/libdevstat.so.2
 OLD_LIBS+=usr/lib/libedit.so.3
 OLD_LIBS+=usr/lib/libgmp.so.3
 OLD_LIBS+=usr/lib/libmp.so.3
 OLD_LIBS+=usr/lib/libpam.so.1
 OLD_LIBS+=usr/lib/libposix1e.so.2
 OLD_LIBS+=usr/lib/libskey.so.2
 OLD_LIBS+=usr/lib/libusbhid.so.0
 OLD_LIBS+=usr/lib/libvgl.so.2
 # 20030218: OpenSSL 0.9.7 import
 OLD_FILES+=usr/include/des.h
 OLD_FILES+=usr/lib/libdes.a
 OLD_FILES+=usr/lib/libdes.so
 OLD_LIBS+=usr/lib/libdes.so.3
 OLD_FILES+=usr/lib/libdes_p.a
 # 200302XX
 OLD_LIBS+=usr/lib/libacl.so.3
 OLD_LIBS+=usr/lib/libasn1.so.5
 OLD_LIBS+=usr/lib/libcrypto.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.5
 OLD_LIBS+=usr/lib/libhdb.so.5
 OLD_LIBS+=usr/lib/libkadm.so.3
 OLD_LIBS+=usr/lib/libkadm5clnt.so.5
 OLD_LIBS+=usr/lib/libkadm5srv.so.5
 OLD_LIBS+=usr/lib/libkafs.so.3
 OLD_LIBS+=usr/lib/libkafs5.so.5
 OLD_LIBS+=usr/lib/libkdb.so.3
 OLD_LIBS+=usr/lib/libkrb.so.3
 OLD_LIBS+=usr/lib/libroken.so.5
 OLD_LIBS+=usr/lib/libssl.so.2
 OLD_LIBS+=usr/lib/pam_kerberosIV.so
 # 200208XX
 OLD_LIBS+=usr/lib/libgssapi.so.4
 # 200203XX
 OLD_LIBS+=usr/lib/libss.so.3
 OLD_LIBS+=usr/lib/libusb.so.0
 # 200112XX
 OLD_LIBS+=usr/lib/libfetch.so.2
 # 200110XX
 OLD_LIBS+=usr/lib/libgssapi.so.3
 # 200104XX
 OLD_LIBS+=usr/lib/libdescrypt.so.2
 OLD_LIBS+=usr/lib/libscrypt.so.2
 # 200102XX
 OLD_LIBS+=usr/lib/libcrypto.so.1
 OLD_LIBS+=usr/lib/libssl.so.1
 # 200009XX
 OLD_LIBS+=usr/lib/libRSAglue.so.1
 OLD_LIBS+=usr/lib/librsaINTL.so.1
 OLD_LIBS+=usr/lib/librsaUSA.so.1
 # 200006XX
 OLD_LIBS+=usr/lib/libalias.so.3
 OLD_LIBS+=usr/lib/libfetch.so.1
 OLD_LIBS+=usr/lib/libipsec.so.0
 # 200005XX
 OLD_LIBS+=usr/lib/libxpg4.so.2
 # 200002XX
 OLD_LIBS+=usr/lib/libc.so.3
 OLD_LIBS+=usr/lib/libcurses.so.2
 OLD_LIBS+=usr/lib/libdialog.so.3
 OLD_LIBS+=usr/lib/libedit.so.2
 OLD_LIBS+=usr/lib/libf2c.so.2
 OLD_LIBS+=usr/lib/libftpio.so.4
 OLD_LIBS+=usr/lib/libg++.so.4
 OLD_LIBS+=usr/lib/libhistory.so.3
 OLD_LIBS+=usr/lib/libmytinfo.so.2
 OLD_LIBS+=usr/lib/libncurses.so.3
 OLD_LIBS+=usr/lib/libreadline.so.3
 OLD_LIBS+=usr/lib/libss.so.2
 OLD_LIBS+=usr/lib/libtermcap.so.2
 OLD_LIBS+=usr/lib/libutil.so.2
 OLD_LIBS+=usr/lib/libvgl.so.1
 OLD_LIBS+=usr/lib/libwrap.so.2
 # ???
 OLD_LIBS+=usr/lib/libarchive.so.2
 OLD_LIBS+=usr/lib/libbsnmp.so.1
 OLD_LIBS+=usr/lib/libc_r.so.6
 OLD_LIBS+=usr/lib/libcipher.so.2
 OLD_LIBS+=usr/lib/libgssapi.so.6
 OLD_LIBS+=usr/lib/libkse.so.1
 OLD_LIBS+=usr/lib/liblwres.so.3
 OLD_LIBS+=usr/lib/pam_ftp.so.2
 
 # 20040925: bind9 import
 OLD_DIRS+=usr/share/doc/bind/html
 OLD_DIRS+=usr/share/doc/bind/misc
 OLD_DIRS+=usr/share/doc/bind/
 # ???
 OLD_DIRS+=usr/include/g++/std
 OLD_DIRS+=usr/include/msdosfs
 OLD_DIRS+=usr/include/ntfs
 OLD_DIRS+=usr/include/nwfs
 OLD_DIRS+=usr/include/ufs/mfs
 # 20011001: UUCP migration to ports
 OLD_DIRS+=usr/libexec/uucp
 
 
 .include "tools/build/mk/OptionalObsoleteFiles.inc"
diff --git a/contrib/ngatm/FREEBSD-Xlist b/contrib/ngatm/FREEBSD-Xlist
deleted file mode 100644
index 32e28ddb55fb..000000000000
--- a/contrib/ngatm/FREEBSD-Xlist
+++ /dev/null
@@ -1,13 +0,0 @@
-#$FreeBSD$
-*/VERSION
-*/README
-*/Makefile.in
-*/Makefile.pre
-*/Makefile.post
-*/aclocal.m4
-*/config
-*/configure
-*/configure.ac
-*/netnatm
-*/snmp_atm/atm_sys.c
-*/snmp_ilmid
diff --git a/contrib/ngatm/FREEBSD-upgrade b/contrib/ngatm/FREEBSD-upgrade
deleted file mode 100644
index 4557bf72bad2..000000000000
--- a/contrib/ngatm/FREEBSD-upgrade
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD$
-
-This is the user part of the NgATM stuff. Be careful to feed changes
-back to the maintainer <harti@freebsd.org>, because the code here is
-actually shared with other environments besides FreeBSD.
-
-Import should be done by:
-
-	cvs import \
-		-m "Virgin import of NgATM user part X.Y" \
-		src/contrib/ngatm BEGEMOT NGATM_X_Y
-
-harti
diff --git a/contrib/ngatm/libngatm/cccust.h b/contrib/ngatm/libngatm/cccust.h
deleted file mode 100644
index d67b12049cca..000000000000
--- a/contrib/ngatm/libngatm/cccust.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2004
- *	Hartmut Brandt
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Begemot: libunimsg/libngatm/cccust.h,v 1.2 2004/07/16 18:48:24 brandt Exp $
- *
- * Customisation of call control source to user space.
- */
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <assert.h>
-#include <errno.h>
-
-#define CCASSERT(E, M) assert(E)
-
-#define	CCMALLOC(S)	(malloc((S)))
-#define	CCZALLOC(S)	(calloc(1, (S)))
-#define	CCFREE(P)	do { free(P); } while (0)
-
-#define	CCGETERRNO()	(errno)
diff --git a/contrib/ngatm/libngatm/net_in.fig b/contrib/ngatm/libngatm/net_in.fig
deleted file mode 100644
index 3914c1002dc9..000000000000
--- a/contrib/ngatm/libngatm/net_in.fig
+++ /dev/null
@@ -1,74 +0,0 @@
-#FIG 3.2
-Landscape
-Center
-Metric
-Letter  
-100.00
-Single
--2
-1200 2
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 675 225 225 5400 675 5400 900
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 1800 225 225 5400 1800 5400 2025
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 2925 225 225 5400 2925 5400 3150
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 4050 225 225 5400 4050 5400 4275
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5408 5169 225 225 5408 5169 5408 5394
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 4281 6292 225 225 4281 6292 4281 6517
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5408 7419 225 225 5408 7419 5408 7644
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 6525 6292 225 225 6525 6292 6525 6517
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
-	 5400 900 5400 1575
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
-	 5400 2025 5400 2700
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
-	 5400 3150 5400 3825
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
-	 5400 4275 5400 4950
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 5
-	1 1 1.00 60.00 120.00
-	 5625 2925 5850 2925 5850 4500 5625 4500 5400 4725
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 5
-	1 1 1.00 60.00 120.00
-	 5175 1800 4725 1800 4725 3375 5175 3375 5400 3600
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 5
-	1 1 1.00 60.00 120.00
-	 5175 1800 4275 1800 4275 4500 5175 4500 5400 4725
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
-	 5400 5400 5400 7200
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3
-	1 1 1.00 60.00 120.00
-	 5175 5175 4275 5175 4275 6075
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3
-	1 1 1.00 60.00 120.00
-	 5625 5175 6525 5175 6525 6075
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3
-	1 1 1.00 60.00 120.00
-	 4275 6525 4275 7425 5175 7425
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3
-	1 1 1.00 60.00 120.00
-	 6525 6525 6525 7425 5625 7425
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 5
-	1 1 1.00 60.00 120.00
-	 5625 1800 8100 1800 8100 7875 5400 7875 5400 7650
-4 1 0 50 0 14 12 0.0000 4 120 210 5400 720 N0\001
-4 0 9 50 0 14 12 0.0000 4 135 1680 5445 1080 SETUP.indication\001
-4 1 0 50 0 14 12 0.0000 4 120 210 5400 1845 N1\001
-4 0 20 50 0 14 12 0.0000 4 150 2520 5445 2205 PROCEEDING.request (opt)\001
-4 1 0 50 0 14 12 0.0000 4 120 210 5400 2970 N3\001
-4 1 0 50 0 14 12 0.0000 4 120 210 5400 4095 N4\001
-4 0 20 50 0 14 12 0.0000 4 135 1680 5760 1755 RELEASE.response\001
-4 0 20 50 0 14 12 0.0000 4 135 1470 5445 4860 SETUP.response\001
-4 0 20 50 0 14 12 0.0000 4 135 1680 5445 3690 ALERTING.request\001
-4 1 0 50 0 14 12 0.0000 4 120 315 5400 5220 N10\001
-4 1 0 50 0 14 12 0.0000 4 120 315 4275 6345 N11\001
-4 1 0 50 0 14 12 0.0000 4 120 315 6525 6345 N12\001
-4 2 9 50 0 14 12 0.0000 4 135 1890 5085 5130 RELEASE.indication\001
-4 0 20 50 0 14 12 0.0000 4 135 1575 5715 5130 RELEASE.request\001
-4 2 9 50 0 14 12 0.0000 4 135 1575 5355 5715 RELEASE.confirm\001
-4 0 9 50 0 14 12 0.0000 4 135 1575 5715 7605 RELEASE.confirm\001
-4 2 20 50 0 14 12 0.0000 4 135 1680 5085 7605 RELEASE.response\001
-4 1 0 50 0 14 12 0.0000 4 120 210 5400 7470 N0\001
diff --git a/contrib/ngatm/libngatm/net_out.fig b/contrib/ngatm/libngatm/net_out.fig
deleted file mode 100644
index c46356d0600f..000000000000
--- a/contrib/ngatm/libngatm/net_out.fig
+++ /dev/null
@@ -1,76 +0,0 @@
-#FIG 3.2
-Landscape
-Center
-Metric
-Letter  
-100.00
-Single
--2
-1200 2
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 675 225 225 5400 675 5400 900
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 1800 225 225 5400 1800 5400 2025
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 2925 225 225 5400 2925 5400 3150
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5400 4050 225 225 5400 4050 5400 4275
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5416 5181 225 225 5416 5181 5416 5406
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5408 6294 225 225 5408 6294 5408 6519
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 4281 7417 225 225 4281 7417 4281 7642
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 5408 8544 225 225 5408 8544 5408 8769
-1 3 0 1 0 7 50 0 -1 0.000 1 0.0000 6525 7417 225 225 6525 7417 6525 7642
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
-	 5400 900 5400 1575
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
-	 5400 2025 5400 2700
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
-	 5400 3150 5400 3825
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
-	 5400 4275 5400 4950
-2 1 0 1 0 7 50 0 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
-	 5400 5400 5400 6075
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 5
-	1 1 1.00 60.00 120.00
-	 5175 1800 4950 1800 4950 3375 5175 3375 5400 3600
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 5
-	1 1 1.00 60.00 120.00
-	 5175 1800 4500 1800 4500 4500 5175 4500 5400 4725
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 5
-	1 1 1.00 60.00 120.00
-	 5625 2925 5850 2925 5850 4500 5625 4500 5400 4725
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 2
-	1 1 1.00 60.00 120.00
-	 5400 6525 5400 8325
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3
-	1 1 1.00 60.00 120.00
-	 5175 6300 4275 6300 4275 7200
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3
-	1 1 1.00 60.00 120.00
-	 5625 6300 6525 6300 6525 7200
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3
-	1 1 1.00 60.00 120.00
-	 4275 7650 4275 8550 5175 8550
-2 1 0 1 -1 7 50 0 -1 0.000 0 0 -1 1 0 3
-	1 1 1.00 60.00 120.00
-	 6525 7650 6525 8550 5625 8550
-4 1 0 50 0 14 12 0.0000 4 120 210 5400 720 N0\001
-4 0 20 50 0 14 12 0.0000 4 135 1365 5535 1125 SETUP.request\001
-4 1 0 50 0 14 12 0.0000 4 120 210 5400 1845 N6\001
-4 1 0 50 0 14 12 0.0000 4 120 210 5400 2970 N9\001
-4 1 0 50 0 14 12 0.0000 4 120 210 5400 4095 N7\001
-4 1 0 50 0 14 12 0.0000 4 120 210 5400 5220 N8\001
-4 1 0 50 0 14 12 0.0000 4 120 315 5400 6345 N10\001
-4 0 20 50 0 14 12 0.0000 4 135 2310 5535 5625 SETUP_COMPLETE.request\001
-4 0 9 50 0 14 12 0.0000 4 135 1995 5535 3735 ALERTING.indication\001
-4 0 9 50 0 14 12 0.0000 4 135 1365 5535 4860 SETUP.confirm\001
-4 0 9 50 0 14 12 0.0000 4 135 2205 5535 2610 PROCEEDING.indication\001
-4 1 0 50 0 14 12 0.0000 4 120 315 4275 7470 N11\001
-4 1 0 50 0 14 12 0.0000 4 120 315 6525 7470 N12\001
-4 2 9 50 0 14 12 0.0000 4 135 1890 5085 6255 RELEASE.indication\001
-4 0 20 50 0 14 12 0.0000 4 135 1575 5715 6255 RELEASE.request\001
-4 2 9 50 0 14 12 0.0000 4 135 1575 5355 6840 RELEASE.confirm\001
-4 0 9 50 0 14 12 0.0000 4 135 1575 5715 8730 RELEASE.confirm\001
-4 2 20 50 0 14 12 0.0000 4 135 1680 5085 8730 RELEASE.response\001
-4 1 0 50 0 14 12 0.0000 4 120 210 5400 8595 N0\001
diff --git a/contrib/ngatm/libngatm/sscfucust.h b/contrib/ngatm/libngatm/sscfucust.h
deleted file mode 100644
index 760fd71660f9..000000000000
--- a/contrib/ngatm/libngatm/sscfucust.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/libngatm/sscfucust.h,v 1.4 2004/07/08 08:21:40 brandt Exp $
- *
- * Customisation of the SSCFU code for the user space library.
- */
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#ifdef SSCFU_DEBUG
-#include <assert.h>
-#endif
-#include <netnatm/unimsg.h>
-
-/*
- * Allocate zeroed or non-zeroed memory of some size and cast it.
- * Return NULL on failure.
- */
-#define MEMINIT()
-
-#define MEMZALLOC(PTR,CAST,SIZE) do {				\
-	void *_m = malloc(SIZE);				\
-	if (_m != NULL)						\
-		bzero(_m, SIZE);				\
-	(PTR) = (CAST)_m;					\
-} while(0)
-
-#define MEMFREE(PTR) \
-	free(PTR)
-
-#define SIG_ALLOC(PTR) \
-	MEMZALLOC(PTR, struct sscfu_sig *, sizeof(struct sscfu_sig))
-#define SIG_FREE(PTR) \
-	MEMFREE(PTR)
-
-/*
- * Signal queues
- */
-typedef TAILQ_ENTRY(sscfu_sig) sscfu_sigq_link_t;
-typedef TAILQ_HEAD(sscfu_sigq, sscfu_sig) sscfu_sigq_head_t;
-#define SIGQ_INIT(Q) 		TAILQ_INIT(Q)
-#define SIGQ_APPEND(Q,S)	TAILQ_INSERT_TAIL(Q, S, link)
-#define SIGQ_GET(Q)							\
-    ({									\
-	struct sscfu_sig *_s = NULL;					\
-									\
-	if(!TAILQ_EMPTY(Q)) {						\
-		_s = TAILQ_FIRST(Q);					\
-		TAILQ_REMOVE(Q, _s, link);				\
-	}								\
-	_s;								\
-    })
-
-#define SIGQ_CLEAR(Q)							\
-    do {								\
-	struct sscfu_sig *_s1, *_s2;					\
-									\
-	_s1 = TAILQ_FIRST(Q);						\
-	while(_s1 != NULL) {						\
-		_s2 = TAILQ_NEXT(_s1, link);				\
-		if(_s1->m)						\
-			MBUF_FREE(_s1->m);				\
-		SIG_FREE(_s1);						\
-		_s1 = _s2;						\
-	}								\
-	TAILQ_INIT(Q);							\
-    } while(0)
-
-
-/*
- * Message buffers
- */
-#define MBUF_FREE(M)	uni_msg_destroy(M)
-
-#ifdef SSCFU_DEBUG
-#define	ASSERT(S)	assert(S)
-#else
-#define	ASSERT(S)
-#endif
diff --git a/contrib/ngatm/libngatm/sscopcust.h b/contrib/ngatm/libngatm/sscopcust.h
deleted file mode 100644
index 12736c26c030..000000000000
--- a/contrib/ngatm/libngatm/sscopcust.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/libngatm/sscopcust.h,v 1.4 2004/07/08 08:21:40 brandt Exp $
- *
- * Customisation of the SSCOP code for the user space library.
- */
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <errno.h>
-#ifdef SSCOP_DEBUG
-#include <assert.h>
-#endif
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netnatm/unimsg.h>
-
-/*
- * Allocate zeroed or non-zeroed memory of some size and cast it.
- * Return NULL on failure.
- */
-#define	MEMINIT()
-
-#define	MEMZALLOC(PTR,CAST,SIZE) do {				\
-	void *_m = malloc(SIZE);				\
-	if (_m != NULL)						\
-		bzero(_m, SIZE);				\
-	(PTR) = (CAST)_m;					\
-} while(0)
-
-#define	MEMFREE(PTR) free(PTR);
-
-#define	MSG_ALLOC(PTR) \
-	MEMZALLOC(PTR, struct sscop_msg *, sizeof(struct sscop_msg))
-#define	MSG_FREE(PTR) \
-	MEMFREE(PTR)
-
-#define	SIG_ALLOC(PTR) \
-	MEMZALLOC(PTR, struct sscop_sig *, sizeof(struct sscop_sig))
-#define	SIG_FREE(PTR) \
-	MEMFREE(PTR)
-
-/*
- * Timer support.
- */
-typedef void *sscop_timer_t;
-#define	TIMER_INIT(S,T)	(S)->t_##T = NULL
-#define	TIMER_STOP(S,T) do {						\
-	if ((S)->t_##T != NULL) {					\
-		(S)->funcs->stop_timer((S), (S)->aarg, (S)->t_##T);	\
-		(S)->t_##T = NULL;					\
-	}								\
-    } while(0)
-#define	TIMER_RESTART(S,T) do {						\
-	if ((S)->t_##T != NULL)						\
-		(S)->funcs->stop_timer((S), (S)->aarg, (S)->t_##T);	\
-	(S)->t_##T = (S)->funcs->start_timer((S), (S)->aarg,		\
-	    (S)->timer##T, T##_func);					\
-    } while(0)
-#define	TIMER_ISACT(S,T)	((S)->t_##T != NULL)
-
-#define	TIMER_FUNC(T,N)							\
-static void								\
-T##_func(void *varg)							\
-{									\
-	struct sscop *sscop = varg;					\
-	VERBOSE(sscop, SSCOP_DBG_TIMER, (sscop, sscop->aarg,		\
-	    "timer_" #T " expired"));					\
-	sscop->t_##T = NULL;						\
-	sscop_signal(sscop, SIG_T_##N, NULL);				\
-}
-
-
-/*
- * Message queues
- */
-typedef TAILQ_ENTRY(sscop_msg) sscop_msgq_link_t;
-typedef TAILQ_HEAD(sscop_msgq, sscop_msg) sscop_msgq_head_t;
-#define	MSGQ_EMPTY(Q) TAILQ_EMPTY(Q)
-#define	MSGQ_INIT(Q) TAILQ_INIT(Q)
-#define	MSGQ_FOREACH(P,Q) TAILQ_FOREACH(P,Q,link)
-#define	MSGQ_REMOVE(Q,M) TAILQ_REMOVE(Q,M,link)
-#define	MSGQ_INSERT_BEFORE(B,M) TAILQ_INSERT_BEFORE(B,M,link)
-#define	MSGQ_APPEND(Q,M) TAILQ_INSERT_TAIL(Q,M,link)
-#define	MSGQ_PEEK(Q) (TAILQ_EMPTY((Q)) ? NULL : TAILQ_FIRST((Q)))
-#define	MSGQ_GET(Q)							\
-    ({									\
-	struct sscop_msg *_m = NULL;					\
-									\
-	if(!TAILQ_EMPTY(Q)) {						\
-		_m = TAILQ_FIRST(Q);					\
-		TAILQ_REMOVE(Q, _m, link);				\
-	}								\
-	_m;								\
-    })
-
-#define	MSGQ_CLEAR(Q)							\
-	do {								\
-		struct sscop_msg *_m1, *_m2;				\
-									\
-		_m1 = TAILQ_FIRST(Q);					\
-		while(_m1 != NULL) {					\
-			_m2 = TAILQ_NEXT(_m1, link);			\
-			SSCOP_MSG_FREE(_m1);				\
-			_m1 = _m2;					\
-		}							\
-		TAILQ_INIT((Q));					\
-	} while(0)
-
-/*
- * Signal queues
- */
-typedef TAILQ_ENTRY(sscop_sig) sscop_sigq_link_t;
-typedef TAILQ_HEAD(sscop_sigq, sscop_sig) sscop_sigq_head_t;
-#define	SIGQ_INIT(Q) 		TAILQ_INIT(Q)
-#define	SIGQ_APPEND(Q,S)	TAILQ_INSERT_TAIL(Q, S, link)
-#define	SIGQ_EMPTY(Q)		TAILQ_EMPTY(Q)
-#define	SIGQ_GET(Q)							\
-    ({									\
-	struct sscop_sig *_s = NULL;					\
-									\
-	if(!TAILQ_EMPTY(Q)) {						\
-		_s = TAILQ_FIRST(Q);					\
-		TAILQ_REMOVE(Q, _s, link);				\
-	}								\
-	_s;								\
-    })
-
-#define	SIGQ_MOVE(F,T)							\
-    do {								\
-	struct sscop_sig *_s;						\
-									\
-	while(!TAILQ_EMPTY(F)) {					\
-		_s = TAILQ_FIRST(F);					\
-		TAILQ_REMOVE(F, _s, link);				\
-		TAILQ_INSERT_TAIL(T, _s, link);				\
-	}								\
-    } while(0)
-
-#define	SIGQ_PREPEND(F,T)						\
-    do {								\
-	struct sscop_sig *_s;						\
-									\
-	while(!TAILQ_EMPTY(F)) {					\
-		_s = TAILQ_LAST(F, sscop_sigq);				\
-		TAILQ_REMOVE(F, _s, link);				\
-		TAILQ_INSERT_HEAD(T, _s, link);				\
-	}								\
-    } while(0)
-
-#define	SIGQ_CLEAR(Q)							\
-    do {								\
-	struct sscop_sig *_s1, *_s2;					\
-									\
-	_s1 = TAILQ_FIRST(Q);						\
-	while(_s1 != NULL) {						\
-		_s2 = TAILQ_NEXT(_s1, link);				\
-		SSCOP_MSG_FREE(_s1->msg);				\
-		SIG_FREE(_s1);						\
-		_s1 = _s2;						\
-	}								\
-	TAILQ_INIT(Q);							\
-    } while(0)
-
-
-
-/*
- * Message buffers
- */
-/* Free a buffer (if there is one) */
-#define	MBUF_FREE(M)	do { if(M) uni_msg_destroy(M); } while(0)
-
-/* duplicate a buffer */
-#define	MBUF_DUP(M) uni_msg_dup(M)
-
-/* compute current length */
-#define	MBUF_LEN(M) uni_msg_len((M))
-
-/*
- * Return the i-th word counted from the end of the buffer.
- * i=-1 will return the last 32bit word, i=-2 the 2nd last.
- * Assumes that there is enough space.
- */
-#define	MBUF_TRAIL32(M,I) uni_msg_trail32((M), (I))
-
-/*
- * Strip 32bit value from the end
- */
-#define	MBUF_STRIP32(M) uni_msg_strip32((M))
-
-/*
- * Strip 32bit value from head
- */
-#define	MBUF_GET32(M) uni_msg_get32((M))
-
-/*
- * Append a 32bit value to an mbuf. Failures are ignored.
- */
-#define	MBUF_APPEND32(M,W) uni_msg_append32((M), (W))
-
-/*
- * Pad a message to a multiple of four byte and return the amount of padding
- * Failures are ignored.
- */
-#define	MBUF_PAD4(M)							\
-    ({									\
-	int _npad = 0;							\
-	while (uni_msg_len(M) % 4 != 0) {				\
-		uni_msg_append8((M), 0);				\
-		_npad++;						\
-	}								\
-	_npad;								\
-    })
-
-#define	MBUF_UNPAD(M,P) do { (M)->b_wptr -= (P); } while(0)
-
-/*
- * Allocate a message that will probably hold N bytes.
- */
-#define	MBUF_ALLOC(N) uni_msg_alloc(N)
-
-#ifdef SSCOP_DEBUG
-#define	ASSERT(X)	assert(X)
-#else
-#define	ASSERT(X)
-#endif
diff --git a/contrib/ngatm/libngatm/unicust.h b/contrib/ngatm/libngatm/unicust.h
deleted file mode 100644
index ff028a65a8e6..000000000000
--- a/contrib/ngatm/libngatm/unicust.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/libngatm/unicust.h,v 1.4 2003/09/19 13:10:35 hbb Exp $
- *
- * Customisation of signalling source to user space.
- */
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#define ASSERT(E, M) assert(E)
-
-static __inline__ void *
-mzalloc(size_t s)
-{
-	void *ptr = malloc(s);
-
-	if (ptr)
-		bzero(ptr, s);
-	return (ptr);
-}
-
-#define INS_ALLOC()	mzalloc(sizeof(struct uni))
-#define INS_FREE(P)	free(P)
-
-#define UNI_ALLOC()	mzalloc(sizeof(struct uni_all))
-#define UNI_FREE(P)	free(P)
-
-#define SIG_ALLOC()	mzalloc(sizeof(struct sig))
-#define SIG_FREE(P)	free(P)
-
-#define CALL_ALLOC()	mzalloc(sizeof(struct call))
-#define CALL_FREE(P)	free(P)
-
-#define PARTY_ALLOC()	mzalloc(sizeof(struct party))
-#define PARTY_FREE(P)	free(P)
-
-/*
- * Timers
- */
-struct uni_timer {
-	void *c;
-};
-
-#define _TIMER_INIT(X,T)	(X)->T.c = NULL
-#define _TIMER_DESTROY(U,F)	_TIMER_STOP(U,F)
-#define _TIMER_STOP(U,F)					\
-    do {							\
-	if (F.c != NULL) {					\
-		(U)->funcs->stop_timer(U, U->arg, F.c);		\
-		F.c = NULL;					\
-	}							\
-    } while(0)
-#define _TIMER_START(UNI,ARG,FIELD,DUE,FUNC)			\
-	(void)(FIELD.c = (UNI)->funcs->start_timer(UNI,		\
-	    UNI->arg, DUE, FUNC, ARG))
-
-#define TIMER_ISACT(X,T)	(X->T.c != NULL)
-
-#define TIMER_FUNC_UNI(T,F)						\
-static void F(struct uni *);						\
-static void								\
-_##T##_func(void *varg)							\
-{									\
-	struct uni *uni = (struct uni *)varg;				\
-	uni->T.c = NULL;						\
-	(F)(uni);							\
-}
-
-/*
- * Be careful: call may be invalid after the call to F
- */
-#define TIMER_FUNC_CALL(T,F)						\
-static void F(struct call *);						\
-static void								\
-_##T##_func(void *varg)							\
-{									\
-	struct call *call = (struct call *)varg;			\
-	call->T.c = NULL;						\
-	(F)(call);							\
-}
-
-/*
- * Be careful: call/party may be invalid after the call to F
- */
-#define TIMER_FUNC_PARTY(T,F)						\
-static void F(struct party *);						\
-static void								\
-_##T##_func(void *varg)							\
-{									\
-	struct party *party = (struct party *)varg;			\
-	party->T.c = NULL;						\
-	(F)(party);							\
-}
diff --git a/contrib/ngatm/libngatm/unimsg.c b/contrib/ngatm/libngatm/unimsg.c
deleted file mode 100644
index 9df02a10598c..000000000000
--- a/contrib/ngatm/libngatm/unimsg.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/libngatm/unimsg.c,v 1.4 2004/07/08 08:21:41 brandt Exp $
- *
- * User space message structure.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include <arpa/inet.h>
-#include <netnatm/unimsg.h>
-
-/* the amount of extra bytes to allocate */
-#define EXTRA	128
-
-/*
- * Allocate a message that can hold at least 's' bytes. Return NULL if
- * allocation fails.
- */
-struct uni_msg *
-uni_msg_alloc(size_t s)
-{
-	struct uni_msg *m;
-
-	s += EXTRA;
-
-	if ((m = malloc(sizeof(struct uni_msg))) == NULL)
-		return NULL;
-	if ((m->b_buf = malloc(s)) == NULL) {
-		free(m);
-		return (NULL);
-	}
-	m->b_rptr = m->b_wptr = m->b_buf;
-	m->b_lim = m->b_buf + s;
-	return (m);
-}
-
-/*
- * Destroy the message and free memory
- */
-void
-uni_msg_destroy(struct uni_msg *m)
-{
-	free(m->b_buf);
-	free(m);
-}
-
-/*
- * Extend message by at least 's' additional bytes.
- * May reallocate the message buffer. Return -1 on errors, 0 if ok.
- * If an error occurs the message is destroyed.
- */
-int
-uni_msg_extend(struct uni_msg *m, size_t s)
-{
-	u_char *b;
-	size_t len, leading, newsize;
-
-	len = uni_msg_len(m);
-	newsize = m->b_wptr - m->b_buf + s + EXTRA;
-	leading = m->b_rptr - m->b_buf;
-	if ((b = realloc(m->b_buf, newsize)) == NULL) {
-		free(m->b_buf);
-		free(m);
-		return (-1);
-	}
-	m->b_buf = b;
-	m->b_rptr = m->b_buf + leading;
-	m->b_wptr = m->b_rptr + len;
-	m->b_lim = m->b_buf + newsize;
-
-	return (0);
-}
-
-/*
- * Append the given buffer to the message. May reallocate the message
- * buffer. Return 0 if ok, -1 on errors.
- */
-int
-uni_msg_append(struct uni_msg *m, void *buf, size_t size)
-{
-	int error;
-
-	if ((error = uni_msg_ensure(m, size)))
-		return (error);
-	memcpy(m->b_wptr, buf, size);
-	m->b_wptr += size;
-
-	return (0);
-}
-
-/*
- * Construct a message from a number of pieces. The list of pieces must end
- * with a NULL pointer.
- */
-struct uni_msg *
-uni_msg_build(void *ptr, ...)
-{
-	va_list ap;
-	struct uni_msg *m;
-	size_t len, n;
-	void *p1;
-
-	len = 0;
-	va_start(ap, ptr);
-	p1 = ptr;
-	while (p1 != NULL) {
-		n = va_arg(ap, size_t);
-		len += n;
-		p1 = va_arg(ap, void *);
-	}
-	va_end(ap);
-
-	if ((m = uni_msg_alloc(len)) == NULL)
-		return (NULL);
-
-	va_start(ap, ptr);
-	p1 = ptr;
-	while (p1 != NULL) {
-		n = va_arg(ap, size_t);
-		memcpy(m->b_wptr, p1, n);
-		m->b_wptr += n;
-		p1 = va_arg(ap, void *);
-	}
-	va_end(ap);
-
-	return (m);
-}
-
-/*
- * Strip the last 32 bit word from the buffer.
- * Barf if there is no word left.
- */
-u_int
-uni_msg_strip32(struct uni_msg *msg)
-{
-	uint32_t w;
-
-	msg->b_wptr -= 4;
-	bcopy(msg->b_wptr, &w, 4);
-	return (ntohl(w));
-}
-
-/*
- * Strip the first four bytes of the buffer.
- */
-u_int
-uni_msg_get32(struct uni_msg *msg)
-{
-	uint32_t w;
-
-	bcopy(msg->b_rptr, &w, 4);
-	msg->b_rptr += 4;
-	return (ntohl(w));
-}
-
-/*
- * Append a 32 bit word to the buffer.
- */
-int
-uni_msg_append32(struct uni_msg *msg, u_int u)
-{
-	if (uni_msg_ensure(msg, 4) == -1)
-		return (-1);
-	u = htonl(u);
-	bcopy(&u, msg->b_wptr, 4);
-	msg->b_wptr += 4;
-	return (0);
-}
-
-/*
- * Append a byte to the buffer.
- */
-int
-uni_msg_append8(struct uni_msg *msg, u_int u)
-{
-	if (uni_msg_ensure(msg, 1) == -1)
-		return (-1);
-	*msg->b_wptr++ = u;
-	return (0);
-}
-
-/*
- * Return the i-th word counted from the end of the buffer.
- * i=-1 will return the last 32bit word, i=-2 the 2nd last.
- * Assumes that the word is in the buffer.
- */
-u_int
-uni_msg_trail32(const struct uni_msg *msg, int i)
-{
-	u_int w;
-
-	bcopy(msg->b_wptr + 4 * i, &w, 4);
-	return (ntohl(w));
-}
-
-
-/*
- * Make a duplicate.
- */
-struct uni_msg *
-uni_msg_dup(const struct uni_msg *inp)
-{
-	struct uni_msg *msg;
-	u_int len, off;
-
-	len = inp->b_wptr - inp->b_rptr;
-	off = inp->b_rptr - inp->b_buf;
-	if ((msg = uni_msg_alloc(inp->b_lim - inp->b_buf)) == NULL)
-		return (NULL);
-	msg->b_rptr = msg->b_buf + off;
-	msg->b_wptr = msg->b_rptr + len;
-	(void)memcpy(msg->b_rptr, inp->b_rptr, len);
-
-	return (msg);
-}
diff --git a/contrib/ngatm/man/libngatm.3 b/contrib/ngatm/man/libngatm.3
deleted file mode 100644
index 8a2dbed332af..000000000000
--- a/contrib/ngatm/man/libngatm.3
+++ /dev/null
@@ -1,75 +0,0 @@
-.\"
-.\" Copyright (c) 2004-2005
-.\"	Hartmut Brandt
-.\" 	All rights reserved.
-.\" Copyright (c) 2001-2003
-.\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-.\" 	All rights reserved.
-.\"
-.\" Author: Hartmut Brandt <harti@FreeBSD.org>
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $Begemot: libunimsg/man/libngatm.3,v 1.6 2005/06/15 11:37:07 brandt_h Exp $
-.\"
-.Dd May 23, 2005
-.Dt LIBNGATM 3
-.Os
-.Sh NAME
-.Nm libngatm
-.Nd "ATM signalling library"
-.Sh LIBRARY
-Begemot ATM signalling library
-.Pq libngatm, -lngatm
-.Sh DESCRIPTION
-The Begemot UNI signalling library handles message decoding and encoding as
-well as the Q.2110 and Q.2120 transport protocols and adaptation layers, and
-ATM-Forum UNI 4.0 compliant signalling.
-Because of this complexity the description is broken down in several man pages:
-.Bl -tag -width XXXX
-.It Xr unimsg 3
-Describes a data structure and functions for handling of variable sized
-messages.
-.It Xr unistruct 3
-describes data structures for the decoding, encoding and printing functions
-in the library.
-.It Xr unifunc 3
-describes the decoding, encoding and printing functions.
-.\" .It Xr sscop 3
-.\" describes the SSCOP transport protocol functions.
-.\" .It Xr sscfu 3
-.\" describes the SSCF at the UNI functions.
-.\" .It Xr uni 3
-.\" describes the UNI 4.0 signalling functions.
-.It Xr uniaddr 3
-describes address structures and handling functions.
-.It Xr unisap 3
-.\" describes ATM-Forum ATM-API service access point structures and
-.\" handling functions.
-.El
-.Sh SEE ALSO
-.Xr sscop 1
-.Sh STANDARDS
-This implementation conforms to the applicable ITU-T
-recommendations and ATM Forum standards.
-.Sh AUTHORS
-.An Hartmut Brandt Aq harti@FreeBSD.org
diff --git a/contrib/ngatm/man/uniaddr.3 b/contrib/ngatm/man/uniaddr.3
deleted file mode 100644
index 3be82bb6c6b3..000000000000
--- a/contrib/ngatm/man/uniaddr.3
+++ /dev/null
@@ -1,129 +0,0 @@
-.\"
-.\" Copyright (c) 2004-2005
-.\"	Hartmut Brandt.
-.\" 	All rights reserved.
-.\" Copyright (c) 2001-2003
-.\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-.\" 	All rights reserved.
-.\"
-.\" Author: Hartmut Brandt <harti@FreeBSD.org>
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $Begemot: libunimsg/man/uniaddr.3,v 1.6 2005/06/15 11:37:08 brandt_h Exp $
-.\"
-.Dd June 14, 2005
-.Dt UNIADDR 3
-.Os
-.Sh NAME
-.Nm unimsg ,
-.Nm uni_str2nsap ,
-.Nm uni_nsap2str ,
-.Nm uni_prefix2str ,
-.Nm uni_e1642nsap ,
-.Nm uni_nsap2e164
-.Nd "ATM signalling library - address handling"
-.Sh LIBRARY
-Begemot ATM signalling library
-.Pq libunimsg, -lunimsg
-.Sh SYNOPSIS
-.In netnatm/addr.h
-.Ft int
-.Fn uni_str2nsap "u_char *nsap" "const char *str"
-.Ft void
-.Fn uni_nsap2str "char *str" "const u_char *nsap" "int dots"
-.Ft void
-.Fn uni_prefix2str "char *str" "const u_char *prefix" "u_int len" "int dots"
-.Ft int
-.Fn uni_e1642nsap "u_char *nsap" "const char *e164"
-.Ft int
-.Fn uni_nsap2e164 "char *e164" "const u_char *nsap" "int check"
-.Sh DESCRIPTION
-The UNI message library contains a number of utility functions to handle
-NSAP and E.164 addresses.
-.Pp
-The function
-.Fn uni_str2nsap
-parses a string and interprets it as an NSAP address.
-The string should consist of exact 40 hexadecimal digits
-(upper and lower case are allowed) and any
-number of dots at any position.
-Any other character is illegal.
-The resulting NSAP address is written to the buffer pointed to by
-.Fa nsap .
-This buffer should be at least 20 bytes.
-On success the funtion returns 0.
-If an parsing error happens -1 is returned.
-.Pp
-The function
-.Fn uni_nsap2str
-converts the NSAP address pointed to by
-.Fa nsap
-into a string.
-For some commonly used NSAP formats (those with leading
-octets 0x39, 0x45 or 0x47) dots may be inserted to make the address more
-readable by passing a non-0 value in
-.Fa dots .
-The buffer pointed to by
-.Fa str
-should be large enough to hold the resulting string plus the terminating NUL.
-A size of 80 byte is large enough for all cases.
-.Pp
-The function
-.Fn uni_prefix2str
-converts an NSAP prefix to a string.
-The length of the NSAP prefix in bytes is passed in
-.Fa len .
-.Li "uni_nsap2str(str, nsap, dots)"
-is equivalent to
-.Li "uni_prefix2str(str, nsap, 20, dots)" .
-.Pp
-The function
-.Fn uni_e1642nsap
-converts an E.164 address given as an ASCII string to an embedded E.164 NSAP
-address.
-The string pointed to by
-.Fa e164
-must consist of at least 1 and not more than 15 ASCII digits.
-The function returns 0 on success and -1 if the E.164 address was malformed.
-.Pp
-The function
-.Fn uni_nsap2e164
-extracts the E.164 address from an embedded E.164 NSAP address.
-The argument
-.Fa check
-specifies whether the NSAP address should be checked for correct syntax.
-If
-.Fa check
-is 0 the last 11 bytes of the address are ignored.
-If
-.Fa check
-is 1 the last 11 bytes except the selector byte must be zero.
-If
-.Fa check
-is 2 the last 11 bytes must be zero.
-The function returns 0 on success and -1 when the NSAP address was not an
-embedded E.164 NSAP or one of the additional checks failed.
-.Sh SEE ALSO
-.Xr libngatm 3
-.Sh AUTHORS
-.An Hartmut Brandt Aq harti@FreeBSD.org
diff --git a/contrib/ngatm/man/unifunc.3 b/contrib/ngatm/man/unifunc.3
deleted file mode 100644
index 3d66900a3372..000000000000
--- a/contrib/ngatm/man/unifunc.3
+++ /dev/null
@@ -1,255 +0,0 @@
-.\"
-.\" Copyright (c) 2004-2005
-.\"	Hartmut Brandt.
-.\" 	All rights reserved.
-.\" Copyright (c) 2001-2003
-.\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-.\" 	All rights reserved.
-.\"
-.\" Author: Hartmut Brandt <harti@FreeBSD.org>
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $Begemot: libunimsg/man/unifunc.3,v 1.6 2005/06/15 11:37:09 brandt_h Exp $
-.\"
-.Dd June 14, 2005
-.Dt UNIFUNC 3
-.Os
-.Sh NAME
-.Nm libngatm ,
-.Nm uni_decode ,
-.Nm uni_decode_head ,
-.Nm uni_decode_body ,
-.Nm uni_decode_ie_hdr ,
-.Nm uni_decode_ie_body ,
-.Nm uni_encode ,
-.Nm uni_encode_msg_hdr ,
-.Nm uni_encode_ie ,
-.Nm uni_encode_ie_hdr ,
-.Nm uni_check_ie ,
-.Nm uni_print_cref ,
-.Nm uni_print_msghdr ,
-.Nm uni_print ,
-.Nm uni_print_ie ,
-.Nm uni_initcx ,
-.Nm uni_print_cx
-.Nd "ATM signalling library - message handling functions"
-.Sh LIBRARY
-Begemot ATM signalling library
-.Pq libngatm, -lngatm
-.Sh SYNOPSIS
-.In netnatm/msg/unistruct.h
-.In netnatm/msg/unimsglib.h
-.Ft int
-.Fn uni_decode "struct uni_msg *buf" "struct uni_all *msg" "struct unicx *cx"
-.Ft int
-.Fn uni_decode_head "struct uni_msg *buf" "struct uni_all *msg" "struct unicx *cx"
-.Ft int
-.Fn uni_decode_body "struct uni_msg *buf" "struct uni_all *msg" "struct unicx *cx"
-.Ft int
-.Fn uni_decode_ie_hdr "enum uni_ietype *type" "struct uni_iehdr *hdr" "struct uni_msg *buf" "struct unicx *cx" "u_int *ielen"
-.Ft int
-.Fn uni_decode_ie_body "enum uni_ietype type" "union uni_ieall *ie" "struct uni_msg *buf" "u_int ielen" "struct unicx *cx"
-.Ft int
-.Fn uni_encode "struct uni_msg *buf" "struct uni_all *msg" "struct unicx *cx"
-.Ft int
-.Fn uni_encode_msg_hdr "struct uni_msg *buf" "struct uni_msghdr *hdr" "enum uni_msgtype type" "struct unicx *cx" "int *mlen"
-.Ft int
-.Fn uni_encode_ie "enum uni_ietype type" "struct uni_msg *buf" "union uni_ieall *ie" "struct unicx *cx"
-.Ft int
-.Fn uni_encode_ie_hdr "struct uni_msg *buf" "enum uni_ietype type" "struct uni_iehdr *hdr" "u_int len" "struct unicx *cx"
-.Ft int
-.Fn uni_check_ie "enum uni_ietype type" "union uni_ieall *ie" "struct unicx *cx"
-.Ft void
-.Fn uni_print_cref "char *buf" "size_t buflen" "struct uni_cref *cref" "struct unicx *cx"
-.Ft void
-.Fn uni_print_msghdr "char *buf" "size_t buflen" "struct uni_msghdr *hdr" "struct unicx *cx"
-.Ft void
-.Fn uni_print "char *buf" "size_t buflen" "struct uni_all *msg" "struct unicx *cx"
-.Ft void
-.Fn uni_print_ie "char *buf" "size_t buflen" "enum uni_ietype type" "union uni_ieall *ie" "struct unicx *cx"
-.Ft void
-.Fn uni_initcx "struct unicx *cx"
-.Ft void
-.Fn uni_print_cx "char *buf" "size_t buflen" "struct unicx *cx"
-.Sh DESCRIPTION
-The
-.Nm
-library handles UNI 4.0 messages.
-For each information element and message
-type the header files contain a structure definition.
-Additionally there
-are a number of help structures and a global context structure for some
-of the library functions.
-This document describes the functions that are
-used to handle messages.
-.Ss DECODING
-Decoding is the process of taking an octet stream containing a UNI message
-or IE, parsing it and filling in a message or IE structure.
-.Pp
-The function
-.Fn uni_decode
-takes a message buffer, interprets it as a UNI message and fills in the
-structure pointed to by
-.Fa msg .
-It also takes a context argument and may fill the error array in the context.
-It returns -1 if there is an error decoding the message header and
--2 if there is an error decoding the message body.
-The function returns 0 on success.
-.Pp
-The process of decoding a message can be split up by calling
-.Fn uni_decode_head
-and
-.Fn uni_decode_body .
-The first of these functions decodes only the message header and the second
-one decodes only the information elements.
-.Fn uni_decode_head
-returns 0 if it could decode the message header
-and -1 if the message could not be decoded (bad protocol
-identifier, bad length or broken call reference).
-.Fn uni_decode_body
-return 0 on success and -1 for unknown message types or if any
-IE had an error.
-.Pp
-The function
-.Fn uni_decode_ie_hdr
-decodes the next information element header.
-It returns the IE type and its length
-in the variables pointed to by
-.Va type
-and
-.Va ielen
-and stores the decoded header in the structure pointed to by
-.Va hdr .
-The function returns 0 on success and -1 if there were not enough bytes
-in the buffer left for a complete IE header.
-.Pp
-The function
-.Fn uni_decode_ie_body
-decodes the body of an information element.
-It is passed the buffer with the message
-.Fa buf ,
-the information element type
-.Fa type
-and length
-.Fa ielen .
-The IE is stored in the union pointed to by
-.Fa ie .
-The function returns -1 on errors and 0 on success.
-In any case the most correct
-number of bytes is consumed from the input buffer.
-.Ss ENCODING
-Encoding is the process of taking a message or IE structure and producing
-an octet stream from it.
-.Pp
-The function
-.Fn uni_encode
-encodes a UNI message.
-It returns -1 if the message type is out of bounds, -3
-if the message type is unknown.
-The encoding functions for the message types
-can return their own error codes.
-The function returns 0 on success.
-.Pp
-The function
-.Fn uni_encode_msg_hdr
-encodes a message header.
-The variable pointed to by
-.Fa mlen
-is set to the offset of the message length field from the begin of the
-byte stream.
-This is needed because the length of the message body will
-be known only after all the IEs have been encoded.
-Then the length
-has to be inserted into this place.
-The function returns -1 if the call reference
-was bad and 0 on success.
-.Pp
-The function
-.Fn uni_encode_ie
-encodes one information element.
-The function returns 0 on success or -1
-on errors.
-The function
-.Fn uni_encode_ie_hdr
-encodes the four byte IE header.
-The argument
-.Fa len
-is the maximum expected length of the information element, not the real length.
-The function inserts a 0 in the real length field.
-This must be
-fixed up by the caller after encoding the IE contents.
-The function
-return -1 if an empty IE is to be encoded (in this case the length field will
-have been set to 4) or 0 otherwise.
-.Ss CHECKING
-There exists a number of function that do consistency checks on information
-elements.
-Note, that these functions do not check inter-IE consistency, but
-each IE by itself.
-.Pp
-The function
-.Fn uni_check_ie
-check an information element for consistency.
-It returns 0 if the IE seems
-ok, -1 otherwise.
-.Ss PRINTING
-A number of functions can be used to print decoded messages and IEs in
-a human readable form.
-This is intended mainly for debugging.
-Some fields of the library context are used to control how the printing is done
-(see
-.Xr unistruct 3 ) .
-Each of the function takes a
-.Fa buf
-and a
-.Fa buflen
-argument.
-The string that is generated in the buffer pointed to by
-.Fa buf
-is guaranteed to be NUL terminated.
-.Pp
-The function
-.Fn uni_print_cref
-formats a call reference taking into account special call references.
-The function
-.Fn uni_print_msg_hdr
-formats a message header.
-The functions
-.Fn uni_print
-and
-.Fn uni_print_ie
-print messages and information elements.
-.Ss CONTEXTS
-There are two functions for context handling.
-.Fn uni_initcx
-initializes a context with default values and
-.Fn uni_print_cx
-prints a context to the given buffer.
-.Sh SEE ALSO
-.Xr libngatm 3
-.Sh STANDARDS
-This implementation conforms to the applicable ITU-T
-recommendations and ATM Forum standards with the exception of some limitations
-(see the Configuration section).
-.Sh AUTHORS
-.An Hartmut Brandt Aq harti@FreeBSD.org
diff --git a/contrib/ngatm/man/unimsg.3 b/contrib/ngatm/man/unimsg.3
deleted file mode 100644
index 41d58ee294ce..000000000000
--- a/contrib/ngatm/man/unimsg.3
+++ /dev/null
@@ -1,249 +0,0 @@
-.\"
-.\" Copyright (c) 2004-2005
-.\"	Hartmut Brandt.
-.\" 	All rights reserved.
-.\" Copyright (c) 2001-2003
-.\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-.\" 	All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" Author: Hartmut Brandt <harti@FreeBSD.org>
-.\"
-.\" $Begemot: libunimsg/man/unimsg.3,v 1.4 2005/06/15 11:37:10 brandt_h Exp $
-.\"
-.Dd June 14, 2005
-.Dt UNIMSG 3
-.Os
-.Sh NAME
-.Nm uni_msg_len ,
-.Nm uni_msg_space ,
-.Nm uni_msg_leading ,
-.Nm uni_msg_size ,
-.Nm uni_msg_ensure ,
-.Nm uni_msg_append ,
-.Nm uni_msg_extend ,
-.Nm uni_msg_alloc ,
-.Nm uni_msg_build ,
-.Nm uni_msg_destroy ,
-.Nm uni_msg_strip32 ,
-.Nm uni_msg_get32 ,
-.Nm uni_msg_append32 ,
-.Nm uni_msg_append8 ,
-.Nm uni_msg_trail32 ,
-.Nm uni_msg_dup
-.Nd "ATM signalling library - message buffers"
-.Sh LIBRARY
-Begemot ATM signalling library
-.Pq libunimsg, -lunimsg
-.Sh SYNOPSIS
-.In uni4/unimsg.h
-.Ft size_t
-.Fn uni_msg_len "const struct uni_msg *msg"
-.Ft size_t
-.Fn uni_msg_space "const struct uni_msg *msg"
-.Ft size_t
-.Fn uni_msg_leading "const struct uni_msg *msg"
-.Ft size_t
-.Fn uni_msg_size "const struct uni_msg *msg"
-.Ft int
-.Fn uni_msg_ensure "struct uni_msg *msg" "size_t bytes"
-.Ft int
-.Fn uni_msg_append "struct uni_msg *msg" "void *buf" "size_t buflen"
-.Ft int
-.Fn uni_msg_extend "struct uni_msg *msg" "size_t bytes"
-.Ft struct uni_msg *
-.Fn uni_msg_alloc "size_t space"
-.Ft struct uni_msg *
-.Fn uni_msg_build "void *buf" "..."
-.Ft void
-.Fn uni_msg_destroy "struct uni_msg *msg"
-.Ft u_int
-.Fn uni_msg_strip32 "struct uni_msg *msg"
-.Ft u_int
-.Fn uni_msg_get32 "struct uni_msg *msg"
-.Ft int
-.Fn uni_msg_append32 "struct uni_msg *msg" "u_int value"
-.Ft int
-.Fn uni_msg_append8 "struct uni_msg *msg" "u_int byte"
-.Ft u_int
-.Fn uni_msg_trail32 "const struct uni_msg *msg" "int n"
-.Ft struct uni_msg *
-.Fn uni_msg_dup "const struct uni_msg *msg"
-.Sh DESCRIPTION
-These functions are used to manipulate variable sized message.
-They are
-inspired by BSD mbufs and SysV stream buffers, but somewhat simplified because
-signalling generally is a low bandwidth task.
-All the functions operation on a
-.Li uni_msg
-data structure:
-.Bd -literal -offset indent
-struct uni_msg {
-	u_char	*b_wptr;	/* tail pointer */
-	u_char	*b_rptr;	/* head pointer */
-	u_char	*b_buf;		/* data buffer */
-	u_char	*b_lim;		/* end of data buffer */
-};
-.Ed
-.Pp
-The field
-.Fa b_buf
-points to the begin of a memory block that is used to store the actual message
-and the field
-.Fa b_lim
-points just to the first byte behind that buffer.
-This buffer is allocated
-separate from the structure itself and the user calling any of the above
-functions with a non const
-.Vt struct uni_msg
-argument should expect the buffer to be reallocated and hence not hold pointers
-into the buffer accross call to these functions.
-The pointer
-.Fa b_rptr
-points to the first used byte in the message and
-.Fa b_wptr
-to the first unused byte behind all used bytes.
-If the message is empty, both pointers point to the same place somewhere in
-the allocated buffer.
-.Pp
-There are several functions and macros that return various sizes and lengths.
-The macro
-.Fn uni_msg_len
-returns the actual size of the message (the number of used bytes).
-The macro
-.Fn uni_msg_space
-returns the number of bytes that are left unused behind the used space.
-The macro
-.Fn uni_msg_leading
-returns the number of bytes that are unused before the used space and the
-macro
-.Fn uni_msg_size
-returns the maximum size of the message (that is the size of the allocated
-buffer).
-.Pp
-Two functions may be used to create new messages: The function
-.Fn uni_msg_alloc
-allocates the message structure and a buffer to hold at least
-.Ar space
-bytes (In fact it allocates a couple of bytes more).
-If the allocation fails NULL is returned.
-The pointers are setup so that there is no leading space in the buffer.
-The function
-.Fn uni_msg_build
-constructs a new message from a variable number of buffers.
-The arguments are pairs of
-.Vt void *
-pointers to buffers and
-.Vt size_t
-buffer sizes, terminated by a NULL pointer.
-The function computes the total resulting message size, allocates a message
-and copies all the buffers into the message.
-The message is built to have no leading space.
-If the allocation fails, NULL is returned.
-.Pp
-The function
-.Fn uni_msg_destroy
-deallocates the buffer pointed to by the message and the message itself.
-It is save to pass a message with a NULL buffer, but not a NULL message.
-.Pp
-The function
-.Fn uni_msg_dup
-returns a copy of a message with exact the same leading space.
-.Pp
-A number of functions are used to add bytes to an existing message.
-The function
-.Fn uni_msg_extend
-extends the message buffer to have space for at least
-.Ar bytes
-additional byte at the end.
-The leading space does not change.
-This function may reallocate the message buffer.
-The function returns 0 on success and ENOMEM if the reallocation fails.
-In this case the message buffer is not changed.
-The macro
-.Fn uni_msg_ensure
-checks whether the message has space for additional
-.Ar bytes
-bytes.
-If not it calls
-.Fn uni_msg_extend
-to make the message buffer larger.
-The macro returns 0 on success or ENOMEM
-if there is not enough space and the reallocation fails.
-In this case the message buffer is not changed.
-The function
-.Fn uni_msg_append
-appends
-.Ar buflen
-bytes from the buffer pointed to by
-.Ar buf
-to the message.
-The function
-.Fn uni_msg_append8
-appends one byte to the message and the function
-.Fn uni_msg_append32
-appends a 32-bit value in network byte order to the message
-.Fa ( b_wptr
-needs not to be aligned).
-All three functions call
-.Fn uni_msg_ensure
-to make sure, that the buffer contents fit into the message.
-They return 0 on success and ENOMEM if the buffer is too small and
-the reallocation fails.
-In this case the message buffer is not changed.
-.Pp
-A number of functions can be used to retrieve parts of the message.
-The function
-.Fn uni_msg_strip32
-returns the last four bytes of the message as a 32-bit integer assumed to
-be in network byte order.
-It adjusts
-.Fa b_wptr
-to remove these four bytes from the message.
-.Fa b_wptr
-does not need to be aligned.
-The function
-.Fn uni_msg_get32
-returns the first four bytes of the message as a 32-bit integer assumed to
-be in network byte order.
-It adjusts
-.Fa b_rptr
-to remove these four bytes from the message.
-.Fa b_rptr
-does not need to be aligned.
-The function
-.Fn uni_msg_trail32
-returns the
-.Fa n 'th
-32-bit integer from the buffer counted from the end of the buffer.
-The integer is assumed to be in network byte order.
-A value of -1 for
-.Fa n
-returns the last four bytes of the buffer, a value of -2 the four bytes
-just before the last four bytes and so on.
-All three functions do not check that the message is large enough.
-.Sh SEE ALSO
-.Xr libunimsg 3 ,
-.Xr mbuf 9
-.Sh AUTHORS
-.An Hartmut Brandt Aq harti@FreeBSD.org
diff --git a/contrib/ngatm/man/unisap.3 b/contrib/ngatm/man/unisap.3
deleted file mode 100644
index bc0c2a7ae475..000000000000
--- a/contrib/ngatm/man/unisap.3
+++ /dev/null
@@ -1,265 +0,0 @@
-.\"
-.\" Copyright (c) 2004-2005
-.\"	Hartmut Brandt.
-.\" 	All rights reserved.
-.\" Copyright (c) 2001-2003
-.\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-.\" 	All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" Author: Hartmut Brandt <harti@FreeBSD.org>
-.\"
-.\" $Begemot: libunimsg/man/unisap.3,v 1.5 2005/06/15 11:37:11 brandt_h Exp $
-.\"
-.Dd June 14, 2005
-.Dt UNISAP 3
-.Os
-.Sh NAME
-.Nm unimsg ,
-.Nm unisve_check_addr ,
-.Nm unisve_check_selector ,
-.Nm unisve_check_blli_id2 ,
-.Nm unisve_check_blli_id3 ,
-.Nm unisve_check_bhli ,
-.Nm unisve_check_sap ,
-.Nm unisve_overlap_addr ,
-.Nm unisve_overlap_selector ,
-.Nm unisve_overlap_blli_id2 ,
-.Nm unisve_overlap_blli_id3 ,
-.Nm unisve_overlap_bhli ,
-.Nm unisve_overlap_sap ,
-.Nm unisve_is_catchall ,
-.Nm unisve_match
-.Nd "ATM signalling library - ATM SAP handling"
-.Sh LIBRARY
-Begemot ATM signalling library
-.Pq libunimsg, -lunimsg
-.Sh SYNOPSIS
-.In uni4/unisap.h
-.Ft int
-.Fn unisve_check_addr "const struct unisve_addr *sve"
-.Ft int
-.Fn unisve_check_selector "const struct unisve_selector *sve"
-.Ft int
-.Fn unisve_check_blli_id2 "const struct unisve_blli_id2 *sve"
-.Ft int
-.Fn unisve_check_blli_id3 "const struct unisve_blli_id3 *sve"
-.Ft int
-.Fn unisve_check_bhli "const struct unisve_bhli *sve"
-.Ft int
-.Fn unisve_check_sap "const struct uni_sap *sve"
-.Ft int
-.Fn unisve_overlap_addr "const struct unisve_addr *sve1" "const struct unisve_addr *sve2"
-.Ft int
-.Fn unisve_overlap_selector "const struct unisve_selector *sve1" "const struct unisve_selector *sve2"
-.Ft int
-.Fn unisve_overlap_blli_id2 "const struct unisve_blli_id2 *sve1" "const struct unisve_blli_id2 *sve2"
-.Ft int
-.Fn unisve_overlap_blli_id3 "const struct unisve_blli_id3 *sve1" "const struct unisve_blli_id3 *sve2"
-.Ft int
-.Fn unisve_overlap_bhli "const struct unisve_bhli *sve1" "const struct unisve_bhli *sve2"
-.Ft int
-.Fn unisve_overlap_sap "const struct uni_sap *sap1" "const struct uni_sap *sap2"
-.Ft int
-.Fn unisve_is_catchall "const struct uni_sap *sap"
-.Ft int
-.Fn unisve_match "const struct uni_sap *sap" \
-"const struct uni_ie_called *called" "const struct uni_ie_blli *blli" \
-"const struct uni_ie_bhli *bhli"
-.Sh DESCRIPTION
-The
-.Nm
-library contains functions to handle Service Access Points (SAP) and SAP Vector
-Elements (SVE) as specified in the ATM Forum ATM API Semantic Description.
-SAPs are the analog of TCP and UDP ports in the ATM world.
-As usually in ATM they are a couple of orders of magnitude more complex as
-their Internet equivalent.
-See the ATM Forum document for a description.
-.Pp
-A SAP is a data structure:
-.Bd -literal -offset indent
-struct uni_sap {
-	struct unisve_addr	addr;
-	struct unisve_selector	selector;
-	struct unisve_blli_id2	blli_id2;
-	struct unisve_blli_id3	blli_id3;
-	struct unisve_bhli	bhli;
-};
-.Ed
-.Pp
-that consists of 5 elements matching different information elements in
-the SETUP message.
-Each of these elements has a tag that defines how the SVE is to be matched
-with the information element.
-The tag is one of
-.Bl -tag -width ".Dv UNISVE_PRESENT"
-.It Dv UNISVE_ABSENT
-The information element has to absent from the SETUP message.
-.It Dv UNISVE_PRESENT
-The information element has to be present in the SETUP message and must
-match the SVE.
-.It Dv UNISVE_ANY
-The information element may be absent from the SETUP message or may
-have any value.
-.El
-.Pp
-The called address is matched by a
-.Bd -literal -offset indent
-struct unisve_addr {
-	enum unisve_tag	tag;
-	enum uni_addr_type type;/* type of address */
-	enum uni_addr_plan plan;/* addressing plan */
-	uint32_t	len;	/* length of address */
-	u_char		addr[UNI_ADDR_MAXLEN];
-};
-.Ed
-.Pp
-Here
-.Fa type
-is the type of address and
-.Fa plan
-is the address plan.
-.Fa len
-is the length of the address (for ATME addresses not counting the selector byte)
-and
-.Fa addr is the address itself.
-.Pp
-In case of ATME addresses the selector byte is matched by a
-.Bd -literal -offset indent
-struct unisve_selector {
-	enum unisve_tag	tag;
-	uint8_t		selector;
-};
-.Ed
-.Pp
-Here
-.Fa selector
-is the selector byte that must match the 20th byte of the ATME calling address
-from the SETUP message.
-.Pp
-The BLLI information element is matched by two SVEs: one for layer 2 options
-and one for layer 3 options.
-The layer 2 SVE is:
-.Bd -literal -offset indent
-struct unisve_blli_id2 {
-	enum unisve_tag	tag;
-	uint8_t		proto:5;/* the protocol */
-	uint8_t		user:7;	/* user specific protocol */
-};
-.Ed
-.Pp
-Where the
-.Fa user
-fields is matched only if the
-.Fa proto
-field specifies
-.Dv UNI_BLLI_L2_USER .
-The layer 3 SVE is:
-.Bd -literal -offset indent
-struct unisve_blli_id3 {
-	enum unisve_tag	tag;
-	uint8_t		proto:5;/* L3 protocol */
-	uint8_t		user:7;	/* user specific protocol */
-	uint8_t		ipi:8;	/* ISO/IEC TR 9557 IPI */
-	uint32_t	oui:24;	/* IEEE 802.1 OUI */
-	uint32_t	pid:16;	/* IEEE 802.1 PID */
-	uint32_t	noipi;	/* ISO/IEC TR 9557 per frame */
-};
-.Ed
-For the exact rules how matching occures refer to the source code or the
-ATM Forum document.
-.Pp
-Finally the BHLI information element is matched with a
-.Bd -literal -offset indent
-struct unisve_bhli {
-	enum unisve_tag	tag;
-	enum uni_bhli	type;	/* type of info */
-	uint32_t	len;	/* length of info */
-	uint8_t		info[8];/* info itself */
-};
-.Ed
-.Pp
-For each SVE type there is a function that checks whether the SVE is correct
-specified.
-The functions
-.Fn unisve_check_addr ,
-.Fn unisve_check_selector ,
-.Fn unisve_check_blli_id2 ,
-.Fn unisve_check_blli_id3 ,
-and
-.Fn unisve_check_bhli
-return one of the following error codes:
-.Bd -literal -offset indent
-enum {
-	UNISVE_OK = 0,
-	UNISVE_ERROR_BAD_TAG,
-	UNISVE_ERROR_TYPE_PLAN_CONFLICT,
-	UNISVE_ERROR_ADDR_SEL_CONFLICT,
-	UNISVE_ERROR_ADDR_LEN,
-	UNISVE_ERROR_BAD_ADDR_TYPE,
-	UNISVE_ERROR_BAD_BHLI_TYPE,
-	UNISVE_ERROR_BAD_BHLI_LEN,
-};
-.Ed
-.Pp
-A code of
-.Li UNISVE_OK
-means that the SVE has no error.
-The function
-.Fn unisve_check_sap
-checks a complete SAP and returns one of the above codes.
-.Pp
-There is a definition
-.Dv UNISVE_ERRSTR
-that evaluates to a comma separated list of strings that can be used
-to initializes an array of char pointers to map the error codes into
-human readable strings.
-.Pp
-The ATM Forum document defines the concept of overlaping SAPs.
-This basically means, that an incoming SETUP could match more than one SAP
-(and more than one application) to receive the SETUP.
-For each SVE type there is a function that checks whether two SVEs overlap
-and there is a function that checks whether two SAPs overlap.
-The functions
-.Fn unisve_overlap_addr ,
-.Fn unisve_overlap_selector ,
-.Fn unisve_overlap_blli_id2 ,
-.Fn unisve_overlap_blli_id3 ,
-.Fn unisve_overlap_bhli , and
-.Fn unisve_overlap_sap
-return 1 if the SVEs or SAPs overlap and 0 if they do not.
-They assume, that the SAPs are correct.
-.Pp
-The ATM Forum document specifies a catch-all SAP.
-The function
-.Fn unisve_is_catchall
-returns 1 if the SAP is the catch-all SAP and 0 otherwise.
-.Pp
-Finally the function
-.Fn unisve_match
-is used to match a SAP against the information elements from a SETUP message.
-It returns 1 if they match and 0 otherwise.
-.Sh SEE ALSO
-.Xr libunimsg 3
-.Sh AUTHORS
-.An Hartmut Brandt Aq harti@FreeBSD.org
diff --git a/contrib/ngatm/man/unistruct.3 b/contrib/ngatm/man/unistruct.3
deleted file mode 100644
index 8a955068a7cc..000000000000
--- a/contrib/ngatm/man/unistruct.3
+++ /dev/null
@@ -1,323 +0,0 @@
-.\"
-.\" Copyright (c) 2004-2005
-.\"	Hartmut Brandt.
-.\" 	All rights reserved.
-.\" Copyright (c) 2001-2003
-.\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-.\" 	All rights reserved.
-.\"
-.\" Author: Hartmut Brandt <harti@FreeBSD.org>
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $Begemot: libunimsg/man/unistruct.3,v 1.5 2005/06/15 11:37:12 brandt_h Exp $
-.\"
-.Dd May 23, 2005
-.Dt UNISTRUCT 3
-.Os
-.Sh NAME
-.Nm libngatm
-.Nd "ATM signalling library"
-.Sh LIBRARY
-Begemot ATM signalling library
-.Pq libngatm, -lngatm
-.Sh SYNOPSIS
-.In netnatm/msg/unistruct.h
-.In netnatm/msg/unimsglib.h
-.Sh DESCRIPTION
-The
-.Nm
-library handles UNI 4.0 messages.
-For each information element and message
-type the header files contain a structure definition.
-Additionally there
-are a number of help structures and a global context structure for some
-of the library functions.
-This document only describes the common structures.
-For information element and message structures see the header files.
-.Ss LIBRARY CONFIGURATION
-When the library is compiled a number of constants are define in the file
-.Pa uni_config.h .
-They define certain limits.
-Because of the use of these definitions a change
-in any of them requires a complete recompilation of all library code and
-all code that uses the library.
-The following constants are defined (they
-value behind the name is the default value):
-.Bl -tag -width XXXX
-.It Dv UNI_MAX_ERRIE ( Li 50 )
-When decoding information elements and analyzing them the library fills
-an array in the context with the identifiers of IEs that had errors.
-This is the size of this array.
-.It Dv UNI_NUM_IE_GIT ( Li 3 )
-A message is allowed to contain more than one General Identifier Transport
-information element.
-This is the maximum supported number of these IEs.
-.It Dv UNI_NUM_IE_BLLI ( Li 3 )
-The maximum number of BLLI information elements in a SETUP message.
-.It Dv UNI_NUM_IE_CALLEDSUB ( Li 2 )
-The maximum number of Called Subaddress information elements in a SETUP message.
-.It Dv UNI_NUM_IE_CALLINGSUB ( Li 2 )
-The maximum number of Calling Subaddress information elements in a SETUP
-message.
-.It Dv UNI_NUM_IE_TNS ( Li 4 )
-The maximum number of Transit Network Selection information elements in a SETUP
-message.
-.It Dv UNI_TNS_MAXLEN ( Li 4 )
-The maximum size of a name in the TNS IE.
-.It Dv UNI_UU_MAXLEN ( Li 128 )
-Maximum size of user data in the UU IE.
-.It Dv UNI_ADDR_MAXLEN ( Li 20 )
-Maximum address size.
-.It Dv UNI_SUBADDR_MAXLEN ( Li 20 )
-Maximum subaddress size.
-.It Dv UNI_NUM_IE_DTL ( Li 10 )
-Maximum number of DTL information elements in a SETUP message.
-.It Dv UNI_DTL_MAXNUM ( Li 20 )
-Maximum number of identifiers in one DTL information element.
-.El
-.Ss INFORMATION ELEMENTS
-Each information element structure starts with a field of type:
-.Bd -literal -offset indent
-struct uni_iehdr {
-	enum uni_coding	coding;	/* coding standard */
-	enum uni_ieact	act;	/* action indicator */
-	u_int		pass:1;	/* PNNI pass along request */
-	u_int		present;/* which optional elements are present */
-};
-.Ed
-.Pp
-The
-.Fa coding
-field is the coding standard of the information element and may be one of
-.Dv UNI_CODING_ITU
-or
-.Dv UNI_CODING_NET .
-The action indicator
-.Fa act
-is used for error processing and is one of:
-.Bl -tag -width XXXX
-.It Dv UNI_IEACT_CLEAR
-clear call
-.It Dv UNI_IEACT_IGNORE
-ignore IE and proceed
-.It Dv UNI_IEACT_REPORT
-ignore IE, report and proceed
-.It Dv UNI_IEACT_MSG_IGNORE
-ignore message
-.It Dv UNI_IEACT_MSG_REPORT
-ignore message and report
-.It Dv UNI_IEACT_DEFAULT
-the use action indicator flag was not set.
-.El
-.Pp
-For information elements in PNNI message the
-.Fa pass
-fields contains the pass along flag from the IE header.
-.Pp
-The
-.Fa present
-field is a bit field, which contains four common bits describing the current
-state of the information element.
-The rest of the bits are used by the
-information elements to indicate which of the optional fields of the IE are
-present.
-Most of the IE header files contain definitions for those bits.
-The common bits are:
-.Bd -literal -offset indent
-#define UNI_IE_EMPTY	0x80000000
-#define UNI_IE_PRESENT	0x40000000
-#define UNI_IE_ERROR	0x20000000
-#define UNI_IE_XXX	0x10000000
-.Ed
-.Pp
-The flag
-.Dv UNI_IE_EMPTY
-indicates that the information element is present, but empty (its length is
-zero).
-This is legal for all information elements.
-The flag
-.Dv UNI_IE_PRESENT
-indicates that the IE is present in the message and the flag
-.Dv UNI_IE_ERROR
-indicates that the IE had an error.
-The flag
-.Dv UNI_IE_XXX
-is currently not used.
-.Pp
-The following macros may be used to test or change these flags:
-.Bl -tag -width XXXX
-.It Dv IE_ISPRESENT
-Check whether the IE is present and not empty.
-Returns true in this case.
-.It Dv IE_SETPRESENT
-Set the IE to be present and not empty.
-.It Dv IE_ISEMPTY
-Check whether the IE is present and empty.
-Returns true in this case.
-.It Dv IE_SETEMPTY
-Set the IE to be present and empty.
-.It Dv IE_ISERROR
-Check whether the IE is present and has an error.
-Returns true in this case.
-.It Dv IE_SETERROR
-Sets the IE to be present and to have an error.
-.It Dv IE_ISGOOD
-Checks whether the IE is present, not empty and without error.
-Returns true in this case.
-.El
-.Pp
-For each IE type there is an
-.Vt enum uni_ietype
-definition of the form
-.Dv UNI_IE_*
-in
-.Pa uni_hdr.h .
-.Pp
-.Pa unistruct.h
-contains a
-.Vt union uni_ieall
-that is the union of all IE structures and a
-.Bd -literal -offset indent
-struct uni_ie {
-	enum uni_ietype		ietype;
-	union uni_ieall		u;
-};
-.Ed
-.Ss MESSAGES
-Each message structure starts with a
-.Bd -literal -offset indent
-struct uni_msghdr {
-	struct uni_cref	cref;
-	enum uni_msgact	act;	/* action indicator */
-	u_int		pass:1;	/* PNNI pass along request */
-};
-.Ed
-.Pp
-The
-.Fa cref
-is the call reference:
-.Bd -literal -offset indent
-struct uni_cref {
-	u_int	flag;
-	u_int	cref;
-};
-.Ed
-.Pp
-There are two special call references:
-.Dv CREF_GLOBAL
-and
-.Dv CREF_DUMMY .
-The
-.Fa act
-field is the message action indicator and has one of the following values:
-.Bl -tag -width XXXX
-.It Dv UNI_MSGACT_CLEAR
-clear call
-.It Dv UNI_MSGACT_IGNORE
-ignore message
-.It Dv UNI_MSGACT_REPORT
-send STATUS message
-.It Dv UNI_MSGACT_DEFAULT
-default handling for this message type
-.El
-.Pp
-The
-.Fa pass
-field is the pass along indicator in the case of PNNI messages.
-.Pp
-For each message type there is a
-.Vt enum uni_msgtype
-definition of the form
-.Dv UNI_*
-in
-.Pa uni_hdr.h .
-.Pa uni_struct.h
-contains a
-.Vt union_msgall
-that is the union of all message structures and a
-.Bd -literal -offset indent
-struct uni_all {
-	enum uni_msgtype	mtype;
-	union uni_msgall	u;
-};
-.Ed
-.Ss CONTEXTS
-The header file
-.Pa unimsglib.h
-contains a definition of a
-.Vt struct uni_context
-that is used to minimize the number of arguments passed to certain functions
-and to avoid the use of global variables.
-This structure has the following
-public fields (all other fields are used internally by the library):
-.Bl -tag -width XXXX
-.It Fa err
-This is an array consisting of the following structures:
-.Bd -literal -offset indent
-struct uni_ierr {
-	enum uni_ierr_type err;	/* what error */
-	enum uni_ieact	act;	/* the action indicator */
-	u_int		ie:8;	/* the ie type */
-	u_int		man:1;	/* mandatory flag */
-	u_int		epref:1;/* Q.2971 9.5.3.2.1 low-pri epref */
-};
-.Ed
-When decoding information elements the information about IEs with errors is
-stuffed into this array.
-.It Fa errcnt
-The current number of IEs in
-.Fa err .
-.It Fa q2932
-Enable the Q.2932.1 Generic Functional Protocol.
-Currently only message
-and IE decoding/encoding is supported.
-The signalling part is still missing.
-.It Fa pnni
-Enable PNNI extensions.
-Currently only message and IE decoding/encoding
-is supported.
-The signalling part is still missing.
-.It Fa git_hard
-Do hard checking on GIT information elements.
-.It Fa bearer_hard
-Do hard checking on Broadband Bearer IEs.
-This involves rejecting old bearer
-type values.
-.It Fa cause_hard
-Do hard checking on Cause information elements.
-.It Fa multiline
-This is used by the printing routines.
-Legal values are 0 to 4 and give
-different kinds of printout.
-.It Fa tabsiz
-The size of tabulation to use in printing.
-4 is a good value.
-.El
-.Sh SEE ALSO
-.Xr libunimsg 3
-.Sh STANDARDS
-This implementation conforms to the applicable ITU-T
-recommendations and ATM Forum standards with the exception of some limitations
-(see the Configuration section).
-.Sh AUTHORS
-.An Hartmut Brandt Aq harti@FreeBSD.org
diff --git a/contrib/ngatm/snmp_atm/BEGEMOT-ATM.txt b/contrib/ngatm/snmp_atm/BEGEMOT-ATM.txt
deleted file mode 100644
index f6cca9615e2c..000000000000
--- a/contrib/ngatm/snmp_atm/BEGEMOT-ATM.txt
+++ /dev/null
@@ -1,301 +0,0 @@
---
--- Copyright (c) 2001-2002
---	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
---	All rights reserved.
--- Copyright (c) 2004
---	Hartmut Brandt.
--- 	All rights reserved.
---
--- Author: Hartmut Brandt <harti@freebsd.org>
--- 
--- Redistribution and use in source and binary forms, with or without
--- modification, are permitted provided that the following conditions
--- are met:
--- 1. Redistributions of source code must retain the above copyright
---    notice, this list of conditions and the following disclaimer.
--- 2. Redistributions in binary form must reproduce the above copyright
---    notice, this list of conditions and the following disclaimer in the
---    documentation and/or other materials provided with the distribution.
--- 
--- THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
--- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
--- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
--- ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
--- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
--- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
--- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
--- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
--- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
--- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
--- SUCH DAMAGE.
---  
--- $Begemot: libunimsg/snmp_atm/BEGEMOT-ATM.txt,v 1.2 2004/08/06 14:50:26 brandt Exp $
---
--- Private Begemot MIB for ATM interfaces.
---
-BEGEMOT-ATM-MIB DEFINITIONS ::= BEGIN
-
-IMPORTS
-    MODULE-IDENTITY, OBJECT-TYPE, Unsigned32, TimeTicks
-	FROM SNMPv2-SMI
-    TEXTUAL-CONVENTION, DisplayString
-	FROM SNMPv2-TC
-    ifIndex
-	FROM IF-MIB
-    begemot
-	FROM BEGEMOT-MIB;
-
-begemotAtm MODULE-IDENTITY
-    LAST-UPDATED "200407190000Z"
-    ORGANIZATION "German Aerospace Centre"
-    CONTACT-INFO
-	    "		Hartmut Brandt
-
-             Postal:    German Aerospace Centre (DLR)
-                        Institute of Communications and Navigation
-                        82234 Wessling
-                        Germany
-
-	     Fax:	+49 8153 28 2844
-
-	     E-mail:	harti@freebsd.org"
-    DESCRIPTION
-	    "The Begemot MIB for ATM interfaces."
-
-    ::= { begemot 101 }
-
-begemotAtmObjects	OBJECT IDENTIFIER ::= { begemotAtm 1 }
-
--- --------------------------------------------------------------------------
-
-AtmESI ::= TEXTUAL-CONVENTION
-    DISPLAY-HINT "1x:"
-    STATUS	current
-    DESCRIPTION
-	    "An ATM End System Identifier. This is basically the same as
-	    an Ethernet Address and is assigned using the same rules."
-    SYNTAX	OCTET STRING (SIZE(6))
-
--- --------------------------------------------------------------------------
-
---
--- Interfaces table
---
-begemotAtmIfTable OBJECT-TYPE
-    SYNTAX	SEQUENCE OF BegemotAtmIfEntry
-    MAX-ACCESS	not-accessible
-    STATUS	current
-    DESCRIPTION
-	    "This table contains an entry for each hardware ATM
-	    interface. The table is indexed by the interface index."
-    ::= { begemotAtmObjects 1 }
-
-begemotAtmIfEntry OBJECT-TYPE
-    SYNTAX	BegemotAtmIfEntry
-    MAX-ACCESS	not-accessible
-    STATUS	current
-    DESCRIPTION
-	    "This is a table entry describing one ATM hardware interface."
-    INDEX	{ ifIndex }
-    ::= { begemotAtmIfTable 1 }
-
-BegemotAtmIfEntry ::= SEQUENCE {
-    begemotAtmIfName		DisplayString,
-    begemotAtmIfPcr		Unsigned32,
-    begemotAtmIfMedia		INTEGER,
-    begemotAtmIfVpiBits		Unsigned32,
-    begemotAtmIfVciBits		Unsigned32,
-    begemotAtmIfMaxVpcs		Unsigned32,
-    begemotAtmIfMaxVccs		Unsigned32,
-    begemotAtmIfEsi		AtmESI,
-    begemotAtmIfCarrierStatus	INTEGER,
-    begemotAtmIfMode		INTEGER
-}
-
-begemotAtmIfName OBJECT-TYPE
-    SYNTAX	DisplayString (SIZE(1..15))
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "Name of the ATM interface."
-    ::= { begemotAtmIfEntry 1 }
-
-begemotAtmIfPcr OBJECT-TYPE
-    SYNTAX	Unsigned32
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "The line cell rate of the interface."
-    ::= { begemotAtmIfEntry 2 }
-
-begemotAtmIfMedia OBJECT-TYPE
-    SYNTAX	INTEGER {
-			other(1),
-			unknown(3),
-			utp25(4),
-			taxi100(5),
-			taxi140(6),
-			mm155(7),
-			sm155(8),
-			utp155(9),
-			mm622(10),
-			sm622(11),
-			virtual(12)
-		}
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "The physical medium."
-    ::= { begemotAtmIfEntry 3 }
-
-begemotAtmIfVpiBits OBJECT-TYPE
-    SYNTAX	Unsigned32 (0..12)
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "Number of VPI bits that are used by the device."
-    ::= { begemotAtmIfEntry 4 }
-
-begemotAtmIfVciBits OBJECT-TYPE
-    SYNTAX	Unsigned32 (0..16)
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "Number of VCI bits that are used by the device."
-    ::= { begemotAtmIfEntry 5 }
-
-begemotAtmIfMaxVpcs OBJECT-TYPE
-    SYNTAX	Unsigned32 (0..256)
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "The maximum number of VPC supported on this device. This may not
-	    be larger than 2^begemotAtmIfVpiBits."
-    ::= { begemotAtmIfEntry 6 }
-
-begemotAtmIfMaxVccs OBJECT-TYPE
-    SYNTAX	Unsigned32 (0..16777216)
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "The maximum number of VCC supported on this device. This may not
-	    be larger than 2^(begemotAtmIfVpiBits + begemotAtmVciBits)."
-    ::= { begemotAtmIfEntry 7 }
-
-begemotAtmIfEsi OBJECT-TYPE
-    SYNTAX	AtmESI
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "The default End System Identifier as reported by the hardware.
-	    If the hardware has no ESI all six bytes are reported as 0."
-    ::= { begemotAtmIfEntry 8 }
-
-begemotAtmIfCarrierStatus OBJECT-TYPE
-    SYNTAX	INTEGER { carrierOn(1), carrierOff(2), unknown(3), none(4) }
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "The state of the carrier. For interfaces which don't have the
-	    notion of a carriere none is reported."
-    ::= { begemotAtmIfEntry 9 }
-
-begemotAtmIfMode OBJECT-TYPE
-    SYNTAX	INTEGER { sonet(1), sdh(2), unknown(3) }
-    MAX-ACCESS	read-write
-    STATUS	current
-    DESCRIPTION
-	    "The mode of the SUNI interface. For interfaces without SUNI
-	    unknown is reported in which case the variable is read-only.
-	    Some types of interfaces may not be able to change this value."
-    ::= { begemotAtmIfEntry 10 }
-
-begemotAtmIfTableLastChange OBJECT-TYPE
-    SYNTAX	TimeTicks
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "The value of sysUpTime the last time that an entry in
-	    begemotIfTable was created or destroyed. If the table is
-	    unchanged since the last coldStart this value is zero."
-    ::= { begemotAtmObjects 2 }
-
---
--- Interface hardware table
---
-begemotAtmHWTable OBJECT-TYPE
-    SYNTAX	SEQUENCE OF BegemotAtmHWEntry
-    MAX-ACCESS	not-accessible
-    STATUS	current
-    DESCRIPTION
-	    "This table augments the begemotAtmIfTable and contains an entry
-	    for each hardware ATM interface. The entries describe the
-	    ATM hardware interface."
-    ::= { begemotAtmObjects 3 }
-
-begemotAtmHWEntry OBJECT-TYPE
-    SYNTAX	BegemotAtmHWEntry
-    MAX-ACCESS	not-accessible
-    STATUS	current
-    DESCRIPTION
-	    "This is a table entry describing one ATM hardware interface."
-    AUGMENTS	{ begemotAtmIfEntry }
-    ::= { begemotAtmHWTable 1 }
-
-BegemotAtmHWEntry ::= SEQUENCE {
-    begemotAtmHWVendor		DisplayString,
-    begemotAtmHWDevice		DisplayString,
-    begemotAtmHWSerial		Unsigned32,
-    begemotAtmHWVersion 	Unsigned32,
-    begemotAtmHWSoftVersion	Unsigned32
-}
-
-begemotAtmHWVendor OBJECT-TYPE
-    SYNTAX	DisplayString
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "A short string naming the vendor of the interface card."
-    ::= { begemotAtmHWEntry 1 }
-
-begemotAtmHWDevice OBJECT-TYPE
-    SYNTAX	DisplayString
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "A short string naming the brand of the interface card."
-    ::= { begemotAtmHWEntry 2 }
-
-begemotAtmHWSerial OBJECT-TYPE
-    SYNTAX	Unsigned32
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "The serial number of the interface card or 0 if it doesn't
-	    report a serial number."
-    ::= { begemotAtmHWEntry 3 }
-
-begemotAtmHWVersion OBJECT-TYPE
-    SYNTAX	Unsigned32
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "The hardware version of the interface card or 0 if it doesn't
-	    report a hardware version number."
-    ::= { begemotAtmHWEntry 4 }
-
-begemotAtmHWSoftVersion OBJECT-TYPE
-    SYNTAX	Unsigned32
-    MAX-ACCESS	read-only
-    STATUS	current
-    DESCRIPTION
-	    "The firmware version of the interface card or 0 if it doesn't
-	    report a firmware version number."
-    ::= { begemotAtmHWEntry 5 }
-
--- --------------------------------------------------------------------
-
--- System specific parts
-begemotAtmSysGroup	OBJECT IDENTIFIER ::= { begemotAtmObjects 4 }
-
-END
diff --git a/contrib/ngatm/snmp_atm/atm.h b/contrib/ngatm/snmp_atm/atm.h
deleted file mode 100644
index 456f31e71ca5..000000000000
--- a/contrib/ngatm/snmp_atm/atm.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2004
- *	Deutsches Zentrum fuer Luft- und Raumfahrt.
- *	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Begemot: libunimsg/snmp_atm/atm.h,v 1.3 2005/05/23 11:46:46 brandt_h Exp $
- */
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <net/if_mib.h>
-
-#include <bsnmp/snmpmod.h>
-#include <bsnmp/snmp_mibII.h>
-#include <bsnmp/snmp_atm.h>
-
-/*
- * Event registrations
- */
-struct atmif_reg {
-	TAILQ_ENTRY(atmif_reg) link;
-	void		*data;
-	atmif_event_f	func;
-	const struct lmodule *mod;
-	struct atmif_priv *aif;		/* back pointer */
-};
-TAILQ_HEAD(atmif_reg_list, atmif_reg);
-
-/*
- * Interface data
- */
-struct atmif_priv {
-	struct atmif	pub;	/* public part, must be first */
-	TAILQ_ENTRY(atmif_priv) link;
-	u_int		index;		/* if_index */
-	void		*ifpreg;
-	struct atmif_sys *sys;
-	struct atmif_reg_list notify;
-};
-TAILQ_HEAD(atmif_list, atmif_priv);
-
-/* list of all (known) ATM interfaces */
-extern struct atmif_list atmif_list;
-
-extern struct lmodule *module;
-
-/* Check the carrier state of the interface */
-void atmif_check_carrier(struct atmif_priv *);
-
-/* Send notification to all listeners. */
-void atmif_send_notification(struct atmif_priv *, enum atmif_notify, uintptr_t);
-
-/* Get the interface point for a table access */
-int atmif_get_aif(struct snmp_value *, u_int, enum snmp_op,
-	struct atmif_priv **);
-
-/* Destroy system dependend stuff. */
-void atmif_sys_destroy(struct atmif_priv *);
-
-/* Attach to an ATM interface */
-int atmif_sys_attach_if(struct atmif_priv *);
-
-/* Get vendor string */
-int atm_sys_get_hw_vendor(struct atmif_priv *, struct snmp_value *);
-
-/* Get device string */
-int atm_sys_get_hw_device(struct atmif_priv *, struct snmp_value *);
-
-/* Extract the ATM MIB from the interface's private MIB */
-void atmif_sys_fill_mib(struct atmif_priv *);
diff --git a/contrib/ngatm/snmp_atm/atm_tree.def b/contrib/ngatm/snmp_atm/atm_tree.def
deleted file mode 100644
index ac70b0e7ee22..000000000000
--- a/contrib/ngatm/snmp_atm/atm_tree.def
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (c) 2000-2003
-#	Fraunhofer Institut for Open Communication Systems (FOKUS).
-#	All rights reserved.
-# Copyright (c) 2004
-#	Hartmut Brandt.
-#	All rights reserved.
-#
-# Author: Hartmut Brandt <harti@freebsd.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $Begemot: libunimsg/snmp_atm/atm_tree.def,v 1.3 2004/08/06 14:50:27 brandt Exp $
-#
-# SNMP module for ATM hardware interfaces.
-#
-# $Begemot: libunimsg/snmp_atm/atm_tree.def,v 1.3 2004/08/06 14:50:27 brandt Exp $
-#
-(1 internet
-  (4 private
-    (1 enterprises
-      (12325 fokus
-        (1 begemot
-          (101 begemotAtm
-            (1 begemotAtmObjects
-              (1 begemotAtmIfTable
-                (1 begemotAtmIfEntry : INTEGER op_atmif
-                  (1 begemotAtmIfName OCTETSTRING GET)
-                  (2 begemotAtmIfPcr UNSIGNED32 GET)
-                  (3 begemotAtmIfMedia INTEGER GET)
-                  (4 begemotAtmIfVpiBits UNSIGNED32 GET)
-                  (5 begemotAtmIfVciBits UNSIGNED32 GET)
-                  (6 begemotAtmIfMaxVpcs UNSIGNED32 GET)
-                  (7 begemotAtmIfMaxVccs UNSIGNED32 GET)
-                  (8 begemotAtmIfEsi OCTETSTRING GET)
-                  (9 begemotAtmIfCarrierStatus INTEGER GET)
-		  (10 begemotAtmIfMode INTEGER GET SET)
-              ))
-              (2 begemotAtmIfTableLastChange TIMETICKS op_atm GET)
-              (3 begemotAtmHWTable
-                (1 begemotAtmHWEntry : INTEGER op_atmhw
-                  (1 begemotAtmHWVendor OCTETSTRING GET)
-                  (2 begemotAtmHWDevice OCTETSTRING GET)
-                  (3 begemotAtmHWSerial UNSIGNED32 GET)
-                  (4 begemotAtmHWVersion UNSIGNED32 GET)
-                  (5 begemotAtmHWSoftVersion UNSIGNED32 GET)
-              ))
-              (4 begemotAtmSysGroup
-                (1 begemotAtmFreeBSDGroup
-                )
-              )
-            )
-        ))
-      )
-    )
-))
diff --git a/contrib/ngatm/snmp_atm/snmp_atm.3 b/contrib/ngatm/snmp_atm/snmp_atm.3
deleted file mode 100644
index a85cd1bcf70e..000000000000
--- a/contrib/ngatm/snmp_atm/snmp_atm.3
+++ /dev/null
@@ -1,218 +0,0 @@
-.\"
-.\" Copyright (c) 2001-2002
-.\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-.\"	All rights reserved.
-.\" Copyright (c) 2003-2004
-.\"	Hartmut Brandt.
-.\"	All rights reserved.
-.\"
-.\" Author: Hartmut Brandt <harti@FreeBSD.org>
-.\" 
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 
-.\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $Begemot: libunimsg/snmp_atm/snmp_atm.3,v 1.2 2005/05/23 12:00:29 brandt_h Exp $
-.\"
-.Dd May 23, 2005
-.Dt SNMP_ATM 3
-.Os
-.Sh NAME
-.Nm atmif_event_f ,
-.Nm atm_find_if_name ,
-.Nm atm_find_if ,
-.Nm atm_notify_aif ,
-.Nm atm_unnotify_aif
-.Nd "ATM driver module for snmpd.
-.Sh LIBRARY
-.Pq begemotSnmpdModulePath."netgraph" = "@MODPATH@snmp_netgraph.so" (FreeBSD)
-.Pq begemotSnmpdModulePath."mibII" = "@MODPATH@snmp_mibII.so"
-.Pq begemotSnmpdModulePath."atm" = "@MODPATH@snmp_atm.so"
-.Sh SYNOPSIS
-.In bsnmp/snmpmod.h
-.In bsnmp/snmp_mibII.h
-.In bsnmp/snmp_atm.h
-.Ft typedef void
-.Fn (*atmif_event_f) "struct atmif *aif" "enum atmif_notify event" "uintptr_t data" "void *uarg"
-.Ft struct atmif *
-.Fn atm_find_if_name "const char *name"
-.Ft struct atmif *
-.Fn atm_find_if "u_int ifindex"
-.Ft void *
-.Fn atm_notify_aif "struct atmif *aif" "const struct lmodule *mod" "atmif_event_f func" "void *uarg"
-.Ft void
-.Fn atm_unnotify_aif "void *not"
-.Sh DESCRIPTION
-The
-.Nm snmp_atm
-module implements a number of tables and scalars that enable remote access to
-the ATM devices in the system. It also exports a number of
-functions, that allow other modules to easily access ATM devices.
-.Pp
-The module maintains an extension to the interface structure exported by
-.Xr snmp_mibII 3
-for all ATM devices. This structure has the following fields:
-.Bd -literal -offset indent
-struct atmif {
-	struct mibif	*ifp;		/* common interface data */
-	struct atmif_mib *mib;		/* ATM MIB */
-	enum atmif_carrier_state carrier;
-	enum atmif_suni_mode mode;	/* SUNI mode SDH or SONET */
-};
-.Ed
-.Pp
-The fields have the following meaning:
-.Bl -tag -width XXX
-.It Fa ifp
-The field points to the
-.Xr snmp_mibII 3
-interface structure.
-.It Fa mib
-The special ATM interface MIB (see below).
-.It Fa carrier
-The current state of the carrier. One of the following:
-.Bl -tag -width XXX
-.It Dv ATMIF_CARRIER_ON
-carrier detected,
-.It Dv ATMIF_CARRIER_OFF
-no carrier,
-.It Dv ATMIF_CARRIER_UNKNOWN
-the state of the carrier is unknown,
-.It Dv ATMIF_CARRIER_NONE
-the device has no notion of carrier or is not able to sense it.
-.El
-.It Fa mode
-For ATM devices with a SUNI chip this is the current mode of the interface:
-.Bl -tag -width XXX
-.It Dv ATMIF_SUNI_MODE_SONET
-The interface is in SONET mode.
-.It Dv ATMIF_SUNI_MODE_SDH
-The interface is in SDH mode.
-.It Dv ATMIF_SUNI_MODE_UNKNOWN
-The interface either has no SUNI interface or the mode is unknown (for example,
-interface is down).
-.El
-.El
-.Pp
-An ATM interface can be found by name or by SNMP interface index (see
-.Xr snmp_mibII 3
-for a discussion of interface indexes).
-The function
-.Fn atm_find_if_name
-searches an interface given a name.
-The function
-.Fn atm_find_if
-searches an interface by its interface index.
-Both functions return NULL if an interface cannot be found.
-.Pp
-The ATM MIB contains the following fields:
-.Bd -literal -offset indent
-struct atmif_mib {
-	u_int	version;	/* currently 0 */
-
-	u_int	device;		/* type of hardware (system specific) */
-	u_int	serial;		/* card serial number (device specific) */
-	u_int	hw_version;	/* card version (device specific) */
-	u_int	sw_version;	/* firmware version (device specific) */
-	u_int	media;		/* physical media (see MIB) */
-
-	u_char	esi[6];		/* end system identifier (MAC) */
-	u_int	pcr;		/* supported peak cell rate */
-	u_int	vpi_bits;	/* number of used bits in VPI field */
-	u_int	vci_bits;	/* number of used bits in VCI field */
-	u_int	max_vpcs;	/* maximum number of VPCs */
-	u_int	max_vccs;	/* maximum number of VCCs */
-};
-.Ed
-.Ss NOTIFICATIONS
-An other module can register with
-.Nm
-to receive notifications when certain events happen on the ATM interface.
-The registration is done with
-.Fn atm_notify_aif
-which takes a pointer to the interface, the calling module pointer, a callback
-function and a user argument that is passed to the callback function.
-The callback function is called with the interface pointer, a notification
-code, a notification argument and the user argument. The following
-notifications are defined:
-.Bl -tag -width XXX
-.It Dv ATMIF_NOTIFY_DESTROY
-The interface is destroyed. The notification argument is not used.
-.It Dv ATMIF_NOTIFY_CARRIER
-The carrier state on the interface has changed. The argument is the
-.Em old
-state of the carrier. The new state can be obtained from the interface
-structure.
-.It Dv ATMIF_NOTIFY_VCC
-A permanent VCC has been created or destroyed. The argument is an u_int that
-can be decoded as follows:
-.Bd -literal -offset indent
-vpi = (arg >> 24) & 0xff;
-vci = (arg >>  8) & 0xffff;
-state = arg & 1;
-.Ed
-.Pp
-.Va state
-is 0 if the VCC was destroyed and 1 if it was created.
-.El
-The registration for notification can be undone by passing the return
-value from
-.Fn atm_notify_aif
-to
-.Fn atm_unnotify_aif .
-The registrations is automatically removed if the interface is destroyed.
-.Ss MIB
-The MIB implemented by the module is defined in
-.Pa BEGEMOT-ATM.txt .
-In the generic part there are two tables and one scalar, there is also
-a system specific group:
-.Bl -tag -width XXX
-.It Va begemotAtmIfTable
-This table is an extension of
-.Va ifTable .
-It contains a row for each ATM interface and is index with
-.Va ifIndex .
-All fields are read-only except the
-.Va begemotAtmIfMode
-column.
-.It Va begemotAtmIfTableLastChange
-Contains the tick when a row was created or destroyed in the above table or
-0, if the table did not change since start of the SNMP agent.
-.It Va begemotAtmHWTable
-Is also indexed by
-.Va ifIndex
-and contains hardware specific information. This table is read-only.
-.El
-.Sh FILES
-.Bl -tag -width "XXXXXXXXX"
-.It Pa @DEFPATH@atm_tree.def
-The description of the MIB tree implemented by
-.Nm .
-.It Pa @MIBSPATH@BEGEMOT-ATM.txt
-This is the MIB that is implemented by this module.
-.El
-.Sh SEE ALSO
-.Xr bsnmpd 1 ,
-.Xr gensnmptree 1 ,
-.Xr snmp_mibII 3 ,
-.Xr snmpmod 3 ,
-.Xr snmp_netgraph 3
-.Sh AUTHORS
-.An Hartmut Brandt Aq harti@FreeBSD.org
diff --git a/contrib/ngatm/snmp_atm/snmp_atm.c b/contrib/ngatm/snmp_atm/snmp_atm.c
deleted file mode 100644
index a2590aeb4dd4..000000000000
--- a/contrib/ngatm/snmp_atm/snmp_atm.c
+++ /dev/null
@@ -1,623 +0,0 @@
-/*
- * Copyright (c) 2001-2002
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- * Copyright (c) 2003-2004
- *	Hartmut Brandt.
- *	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Begemot: libunimsg/snmp_atm/snmp_atm.c,v 1.3 2005/05/23 11:46:46 brandt_h Exp $
- *
- * SNMP module for ATM hardware interfaces.
- */
-
-#include "atm.h"
-#include "atm_tree.h"
-#include "atm_oid.h"
-
-#include <sys/ioctl.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <syslog.h>
-#include <net/if_types.h>
-#include <net/if_media.h>
-#include <net/if_atm.h>
-
-struct lmodule *module;
-
-/* list of all (known) ATM interfaces */
-struct atmif_list atmif_list = TAILQ_HEAD_INITIALIZER(atmif_list);
-
-/* whether we are started or not */
-static int started;
-
-/* last time table was changed */
-static uint64_t last_change;
-
-/* for the registration */
-static const struct asn_oid oid_begemotAtm = OIDX_begemotAtm;
-
-/* the registration */
-static u_int reg_atm;
-
-/*
- * Find an ATM interface by name
- */
-struct atmif *
-atm_find_if_name(const char *name)
-{
-	struct atmif_priv *aif;
-
-	TAILQ_FOREACH(aif, &atmif_list, link)
-		if (strcmp(aif->pub.ifp->name, name) == 0)
-			return (&aif->pub);
-	return (NULL);
-}
-
-/*
- * get the interface from the interface index
- */
-struct atmif *
-atm_find_if(u_int ifindex)
-{
-	struct atmif_priv *aif;
-
-	TAILQ_FOREACH(aif, &atmif_list, link)
-		if (aif->index == ifindex)
-			return (&aif->pub);
-	return (NULL);
-}
-
-/*
- * Send notification to all listeners.
- */
-void
-atmif_send_notification(struct atmif_priv *aif, enum atmif_notify code,
-    uintptr_t arg)
-{
-	struct atmif_reg *r0, *r1;
-
-	r0 = TAILQ_FIRST(&aif->notify);
-	while (r0 != NULL) {
-		r1 = TAILQ_NEXT(r0, link);
-		r0->func(&aif->pub, code, arg, r0->data);
-		r0 = r1;
-	}
-}
-
-/*
- * Destroy an interface
- */
-static void
-atmif_destroy(struct atmif_priv *aif)
-{
-	struct atmif_reg *r0;
-
-	atmif_send_notification(aif, ATMIF_NOTIFY_DESTROY,
-	    (uintptr_t)0);
-
-	atmif_sys_destroy(aif);
-
-	if (aif->ifpreg != NULL)
-		mibif_unnotify(aif->ifpreg);
-
-	while ((r0 = TAILQ_FIRST(&aif->notify)) != NULL) {
-		TAILQ_REMOVE(&aif->notify, r0, link);
-		free(r0);
-	}
-
-	TAILQ_REMOVE(&atmif_list, aif, link);
-	free(aif);
-
-	last_change = this_tick;
-}
-
-/*
- * Function gets called from the MIB-II module for events on that interface
- */
-static void
-atmif_notify(struct mibif *ifp __unused, enum mibif_notify event, void *data)
-{
-	struct atmif_priv *aif = data;
-
-	switch (event) {
-
-	  case MIBIF_NOTIFY_DESTROY:
-		atmif_destroy(aif);
-		break;
-	}
-}
-
-/*
- * Check the carrier state of the interface
- */
-void
-atmif_check_carrier(struct atmif_priv *aif)
-{
-	struct ifmediareq ifmr;
-	enum atmif_carrier_state ost = aif->pub.carrier;
-
-	memset(&ifmr, 0, sizeof(ifmr));
-	strcpy(ifmr.ifm_name, aif->pub.ifp->name);
-
-	if (ioctl(mib_netsock, SIOCGIFMEDIA, &ifmr) == -1) {
-		aif->pub.carrier = ATMIF_CARRIER_UNKNOWN;
-		return;
-	}
-	if (!(ifmr.ifm_status & IFM_AVALID)) {
-		aif->pub.carrier = ATMIF_CARRIER_UNKNOWN;
-		return;
-	}
-	if (ifmr.ifm_status & IFM_ACTIVE)
-		aif->pub.carrier = ATMIF_CARRIER_ON;
-	else
-		aif->pub.carrier = ATMIF_CARRIER_OFF;
-
-	if (ost != aif->pub.carrier)
-		atmif_send_notification(aif, ATMIF_NOTIFY_CARRIER,
-		    (uintptr_t)ost);
-}
-
-/*
- * Retrieve the SUNI mode
- */
-static int
-atmif_get_mode(struct atmif_priv *aif)
-{
-	struct ifmediareq ifmr;
-
-	memset(&ifmr, 0, sizeof(ifmr));
-	strcpy(ifmr.ifm_name, aif->pub.ifp->name);
-
-	if (ioctl(mib_netsock, SIOCGIFMEDIA, &ifmr) < 0) {
-		syslog(LOG_ERR, "SIOCGIFMEDIA: %m");
-		aif->pub.mode = ATMIF_SUNI_MODE_UNKNOWN;
-		return (SNMP_ERR_GENERR);
-	}
-	if (ifmr.ifm_current & IFM_ATM_SDH)
-		aif->pub.mode = ATMIF_SUNI_MODE_SDH;
-	else
-		aif->pub.mode = ATMIF_SUNI_MODE_SONET;
-
-	return (SNMP_ERR_NOERROR);
-}
-
-/*
- * Change the SUNI mod
- */
-static int
-atmif_set_mode(struct atmif_priv *aif, int newmode)
-{
-	struct ifmediareq ifmr;
-	struct ifreq ifr;
-
-	memset(&ifmr, 0, sizeof(ifmr));
-	strcpy(ifmr.ifm_name, aif->pub.ifp->name);
-
-	/* get current mode */
-	if (ioctl(mib_netsock, SIOCGIFMEDIA, &ifmr) < 0) {
-		syslog(LOG_ERR, "SIOCGIFMEDIA: %m");
-		return (SNMP_ERR_GENERR);
-	}
-
-	memset(&ifr, 0, sizeof(ifr));
-	strcpy(ifr.ifr_name, aif->pub.ifp->name);
-
-	ifr.ifr_media = ifmr.ifm_current;
-	if (newmode == ATMIF_SUNI_MODE_SDH)
-		ifr.ifr_media |= IFM_ATM_SDH;
-	else
-		ifr.ifr_media &= ~IFM_ATM_SDH;
-
-	if (ioctl(mib_netsock, SIOCSIFMEDIA, &ifr) < 0) {
-		syslog(LOG_ERR, "SIOCSIFMEDIA: %m");
-		return (SNMP_ERR_GENERR);
-	}
-
-	aif->pub.mode = newmode;
-	return (SNMP_ERR_NOERROR);
-}
-
-/*
- * Attach to an ATM interface
- */
-static void
-attach_if(struct mibif *ifp)
-{
-	struct atmif_priv *aif;
-
-	/* we should not know it */
-	TAILQ_FOREACH(aif, &atmif_list, link)
-		if (aif->pub.ifp == ifp) {
-			syslog(LOG_CRIT, "new ATM if already known '%s'",
-			    ifp->name);
-			return;
-		}
-
-	/*
-	 * tap it
-	 */
-	if ((aif = malloc(sizeof(*aif))) == NULL) {
-		syslog(LOG_ERR, "new atmif: %m");
-		return;
-	}
-	memset(aif, 0, sizeof(*aif));
-
-	aif->pub.ifp = ifp;
-	aif->index = ifp->index;
-	TAILQ_INIT(&aif->notify);
-
-	if (atmif_sys_attach_if(aif)) {
-		free(aif);
-		return;
-	}
-
-	aif->ifpreg = mibif_notify(ifp, module, atmif_notify, aif);
-
-	aif->pub.carrier = ATMIF_CARRIER_UNKNOWN;
-	atmif_check_carrier(aif);
-	(void)atmif_get_mode(aif);
-
-	INSERT_OBJECT_INT(aif, &atmif_list);
-
-	last_change = this_tick;
-
-	return;
-}
-
-/*
- * Function gets called when a new interface is created. If this is an
- * ATM interface, hook in. Claim the interface in any case even when
- * the creation of our data structures fails.
- */
-static int
-new_if(struct mibif *ifp)
-{
-	if (!started || ifp->mib.ifmd_data.ifi_type != IFT_ATM ||
-	    ifp->xnotify != NULL)
-		return (0);
-
-	attach_if(ifp);
-	return (1);
-}
-
-/*
- * Start the module
- */
-static void
-atm_start(void)
-{
-	struct mibif *ifp;
-
-	reg_atm = or_register(&oid_begemotAtm, 
-	    "The Begemot MIB for ATM interfaces.", module);
-
-	started = 1;
-	for (ifp = mib_first_if(); ifp != NULL; ifp = mib_next_if(ifp))
-		if (ifp->mib.ifmd_data.ifi_type == IFT_ATM &&
-		    ifp->xnotify == NULL)
-			attach_if(ifp);
-}
-
-/*
- * Called when modules is loaded
- */
-static int
-atm_init(struct lmodule *mod, int argc __unused, char *argv[] __unused)
-{
-	module = mod;
-
-	/* register to get creation messages for ATM interfaces */
-	if (mib_register_newif(new_if, module)) {
-		syslog(LOG_ERR, "cannot register newif function: %m");
-		return (-1);
-	}
-
-	return (0);
-}
-
-/*
- * Called when module gets unloaded - free all resources
- */
-static int
-atm_fini(void)
-{
-	struct atmif_priv *aif;
-
-	while ((aif = TAILQ_FIRST(&atmif_list)) != NULL)
-		atmif_destroy(aif);
-
-	mib_unregister_newif(module);
-	or_unregister(reg_atm);
-
-	return (0);
-}
-
-/*
- * Other module unloaded/loaded
- */
-static void
-atm_loading(const struct lmodule *mod, int loading)
-{
-	struct atmif_priv *aif;
-	struct atmif_reg *r0, *r1;
-
-	if (!loading) {
-		/* remove notifications for this module */
-		TAILQ_FOREACH(aif, &atmif_list, link)
-			TAILQ_FOREACH_SAFE(r0, &aif->notify, link, r1) {
-				if (r0->mod == mod) {
-					TAILQ_REMOVE(&aif->notify, r0, link);
-					free(r0);
-				}
-			}
-	}
-}
-
-const struct snmp_module config = {
-	.comment = "This module implements a private MIB for ATM interfaces.",
-	.init =		atm_init,
-	.fini =		atm_fini,
-	.start =	atm_start,
-	.tree =		atm_ctree,
-	.tree_size =	atm_CTREE_SIZE,
-	.loading =	atm_loading
-};
-
-/*
- * Get the interface point for a table access
- */
-int
-atmif_get_aif(struct snmp_value *value, u_int sub, enum snmp_op op,
-    struct atmif_priv **aifp)
-{
-	switch (op) {
-
-	  case SNMP_OP_GETNEXT:
-		if ((*aifp = NEXT_OBJECT_INT(&atmif_list,
-		    &value->var, sub)) == NULL)
-			return (SNMP_ERR_NOSUCHNAME);
-		value->var.len = sub + 1;
-		value->var.subs[sub] = (*aifp)->index;
-		break;
-
-	  case SNMP_OP_GET:
-		if ((*aifp = FIND_OBJECT_INT(&atmif_list,
-		    &value->var, sub)) == NULL)
-			return (SNMP_ERR_NOSUCHNAME);
-		break;
-
-	  case SNMP_OP_SET:
-		if ((*aifp = FIND_OBJECT_INT(&atmif_list,
-		    &value->var, sub)) == NULL)
-			return (SNMP_ERR_NO_CREATION);
-		break;
-
-	  case SNMP_OP_ROLLBACK:
-	  case SNMP_OP_COMMIT:
-		if ((*aifp = FIND_OBJECT_INT(&atmif_list,
-		    &value->var, sub)) == NULL)
-			abort();
-		return (SNMP_ERR_NOERROR);
-	}
-
-	if ((*aifp)->pub.mib->pcr == 0) {
-		mib_fetch_ifmib((*aifp)->pub.ifp);
-		atmif_sys_fill_mib(*aifp);
-		atmif_check_carrier(*aifp);
-	}
-
-	return (SNMP_ERR_NOERROR);
-}
-
-/* 
- * Table of all ATM interfaces
- */
-int
-op_atmif(struct snmp_context *ctx __unused, struct snmp_value *value,
-    u_int sub, u_int vindex __unused, enum snmp_op op)
-{
-	struct atmif_priv *aif;
-	int err;
-
-	if ((err = atmif_get_aif(value, sub, op, &aif)) != SNMP_ERR_NOERROR)
-		return (err);
-
-	if (op == SNMP_OP_SET) {
-		switch (value->var.subs[sub - 1]) {
-
-		  default:
-			return (SNMP_ERR_NOT_WRITEABLE);
-
-		  case LEAF_begemotAtmIfMode:
-			if ((err = atmif_get_mode(aif)) != SNMP_ERR_NOERROR)
-				return (err);
-			if (aif->pub.mode == ATMIF_SUNI_MODE_UNKNOWN)
-				return (SNMP_ERR_INCONS_VALUE);
-			if (value->v.integer != ATMIF_SUNI_MODE_SONET &&
-			    value->v.integer != ATMIF_SUNI_MODE_SDH)
-				return (SNMP_ERR_WRONG_VALUE);
-			if ((u_int)value->v.integer == aif->pub.mode)
-				return (SNMP_ERR_NOERROR);
-			return (atmif_set_mode(aif, value->v.integer));
-		}
-		abort();
-	}
-
-	switch (value->var.subs[sub - 1]) {
-
-	  case LEAF_begemotAtmIfName:
-		return (string_get(value, aif->pub.ifp->name, -1));
-
-	  case LEAF_begemotAtmIfPcr:
-		value->v.uint32 = aif->pub.mib->pcr;
-		return (SNMP_ERR_NOERROR);
-
-	  case LEAF_begemotAtmIfMedia:
-		value->v.integer = aif->pub.mib->media;
-		return (SNMP_ERR_NOERROR);
-
-	  case LEAF_begemotAtmIfVpiBits:
-		value->v.uint32 = aif->pub.mib->vpi_bits;
-		return (SNMP_ERR_NOERROR);
-
-	  case LEAF_begemotAtmIfVciBits:
-		value->v.uint32 = aif->pub.mib->vci_bits;
-		return (SNMP_ERR_NOERROR);
-
-	  case LEAF_begemotAtmIfMaxVpcs:
-		value->v.uint32 = aif->pub.mib->max_vpcs;
-		return (SNMP_ERR_NOERROR);
-
-	  case LEAF_begemotAtmIfMaxVccs:
-		value->v.uint32 = aif->pub.mib->max_vccs;
-		return (SNMP_ERR_NOERROR);
-
-	  case LEAF_begemotAtmIfEsi:
-		return (string_get(value, aif->pub.mib->esi, 6));
-
-	  case LEAF_begemotAtmIfCarrierStatus:
-		value->v.integer = aif->pub.carrier;
-		return (SNMP_ERR_NOERROR);
-
-	  case LEAF_begemotAtmIfMode:
-		if ((err = atmif_get_mode(aif)) != SNMP_ERR_NOERROR)
-			return (err);
-		value->v.integer = aif->pub.mode;
-		return (SNMP_ERR_NOERROR);
-	}
-	abort();
-}
-
-/* 
- * Hardware table
- */
-int
-op_atmhw(struct snmp_context *ctx __unused, struct snmp_value *value,
-    u_int sub, u_int vindex __unused, enum snmp_op op)
-{
-	struct atmif_priv *aif;
-	int err;
-
-	if ((err = atmif_get_aif(value, sub, op, &aif)) != SNMP_ERR_NOERROR)
-		return (err);
-	if (op == SNMP_OP_SET)
-		return (SNMP_ERR_NOT_WRITEABLE);
-
-	switch (value->var.subs[sub - 1]) {
-
-	  case LEAF_begemotAtmHWVendor:
-		return (atm_sys_get_hw_vendor(aif, value));
-
-	  case LEAF_begemotAtmHWDevice:
-		return (atm_sys_get_hw_device(aif, value));
-
-	  case LEAF_begemotAtmHWSerial:
-		value->v.uint32 = aif->pub.mib->serial;
-		return (SNMP_ERR_NOERROR);
-
-	  case LEAF_begemotAtmHWVersion:
-		value->v.uint32 = aif->pub.mib->hw_version;
-		return (SNMP_ERR_NOERROR);
-
-	  case LEAF_begemotAtmHWSoftVersion:
-		value->v.uint32 = aif->pub.mib->sw_version;
-		return (SNMP_ERR_NOERROR);
-
-	}
-	abort();
-}
-
-/*
- * Scalars
- */
-int
-op_atm(struct snmp_context *ctx __unused, struct snmp_value *value,
-    u_int sub, u_int vindex __unused, enum snmp_op op)
-{
-	switch (op) {
-
-	  case SNMP_OP_GETNEXT:
-		abort();
-
-	  case SNMP_OP_GET:
-		switch (value->var.subs[sub - 1]) {
-
-		  case LEAF_begemotAtmIfTableLastChange:
-			value->v.uint32 =
-			    (last_change == 0 ? 0 : last_change - start_tick);
-			return (SNMP_ERR_NOERROR);
-		}
-		abort();
-
-	  case SNMP_OP_SET:
-		return (SNMP_ERR_NOT_WRITEABLE);
-
-	  case SNMP_OP_ROLLBACK:
-	  case SNMP_OP_COMMIT:
-		abort();
-	}
-	abort();
-}
-
-/*
- * Register for interface notifications
- */
-void *
-atm_notify_aif(struct atmif *pub, const struct lmodule *mod,
-    atmif_event_f func, void *arg)
-{
-	struct atmif_priv *aif = (struct atmif_priv *)pub;
-	struct atmif_reg *r0;
-
-	if ((r0 = malloc(sizeof(*r0))) == NULL) {
-		syslog(LOG_CRIT, "out of memory");
-		return (NULL);
-	}
-	r0->func = func;
-	r0->mod = mod;
-	r0->data = arg;
-	r0->aif = aif;
-
-	TAILQ_INSERT_TAIL(&aif->notify, r0, link);
-
-	return (r0);
-}
-
-/*
- * Unregister it
- */
-void
-atm_unnotify_aif(void *arg)
-{
-	struct atmif_reg *r0 = arg;
-
-	TAILQ_REMOVE(&r0->aif->notify, r0, link);
-	free(r0);
-}
diff --git a/contrib/ngatm/snmp_atm/snmp_atm.h b/contrib/ngatm/snmp_atm/snmp_atm.h
deleted file mode 100644
index 50784ccc45bb..000000000000
--- a/contrib/ngatm/snmp_atm/snmp_atm.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2001-2002
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- * Copyright (c) 2003-2004
- *	Hartmut Brandt
- *	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Begemot: libunimsg/snmp_atm/snmp_atm.h,v 1.2 2004/08/06 17:30:40 brandt Exp $
- */
-#ifndef _BSNMP_SNMP_ATM_H
-#define _BSNMP_SNMP_ATM_H
-
-enum atmif_notify {
-	ATMIF_NOTIFY_DESTROY,	/* interface has been destroyed */
-	ATMIF_NOTIFY_CARRIER,	/* carriere change */
-	ATMIF_NOTIFY_VCC	/* VCC change */
-};
-
-enum atmif_carrier_state {
-	ATMIF_CARRIER_ON	= 1,
-	ATMIF_CARRIER_OFF	= 2,
-	ATMIF_CARRIER_UNKNOWN	= 3,
-	ATMIF_CARRIER_NONE	= 4
-};
-
-enum atmif_suni_mode {
-	ATMIF_SUNI_MODE_SONET	= 1,
-	ATMIF_SUNI_MODE_SDH	= 2,
-	ATMIF_SUNI_MODE_UNKNOWN	= 3
-};
-
-/* forward declaration */
-struct atmif;
-typedef void (*atmif_event_f)(struct atmif *, enum atmif_notify, uintptr_t,
-    void *);
-
-struct atmif_mib {
-	u_int	version;	/* currently 0 */
-
-	u_int	device;		/* type of hardware (system specific) */
-	u_int	serial;		/* card serial number (device specific) */
-	u_int	hw_version;	/* card version (device specific) */
-	u_int	sw_version;	/* firmware version (device specific) */
-	u_int	media;		/* physical media (see MIB) */
-
-	u_char	esi[6];		/* end system identifier (MAC) */
-	u_int	pcr;		/* supported peak cell rate */
-	u_int	vpi_bits;	/* number of used bits in VPI field */
-	u_int	vci_bits;	/* number of used bits in VCI field */
-	u_int	max_vpcs;	/* maximum number of VPCs */
-	u_int	max_vccs;	/* maximum number of VCCs */
-};
-
-struct atmif {
-	struct mibif	*ifp;		/* common interface data */
-	struct atmif_mib *mib;		/* ATM MIB */
-	enum atmif_carrier_state carrier;
-	enum atmif_suni_mode mode;	/* SUNI mode SDH or SONET */
-};
-
-/* find an ATM interface by name */
-struct atmif *atm_find_if_name(const char *);
-
-/* get the interface from the interface index */
-struct atmif *atm_find_if(u_int);
-
-/* register for notifications */
-void *atm_notify_aif(struct atmif *, const struct lmodule *mod,
-    atmif_event_f, void *);
-void atm_unnotify_aif(void *);
-
-/* return the If for a system-specific node number */
-struct atmif *atm_node2if(u_int);
-
-/* return the node id for the if */
-u_int atm_if2node(struct atmif *);
-
-#endif
diff --git a/contrib/ngatm/sscop/common.c b/contrib/ngatm/sscop/common.c
deleted file mode 100644
index e34181c36150..000000000000
--- a/contrib/ngatm/sscop/common.c
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Begemot: libunimsg/sscop/common.c,v 1.5 2005/05/23 11:46:16 brandt_h Exp $
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <time.h>
-#include <signal.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <err.h>
-
-#include <netnatm/unimsg.h>
-#include <netnatm/saal/sscop.h>
-#include "common.h"
-
-struct timer {
-	evTimerID	id;
-	struct sscop	*sscop;
-	void		(*func)(void *);
-};
-
-int useframe;
-int sscopframe;
-u_int sscop_vflag;
-int sscop_fd;
-int user_fd;
-int loose;
-int user_out_fd;
-u_int verbose;
-#ifndef USE_LIBBEGEMOT
-evContext evctx;
-#endif
-evFileID sscop_h;
-evFileID user_h;
-
-/*
- * This function get's called from sscop to put out verbose messages
- */
-void 
-sscop_verbose(struct sscop *sscop __unused, void *u __unused,
-    const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
-	fprintf(stderr, "\n");
-	va_end(ap);
-}
-void
-verb(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
-	fprintf(stderr, "\n");
-	va_end(ap);
-}
-
-/*
- * Dump a buffer in hex to stderr.
- */
-void
-dump_buf(const char *w, const u_char *buf, size_t len)
-{
-	u_int i;
-
-	fprintf(stderr, "%s %zu: ", w, len);
-	for(i = 0; i < len; i++) {
-		if (i % 4 == 0 && i != 0)
-			fprintf(stderr, " ");
-		fprintf(stderr, "%02x", *buf++);
-	}
-	fprintf(stderr, "\n");
-}
-
-/*
- * SSCOP file descriptor is ready. Allocate and read one message
- * and dispatch a signal.
- */
-struct uni_msg *
-proto_msgin(int fd __unused)
-{
-	struct uni_msg *m = NULL;
-	ssize_t size;
-	u_int32_t flen;
-	u_int got;
-
-	if (sscopframe) {
-		if ((size = read(sscop_fd, &flen, 4)) == -1)
-			err(1, "error reading frame hdr");
-		if (size == 0) {
-			got = 0;
-			goto eof;
-		}
-		if (size != 4)
-			errx(1, "short frame header: %zd", size);
-		if ((m = uni_msg_alloc(flen)) == NULL)
-			err(1, NULL);
-		for (got = 0; got < flen; got += (size_t)size) {
-			size = read(sscop_fd, m->b_rptr + got, flen - got);
-			if (size == -1)
-				err(1, "error reading frame");
-			if (size == 0) {
-				got = 0;
-				break;
-			}
-		}
-
-	} else {
-		if ((m = uni_msg_alloc(MAXMSG)) == NULL)
-			err(1, NULL);
-		if ((size = read(sscop_fd, m->b_rptr, MAXMSG)) == -1)
-			err(1, "error reading message");
-		got = size;
-	}
-
-	if (got == 0) {
-  eof:
-#ifdef USE_LIBBEGEMOT
-		poll_unregister(sscop_h);
-#else
-		evDeselectFD(evctx, sscop_h);
-#endif
-		(void)close(sscop_fd);
-		sscop_fd = -1;
-		if (m != NULL)
-			uni_msg_destroy(m);
-		VERBOSE(("EOF on sscop file descriptor"));
-		return (NULL);
-	}
-	m->b_wptr = m->b_rptr + got;
-
-	if(verbose & 0x0002)
-		dump_buf("SSCOP INPUT", m->b_rptr, got);
-
-	return (m);
-}
-
-/*
- * User file descriptor ready - read a message
- */
-struct uni_msg *
-user_msgin(int fd __unused)
-{
-	struct uni_msg *m = NULL;
-	ssize_t size;
-	u_int32_t flen;
-	u_int got;
-
-	if (useframe) {
-		if ((size = read(user_fd, &flen, 4)) == -1)
-			err(1, "error reading frame hdr");
-		if (size == 0) {
-			got = 0;
-			goto eof;
-		}
-		if (size != 4)
-			errx(1, "short frame header: %zd", size);
-		if ((m = uni_msg_alloc(flen)) == NULL)
-			err(1, NULL);
-		for (got = 0; got < flen; got++) {
-			size = read(user_fd, m->b_rptr + got, flen - got);
-			if (size == -1)
-				err(1, "error reading frame");
-			if (size == 0) {
-				got = 0;
-				break;
-			}
-			got += (size_t)size;
-		}
-
-	} else {
-		if ((m = uni_msg_alloc(MAXMSG)) == NULL)
-			err(1, NULL);
-		if ((size = read(user_fd, m->b_rptr, MAXMSG)) == -1)
-			err(1, "error reading message");
-		got = size;
-	}
-
-	if (size == 0) {
-  eof:
-#ifdef USE_LIBBEGEMOT
-		poll_unregister(user_h);
-#else
-		evDeselectFD(evctx, user_h);
-#endif
-		if (m != NULL)
-			uni_msg_destroy(m);
-		VERBOSE(("EOF on user connection"));
-		return (NULL);
-	}
-	m->b_wptr = m->b_rptr + size;
-
-	return (m);
-}
-
-/*
- * Write message to the SSCOP file descriptor.
- * Here we have a problem: we should have a means to check how much space
- * we have. If the pipe is full, we could declare the lower layer busy and
- * drop the message. However, how do we know, when a message will fit?
- * Selecting for WRITE doesn't help, because it will return even if a single
- * byte can be written. For this reason, we switch the file descriptor to
- * blocking mode, and hope everything is fast enough to not timeout us.
- * Alternatively we could just drop the message. Using kevent would help here.
- */
-void
-proto_msgout(struct uni_msg *m)
-{
-	struct iovec iov[2];
-	u_int32_t flen;
-	ssize_t size;
-	static int sent;
-	int fl;
-
-	if (verbose & 0x0002)
-		dump_buf("send", m->b_rptr, uni_msg_len(m));
-	if (loose > 0 && (sent++ % loose) == loose - 1) {
-		VERBOSE(("loosing message"));
-		uni_msg_destroy(m);
-		return;
-	}
-
-	flen = uni_msg_len(m);
-
-	iov[0].iov_len = sscopframe ? 4 : 0;
-	iov[0].iov_base = (caddr_t)&flen;
-	iov[1].iov_len = uni_msg_len(m);
-	iov[1].iov_base = m->b_rptr;
-
-	if ((fl = fcntl(sscop_fd, F_GETFL, 0)) == -1)
-		err(1, "cannot get flags for sscop fd");
-	fl &= ~O_NONBLOCK;
-	if (fcntl(sscop_fd, F_SETFL, fl) == -1)
-		err(1, "cannot set flags for sscop fd");
-
-	if ((size = writev(sscop_fd, iov, 2)) == -1)
-		err(1, "write sscop");
-	if ((size_t)size != iov[0].iov_len + iov[1].iov_len)
-		err(1, "short sscop write %zu %zu %zd",
-		    iov[0].iov_len, iov[1].iov_len, size);
-
-	fl |= O_NONBLOCK;
-	if (fcntl(sscop_fd, F_SETFL, fl) == -1)
-		err(1, "cannot restore flags for sscop fd");
-
-	uni_msg_destroy(m);
-}
-
-/*
- * output a message to the user
- */
-void
-user_msgout(struct uni_msg *m)
-{
-	struct iovec iov[2];
-	u_int32_t flen;
-	ssize_t size;
-
-	flen = uni_msg_len(m);
-
-	iov[0].iov_len = useframe ? 4 : 0;
-	iov[0].iov_base = (caddr_t)&flen;
-	iov[1].iov_len = uni_msg_len(m);
-	iov[1].iov_base = m->b_rptr;
-
-	if ((size = writev(user_out_fd, iov, 2)) == -1)
-		err(1, "write sscop");
-	if ((size_t)size != iov[0].iov_len + iov[1].iov_len)
-		errx(1, "short sscop write");
-
-	uni_msg_destroy(m);
-}
-
-void
-parse_param(struct sscop_param *param, u_int *pmask, int opt, char *arg)
-{
-	u_int val;
-	char *end, *p;
-
-	if(opt == 'b') {
-		param->flags |= SSCOP_ROBUST;
-		*pmask |= SSCOP_SET_ROBUST;
-		return;
-	}
-	if(opt == 'x') {
-		param->flags |= SSCOP_POLLREX;
-		*pmask |= SSCOP_SET_POLLREX;
-		return;
-	}
-	if(opt == 'W') {
-		val = (u_int)strtoul(optarg, &end, 0);
-
-		if(*end != '\0')
-			errx(1, "bad number to -W '%s'", optarg);
-		if(val >= (1 << 24) - 1)
-			errx(1, "window too large: 0x%x", val);
-		param->mr = val;
-		*pmask |= SSCOP_SET_MR;
-		return;
-	}
-
-	if((p = strchr(arg, '=')) == NULL)
-		errx(1, "need '=' in argument to -%c", opt);
-	*p++ = 0;
-	if(*p == 0)
-		errx(1, "argument to -%c %s empty", opt, arg);
-	val = strtoul(p, &end, 0);
-	if(*end != 0)
-		errx(1, "bad number in -%c %s=%s", opt, arg, p);
-
-	if(opt == 't') {
-		if(strcmp(arg, "cc") == 0) {
-			param->timer_cc = val;
-			*pmask |= SSCOP_SET_TCC;
-		} else if(strcmp(arg, "poll") == 0) {
-			param->timer_poll = val;
-			*pmask |= SSCOP_SET_TPOLL;
-		} else if(strcmp(arg, "ka") == 0) {
-			param->timer_keep_alive = val;
-			*pmask |= SSCOP_SET_TKA;
-		} else if(strcmp(arg, "nr") == 0) {
-			param->timer_no_response = val;
-			*pmask |= SSCOP_SET_TNR;
-		} else if(strcmp(arg, "idle") == 0) {
-			param->timer_idle = val;
-			*pmask |= SSCOP_SET_TIDLE;
-		} else
-			errx(1, "bad timer name '%s'", arg);
-		return;
-	}
-
-	if(opt == 'a') {
-		if(strcmp(arg, "j") == 0) {
-			param->maxj = val;
-			*pmask |= SSCOP_SET_MAXJ;
-		} else if(strcmp(arg, "k") == 0) {
-			param->maxk = val;
-			*pmask |= SSCOP_SET_MAXK;
-		} else if(strcmp(arg, "cc") == 0) {
-			param->maxcc = val;
-			*pmask |= SSCOP_SET_MAXCC;
-		} else if(strcmp(arg, "pd") == 0) {
-			param->maxpd = val;
-			*pmask |= SSCOP_SET_MAXPD;
-		} else if(strcmp(arg, "stat") == 0) {
-			param->maxstat = val;
-			*pmask |= SSCOP_SET_MAXSTAT;
-		} else
-			errx(1, "bad parameter '%s'", arg);
-		return;
-	}
-
-	verb("bad flag");
-	abort();
-}
-
-#ifdef USE_LIBBEGEMOT
-static void
-tfunc(int tid __unused, void *uap)
-#else
-static void
-tfunc(evContext ctx __unused, void *uap, struct timespec due __unused,
-    struct timespec inter __unused)
-#endif
-{
-	struct timer *t = uap;
-
-	t->func(t->sscop);
-	free(t);
-}
-
-/*
- * Start a timer
- */
-void *
-sscop_start_timer(struct sscop *sscop, void *arg __unused, u_int msec,
-    void (*func)(void *))
-{
-	struct timer *t;
-#ifndef USE_LIBBEGEMOT
-	struct timespec due;
-#endif
-
-	if ((t = malloc(sizeof(*t))) == NULL)
-		err(1, NULL);
-	t->sscop = sscop;
-	t->func = func;
-
-#ifdef USE_LIBBEGEMOT
-	if ((t->id = poll_start_timer(msec, 0, tfunc, t)) == -1)
-		err(1, "cannot start timer");
-#else
-	due = evAddTime(evNowTime(),
-	    evConsTime((time_t)msec/1000, (long)(msec%1000)*1000));
-
-	if (evSetTimer(evctx, tfunc, t, due, evConsTime(0, 0), &t->id))
-		err(1, "cannot start timer");
-#endif
-
-	return (t);
-}
-
-/*
- * Stop a timer
- */
-void
-sscop_stop_timer(struct sscop *sscop __unused, void *arg __unused, void *tp)
-{
-	struct timer *t = tp;
-
-#ifdef USE_LIBBEGEMOT
-	poll_stop_timer(t->id);
-#else
-	evClearTimer(evctx, t->id);
-#endif
-	free(t);
-}
diff --git a/contrib/ngatm/sscop/common.h b/contrib/ngatm/sscop/common.h
deleted file mode 100644
index 9ad6d4e95b6e..000000000000
--- a/contrib/ngatm/sscop/common.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Begemot: libunimsg/sscop/common.h,v 1.5 2005/05/23 11:46:16 brandt_h Exp $
- *
- * Common declaration for the SAAL programs.
- */
-#ifndef _SAAL_COMMON_H_
-#define _SAAL_COMMON_H_
-
-#ifdef USE_LIBBEGEMOT
-#include <rpoll.h>
-#define evFileID int
-#define evTimerID int
-#else
-#include <isc/eventlib.h>
-#endif
-
-/*
- * Writes to a pipe must be in messages (if we don't use framing).
- * It is not clear, what is the maximum message size for this. It seems
- * to be PIPE_BUF, but be conservative.
- */
-#define	MAXUSRMSG	4096
-#define	MAXMSG		(MAXUSRMSG+4)
-
-extern int useframe;		/* use frame functions */
-extern int sscopframe;		/* use sscop framing */
-extern u_int sscop_vflag;	/* be talkative */
-extern int sscop_fd;		/* file descriptor for SSCOP protocol */
-extern int user_fd;		/* file descriptor for USER */
-extern int loose;		/* loose messages */
-extern int user_out_fd;		/* file descriptor for output to user */
-extern u_int verbose;		/* talk to me */
-#ifndef USE_LIBBEGEMOT
-extern evContext evctx;
-#endif
-extern evFileID sscop_h;
-extern evFileID user_h;
-
-void dump_buf(const char *, const u_char *, size_t);
-struct uni_msg *proto_msgin(int);
-struct uni_msg *user_msgin(int);
-void proto_msgout(struct uni_msg *);
-void user_msgout(struct uni_msg *);
-void parse_param(struct sscop_param *, u_int *, int, char *);
-
-void verb(const char *, ...) __printflike(1, 2);
-
-void sscop_verbose(struct sscop *, void *, const char *, ...)
-	__printflike(3, 4);
-void *sscop_start_timer(struct sscop *, void *, u_int, void (*)(void *));
-void sscop_stop_timer(struct sscop *, void *, void *);
-
-#define VERBOSE(P)	do { if (verbose & 0x0001) verb P; } while(0)
-
-#endif	/* _SAAL_COMMON_H_ */
diff --git a/contrib/ngatm/sscop/sscop.1 b/contrib/ngatm/sscop/sscop.1
deleted file mode 100644
index 6cbc6d268739..000000000000
--- a/contrib/ngatm/sscop/sscop.1
+++ /dev/null
@@ -1,169 +0,0 @@
-.\"
-.\" Copyright (c) 2001-2003
-.\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-.\" 	All rights reserved.
-.\"
-.\" Author: Harti Brandt <harti@FreeBSD.org>
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $Begemot: libunimsg/sscop/sscop.1,v 1.3 2004/07/08 08:22:28 brandt Exp $
-.\"
-.Dd October 28, 2003
-.Dt SSCOP 1
-.Os
-.Sh NAME
-.Nm sscop
-.Nd "SSCOP transport protocol"
-.Sh SYNOPSIS
-.Nm
-.Op Fl Fbefhirwx3
-.Op Fl V Ar X
-.Op Fl W Ar N
-.Op Fl a Ar p Ns Li = Ns Ar v
-.Op Fl l Ar N
-.Op Fl t Ar t Ns Li = Ns Ar m
-.Op Fl v Ar X
-.Sh DESCRIPTION
-The
-.Nm
-tool implements the Q.2110 transport protocol.
-Normally the program reads from standard input and sends this input over
-the SSCOP protocol on the standard output file descriptor. This means, that
-the standard output file descriptor should be connected in read-write mode.
-The program takes the
-following arguments:
-.Bl -tag -width ".It Fl a Ar p Ns Li = Ns Ar v"
-.It Fl F
-Use frameing on the SSCOP connection (see the
-.Fl f
-option).
-.It Fl V Ar X
-Set the verbose flag to the hex value
-.Ar X .
-.It Fl W Ar N
-Set the initial SSCOP window to
-.Ar N .
-.It Fl a Ar p Ns Li = Ns Ar v
-Set SSCOP parameter
-.Ar p
-to the value
-.Ar v .
-The following parameters may be set:
-.Bl -tag -width ".It Li stat Ns = Ns Ar N"
-.It Li j Ns = Ns Ar N
-Set the maximum SSCOP-UU data size to
-.Ar N
-octets.
-.It Li k Ns = Ns Ar N
-Set the maximum SSCOP SDU data size to
-.Ar N
-octets.
-.It Li cc Ns = Ns Ar N
-Set the parameter
-.Li MaxCC
-(maximum number of connection control message re-transmissions) to
-the value
-.Ar N .
-.It Li pd Ns = Ns Ar N
-Set the parameter
-.Li MaxPD
-(maximum acceptable number of outstanding unacknowledged SD PDUs before
-sending a POLL) to the value
-.Ar N .
-.It Li stat Ns = Ns Ar N
-Set the parameter
-.Li MaxSTAT
-(maximum number of elements placed in a STAT PDU) to the value
-.Ar N .
-.El
-.It Fl b
-Enable the ATM-Forum SSCOP robustness enhancement.
-.It Fl e
-Exit when there is an end of file condition on the input file or the
-SSCOP indicates a release confirmation.
-.It Fl f
-Use the framing protocol for communication over the SSCOP link. See
-.Xr frame l
-(libbegemot) for framing.
-.It Fl h
-Print a short help information and exit.
-.It Fl i
-Try not to read from the user input file descriptor. Assume that we a receiving
-only.
-.It Fl l Ar N
-Loose every Nth message. This is used for testing.
-.It Fl r
-Revert user and SSCOP file descriptors. That means, that user input and output
-is done on standard output and SSCOP input and output on standard input.
-.It Fl t Ar t Ns Li = Ns Ar m
-Set SSCOP timer
-.Ar t
-to
-.Ar m
-milliseconds. The following timers may be set:
-.Bl -tag -width ".It Li stat Ns = Ns Ar N"
-.It Li cc Ns = Ns Ar m
-Set the connection control timer to
-.Ar m .
-This timer controls the retransmission of connection control messages.
-.It Li poll Ns = Ns Ar m
-Set the poll timer to
-.Ar m .
-This timer controls the transmission of POLL messages.
-.It Li ka Ns = Ns Ar m
-Set the keep-alive timer to
-.Ar m .
-This timer controls the maximum length of the transient phase.
-.It Li nr Ns = Ns Ar m
-Set the no-response timer to
-.Ar m .
-This timer controls the maximum time between two received STAT PDUs before
-the connection is aborted.
-.It Li idle Ns = Ns Ar m
-Set the idle timer to
-.Ar m .
-This timer controls the length of the idle phase.
-.El
-.It Fl v Ar X
-Set the SSCOP library verbose flag to the hex value.
-.It Fl w
-Don't start the SSCOP protocol. Wait for a establish indication from the remote
-side.
-.It Fl x
-Enable to POLL after retransmission flag.
-.It Fl 3
-Send user output to file descriptor 3.
-.El
-.Sh EXAMPLES
-The following command line sends the file
-.Pa Makefile
-over a pipe (this depends on the feature that pipes are bi-directional):
-.Bd -literal
-cat Makefile | sscop -reF | sscop -weF
-.Ed
-.Sh SEE ALSO
-.Xr libunimsg 3
-.Sh STANDARDS
-The implemented protocol conforms to ITU-T recommendation Q.2110.
-.Sh AUTHORS
-.An Hartmut Brandt Aq harti@FreeBSD.org
diff --git a/contrib/ngatm/sscop/sscop_main.c b/contrib/ngatm/sscop/sscop_main.c
deleted file mode 100644
index a35d7a6c2da5..000000000000
--- a/contrib/ngatm/sscop/sscop_main.c
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Begemot: libunimsg/sscop/sscop_main.c,v 1.5 2005/05/23 11:46:17 brandt_h Exp $
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <time.h>
-#include <signal.h>
-#include <assert.h>
-#include <err.h>
-
-#include <netnatm/unimsg.h>
-#include <netnatm/saal/sscop.h>
-#include "common.h"
-
-static int sigusr1;		/* got SIGUSR1 */
-static int unidir;		/* write only user */
-static int end_at_eof = 1;	/* send RELEASE_request at user EOF */
-
-static volatile int ready;	/* flag if connection is established */
-static volatile int finished;	/* got release confirm or indication */
-
-static const char usgtxt[] = "\
-SSCOP transport protocol\n\
-Usage: sscop [-h] [-Fbefirwx3] [-ap=v] [-lN] [-tt=m] [-v X] [-V X] [-W N]\n\
-Options:\n\
-  -F	  use framing for sscop also\n\
-  -V X	  set verbose flags to hex X\n\
-  -W N	  set initial window to N\n\
-  -a p=v  set parameter 'p' to 'v'\n\
-  -b	  enable robustness enhancement\n\
-  -e	  don't RELEASE_request on user EOF\n\
-  -f	  use begemot frame functions for user fd\n\
-  -h	  print this info\n\
-  -i	  use user fd only for output\n\
-  -lN	  loose every nth message\n\
-  -r	  reverse user and sscop file descriptors\n\
-  -t t=m  set timer 't' to 'm' milliseconds\n\
-  -v X	  set sscop verbose flags to hex X\n\
-  -w	  don't start conversation\n\
-  -x	  enable POLL after retransmission\n\
-  -3	  redirect output to fd 3\n\
-Timers are cc, poll, ka, nr or idle; parameters are j, k, cc, pd or stat.\n";
-
-static void sscop_send_manage(struct sscop *, void *,
-	enum sscop_maasig, struct uni_msg *, u_int, u_int);
-static void sscop_send_upper(struct sscop *, void *, enum sscop_aasig,
-	struct SSCOP_MBUF_T *, u_int);
-static void sscop_send_lower(struct sscop *, void *, struct SSCOP_MBUF_T *);
-
-static const struct sscop_funcs sscop_funcs = {
-	sscop_send_manage,
-	sscop_send_upper,
-	sscop_send_lower,
-	sscop_verbose,
-	sscop_start_timer,
-	sscop_stop_timer
-};
-
-/*
- * SSCOP file descriptor is ready. Allocate and read one message
- * and dispatch a signal.
- */
-#ifdef USE_LIBBEGEMOT
-static void
-proto_infunc(int fd, int mask __unused, void *uap)
-#else
-static void
-proto_infunc(evContext ctx __unused, void *uap, int fd, int mask __unused)
-#endif
-{
-	struct uni_msg *m;
-
-	if ((m = proto_msgin(fd)) != NULL)
-		sscop_input((struct sscop *)uap, m);
-}
-
-/*
- * User input. Allocate and read message and dispatch signal.
- */
-#ifdef USE_LIBBEGEMOT
-static void
-user_infunc(int fd, int mask __unused, void *uap)
-#else
-static void
-user_infunc(evContext ctx __unused, void *uap, int fd, int mask __unused)
-#endif
-{
-	struct uni_msg *m;
-
-	if ((m = user_msgin(fd)) != NULL)
-		sscop_aasig((struct sscop *)uap, SSCOP_DATA_request, m, 0);
-
-	else if (end_at_eof)
-		sscop_aasig((struct sscop *)uap, SSCOP_RELEASE_request, 0, 0);
-}
-
-static void
-onusr1(int s __unused)
-{
-	sigusr1++;
-}
-
-int
-main(int argc, char *argv[])
-{
-	int opt;
-	struct sscop *sscop;
-	struct sscop_param param;
-	struct sigaction sa;
-	int wait = 0;
-	u_int mask;
-#ifndef USE_LIBBEGEMOT
-	evEvent ev;
-#endif
-
-	/*
-	 * Default is to have the USER on stdin and SSCOP on stdout
-	 */
-	sscop_fd = 0;
-	user_fd = 1;
-	user_out_fd = -1;
-
-	memset(&param, 0, sizeof(param));
-	param.maxk = MAXUSRMSG;
-	param.maxj = 0;
-	param.maxcc = 4;
-	mask = SSCOP_SET_MAXK | SSCOP_SET_MAXJ | SSCOP_SET_MAXCC;
-
-	while((opt = getopt(argc, argv, "3a:befFhil:rt:v:V:wW:x")) != -1)
-		switch(opt) {
-
-		  case '3':
-			user_out_fd = 3;
-			break;
-
-		  case 'e':
-			end_at_eof = 0;
-			break;
-
-		  case 'f':
-			useframe = 1;
-			break;
-
-		  case 'F':
-			sscopframe = 1;
-			break;
-
-		  case 'h':
-			fprintf(stderr, usgtxt);
-			exit(0);
-
-		  case 'i':
-			unidir++;
-			break;
-
-		  case 'l':
-			loose = strtoul(optarg, NULL, 0);
-			break;
-
-		  case 'r':
-			sscop_fd = 1;
-			user_fd = 0;
-			break;
-
-		  case 'v':
-			sscop_vflag = strtoul(optarg, NULL, 16);
-			break;
-
-		  case 'V':
-			verbose = strtoul(optarg, NULL, 16);
-			break;
-
-		  case 'w':
-			wait = 1;
-			break;
-
-		  case 'a':
-		  case 't':
-		  case 'b':
-		  case 'x':
-		  case 'W':
-			parse_param(&param, &mask, opt, optarg);
-			break;
-		}
-
-	if(user_out_fd < 0)
-		user_out_fd = user_fd;
-
-#ifndef USE_LIBBEGEMOT
-	if (evCreate(&evctx))
-		err(1, "evCreate");
-#endif
-
-	/*
-	 * Catch USR1
-	 */
-	sa.sa_handler = onusr1;
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = SA_RESTART;
-	if(sigaction(SIGUSR1, &sa, NULL))
-		err(1, "sigaction(SIGUSR1)");
-
-	/*
-	 * Allocate and initialize SSCOP
-	 */
-	if ((sscop = sscop_create(NULL, &sscop_funcs)) == NULL)
-		err(1, NULL);
-	sscop_setdebug(sscop, sscop_vflag);
-	if ((errno = sscop_setparam(sscop, &param, &mask)) != 0)
-		err(1, "can't set sscop parameters %#x", mask);
-
-	/*
-	 * Register sscop fd
-	 */
-#ifdef USE_LIBBEGEMOT
-	if ((sscop_h = poll_register(sscop_fd, proto_infunc,
-	    sscop, POLL_IN)) == -1)
-		err(1, "can't select on sscop fd");
-#else
-	if (evSelectFD(evctx, sscop_fd, EV_READ, proto_infunc, sscop, &sscop_h))
-		err(1, "can't select on sscop fd");
-#endif
-
-	/*
-	 * if we are active - send establish request
-	 */
-	if(!wait)
-		sscop_aasig(sscop, SSCOP_ESTABLISH_request, NULL, 1);
-
-	/*
-	 * Run protocol until it get's ready
-	 */
-	while (sscop_fd >= 0 && !ready) {
-#ifdef USE_LIBBEGEMOT
-		poll_dispatch(1);
-#else
-		if (evGetNext(evctx, &ev, EV_WAIT) == 0) {
-			if (evDispatch(evctx, ev))
-				err(1, "dispatch event");
-		} else if (errno != EINTR)
-			err(1, "get event");
-#endif
-	}
-
-	/*
-	 * If this led to a closed file - exit.
-	 */
-	if (sscop_fd < 0) {
-		VERBOSE(("SSCOP file descriptor closed - exiting"));
-		sscop_destroy(sscop);
-		return 0;
-	}
-
-	VERBOSE(("READY - starting data transfer"));
-
-	if (!unidir &&
-#ifdef USE_LIBBEGEMOT
-	    ((user_h = poll_register(user_fd, user_infunc, sscop, POLL_IN)) == -1))
-#else
-	    evSelectFD(evctx, user_fd, EV_READ, user_infunc, sscop, &user_h))
-#endif
-		err(1, "can't select on sscop fd");
-
-	while (!sigusr1 && sscop_fd >= 0) {
-#ifdef USE_LIBBEGEMOT
-		poll_dispatch(1);
-#else
-		if (evGetNext(evctx, &ev, EV_WAIT) == 0) {
-			if (evDispatch(evctx, ev))
-				err(1, "dispatch event");
-		} else if (errno != EINTR)
-			err(1, "get event");
-#endif
-	}
-
-	if (sigusr1 && sscop_fd >= 0) {
-		/*
-		 * Release if we still have the connection
-		 */
-		sscop_aasig(sscop, SSCOP_RELEASE_request, NULL, 0);
-		while (!finished && sscop_fd >= 0) {
-#ifdef USE_LIBBEGEMOT
-			poll_dispatch(1);
-#else
-			if (evGetNext(evctx, &ev, EV_WAIT) == 0) {
-				if (evDispatch(evctx, ev))
-					err(1, "dispatch event");
-			} else if (errno != EINTR)
-				err(1, "get event");
-#endif
-		}
-	}
-
-	VERBOSE(("SSCOP file descriptor closed - exiting"));
-	sscop_destroy(sscop);
-
-	return (0);
-}
-
-
-
-/*
- * AAL OUTPUT
- */
-static void
-sscop_send_lower(struct sscop *sscop __unused, void *arg __unused,
-    struct SSCOP_MBUF_T *m)
-{
-	proto_msgout(m);
-}
-
-
-/*
- * Write the message to the user and move the window
- */
-static void
-uoutput(struct sscop *sscop, struct uni_msg *m)
-{
-	user_msgout(m);
-	sscop_window(sscop, +1);
-}
-
-/*
- * SSCOP AA-SIGNALS
- */
-static void
-sscop_send_upper(struct sscop *sscop, void *arg __unused, enum sscop_aasig sig,
-    struct SSCOP_MBUF_T *m, u_int p __unused)
-{
-	VERBOSE(("--> got aa %d(%s)", sig, sscop_signame(sig)));
-
-	switch (sig) {
-
-	  case SSCOP_RELEASE_indication:
-		if (end_at_eof) {
-			VERBOSE((" ... exiting"));
-#ifdef USE_LIBBEGEMOT
-			poll_unregister(sscop_h);
-#else
-			evDeselectFD(evctx, sscop_h);
-#endif
-			(void)close(sscop_fd);
-			sscop_fd = -1;
-		}
-		finished++;
-		if (m)
-			uni_msg_destroy(m);
-		break;
-
-	  case SSCOP_RELEASE_confirm:
-		if (end_at_eof) {
-			VERBOSE((" ... exiting"));
-#ifdef USE_LIBBEGEMOT
-			poll_unregister(sscop_h);
-#else
-			evDeselectFD(evctx, sscop_h);
-#endif
-			(void)close(sscop_fd);
-			sscop_fd = -1;
-		}
-		finished++;
-		break;
-
-	  case SSCOP_ESTABLISH_indication:
-		sscop_aasig(sscop, SSCOP_ESTABLISH_response, NULL, 1);
-		ready++;
-		if (m)
-			uni_msg_destroy(m);
-		break;
-
-	  case SSCOP_ESTABLISH_confirm:
-		ready++;
-		if (m)
-			uni_msg_destroy(m);
-		break;
-
-	  case SSCOP_DATA_indication:
-		assert(m != NULL);
-		uoutput(sscop, m);
-		break;
-
-	  case SSCOP_UDATA_indication:
-		assert(m != NULL);
-		VERBOSE(("UDATA.indication ignored"));
-		uni_msg_destroy(m);
-		break;
-
-	  case SSCOP_RECOVER_indication:
-		sscop_aasig(sscop, SSCOP_RECOVER_response, NULL, 0);
-		break;
-
-	  case SSCOP_RESYNC_indication:
-		sscop_aasig(sscop, SSCOP_RESYNC_response, NULL, 0);
-		if (m)
-			uni_msg_destroy(m);
-		break;
-
-	  case SSCOP_RESYNC_confirm:
-		break;
-
-	  case SSCOP_RETRIEVE_indication:
-	  case SSCOP_RETRIEVE_COMPL_indication:
-		warnx("Ooops. A retrieve indication");
-		abort();
-
-	  case SSCOP_ESTABLISH_request:
-	  case SSCOP_RELEASE_request:
-	  case SSCOP_ESTABLISH_response:
-	  case SSCOP_DATA_request:
-	  case SSCOP_UDATA_request:
-	  case SSCOP_RECOVER_response:
-	  case SSCOP_RESYNC_request:
-	  case SSCOP_RESYNC_response:
-	  case SSCOP_RETRIEVE_request:
-		warnx("bad signal for this direction");
-		abort();
-	}
-}
-
-/*
- * This get's called for MAAL
- */
-static void
-sscop_send_manage(struct sscop *sscop __unused, void *arg __unused,
-    enum sscop_maasig sig, struct uni_msg *m, u_int error, u_int cnt)
-{
-	VERBOSE(("--> got maa %d(%s)", sig, sscop_msigname(sig)));
-
-	switch (sig) {
-
-	  case SSCOP_MDATA_indication:
-		VERBOSE(("MDATA.indication ignored"));
-		uni_msg_destroy(m);
-		break;
-
-	  case SSCOP_MERROR_indication:
-		VERBOSE(("MAAL-ERROR.indication '%c' %u", error, cnt));
-		break;
-
-	  case SSCOP_MDATA_request:
-		warnx("bad signal for this direction");
-		abort();
-	}
-}
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 5887e25261a8..ac9edf6a8bcb 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -1,368 +1,358 @@
 # $FreeBSD$
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
     arpa
     ..
     atf-c
     ..
     atf-c++
     ..
     bsm
     ..
     bsnmp
     ..
     c++
         v1
             __algorithm
             ..
             __bit
             ..
             __charconv
             ..
             __chrono
             ..
             __compare
             ..
             __concepts
             ..
             __coroutine
             ..
             __debug_utils
             ..
             __filesystem
             ..
             __format
             ..
             __functional
             ..
             __fwd
             ..
             __ios
             ..
             __iterator
             ..
             __memory
             ..
             __numeric
             ..
             __random
             ..
             __ranges
             ..
             __string
             ..
             __thread
             ..
             __type_traits
             ..
             __utility
             ..
             __variant
             ..
             experimental
             ..
             ext
             ..
         ..
     ..
     cam
         ata
         ..
         mmc
         ..
         nvme
         ..
         scsi
         ..
     ..
     casper
     ..
     crypto
     ..
     dev
         acpica
         ..
         agp
         ..
         an
         ..
         ciss
         ..
         evdev
         ..
         filemon
         ..
         firewire
         ..
         hid
         ..
         hwpmc
         ..
         hyperv
         ..
         ic
         ..
         iicbus
         ..
         io
         ..
         mfi
         ..
         mlx5
         ..
         mmc
         ..
         mpt
             mpilib
             ..
         ..
         nvme
         ..
         ofw
         ..
         pbio
         ..
         pci
         ..
         powermac_nvram
         ..
         ppbus
         ..
         pwm
         ..
         smbus
         ..
         speaker
         ..
         tcp_log
         ..
         usb
         ..
         veriexec
         ..
         vkbd
         ..
         wg
         ..
         wi
         ..
     ..
     devdctl
     ..
     edit
         readline
         ..
     ..
     fs
         cuse
         ..
         devfs
         ..
         fdescfs
         ..
         msdosfs
         ..
         nfs
         ..
         nullfs
         ..
         procfs
         ..
         smbfs
         ..
         udf
         ..
         unionfs
         ..
     ..
     gcc
         4.2
         ..
     ..
     geom
         cache
         ..
         concat
         ..
         eli
         ..
         gate
         ..
         journal
         ..
         label
         ..
         mirror
         ..
         mountver
         ..
         multipath
         ..
         nop
         ..
         raid
         ..
         raid3
         ..
         shsec
         ..
         stripe
         ..
         union
         ..
         virstor
         ..
     ..
     gssapi
     ..
     infiniband
         complib
         ..
         iba
         ..
         opensm
         ..
         vendor
         ..
     ..
     isofs
         cd9660
         ..
     ..
     kadm5
     ..
     krb5
     ..
     lib80211
     ..
     lib9p
     ..
     libipt
     ..
     libmilter
     ..
     libxo
     ..
     lzma
     ..
     machine
         pc
         ..
     ..
     net
         altq
         ..
         route
         ..
     ..
     net80211
     ..
     netgraph
         atm
         ..
         bluetooth
             include
             ..
         ..
         netflow
         ..
     ..
     netinet
         cc
         ..
         netdump
         ..
         tcp_stacks
         ..
     ..
     netinet6
     ..
     netlink
         route
         ..
     ..
     netipsec
     ..
-    netnatm
-        api
-        ..
-        msg
-        ..
-        saal
-        ..
-        sig
-        ..
-    ..
     netpfil
         pf
         ..
     ..
     netsmb
     ..
     nfs
     ..
     nfsclient
     ..
     nfsserver
     ..
     opencsd
         c_api
         ..
         etmv3
         ..
         etmv4
         ..
         ptm
         ..
         stm
         ..
     ..
     openssl
     ..
     pcap
     ..
     protocols
     ..
     rdma
     ..
     rpc
     ..
     rpcsvc
     ..
     security
         audit
         ..
         mac_biba
         ..
         mac_bsdextended
         ..
         mac_lomac
         ..
         mac_mls
         ..
         mac_partition
         ..
         mac_veriexec
         ..
     ..
     sys
         disk
         ..
     ..
     teken
     ..
     ufs
         ffs
         ..
         ufs
         ..
     ..
     vm
     ..
     xlocale
     ..
 ..
diff --git a/lib/Makefile b/lib/Makefile
index 8d4115d29602..e791c983cc77 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,230 +1,229 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 # The SUBDIR_BOOTSTRAP list is a small set of libraries which are used by many
 # of the other libraries.  These are built first with a .WAIT between them
 # and the main list to avoid needing a SUBDIR_DEPEND line on every library
 # naming just these few items.
 
 SUBDIR_BOOTSTRAP= \
 	csu \
 	.WAIT \
 	libc \
 	libc_nonshared \
 	libcompiler_rt \
 	${_libclang_rt} \
 	libc++ \
 	libc++experimental \
 	libcxxrt \
 	libelf \
 	libssp \
 	libssp_nonshared \
 	msun
 
 # The main list; please keep these sorted alphabetically.
 # The only exception is sqlite3: we place it at the start of the list since it
 # takes a long time to build and starting it first improves parallelism.
 
 SUBDIR=	${SUBDIR_BOOTSTRAP} \
 	.WAIT \
 	libsqlite3 \
 	geom \
 	lib9p \
 	libalias \
 	libarchive \
 	libauditd \
 	libbegemot \
 	libblocksruntime \
 	libbsddialog \
 	libbsdstat \
 	libbsm \
 	libbz2 \
 	libcalendar \
 	libcam \
 	libcapsicum \
 	libcasper \
 	libcompat \
 	libcrypt \
 	libdevctl \
 	libdevdctl \
 	libdevinfo \
 	libdevstat \
 	libdl \
 	libdwarf \
 	libedit \
 	libelftc \
 	libevent1 \
 	libexecinfo \
 	libexpat \
 	libfetch \
 	libgcc_eh \
 	libgcc_s \
 	libgeom \
 	libifconfig \
 	libipsec \
 	libiscsiutil \
 	libjail \
 	libkiconv \
 	libkvm \
 	liblua \
 	liblzma \
 	libmemstat \
 	libmd \
 	libmixer \
 	libmt \
 	lib80211 \
 	libnetbsd \
 	libnetmap \
 	libnv \
 	libopenbsd \
 	libpam \
 	libpathconv \
 	libpcap \
 	libpjdlog \
 	libproc \
 	libprocstat \
 	libregex \
 	librpcsvc \
 	librss \
 	librt \
 	librtld_db \
 	libsbuf \
 	libsmb \
 	libstdbuf \
 	libstdthreads \
 	libsysdecode \
 	libtacplus \
 	libthr \
 	libthread_db \
 	libucl \
 	libufs \
 	libugidfw \
 	libulog \
 	libutil \
 	${_libvgl} \
 	libwrap \
 	libxo \
 	liby \
 	libz \
 	libzstd \
 	ncurses
 
 # Inter-library dependencies.  When the makefile for a library contains LDADD
 # libraries, those libraries should be listed as build order dependencies here.
 
 SUBDIR_DEPEND_geom=	libufs
 SUBDIR_DEPEND_googletest= libregex
 SUBDIR_DEPEND_libarchive= libz libbz2 libexpat liblzma libmd libzstd
 SUBDIR_DEPEND_libauditdm= libbsm
 SUBDIR_DEPEND_libbsddialog= ncurses
 SUBDIR_DEPEND_libbsnmp= ${_libnetgraph}
 SUBDIR_DEPEND_libc++:= libcxxrt
 # libssp_nonshared doesn't need to be linked into libc on every arch, but it is
 # small enough to build that this bit of serialization is likely insignificant.
 SUBDIR_DEPEND_libc= libcompiler_rt libssp_nonshared
 SUBDIR_DEPEND_libcam= libsbuf
 SUBDIR_DEPEND_libcasper= libnv
 SUBDIR_DEPEND_libdevstat= libkvm
 SUBDIR_DEPEND_libdpv= libfigpar ncurses libutil
 SUBDIR_DEPEND_libedit= ncurses
 SUBDIR_DEPEND_libgeom= libexpat libsbuf
 SUBDIR_DEPEND_librpcsec_gss= libgssapi
 SUBDIR_DEPEND_libmagic= libz
 SUBDIR_DEPEND_libmemstat= libkvm
 SUBDIR_DEPEND_libpam= libcrypt ${_libradius} librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err}
 SUBDIR_DEPEND_libpjdlog= libutil
 SUBDIR_DEPEND_libprocstat= libkvm libutil
 SUBDIR_DEPEND_libradius= libmd
 SUBDIR_DEPEND_libsmb= libkiconv
 SUBDIR_DEPEND_libtacplus= libmd
 SUBDIR_DEPEND_libulog= libmd
 SUBDIR_DEPEND_libunbound= ${_libldns}
 SUBDIR_DEPEND_liblzma= libthr
 .if ${MK_OFED} != "no"
 SUBDIR_DEPEND_libpcap= ofed
 .endif
 
 .if !defined(COMPAT_32BIT)
 SUBDIR+=	flua
 SUBDIR_DEPEND_flua=	libjail
 .endif
 
 # NB: keep these sorted by MK_* knobs
 
-SUBDIR.${MK_ATM}+=	libngatm
 SUBDIR.${MK_BEARSSL}+=	libbearssl libsecureboot
 SUBDIR.${MK_BLACKLIST}+=libblacklist
 SUBDIR.${MK_BLUETOOTH}+=libbluetooth libsdp
 SUBDIR.${MK_BSNMP}+=	libbsnmp
 
 .if !defined(COMPAT_32BIT) && !defined(COMPAT_SOFTFP)
 .if ${MK_CLANG} != "no" || ${MK_LLD} != "no" || \
     ${MK_LLDB} != "no" || ${MK_LLVM_BINUTILS} != "no"
 SUBDIR+=	clang
 .endif
 .endif
 
 SUBDIR.${MK_CUSE}+= 	libcuse
 SUBDIR.${MK_TOOLCHAIN}+=libpe
 SUBDIR.${MK_DIALOG}+=	libdpv libfigpar
 SUBDIR.${MK_FILE}+=	libmagic
 SUBDIR.${MK_GPIO}+=	libgpio
 SUBDIR.${MK_GSSAPI}+=	libgssapi librpcsec_gss
 SUBDIR.${MK_ICONV}+=	libiconv_modules
 SUBDIR.${MK_KERBEROS_SUPPORT}+=	libcom_err
 SUBDIR.${MK_LDNS}+=	libldns
 SUBDIR.${MK_STATS}+=	libstats
 
 # The libraries under libclang_rt can only be built by clang.
 .if ${COMPILER_TYPE} == "clang"
 _libclang_rt=	libclang_rt
 .elif (${MK_ASAN} != "no" || ${MK_UBSAN} != "no") && make(all)
 .error Requested build with sanitizers but cannot build runtime libraries!
 .endif
 
 SUBDIR.${MK_EFI}+=	libefivar
 SUBDIR.${MK_GOOGLETEST}+=	googletest
 SUBDIR.${MK_NETGRAPH}+=	libnetgraph
 SUBDIR.${MK_NIS}+=	libypclnt
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 _libvgl=	libvgl
 .endif
 
 .if ${MACHINE_CPUARCH} == "aarch64"
 SUBDIR.${MK_PMC}+=	libopencsd
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
 SUBDIR.${MK_PMC}+=	libipt
 SUBDIR.${MK_BHYVE}+=	libvmmapi
 .endif
 
 .if ${MACHINE_ARCH} != "powerpc"
 SUBDIR.${MK_OPENMP}+=	libomp
 .endif
 .if !defined(COMPAT_32BIT) && ${MK_USB} != "no"
 SUBDIR.${MK_OPENSSH}+=	libcbor libfido2
 .endif
 SUBDIR.${MK_OPENSSL}+=	libmp
 SUBDIR.${MK_PF}+=	libpfctl
 SUBDIR.${MK_PMC}+=	libpmc libpmcstat
 SUBDIR.${MK_RADIUS_SUPPORT}+=	libradius
 SUBDIR.${MK_SENDMAIL}+=	libmilter libsm libsmdb libsmutil
 SUBDIR.${MK_TELNET}+=	libtelnet
 SUBDIR.${MK_TESTS_SUPPORT}+=	atf
 SUBDIR.${MK_TESTS_SUPPORT}+=	liblutok
 SUBDIR.${MK_TESTS}+=	tests
 SUBDIR.${MK_UNBOUND}+=	libunbound
 SUBDIR.${MK_USB}+=	libusbhid libusb
 SUBDIR.${MK_OFED}+=	ofed
 SUBDIR.${MK_VERIEXEC}+=	libveriexec
 SUBDIR.${MK_ZFS}+=	libbe
 
 .if !make(install)
 SUBDIR_PARALLEL=
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/lib/libngatm/Makefile b/lib/libngatm/Makefile
deleted file mode 100644
index 47dc716b800e..000000000000
--- a/lib/libngatm/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# $FreeBSD$
-#
-# Author: Harti Brandt <harti@freebsd.org>
-#
-LIB=	ngatm
-SHLIB_MAJOR= 4
-MAN=	libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3
-
-# source of the library lives in contrib
-SDIR=	${SRCTOP}/sys
-CTRB=	${SRCTOP}/contrib/ngatm
-LIBBASE= ${SDIR}/contrib/ngatm
-
-CFLAGS+= -I${LIBBASE} -I${.OBJDIR} -I${CTRB}/libngatm
-# CFLAGS+= -DSSCOP_DEBUG -DSSCFU_DEBUG -DUNI_DEBUG -DCCATM_DEBUG
-
-.PATH: ${LIBBASE}/netnatm ${LIBBASE}/netnatm/saal ${LIBBASE}/netnatm/misc \
-	${LIBBASE}/netnatm/msg ${LIBBASE}/netnatm/sig ${LIBBASE}/netnatm/api
-.PATH: ${CTRB}/libngatm ${CTRB}/man
-
-SRCS=	unimsg.c unimsg_common.c straddr.c				\
-	traffic.c uni_ie.c uni_msg.c					\
-	saal_sscop.c saal_sscfu.c					\
-	sig_call.c sig_coord.c sig_party.c sig_print.c sig_reset.c	\
-	sig_uni.c sig_unimsgcpy.c sig_verify.c				\
-	cc_conn.c cc_user.c cc_sig.c cc_data.c cc_port.c unisap.c	\
-	cc_dump.c
-
-# Includes
-INCSGROUPS= INCSATM INCSSAAL INCSMSG INCSSIG INCSAPI
-
-# common files
-INCSATMDIR= $(INCLUDEDIR)/netnatm
-INCSATM= unimsg.h addr.h
-
-# signaling AAL
-INCSSAALDIR= $(INCLUDEDIR)/netnatm/saal
-INCSSAAL= saal/sscfu.h saal/sscfudef.h saal/sscop.h saal/sscopdef.h
-
-# message parsing
-INCSMSGDIR= $(INCLUDEDIR)/netnatm/msg
-INCSMSG= msg/uni_config.h msg/uni_hdr.h msg/uni_ie.h msg/uni_msg.h	\
-	 msg/unimsglib.h msg/uniprint.h msg/unistruct.h
-
-# signaling layer
-INCSSIGDIR= $(INCLUDEDIR)/netnatm/sig
-INCSSIG= sig/uni.h sig/unidef.h sig/unisig.h
-
-# call control layer
-INCSAPIDIR= $(INCLUDEDIR)/netnatm/api
-INCSAPI= api/atmapi.h api/ccatm.h api/unisap.h
-
-.include <bsd.lib.mk>
diff --git a/lib/libngatm/Makefile.depend b/lib/libngatm/Makefile.depend
deleted file mode 100644
index b9209eb15132..000000000000
--- a/lib/libngatm/Makefile.depend
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	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/share/man/man4/Makefile b/share/man/man4/Makefile
index da5344bdeb68..1e6354e314fe 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,1048 +1,1043 @@
 #	@(#)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_ged.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} \
 	${_aout.4} \
 	${_apic.4} \
 	arcmsr.4 \
 	arswitch.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 \
 	bcm5974.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 \
 	boottrace.4 \
 	bpf.4 \
 	bridge.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 \
 	${_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 \
 	enic.4 \
 	epair.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 \
 	${_ftgpio.4} \
 	${_ftwd.4} \
 	full.4 \
 	fwe.4 \
 	fwip.4 \
 	fwohci.4 \
 	fxp.4 \
 	gbde.4 \
 	gdb.4 \
 	gem.4 \
 	genet.4 \
 	genetlink.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 \
 	ietp.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 \
 	${_igc.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 \
 	iwlwifi.4 \
 	iwlwififw.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 \
 	${_kvmclock.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_ddb.4 \
 	mac_ifoff.4 \
 	mac_lomac.4 \
 	mac_mls.4 \
 	mac_none.4 \
 	mac_ntpd.4 \
 	mac_partition.4 \
 	mac_portacl.4 \
 	mac_priority.4 \
 	mac_seeotheruids.4 \
 	mac_stub.4 \
 	mac_test.4 \
 	malo.4 \
 	max44009.4 \
 	md.4 \
 	mdio.4 \
 	me.4 \
 	mem.4 \
 	mfi.4 \
 	${_mgb.4} \
 	miibus.4 \
 	mld.4 \
 	mlx.4 \
 	mlx4en.4 \
 	mlx5en.4 \
 	mmc.4 \
 	mmcsd.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 \
 	net80211.4 \
 	netdump.4 \
 	netfpga10g_nf10bmac.4 \
 	netgdb.4 \
 	netgraph.4 \
 	netintro.4 \
 	netlink.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_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_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 \
 	ng_vlan_rotate.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} \
 	oce.4 \
 	ocs_fc.4\
 	ohci.4 \
 	openfirm.4 \
 	orm.4 \
 	${_ossl.4} \
 	ow.4 \
 	ow_temp.4 \
 	owc.4 \
 	ovpn.4 \
 	${_padlock.4} \
 	pass.4 \
 	pca954x.4 \
 	pccard.4 \
 	pccbb.4 \
 	pcf.4 \
 	pcf8574.4 \
 	pcf8591.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_c2xxx.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 \
 	rtnetlink.4 \
 	rtsx.4 \
 	rtw88.4 \
 	rtw88fw.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_als4000.4 \
 	snd_atiixp.4 \
 	snd_cmi.4 \
 	snd_cs4281.4 \
 	snd_csa.4 \
 	snd_emu10k1.4 \
 	snd_emu10kx.4 \
 	snd_envy24.4 \
 	snd_envy24ht.4 \
 	snd_es137x.4 \
 	snd_fm801.4 \
 	snd_hda.4 \
 	snd_hdspe.4 \
 	snd_ich.4 \
 	snd_maestro3.4 \
 	snd_neomagic.4 \
 	snd_solo.4 \
 	snd_spicds.4 \
 	snd_t4dwave.4 \
 	snd_uaudio.4 \
 	snd_via8233.4 \
 	snd_via82c686.4 \
 	snd_vibes.4 \
 	sndstat.4 \
 	snp.4 \
 	spigen.4 \
 	${_spkr.4} \
 	splash.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 \
 	tcp_rack.4 \
 	tdfx.4 \
 	termios.4 \
 	textdump.4 \
 	ti.4 \
 	timecounters.4 \
 	${_tpm.4} \
 	tslog.4 \
 	tty.4 \
 	tun.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} \
 	${_wdatwd.4} \
 	wg.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+=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+=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+=genet.4 if_genet.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+=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+=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+=${_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+=wg.4 if_wg.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
 _ftgpio.4=	ftgpio.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_nfe.4=	if_nfe.4
 _if_urtw.4=	if_urtw.4
 _if_vmx.4=	if_vmx.4
 _if_wpi.4=	if_wpi.4
 _igc.4=		igc.4
 _imcsmb.4=	imcsmb.4
 _io.4=		io.4
 _itwd.4=	itwd.4
 _kvmclock.4=	kvmclock.4
 _mgb.4=		mgb.4
 _nda.4=		nda.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
 _padlock.4=	padlock.4
 _pchtherm.4=	pchtherm.4
 _qat_c2xxx.4=	qat_c2xxx.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
 _vmd.4=		vmd.4
 _vmx.4=		vmx.4
 _wbwd.4=	wbwd.4
 _wdatwd.4=	wdatwd.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
 
 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} == "powerpc"
 _nvd.4= 	nvd.4
 _nvme.4=	nvme.4
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
 	 ${MACHINE_CPUARCH} == "aarch64"
 _ipmi.4=	ipmi.4
 _linux.4=	linux.4
 _ossl.4=	ossl.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) || ${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_kinst.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+=		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/netgraph.4 b/share/man/man4/netgraph.4
index bbea09264435..3f79a47c2c40 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -1,1480 +1,1477 @@
 .\" Copyright (c) 1996-1999 Whistle Communications, Inc.
 .\" All rights reserved.
 .\"
 .\" Subject to the following obligations and disclaimer of warranty, use and
 .\" redistribution of this software, in source or object code forms, with or
 .\" without modifications are expressly permitted by Whistle Communications;
 .\" provided, however, that:
 .\" 1. Any and all reproductions of the source or object code must include the
 .\"    copyright notice above and the following disclaimer of warranties; and
 .\" 2. No rights are granted, in any manner or form, to use Whistle
 .\"    Communications, Inc. trademarks, including the mark "WHISTLE
 .\"    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
 .\"    such appears in the above copyright notice or in the software.
 .\"
 .\" THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
 .\" TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
 .\" REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
 .\" INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
 .\" WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
 .\" REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
 .\" SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
 .\" IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
 .\" RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
 .\" WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
 .\" PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
 .\" SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
 .\" OF SUCH DAMAGE.
 .\"
 .\" Authors: Julian Elischer <julian@FreeBSD.org>
 .\"          Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $Whistle: netgraph.4,v 1.7 1999/01/28 23:54:52 julian Exp $
 .\" $FreeBSD$
 .\"
 .Dd September 29, 2021
 .Dt NETGRAPH 4
 .Os
 .Sh NAME
 .Nm netgraph
 .Nd "graph based kernel networking subsystem"
 .Sh DESCRIPTION
 The
 .Nm
 system provides a uniform and modular system for the implementation
 of kernel objects which perform various networking functions.
 The objects, known as
 .Em nodes ,
 can be arranged into arbitrarily complicated graphs.
 Nodes have
 .Em hooks
 which are used to connect two nodes together, forming the edges in the graph.
 Nodes communicate along the edges to process data, implement protocols, etc.
 .Pp
 The aim of
 .Nm
 is to supplement rather than replace the existing kernel networking
 infrastructure.
 It provides:
 .Pp
 .Bl -bullet -compact
 .It
 A flexible way of combining protocol and link level drivers.
 .It
 A modular way to implement new protocols.
 .It
 A common framework for kernel entities to inter-communicate.
 .It
 A reasonably fast, kernel-based implementation.
 .El
 .Ss Nodes and Types
 The most fundamental concept in
 .Nm
 is that of a
 .Em node .
 All nodes implement a number of predefined methods which allow them
 to interact with other nodes in a well defined manner.
 .Pp
 Each node has a
 .Em type ,
 which is a static property of the node determined at node creation time.
 A node's type is described by a unique
 .Tn ASCII
 type name.
 The type implies what the node does and how it may be connected
 to other nodes.
 .Pp
 In object-oriented language, types are classes, and nodes are instances
 of their respective class.
 All node types are subclasses of the generic node
 type, and hence inherit certain common functionality and capabilities
 (e.g., the ability to have an
 .Tn ASCII
 name).
 .Pp
 Nodes may be assigned a globally unique
 .Tn ASCII
 name which can be
 used to refer to the node.
 The name must not contain the characters
 .Ql .\&
 or
 .Ql \&: ,
 and is limited to
 .Dv NG_NODESIZ
 characters (including the terminating
 .Dv NUL
 character).
 .Pp
 Each node instance has a unique
 .Em ID number
 which is expressed as a 32-bit hexadecimal value.
 This value may be used to refer to a node when there is no
 .Tn ASCII
 name assigned to it.
 .Ss Hooks
 Nodes are connected to other nodes by connecting a pair of
 .Em hooks ,
 one from each node.
 Data flows bidirectionally between nodes along
 connected pairs of hooks.
 A node may have as many hooks as it
 needs, and may assign whatever meaning it wants to a hook.
 .Pp
 Hooks have these properties:
 .Bl -bullet
 .It
 A hook has an
 .Tn ASCII
 name which is unique among all hooks
 on that node (other hooks on other nodes may have the same name).
 The name must not contain the characters
 .Ql .\&
 or
 .Ql \&: ,
 and is
 limited to
 .Dv NG_HOOKSIZ
 characters (including the terminating
 .Dv NUL
 character).
 .It
 A hook is always connected to another hook.
 That is, hooks are
 created at the time they are connected, and breaking an edge by
 removing either hook destroys both hooks.
 .It
 A hook can be set into a state where incoming packets are always queued
 by the input queueing system, rather than being delivered directly.
 This can be used when the data is sent from an interrupt handler,
 and processing must be quick so as not to block other interrupts.
 .It
 A hook may supply overriding receive data and receive message functions,
 which should be used for data and messages received through that hook
 in preference to the general node-wide methods.
 .El
 .Pp
 A node may decide to assign special meaning to some hooks.
 For example, connecting to the hook named
 .Va debug
 might trigger
 the node to start sending debugging information to that hook.
 .Ss Data Flow
 Two types of information flow between nodes: data messages and
 control messages.
 Data messages are passed in
 .Vt mbuf chains
 along the edges
 in the graph, one edge at a time.
 The first
 .Vt mbuf
 in a chain must have the
 .Dv M_PKTHDR
 flag set.
 Each node decides how to handle data received through one of its hooks.
 .Pp
 Along with data, nodes can also receive control messages.
 There are generic and type-specific control messages.
 Control messages have a common
 header format, followed by type-specific data, and are binary structures
 for efficiency.
 However, node types may also support conversion of the
 type-specific data between binary and
 .Tn ASCII
 formats,
 for debugging and human interface purposes (see the
 .Dv NGM_ASCII2BINARY
 and
 .Dv NGM_BINARY2ASCII
 generic control messages below).
 Nodes are not required to support these conversions.
 .Pp
 There are three ways to address a control message.
 If there is a sequence of edges connecting the two nodes, the message
 may be
 .Dq source routed
 by specifying the corresponding sequence
 of
 .Tn ASCII
 hook names as the destination address for the message (relative
 addressing).
 If the destination is adjacent to the source, then the source
 node may simply specify (as a pointer in the code) the hook across which the
 message should be sent.
 Otherwise, the recipient node's global
 .Tn ASCII
 name
 (or equivalent ID-based name) is used as the destination address
 for the message (absolute addressing).
 The two types of
 .Tn ASCII
 addressing
 may be combined, by specifying an absolute start node and a sequence
 of hooks.
 Only the
 .Tn ASCII
 addressing modes are available to control programs outside the kernel;
 use of direct pointers is limited to kernel modules.
 .Pp
 Messages often represent commands that are followed by a reply message
 in the reverse direction.
 To facilitate this, the recipient of a
 control message is supplied with a
 .Dq return address
 that is suitable for addressing a reply.
 .Pp
 Each control message contains a 32-bit value, called a
 .Dq typecookie ,
 indicating the type of the message, i.e.\& how to interpret it.
 Typically each type defines a unique typecookie for the messages
 that it understands.
 However, a node may choose to recognize and
 implement more than one type of messages.
 .Pp
 If a message is delivered to an address that implies that it arrived
 at that node through a particular hook (as opposed to having been directly
 addressed using its ID or global name) then that hook is identified to the
 receiving node.
 This allows a message to be re-routed or passed on, should
 a node decide that this is required, in much the same way that data packets
 are passed around between nodes.
 A set of standard
 messages for flow control and link management purposes are
 defined by the base system that are usually
 passed around in this manner.
 Flow control message would usually travel
 in the opposite direction to the data to which they pertain.
 .Ss Netgraph is (Usually) Functional
 In order to minimize latency, most
 .Nm
 operations are functional.
 That is, data and control messages are delivered by making function
 calls rather than by using queues and mailboxes.
 For example, if node
 A wishes to send a data
 .Vt mbuf
 to neighboring node B, it calls the
 generic
 .Nm
 data delivery function.
 This function in turn locates
 node B and calls B's
 .Dq receive data
 method.
 There are exceptions to this.
 .Pp
 Each node has an input queue, and some operations can be considered to
 be
 .Em writers
 in that they alter the state of the node.
 Obviously, in an SMP
 world it would be bad if the state of a node were changed while another
 data packet were transiting the node.
 For this purpose, the input queue implements a
 .Em reader/writer
 semantic so that when there is a writer in the node, all other requests
 are queued, and while there are readers, a writer, and any following
 packets are queued.
 In the case where there is no reason to queue the
 data, the input method is called directly, as mentioned above.
 .Pp
 A node may declare that all requests should be considered as writers,
 or that requests coming in over a particular hook should be considered to
 be a writer, or even that packets leaving or entering across a particular
 hook should always be queued, rather than delivered directly (often useful
 for interrupt routines who want to get back to the hardware quickly).
 By default, all control message packets are considered to be writers
 unless specifically declared to be a reader in their definition.
 (See
 .Dv NGM_READONLY
 in
 .In netgraph/ng_message.h . )
 .Pp
 While this mode of operation
 results in good performance, it has a few implications for node
 developers:
 .Bl -bullet
 .It
 Whenever a node delivers a data or control message, the node
 may need to allow for the possibility of receiving a returning
 message before the original delivery function call returns.
 .It
 .Nm Netgraph
 provides internal synchronization between nodes.
 Data always enters a
 .Dq graph
 at an
 .Em edge node .
 An
 .Em edge node
 is a node that interfaces between
 .Nm
 and some other part of the system.
 Examples of
 .Dq edge nodes
 include device drivers, the
 .Vt socket , ether , tty ,
 and
 .Vt ksocket
 node type.
 In these
 .Em edge nodes ,
 the calling thread directly executes code in the node, and from that code
 calls upon the
 .Nm
 framework to deliver data across some edge
 in the graph.
 From an execution point of view, the calling thread will execute the
 .Nm
 framework methods, and if it can acquire a lock to do so,
 the input methods of the next node.
 This continues until either the data is discarded or queued for some
 device or system entity, or the thread is unable to acquire a lock on
 the next node.
 In that case, the data is queued for the node, and execution rewinds
 back to the original calling entity.
 The queued data will be picked up and processed by either the current
 holder of the lock when they have completed their operations, or by
 a special
 .Nm
 thread that is activated when there are such items
 queued.
 .It
 It is possible for an infinite loop to occur if the graph contains cycles.
 .El
 .Pp
 So far, these issues have not proven problematical in practice.
 .Ss Interaction with Other Parts of the Kernel
 A node may have a hidden interaction with other components of the
 kernel outside of the
 .Nm
 subsystem, such as device hardware,
 kernel protocol stacks, etc.
 In fact, one of the benefits of
 .Nm
 is the ability to join disparate kernel networking entities together in a
 consistent communication framework.
 .Pp
 An example is the
 .Vt socket
 node type which is both a
 .Nm
 node and a
 .Xr socket 2
 in the protocol family
 .Dv PF_NETGRAPH .
 Socket nodes allow user processes to participate in
 .Nm .
 Other nodes communicate with socket nodes using the usual methods, and the
 node hides the fact that it is also passing information to and from a
 cooperating user process.
 .Pp
 Another example is a device driver that presents
 a node interface to the hardware.
 .Ss Node Methods
 Nodes are notified of the following actions via function calls
 to the following node methods,
 and may accept or reject that action (by returning the appropriate
 error code):
 .Bl -tag -width 2n
 .It Creation of a new node
 The constructor for the type is called.
 If creation of a new node is allowed, constructor method may allocate any
 special resources it needs.
 For nodes that correspond to hardware, this is typically done during the
 device attach routine.
 Often a global
 .Tn ASCII
 name corresponding to the
 device name is assigned here as well.
 .It Creation of a new hook
 The hook is created and tentatively
 linked to the node, and the node is told about the name that will be
 used to describe this hook.
 The node sets up any special data structures
 it needs, or may reject the connection, based on the name of the hook.
 .It Successful connection of two hooks
 After both ends have accepted their
 hooks, and the links have been made, the nodes get a chance to
 find out who their peer is across the link, and can then decide to reject
 the connection.
 Tear-down is automatic.
 This is also the time at which
 a node may decide whether to set a particular hook (or its peer) into
 the
 .Em queueing
 mode.
 .It Destruction of a hook
 The node is notified of a broken connection.
 The node may consider some hooks
 to be critical to operation and others to be expendable: the disconnection
 of one hook may be an acceptable event while for another it
 may effect a total shutdown for the node.
 .It Preshutdown of a node
 This method is called before real shutdown, which is discussed below.
 While in this method, the node is fully operational and can send a
 .Dq goodbye
 message to its peers, or it can exclude itself from the chain and reconnect
 its peers together, like the
 .Xr ng_tee 4
 node type does.
 .It Shutdown of a node
 This method allows a node to clean up
 and to ensure that any actions that need to be performed
 at this time are taken.
 The method is called by the generic (i.e., superclass)
 node destructor which will get rid of the generic components of the node.
 Some nodes (usually associated with a piece of hardware) may be
 .Em persistent
 in that a shutdown breaks all edges and resets the node,
 but does not remove it.
 In this case, the shutdown method should not
 free its resources, but rather, clean up and then call the
 .Fn NG_NODE_REVIVE
 macro to signal the generic code that the shutdown is aborted.
 In the case where the shutdown is started by the node itself due to hardware
 removal or unloading (via
 .Fn ng_rmnode_self ) ,
 it should set the
 .Dv NGF_REALLY_DIE
 flag to signal to its own shutdown method that it is not to persist.
 .El
 .Ss Sending and Receiving Data
 Two other methods are also supported by all nodes:
 .Bl -tag -width 2n
 .It Receive data message
 A
 .Nm
 .Em queueable request item ,
 usually referred to as an
 .Em item ,
 is received by this function.
 The item contains a pointer to an
 .Vt mbuf .
 .Pp
 The node is notified on which hook the item has arrived,
 and can use this information in its processing decision.
 The receiving node must always
 .Fn NG_FREE_M
 the
 .Vt mbuf chain
 on completion or error, or pass it on to another node
 (or kernel module) which will then be responsible for freeing it.
 Similarly, the
 .Em item
 must be freed if it is not to be passed on to another node, by using the
 .Fn NG_FREE_ITEM
 macro.
 If the item still holds references to
 .Vt mbufs
 at the time of
 freeing then they will also be appropriately freed.
 Therefore, if there is any chance that the
 .Vt mbuf
 will be
 changed or freed separately from the item, it is very important
 that it be retrieved using the
 .Fn NGI_GET_M
 macro that also removes the reference within the item.
 (Or multiple frees of the same object will occur.)
 .Pp
 If it is only required to examine the contents of the
 .Vt mbufs ,
 then it is possible to use the
 .Fn NGI_M
 macro to both read and rewrite
 .Vt mbuf
 pointer inside the item.
 .Pp
 If developer needs to pass any meta information along with the
 .Vt mbuf chain ,
 he should use
 .Xr mbuf_tags 9
 framework.
 .Bf -symbolic
 Note that old
 .Nm
 specific meta-data format is obsoleted now.
 .Ef
 .Pp
 The receiving node may decide to defer the data by queueing it in the
 .Nm
 NETISR system (see below).
 It achieves this by setting the
 .Dv HK_QUEUE
 flag in the flags word of the hook on which that data will arrive.
 The infrastructure will respect that bit and queue the data for delivery at
 a later time, rather than deliver it directly.
 A node may decide to set
 the bit on the
 .Em peer
 node, so that its own output packets are queued.
 .Pp
 The node may elect to nominate a different receive data function
 for data received on a particular hook, to simplify coding.
 It uses the
 .Fn NG_HOOK_SET_RCVDATA hook fn
 macro to do this.
 The function receives the same arguments in every way
 other than it will receive all (and only) packets from that hook.
 .It Receive control message
 This method is called when a control message is addressed to the node.
 As with the received data, an
 .Em item
 is received, with a pointer to the control message.
 The message can be examined using the
 .Fn NGI_MSG
 macro, or completely extracted from the item using the
 .Fn NGI_GET_MSG
 which also removes the reference within the item.
 If the item still holds a reference to the message when it is freed
 (using the
 .Fn NG_FREE_ITEM
 macro), then the message will also be freed appropriately.
 If the
 reference has been removed, the node must free the message itself using the
 .Fn NG_FREE_MSG
 macro.
 A return address is always supplied, giving the address of the node
 that originated the message so a reply message can be sent anytime later.
 The return address is retrieved from the
 .Em item
 using the
 .Fn NGI_RETADDR
 macro and is of type
 .Vt ng_ID_t .
 All control messages and replies are
 allocated with the
 .Xr malloc 9
 type
 .Dv M_NETGRAPH_MSG ,
 however it is more convenient to use the
 .Fn NG_MKMESSAGE
 and
 .Fn NG_MKRESPONSE
 macros to allocate and fill out a message.
 Messages must be freed using the
 .Fn NG_FREE_MSG
 macro.
 .Pp
 If the message was delivered via a specific hook, that hook will
 also be made known, which allows the use of such things as flow-control
 messages, and status change messages, where the node may want to forward
 the message out another hook to that on which it arrived.
 .Pp
 The node may elect to nominate a different receive message function
 for messages received on a particular hook, to simplify coding.
 It uses the
 .Fn NG_HOOK_SET_RCVMSG hook fn
 macro to do this.
 The function receives the same arguments in every way
 other than it will receive all (and only) messages from that hook.
 .El
 .Pp
 Much use has been made of reference counts, so that nodes being
 freed of all references are automatically freed, and this behaviour
 has been tested and debugged to present a consistent and trustworthy
 framework for the
 .Dq type module
 writer to use.
 .Ss Addressing
 The
 .Nm
 framework provides an unambiguous and simple to use method of specifically
 addressing any single node in the graph.
 The naming of a node is
 independent of its type, in that another node, or external component
 need not know anything about the node's type in order to address it so as
 to send it a generic message type.
 Node and hook names should be
 chosen so as to make addresses meaningful.
 .Pp
 Addresses are either absolute or relative.
 An absolute address begins
 with a node name or ID, followed by a colon, followed by a sequence of hook
 names separated by periods.
 This addresses the node reached by starting
 at the named node and following the specified sequence of hooks.
 A relative address includes only the sequence of hook names, implicitly
 starting hook traversal at the local node.
 .Pp
 There are a couple of special possibilities for the node name.
 The name
 .Ql .\&
 (referred to as
 .Ql .: )
 always refers to the local node.
 Also, nodes that have no global name may be addressed by their ID numbers,
 by enclosing the hexadecimal representation of the ID number within
 the square brackets.
 Here are some examples of valid
 .Nm
 addresses:
 .Bd -literal -offset indent
 \&.:
 [3f]:
 foo:
 \&.:hook1
 foo:hook1.hook2
 [d80]:hook1
 .Ed
 .Pp
 The following set of nodes might be created for a site with
 a single physical frame relay line having two active logical DLCI channels,
 with RFC 1490 frames on DLCI 16 and PPP frames over DLCI 20:
 .Bd -literal
 [type SYNC ]                  [type FRAME]                 [type RFC1490]
 [ "Frame1" ](uplink)<-->(data)[<un-named>](dlci16)<-->(mux)[<un-named>  ]
 [    A     ]                  [    B     ](dlci20)<---+    [     C      ]
                                                       |
                                                       |      [ type PPP ]
                                                       +>(mux)[<un-named>]
                                                              [    D     ]
 .Ed
 .Pp
 One could always send a control message to node C from anywhere
 by using the name
 .Dq Li Frame1:uplink.dlci16 .
 In this case, node C would also be notified that the message
 reached it via its hook
 .Va mux .
 Similarly,
 .Dq Li Frame1:uplink.dlci20
 could reliably be used to reach node D, and node A could refer
 to node B as
 .Dq Li .:uplink ,
 or simply
 .Dq Li uplink .
 Conversely, B can refer to A as
 .Dq Li data .
 The address
 .Dq Li mux.data
 could be used by both nodes C and D to address a message to node A.
 .Pp
 Note that this is only for
 .Em control messages .
 In each of these cases, where a relative addressing mode is
 used, the recipient is notified of the hook on which the
 message arrived, as well as
 the originating node.
 This allows the option of hop-by-hop distribution of messages and
 state information.
 Data messages are
 .Em only
 routed one hop at a time, by specifying the departing
 hook, with each node making
 the next routing decision.
 So when B receives a frame on hook
 .Va data ,
 it decodes the frame relay header to determine the DLCI,
 and then forwards the unwrapped frame to either C or D.
 .Pp
 In a similar way, flow control messages may be routed in the reverse
 direction to outgoing data.
 For example a
 .Dq "buffer nearly full"
 message from
 .Dq Li Frame1:
 would be passed to node B
 which might decide to send similar messages to both nodes
 C and D.
 The nodes would use
 .Em "direct hook pointer"
 addressing to route the messages.
 The message may have travelled from
 .Dq Li Frame1:
 to B
 as a synchronous reply, saving time and cycles.
 .Ss Netgraph Structures
 Structures are defined in
 .In netgraph/netgraph.h
 (for kernel structures only of interest to nodes)
 and
 .In netgraph/ng_message.h
 (for message definitions also of interest to user programs).
 .Pp
 The two basic object types that are of interest to node authors are
 .Em nodes
 and
 .Em hooks .
 These two objects have the following
 properties that are also of interest to the node writers.
 .Bl -tag -width 2n
 .It Vt "struct ng_node"
 Node authors should always use the following
 .Ic typedef
 to declare
 their pointers, and should never actually declare the structure.
 .Pp
 .Fd "typedef struct ng_node *node_p;"
 .Pp
 The following properties are associated with a node, and can be
 accessed in the following manner:
 .Bl -tag -width 2n
 .It Validity
 A driver or interrupt routine may want to check whether
 the node is still valid.
 It is assumed that the caller holds a reference
 on the node so it will not have been freed, however it may have been
 disabled or otherwise shut down.
 Using the
 .Fn NG_NODE_IS_VALID node
 macro will return this state.
 Eventually it should be almost impossible
 for code to run in an invalid node but at this time that work has not been
 completed.
 .It Node ID Pq Vt ng_ID_t
 This property can be retrieved using the macro
 .Fn NG_NODE_ID node .
 .It Node name
 Optional globally unique name,
 .Dv NUL
 terminated string.
 If there
 is a value in here, it is the name of the node.
 .Bd -literal -offset indent
 if (NG_NODE_NAME(node)[0] != '\e0') ...
 
 if (strcmp(NG_NODE_NAME(node), "fred") == 0) ...
 .Ed
 .It A node dependent opaque cookie
 Anything of the pointer type can be placed here.
 The macros
 .Fn NG_NODE_SET_PRIVATE node value
 and
 .Fn NG_NODE_PRIVATE node
 set and retrieve this property, respectively.
 .It Number of hooks
 The
 .Fn NG_NODE_NUMHOOKS node
 macro is used
 to retrieve this value.
 .It Hooks
 The node may have a number of hooks.
 A traversal method is provided to allow all the hooks to be
 tested for some condition.
 .Fn NG_NODE_FOREACH_HOOK node fn arg rethook
 where
 .Fa fn
 is a function that will be called for each hook
 with the form
 .Fn fn hook arg
 and returning 0 to terminate the search.
 If the search is terminated, then
 .Fa rethook
 will be set to the hook at which the search was terminated.
 .El
 .It Vt "struct ng_hook"
 Node authors should always use the following
 .Ic typedef
 to declare
 their hook pointers.
 .Pp
 .Fd "typedef struct ng_hook *hook_p;"
 .Pp
 The following properties are associated with a hook, and can be
 accessed in the following manner:
 .Bl -tag -width 2n
 .It A hook dependent opaque cookie
 Anything of the pointer type can be placed here.
 The macros
 .Fn NG_HOOK_SET_PRIVATE hook value
 and
 .Fn NG_HOOK_PRIVATE hook
 set and retrieve this property, respectively.
 .It \&An associate node
 The macro
 .Fn NG_HOOK_NODE hook
 finds the associated node.
 .It A peer hook Pq Vt hook_p
 The other hook in this connected pair.
 The
 .Fn NG_HOOK_PEER hook
 macro finds the peer.
 .It References
 The
 .Fn NG_HOOK_REF hook
 and
 .Fn NG_HOOK_UNREF hook
 macros
 increment and decrement the hook reference count accordingly.
 After decrement you should always assume the hook has been freed
 unless you have another reference still valid.
 .It Override receive functions
 The
 .Fn NG_HOOK_SET_RCVDATA hook fn
 and
 .Fn NG_HOOK_SET_RCVMSG hook fn
 macros can be used to set override methods that will be used in preference
 to the generic receive data and receive message functions.
 To unset these, use the macros to set them to
 .Dv NULL .
 They will only be used for data and
 messages received on the hook on which they are set.
 .El
 .Pp
 The maintenance of the names, reference counts, and linked list
 of hooks for each node is handled automatically by the
 .Nm
 subsystem.
 Typically a node's private info contains a back-pointer to the node or hook
 structure, which counts as a new reference that must be included
 in the reference count for the node.
 When the node constructor is called,
 there is already a reference for this calculated in, so that
 when the node is destroyed, it should remember to do a
 .Fn NG_NODE_UNREF
 on the node.
 .Pp
 From a hook you can obtain the corresponding node, and from
 a node, it is possible to traverse all the active hooks.
 .Pp
 A current example of how to define a node can always be seen in
 .Pa src/sys/netgraph/ng_sample.c
 and should be used as a starting point for new node writers.
 .El
 .Ss Netgraph Message Structure
 Control messages have the following structure:
 .Bd -literal
 #define NG_CMDSTRSIZ    32      /* Max command string (including null) */
 
 struct ng_mesg {
   struct ng_msghdr {
     u_char      version;        /* Must equal NG_VERSION */
     u_char      spare;          /* Pad to 4 bytes */
     uint16_t    spare2;
     uint32_t    arglen;         /* Length of cmd/resp data */
     uint32_t    cmd;            /* Command identifier */
     uint32_t    flags;          /* Message status flags */
     uint32_t    token;          /* Reply should have the same token */
     uint32_t    typecookie;     /* Node type understanding this message */
     u_char      cmdstr[NG_CMDSTRSIZ];  /* cmd string + \0 */
   } header;
   char  data[];                 /* placeholder for actual data */
 };
 
 #define NG_ABI_VERSION  12              /* Netgraph kernel ABI version */
 #define NG_VERSION      8               /* Netgraph message version */
 #define NGF_ORIG        0x00000000      /* The msg is the original request */
 #define NGF_RESP        0x00000001      /* The message is a response */
 .Ed
 .Pp
 Control messages have the fixed header shown above, followed by a
 variable length data section which depends on the type cookie
 and the command.
 Each field is explained below:
 .Bl -tag -width indent
 .It Va version
 Indicates the version of the
 .Nm
 message protocol itself.
 The current version is
 .Dv NG_VERSION .
 .It Va arglen
 This is the length of any extra arguments, which begin at
 .Va data .
 .It Va flags
 Indicates whether this is a command or a response control message.
 .It Va token
 The
 .Va token
 is a means by which a sender can match a reply message to the
 corresponding command message; the reply always has the same token.
 .It Va typecookie
 The corresponding node type's unique 32-bit value.
 If a node does not recognize the type cookie it must reject the message
 by returning
 .Er EINVAL .
 .Pp
 Each type should have an include file that defines the commands,
 argument format, and cookie for its own messages.
 The typecookie
 ensures that the same header file was included by both sender and
 receiver; when an incompatible change in the header file is made,
 the typecookie
 .Em must
 be changed.
 The de-facto method for generating unique type cookies is to take the
 seconds from the Epoch at the time the header file is written
 (i.e., the output of
 .Dq Nm date Fl u Li +%s ) .
 .Pp
 There is a predefined typecookie
 .Dv NGM_GENERIC_COOKIE
 for the
 .Vt generic
 node type, and
 a corresponding set of generic messages which all nodes understand.
 The handling of these messages is automatic.
 .It Va cmd
 The identifier for the message command.
 This is type specific,
 and is defined in the same header file as the typecookie.
 .It Va cmdstr
 Room for a short human readable version of
 .Va command
 (for debugging purposes only).
 .El
 .Pp
 Some modules may choose to implement messages from more than one
 of the header files and thus recognize more than one type cookie.
 .Ss Control Message ASCII Form
 Control messages are in binary format for efficiency.
 However, for
 debugging and human interface purposes, and if the node type supports
 it, control messages may be converted to and from an equivalent
 .Tn ASCII
 form.
 The
 .Tn ASCII
 form is similar to the binary form, with two exceptions:
 .Bl -enum
 .It
 The
 .Va cmdstr
 header field must contain the
 .Tn ASCII
 name of the command, corresponding to the
 .Va cmd
 header field.
 .It
 The arguments field contains a
 .Dv NUL Ns
 -terminated
 .Tn ASCII
 string version of the message arguments.
 .El
 .Pp
 In general, the arguments field of a control message can be any
 arbitrary C data type.
 .Nm Netgraph
 includes parsing routines to support
 some pre-defined datatypes in
 .Tn ASCII
 with this simple syntax:
 .Bl -bullet
 .It
 Integer types are represented by base 8, 10, or 16 numbers.
 .It
 Strings are enclosed in double quotes and respect the normal
 C language backslash escapes.
 .It
 IP addresses have the obvious form.
 .It
 Arrays are enclosed in square brackets, with the elements listed
 consecutively starting at index zero.
 An element may have an optional index and equals sign
 .Pq Ql =
 preceding it.
 Whenever an element
 does not have an explicit index, the index is implicitly the previous
 element's index plus one.
 .It
 Structures are enclosed in curly braces, and each field is specified
 in the form
 .Ar fieldname Ns = Ns Ar value .
 .It
 Any array element or structure field whose value is equal to its
 .Dq default value
 may be omitted.
 For integer types, the default value
 is usually zero; for string types, the empty string.
 .It
 Array elements and structure fields may be specified in any order.
 .El
 .Pp
 Each node type may define its own arbitrary types by providing
 the necessary routines to parse and unparse.
 .Tn ASCII
 forms defined
 for a specific node type are documented in the corresponding man page.
 .Ss Generic Control Messages
 There are a number of standard predefined messages that will work
 for any node, as they are supported directly by the framework itself.
 These are defined in
 .In netgraph/ng_message.h
 along with the basic layout of messages and other similar information.
 .Bl -tag -width indent
 .It Dv NGM_CONNECT
 Connect to another node, using the supplied hook names on either end.
 .It Dv NGM_MKPEER
 Construct a node of the given type and then connect to it using the
 supplied hook names.
 .It Dv NGM_SHUTDOWN
 The target node should disconnect from all its neighbours and shut down.
 Persistent nodes such as those representing physical hardware
 might not disappear from the node namespace, but only reset themselves.
 The node must disconnect all of its hooks.
 This may result in neighbors shutting themselves down, and possibly a
 cascading shutdown of the entire connected graph.
 .It Dv NGM_NAME
 Assign a name to a node.
 Nodes can exist without having a name, and this
 is the default for nodes created using the
 .Dv NGM_MKPEER
 method.
 Such nodes can only be addressed relatively or by their ID number.
 .It Dv NGM_RMHOOK
 Ask the node to break a hook connection to one of its neighbours.
 Both nodes will have their
 .Dq disconnect
 method invoked.
 Either node may elect to totally shut down as a result.
 .It Dv NGM_NODEINFO
 Asks the target node to describe itself.
 The four returned fields
 are the node name (if named), the node type, the node ID and the
 number of hooks attached.
 The ID is an internal number unique to that node.
 .It Dv NGM_LISTHOOKS
 This returns the information given by
 .Dv NGM_NODEINFO ,
 but in addition
 includes an array of fields describing each link, and the description for
 the node at the far end of that link.
 .It Dv NGM_LISTNAMES
 This returns an array of node descriptions (as for
 .Dv NGM_NODEINFO )
 where each entry of the array describes a named node.
 All named nodes will be described.
 .It Dv NGM_LISTNODES
 This is the same as
 .Dv NGM_LISTNAMES
 except that all nodes are listed regardless of whether they have a name or not.
 .It Dv NGM_LISTTYPES
 This returns a list of all currently installed
 .Nm
 types.
 .It Dv NGM_TEXT_STATUS
 The node may return a text formatted status message.
 The status information is determined entirely by the node type.
 It is the only
 .Dq generic
 message
 that requires any support within the node itself and as such the node may
 elect to not support this message.
 The text response must be less than
 .Dv NG_TEXTRESPONSE
 bytes in length (presently 1024).
 This can be used to return general
 status information in human readable form.
 .It Dv NGM_BINARY2ASCII
 This message converts a binary control message to its
 .Tn ASCII
 form.
 The entire control message to be converted is contained within the
 arguments field of the
 .Dv NGM_BINARY2ASCII
 message itself.
 If successful, the reply will contain the same control
 message in
 .Tn ASCII
 form.
 A node will typically only know how to translate messages that it
 itself understands, so the target node of the
 .Dv NGM_BINARY2ASCII
 is often the same node that would actually receive that message.
 .It Dv NGM_ASCII2BINARY
 The opposite of
 .Dv NGM_BINARY2ASCII .
 The entire control message to be converted, in
 .Tn ASCII
 form, is contained
 in the arguments section of the
 .Dv NGM_ASCII2BINARY
 and need only have the
 .Va flags , cmdstr ,
 and
 .Va arglen
 header fields filled in, plus the
 .Dv NUL Ns
 -terminated string version of
 the arguments in the arguments field.
 If successful, the reply
 contains the binary version of the control message.
 .El
 .Ss Flow Control Messages
 In addition to the control messages that affect nodes with respect to the
 graph, there are also a number of
 .Em flow control
 messages defined.
 At present these are
 .Em not
 handled automatically by the system, so
 nodes need to handle them if they are going to be used in a graph utilising
 flow control, and will be in the likely path of these messages.
 The default action of a node that does not understand these messages should
 be to pass them onto the next node.
 Hopefully some helper functions will assist in this eventually.
 These messages are also defined in
 .In netgraph/ng_message.h
 and have a separate cookie
 .Dv NG_FLOW_COOKIE
 to help identify them.
 They will not be covered in depth here.
 .Sh INITIALIZATION
 The base
 .Nm
 code may either be statically compiled
 into the kernel or else loaded dynamically as a KLD via
 .Xr kldload 8 .
 In the former case, include
 .Pp
 .D1 Cd "options NETGRAPH"
 .Pp
 in your kernel configuration file.
 You may also include selected
 node types in the kernel compilation, for example:
 .Pp
 .D1 Cd "options NETGRAPH"
 .D1 Cd "options NETGRAPH_SOCKET"
 .D1 Cd "options NETGRAPH_ECHO"
 .Pp
 Once the
 .Nm
 subsystem is loaded, individual node types may be loaded at any time
 as KLD modules via
 .Xr kldload 8 .
 Moreover,
 .Nm
 knows how to automatically do this; when a request to create a new
 node of unknown type
 .Ar type
 is made,
 .Nm
 will attempt to load the KLD module
 .Pa ng_ Ns Ao Ar type Ac Ns Pa .ko .
 .Pp
 Types can also be installed at boot time, as certain device drivers
 may want to export each instance of the device as a
 .Nm
 node.
 .Pp
 In general, new types can be installed at any time from within the
 kernel by calling
 .Fn ng_newtype ,
 supplying a pointer to the type's
 .Vt "struct ng_type"
 structure.
 .Pp
 The
 .Fn NETGRAPH_INIT
 macro automates this process by using a linker set.
 .Sh EXISTING NODE TYPES
 Several node types currently exist.
 Each is fully documented in its own man page:
 .Bl -tag -width indent
 .It SOCKET
 The socket type implements two new sockets in the new protocol domain
 .Dv PF_NETGRAPH .
 The new sockets protocols are
 .Dv NG_DATA
 and
 .Dv NG_CONTROL ,
 both of type
 .Dv SOCK_DGRAM .
 Typically one of each is associated with a socket node.
 When both sockets have closed, the node will shut down.
 The
 .Dv NG_DATA
 socket is used for sending and receiving data, while the
 .Dv NG_CONTROL
 socket is used for sending and receiving control messages.
 Data and control messages are passed using the
 .Xr sendto 2
 and
 .Xr recvfrom 2
 system calls, using a
 .Vt "struct sockaddr_ng"
 socket address.
 .It HOLE
 Responds only to generic messages and is a
 .Dq black hole
 for data.
 Useful for testing.
 Always accepts new hooks.
 .It ECHO
 Responds only to generic messages and always echoes data back through the
 hook from which it arrived.
 Returns any non-generic messages as their own response.
 Useful for testing.
 Always accepts new hooks.
 .It TEE
 This node is useful for
 .Dq snooping .
 It has 4 hooks:
 .Va left , right , left2right ,
 and
 .Va right2left .
 Data entering from the
 .Va right
 is passed to the
 .Va left
 and duplicated on
 .Va right2left ,
 and data entering from the
 .Va left
 is passed to the
 .Va right
 and duplicated on
 .Va left2right .
 Data entering from
 .Va left2right
 is sent to the
 .Va right
 and data from
 .Va right2left
 to
 .Va left .
 .It RFC1490 MUX
 Encapsulates/de-encapsulates frames encoded according to RFC 1490.
 Has a hook for the encapsulated packets
 .Pq Va downstream
 and one hook
 for each protocol (i.e., IP, PPP, etc.).
 .It FRAME RELAY MUX
 Encapsulates/de-encapsulates Frame Relay frames.
 Has a hook for the encapsulated packets
 .Pq Va downstream
 and one hook
 for each DLCI.
 .It FRAME RELAY LMI
 Automatically handles frame relay
 .Dq LMI
 (link management interface) operations and packets.
 Automatically probes and detects which of several LMI standards
 is in use at the exchange.
 .It TTY
 This node is also a line discipline.
 It simply converts between
 .Vt mbuf
 frames and sequential serial data, allowing a TTY to appear as a
 .Nm
 node.
 It has a programmable
 .Dq hotkey
 character.
 .It ASYNC
 This node encapsulates and de-encapsulates asynchronous frames
 according to RFC 1662.
 This is used in conjunction with the TTY node
 type for supporting PPP links over asynchronous serial lines.
 .It ETHERNET
 This node is attached to every Ethernet interface in the system.
 It allows capturing raw Ethernet frames from the network, as well as
 sending frames out of the interface.
 .It INTERFACE
 This node is also a system networking interface.
 It has hooks representing each protocol family (IP, IPv6)
 and appears in the output of
 .Xr ifconfig 8 .
 The interfaces are named
 .Dq Li ng0 ,
 .Dq Li ng1 ,
 etc.
 .It ONE2MANY
 This node implements a simple round-robin multiplexer.
 It can be used
 for example to make several LAN ports act together to get a higher speed
 link between two machines.
 .It Various PPP related nodes
 There is a full multilink PPP implementation that runs in
 .Nm .
 The
 .Pa net/mpd5
 port can use these modules to make a very low latency high
 capacity PPP system.
 It also supports
 .Tn PPTP
 VPNs using the PPTP node.
 .It PPPOE
 A server and client side implementation of PPPoE.
 Used in conjunction with
 either
 .Xr ppp 8
 or the
 .Pa net/mpd5
 port.
 .It BRIDGE
 This node, together with the Ethernet nodes, allows a very flexible
 bridging system to be implemented.
 .It KSOCKET
 This intriguing node looks like a socket to the system but diverts
 all data to and from the
 .Nm
 system for further processing.
 This allows
 such things as UDP tunnels to be almost trivially implemented from the
 command line.
 .El
 .Pp
 Refer to the section at the end of this man page for more nodes types.
 .Sh NOTES
 Whether a named node exists can be checked by trying to send a control message
 to it (e.g.,
 .Dv NGM_NODEINFO ) .
 If it does not exist,
 .Er ENOENT
 will be returned.
 .Pp
 All data messages are
 .Vt mbuf chains
 with the
 .Dv M_PKTHDR
 flag set.
 .Pp
 Nodes are responsible for freeing what they allocate.
 There are three exceptions:
 .Bl -enum
 .It
 .Vt Mbufs
 sent across a data link are never to be freed by the sender.
 In the
 case of error, they should be considered freed.
 .It
 Messages sent using one of
 .Fn NG_SEND_MSG_*
 family macros are freed by the recipient.
 As in the case above, the addresses
 associated with the message are freed by whatever allocated them so the
 recipient should copy them if it wants to keep that information.
 .It
 Both control messages and data are delivered and queued with a
 .Nm
 .Em item .
 The item must be freed using
 .Fn NG_FREE_ITEM item
 or passed on to another node.
 .El
 .Sh FILES
 .Bl -tag -width indent
 .It In netgraph/netgraph.h
 Definitions for use solely within the kernel by
 .Nm
 nodes.
 .It In netgraph/ng_message.h
 Definitions needed by any file that needs to deal with
 .Nm
 messages.
 .It In netgraph/ng_socket.h
 Definitions needed to use
 .Nm
 .Vt socket
 type nodes.
 .It In netgraph/ng_ Ns Ao Ar type Ac Ns Pa .h
 Definitions needed to use
 .Nm
 .Ar type
 nodes, including the type cookie definition.
 .It Pa /boot/kernel/netgraph.ko
 The
 .Nm
 subsystem loadable KLD module.
 .It Pa /boot/kernel/ng_ Ns Ao Ar type Ac Ns Pa .ko
 Loadable KLD module for node type
 .Ar type .
 .It Pa src/sys/netgraph/ng_sample.c
 Skeleton
 .Nm
 node.
 Use this as a starting point for new node types.
 .El
 .Sh USER MODE SUPPORT
 There is a library for supporting user-mode programs that wish
 to interact with the
 .Nm
 system.
 See
 .Xr netgraph 3
 for details.
 .Pp
 Two user-mode support programs,
 .Xr ngctl 8
 and
 .Xr nghook 8 ,
 are available to assist manual configuration and debugging.
 .Pp
 There are a few useful techniques for debugging new node types.
 First, implementing new node types in user-mode first
 makes debugging easier.
 The
 .Vt tee
 node type is also useful for debugging, especially in conjunction with
 .Xr ngctl 8
 and
 .Xr nghook 8 .
 .Pp
 Also look in
 .Pa /usr/share/examples/netgraph
 for solutions to several
 common networking problems, solved using
 .Nm .
 .Sh SEE ALSO
 .Xr socket 2 ,
 .Xr netgraph 3 ,
 .Xr ng_async 4 ,
 .Xr ng_atmllc 4 ,
 .Xr ng_bluetooth 4 ,
 .Xr ng_bpf 4 ,
 .Xr ng_bridge 4 ,
 .Xr ng_btsocket 4 ,
 .Xr ng_car 4 ,
 .Xr ng_cisco 4 ,
 .Xr ng_device 4 ,
 .Xr ng_echo 4 ,
 .Xr ng_eiface 4 ,
 .Xr ng_etf 4 ,
 .Xr ng_ether 4 ,
 .Xr ng_frame_relay 4 ,
 .Xr ng_gif 4 ,
 .Xr ng_gif_demux 4 ,
 .Xr ng_hci 4 ,
 .Xr ng_hole 4 ,
 .Xr ng_hub 4 ,
 .Xr ng_iface 4 ,
 .Xr ng_ip_input 4 ,
 .Xr ng_ipfw 4 ,
 .Xr ng_ksocket 4 ,
 .Xr ng_l2cap 4 ,
 .Xr ng_l2tp 4 ,
 .Xr ng_lmi 4 ,
 .Xr ng_mppc 4 ,
 .Xr ng_nat 4 ,
 .Xr ng_netflow 4 ,
 .Xr ng_one2many 4 ,
 .Xr ng_patch 4 ,
 .Xr ng_ppp 4 ,
 .Xr ng_pppoe 4 ,
 .Xr ng_pptpgre 4 ,
 .Xr ng_rfc1490 4 ,
 .Xr ng_socket 4 ,
 .Xr ng_split 4 ,
-.Xr ng_sscfu 4 ,
-.Xr ng_sscop 4 ,
 .Xr ng_tee 4 ,
 .Xr ng_tty 4 ,
 .Xr ng_ubt 4 ,
 .Xr ng_UI 4 ,
-.Xr ng_uni 4 ,
 .Xr ng_vjc 4 ,
 .Xr ng_vlan 4 ,
 .Xr ngctl 8 ,
 .Xr nghook 8
 .Sh HISTORY
 The
 .Nm
 system was designed and first implemented at Whistle Communications, Inc.\&
 in a version of
 .Fx 2.2
 customized for the Whistle InterJet.
 It first made its debut in the main tree in
 .Fx 3.4 .
 .Sh AUTHORS
 .An -nosplit
 .An Julian Elischer Aq Mt julian@FreeBSD.org ,
 with contributions by
 .An Archie Cobbs Aq Mt archie@FreeBSD.org .
diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4
deleted file mode 100644
index 02a5a5f011b5..000000000000
--- a/share/man/man4/ng_ccatm.4
+++ /dev/null
@@ -1,328 +0,0 @@
-.\"
-.\" Copyright (c) 2001-2004
-.\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-.\"	All rights reserved.
-.\" Copyright (c) 2005
-.\"	Hartmut Brandt.
-.\"	All rights reserved.
-.\"
-.\" Author: Harti Brandt <harti@FreeBSD.org>
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd March 3, 2023
-.Dt NG_CCATM 4
-.Os
-.Sh NAME
-.Nm ng_ccatm
-.Nd "ATM Call Control netgraph node type"
-.Sh SYNOPSIS
-.In netnatm/unimsg.h
-.In netnatm/msg/unistruct.h
-.In netnatm/sig/unidef.h
-.In netnatm/api/unisap.h
-.In netnatm/api/atmapi.h
-.In netnatm/api/ccatm.h
-.In netgraph.h
-.In netgraph/ng_uni.h
-.In netgraph/ng_ccatm.h
-.Sh DEPRECATION NOTICE
-.Nm
-is deprecated and may not be available in
-.Fx 14.0
-and later.
-.Sh DESCRIPTION
-The
-.Nm
-node implements the API specified by the ATM Forum for access to ATM services
-(see ATM-Forum document
-.Pa af-saa-0108 ) .
-This document specifies the semantics
-of the API, not the exact language binding.
-For this reason, it is expected that
-this implementation is neither compile-time nor binary compatible with
-other implementations of this API.
-It should, however, be fairly straightforward
-to convert between different API implementations.
-.Pp
-This node is usually stacked on top of one or more UNI nodes (see
-.Xr ng_uni 4 ) .
-Each of these hooks appears as a
-.Dq port
-to the user of the node.
-It also has one hook connected to the ILMI daemon for management purposes.
-.Pp
-The node is removed when it receives a
-.Dv NGM_SHUTDOWN
-messages or when all hooks are disconnected.
-.Sh HOOKS
-The node understands a number of hooks with predefined names and an
-unlimited number of hooks for user connections.
-The predefined names are:
-.Bl -tag -width ".Va orphans"
-.It Va uni Ns Ar NNN
-These hooks stack the
-.Nm
-node on top of a UNI stack.
-The node expects the interface on these hooks
-to conform to the upper interface specified in
-.Xr ng_uni 4 .
-These hooks are forced into queuing mode, so that there are no circular
-calls from call control to UNI and UNI back to call control.
-The
-.Ar NNN
-in the hook name is the decimal port number and should not be zero.
-The port number is a 32-bit unsigned integer.
-.It Va manage
-This hook should be connected to the ILMI daemon.
-No data is ever sent on this hook and all received data is discarded.
-The hook is used to send control messages along.
-.It Va dump
-On receipt of a
-.Dv NGM_CCATM_DUMP
-command a textual description of the current state of the node is sent
-out of this hook.
-This text is sent as one large message consisting of more
-than one
-.Vt mbuf .
-.El
-.Pp
-All other hook names are taken to be user hooks and correspond to an
-ATM endpoint as specified in the ATM Forum document.
-The interface on these hooks is defined in
-.In atmapi.h
-and uses a structure
-.Bd -literal
-struct ccatm_op {
-	uint32_t	op;	/* request code */
-	u_char		data[];	/* optional data */
-};
-.Ed
-.Pp
-This structure is followed directly by the data for the operation.
-The opcode is one of the following:
-.Bd -literal
-enum atmop {
-	ATMOP_RESP,
-	ATMOP_ABORT_CONNECTION,
-	ATMOP_ACCEPT_INCOMING_CALL,
-	ATMOP_ADD_PARTY,
-	ATMOP_ADD_PARTY_REJECT,
-	ATMOP_ADD_PARTY_SUCCESS,
-	ATMOP_ARRIVAL_OF_INCOMING_CALL,
-	ATMOP_CALL_RELEASE,
-	ATMOP_CONNECT_OUTGOING_CALL,
-	ATMOP_DROP_PARTY,
-	ATMOP_GET_LOCAL_PORT_INFO,
-	ATMOP_P2MP_CALL_ACTIVE,
-	ATMOP_P2P_CALL_ACTIVE,
-	ATMOP_PREPARE_INCOMING_CALL,
-	ATMOP_PREPARE_OUTGOING_CALL,
-	ATMOP_QUERY_CONNECTION_ATTRIBUTES,
-	ATMOP_REJECT_INCOMING_CALL,
-	ATMOP_SET_CONNECTION_ATTRIBUTES,
-	ATMOP_WAIT_ON_INCOMING_CALL,
-	ATMOP_SET_CONNECTION_ATTRIBUTES_X,
-	ATMOP_QUERY_CONNECTION_ATTRIBUTES_X,
-	ATMOP_QUERY_STATE
-};
-.Ed
-.Pp
-These codes correspond directly to the operations specified in the ATM
-Forum document with the following exceptions:
-.Bl -tag -width foo
-.It Dv ATMOP_RESP
-As discussed in
-.Xr ng_uni 4 ,
-this is used to
-.Dq synchronify
-the interface.
-The argument is a
-.Bd -literal
-struct atm_resp {
-	int32_t		resp;
-	uint32_t	data;		/* type of attached data */
-};
-.Ed
-.Pp
-If the response code
-.Va resp
-is zero, the node has accepted the user request.
-If something goes wrong,
-.Va resp
-contains an error code.
-For requests that return data,
-.Va data
-contains a code describing the type of data and the data itself
-starts immediately after the structure.
-.It Dv ATMOP_QUERY_CONNECTION_ATTRIBUTES_X
-This is the same as
-.Dv ATMOP_QUERY_CONNECTION_ATTRIBUTES
-except that it allows to query several attributes
-within one request.
-.It Dv ATMOP_SET_CONNECTION_ATTRIBUTES_X
-This is the same as
-.Dv ATMOP_SET_CONNECTION_ATTRIBUTES
-except that it allows to set several attributes
-within one request.
-The list of attributes is followed directly by the attributes in the same
-order as they appear in the list.
-.El
-.Pp
-If a user hook is disconnected, an active connection on that hook is released.
-Incoming connections waiting to be accepted are reoffered to other
-listening hooks or rejected.
-.Sh CONTROL MESSAGES
-Besides the generic messages the node understands the following special
-messages:
-.Bl -tag -width foo
-.It Dv NGM_CCATM_DUMP Pq Ic dump
-This causes the internal state of the node to be dumped in ASCII to the
-.Va dump
-hook.
-.It Dv NGM_CCATM_STOP Pq Ic stop
-This message causes all connections on that port to be aborted (not released!\&)
-and all ATM endpoints which are bound to that port to be closed.
-It stops processing of all messages from the UNI stack on that port UNI stack.
-The argument is a
-.Bd -literal
-struct ngm_ccatm_port {
-	uint32_t	port;
-};
-.Ed
-.It Dv NGM_CCATM_START Pq Ic start
-Start processing on the port.
-The argument is a
-.Vt ngm_ccatm_port
-structure.
-.It Dv NGM_CCATM_CLEAR Pq Ic clear
-This message takes a
-.Vt ngm_ccatm_port
-structure and clears all prefixes and addresses on that port.
-If the port number is zero, all ports are cleared.
-.It Dv NGM_CCATM_GET_ADDRESSES Pq Ic get_addresses
-Get the list of all registered addresses on the given port.
-The argument is a
-.Vt ngm_ccatm_port
-structure and the result is a
-.Vt ngm_ccatm_get_addresses
-structure:
-.Bd -literal
-struct ngm_ccatm_get_addresses {
-	uint32_t	count;
-	struct ngm_ccatm_address_req addr[0];
-};
-struct ngm_ccatm_address_req {
-	uint32_t	port;
-	struct uni_addr	addr;
-};
-.Ed
-.Pp
-If the
-.Va port
-field is zero in the request, all addresses on all ports
-are returned.
-If it is not zero, only the addresses on that port are reported.
-The number of addresses is returned in the
-.Va count
-field.
-.It Dv NGM_CCATM_ADDRESS_REGISTERED Pq Ic address_reg
-This message is used by ILMI to inform the
-.Nm
-node that a previous address registration request was successful.
-This causes the node to activate that address.
-The argument to the message is a
-.Vt ngm_ccatm_address_req
-structure.
-.It Dv NGM_CCATM_ADDRESS_UNREGISTERED Pq Ic address_unreg
-This message is used by ILMI to inform the
-.Nm
-node that an address has been unregistered.
-The node clears that address from its tables.
-The argument is a
-.Vt ngm_ccatm_address_req
-structure.
-.It Dv NGM_CCATM_SET_PORT_PARAM Pq Ic set_port_param
-This request sets the parameters on the given port.
-The argument is a
-.Bd -literal
-struct ngm_ccatm_atm_port {
-	uint32_t port;		/* port for which to set parameters */
-	uint32_t pcr;		/* port peak cell rate */
-	uint32_t max_vpi_bits;
-	uint32_t max_vci_bits;
-	uint32_t max_svpc_vpi;
-	uint32_t max_svcc_vpi;
-	uint32_t min_svcc_vci;
-	uint8_t	 esi[6];
-	uint32_t num_addr;
-};
-.Ed
-.Pp
-This should be used only by ILMI and when that port is stopped and the
-address and prefix tables of that port are empty.
-The
-.Va num_addr
-field is ignored.
-.It Dv NGM_CCATM_GET_PORT_PARAM Pq Ic get_port_param
-Retrieve the parameters of the given port.
-The argument is a
-.Vt ngm_ccatm_port
-and the result a
-.Vt ngm_ccatm_atm_port .
-.It Dv NGM_CCATM_GET_PORTLIST Pq Ic get_portlist
-Get a list of all available ports on that node.
-This is returned as a
-.Bd -literal
-struct ngm_ccatm_portlist {
-	uint32_t	nports;
-	uint32_t	ports[];
-};
-.Ed
-.It Dv NGM_CCATM_GETSTATE Pq Ic getstate
-Return the state of a port.
-The argument is a
-.Vt "struct ngm_ccatm_port"
-and the return values as a
-.Vt uint32_t .
-.It Dv NGM_CCATM_SETLOG Pq Ic setlog
-This requests sets a new logging level and returns the previous one.
-The argument is either a
-.Vt uint32_t
-in which case it specifies the new logging level, or may be empty
-in which case just the old level is returned as a
-.Vt uint32_t .
-.It Dv NGM_CCATM_RESET Pq Ic reset
-Reset the node.
-This is allowed only if the number of user hooks and connected UNI stacks is
-zero.
-.It Dv NGM_CCATM_GET_EXSTAT
-Return extended status information from the node.
-.El
-.Sh SEE ALSO
-.Xr netgraph 4 ,
-.Xr ng_uni 4 ,
-.Xr ngctl 8
-.Sh AUTHORS
-.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/ng_sscfu.4 b/share/man/man4/ng_sscfu.4
deleted file mode 100644
index 6011deaeb2b3..000000000000
--- a/share/man/man4/ng_sscfu.4
+++ /dev/null
@@ -1,166 +0,0 @@
-.\"
-.\" Copyright (c) 2001-2003
-.\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-.\" 	All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" Author: Hartmut Brandt <harti@FreeBSD.org>
-.\"
-.\" $FreeBSD$
-.\"
-.\" ng_sscfu(4) man page
-.\"
-.Dd March 3, 2023
-.Dt NG_SSCFU 4
-.Os
-.Sh NAME
-.Nm ng_sscfu
-.Nd netgraph SSCF at the UNI node type
-.Sh SYNOPSIS
-.In netnatm/saal/sscopdef.h
-.In netnatm/saal/sscfudef.h
-.In netgraph/atm/ng_sscfu.h
-.Sh DEPRECATION NOTICE
-.Nm
-is deprecated and may not be available in
-.Fx 14.0
-and later.
-.Sh DESCRIPTION
-The
-.Nm sscfu
-netgraph node type implements ITU-T recommendation Q.2130.
-This recommendation specifies the Service Specific Coordination
-Function at the UNI.
-This is a thin sub-layer between the SSCOP (see
-.Xr ng_sscop 4 )
-and the UNI signalling.
-This node does not really implement a protocol but
-provides a mapping between the signals at the upper layer of the SSCOP and
-the signals the UNI expects at its lower layer.
-It also provides default values for the parameters of the SSCOP.
-.Pp
-After creation of the node, the SSCF instance must be created by sending
-an
-.Dq enable
-message to the node.
-If the node is enabled, default SSCOP parameters
-can be retrieved and set in the corresponding SSCOP instance.
-.Pp
-The node is shut down either by a
-.Dv NGM_SHUTDOWN
-message, or when all hooks are disconnected.
-.Sh HOOKS
-Each
-.Nm sscfu
-node has two hooks with fixed names:
-.Bl -tag -width ".Va upper"
-.It Va lower
-This hook is the interface to the SSCOP.
-The interface expected here is exactly
-that which is exported by the
-.Xr ng_sscop 4
-node type.
-.It Va upper
-This is the interface to the UNI.
-It uses the following message format:
-.Bd -literal
-struct sscfu_arg {
-	uint32_t sig;
-	u_char	 data[];
-};
-.Ed
-.Pp
-The
-.Va sig
-field
-is one of the following signals:
-.Bd -literal
-enum saal_sig {
-    SAAL_ESTABLISH_request,	/* U -> SAAL: (UU) */
-    SAAL_ESTABLISH_indication,	/* SAAL -> U: (UU) */
-    SAAL_ESTABLISH_confirm,	/* SAAL -> U: (UU) */
-    SAAL_RELEASE_request,	/* U -> SAAL: (UU) */
-    SAAL_RELEASE_confirm,	/* SAAL -> U: */
-    SAAL_RELEASE_indication,	/* SAAL -> U: (UU) */
-    SAAL_DATA_request,		/* U -> SAAL: (DATA) */
-    SAAL_DATA_indication,	/* SAAL -> U: (DATA) */
-    SAAL_UDATA_request,		/* U -> SAAL: (UDATA) */
-    SAAL_UDATA_indication,	/* SAAL -> U: (UDATA) */
-};
-.Ed
-.Pp
-The arrows in the comment show the direction of the signal, whether it
-is a signal that comes out of the node
-.Pq Ql -> ,
-or is sent by the node user to the node
-.Pq Ql <- .
-The type of the data expected for the signal is specified in parentheses.
-This data starts at the
-.Va data
-field of the message structure.
-.El
-.Pp
-If the
-.Va lower
-hook is disconnected and the node is enabled, the protocol state is
-reset.
-.Sh CONTROL MESSAGES
-The
-.Nm sscfu
-node understands the generic messages plus the following:
-.Bl -tag -width foo
-.It Dv NGM_SSCFU_GETDEFPARAM Pq Ic getdefparam
-This message returns a
-.Vt sscop_param
-structure, which contains the default parameters for the SSCOP at the
-UNI.
-This structure should be used for a
-.Dv NGM_SSCOP_SETPARAM
-message to the SSCOP node below the SSCF.
-.It Dv NGM_SSCFU_ENABLE Pq Ic enable
-This message creates the actual SSCF instance and initializes it.
-Until this is done, parameters may neither be retrieved nor set,
-and all messages
-received on any hook are discarded.
-.It Dv NGM_SSCFU_DISABLE Pq Ic disable
-Destroy the SSCF instance.
-After this, all messages on any hooks are discarded.
-.It Dv NGM_SSCFU_GETDEBUG Pq Ic getdebug
-Retrieve the debugging flags in a
-.Vt uint32_t .
-.It Dv NGM_SSCFU_SETDEBUG Pq Ic setdebug
-Set debugging flags.
-The argument must be a
-.Vt uint32_t .
-.It Dv NGM_SSCFU_GETSTATE Pq Ic getstate
-Retrieve the current state of the SSCFU instance in a
-.Vt uint32_t .
-If the node has not been enabled, 0 is returned.
-.El
-.Sh SEE ALSO
-.Xr netgraph 4 ,
-.Xr ng_atm 4 ,
-.Xr ng_sscop 4 ,
-.Xr ngctl 8
-.Sh AUTHORS
-.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/ng_sscop.4 b/share/man/man4/ng_sscop.4
deleted file mode 100644
index 451edcc4aebf..000000000000
--- a/share/man/man4/ng_sscop.4
+++ /dev/null
@@ -1,408 +0,0 @@
-.\"
-.\" Copyright (c) 2001-2003
-.\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-.\" 	All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" Author: Hartmut Brandt <harti@FreeBSD.org>
-.\"
-.\" $FreeBSD$
-.\"
-.\" ng_sscop(4) man page
-.\"
-.Dd March 3, 2023
-.Dt NG_SSCOP 4
-.Os
-.Sh NAME
-.Nm ng_sscop
-.Nd netgraph SSCOP node type
-.Sh SYNOPSIS
-.In netnatm/saal/sscopdef.h
-.In netgraph/atm/ng_sscop.h
-.Sh DEPRECATION NOTICE
-.Nm
-is deprecated and may not be available in
-.Fx 14.0
-and later.
-.Sh DESCRIPTION
-The
-.Nm sscop
-netgraph node type implements the ITU-T standard Q.2110.
-This standard describes
-the so called Service Specific Connection Oriented Protocol (SSCOP) that
-is used to carry signalling messages over the private and public UNIs and
-the public NNI.
-This protocol is a transport protocol with selective
-acknowledgements, and can be tailored to the environment.
-This implementation is a full implementation of that standard.
-.Pp
-After creation of the node, the SSCOP instance must be created by sending
-an
-.Dq enable
-message to the node.
-If the node is enabled, the SSCOP parameters
-can be retrieved and modified and the protocol can be started.
-.Pp
-The node is shut down either by a
-.Dv NGM_SHUTDOWN
-message, or when all hooks are disconnected.
-.Sh HOOKS
-Each
-.Nm sscop
-node has three hooks with fixed names:
-.Bl -tag -width ".Va manage"
-.It Va lower
-This hook must be connected to a node that ensures
-transport of packets to and from the remote peer node.
-Normally this is a
-.Xr ng_atm 4
-node with an AAL5 hook, but the
-.Nm sscop
-node is able to work on any packet-transporting layer, like, for example,
-IP or UDP.
-The node handles flow control messages received on
-this hook: if it receives a
-.Dv NGM_HIGH_WATER_PASSED
-message, it declares the
-.Dq "lower layer busy"
-state.
-If a
-.Dv NGM_LOW_WATER_PASSED
-message is received, the busy state is cleared.
-Note that the node does not
-look at the message contents of these flow control messages.
-.It Va upper
-This is the interface to the SSCOP user.
-This interface uses the following message format:
-.Bd -literal
-struct sscop_arg {
-	uint32_t sig;
-	uint32_t arg;	/* opt. sequence number or clear-buff */
-	u_char	 data[];
-};
-.Ed
-.Pp
-The
-.Va sig
-field
-is one of the signals defined in the standard:
-.Bd -literal
-enum sscop_aasig {
-    SSCOP_ESTABLISH_request,	/* <- UU, BR */
-    SSCOP_ESTABLISH_indication,	/* -> UU */
-    SSCOP_ESTABLISH_response,	/* <- UU, BR */
-    SSCOP_ESTABLISH_confirm,	/* -> UU */
-
-    SSCOP_RELEASE_request,	/* <- UU */
-    SSCOP_RELEASE_indication,	/* -> UU, SRC */
-    SSCOP_RELEASE_confirm,	/* -> */
-
-    SSCOP_DATA_request,		/* <- MU */
-    SSCOP_DATA_indication,	/* -> MU, SN */
-
-    SSCOP_UDATA_request,	/* <- MU */
-    SSCOP_UDATA_indication,	/* -> MU */
-
-    SSCOP_RECOVER_indication,	/* -> */
-    SSCOP_RECOVER_response,	/* <- */
-
-    SSCOP_RESYNC_request,	/* <- UU */
-    SSCOP_RESYNC_indication,	/* -> UU */
-    SSCOP_RESYNC_response,	/* <- */
-    SSCOP_RESYNC_confirm,	/* -> */
-
-    SSCOP_RETRIEVE_request,	/* <- RN */
-    SSCOP_RETRIEVE_indication,	/* -> MU */
-    SSCOP_RETRIEVE_COMPL_indication,/* -> */
-};
-.Ed
-.Pp
-The arrows in the comment show the direction of the signal, whether it
-is a signal that comes out of the node
-.Pq Ql -> ,
-or is sent by the node user to the node
-.Pq Ql <- .
-The
-.Va arg
-field contains the argument to some of the signals: it is either a PDU
-sequence number, or the
-.Dv CLEAR-BUFFER
-flag.
-There are a number of special sequence numbers for some operations:
-.Pp
-.Bl -tag -width ".Dv SSCOP_RETRIEVE_UNKNOWN" -offset indent -compact
-.It Dv SSCOP_MAXSEQNO
-maximum legal sequence number
-.It Dv SSCOP_RETRIEVE_UNKNOWN
-retrieve transmission queue
-.It Dv SSCOP_RETRIEVE_TOTAL
-retrieve transmission buffer and queue
-.El
-.Pp
-For signals that carry user data (as, for example,
-.Dv SSCOP_DATA_request )
-these two fields are followed by the variable sized user data.
-.Pp
-If the
-.Va upper
-hook is disconnected and the SSCOP instance is not in the idle
-state, and the
-.Va lower
-hook is still connected, an
-.Dv SSCOP_RELEASE_request
-is executed to release the SSCOP connection.
-.It Va manage
-This is the management interface defined in the standard.
-The data structure used here is:
-.Bd -literal
-struct sscop_marg {
-	uint32_t sig;
-	u_char	 data[];
-};
-.Ed
-.Pp
-Here
-.Va sig
-is one of
-.Bd -literal
-enum sscop_maasig {
-    SSCOP_MDATA_request,	/* <- MU */
-    SSCOP_MDATA_indication,	/* -> MU */
-    SSCOP_MERROR_indication,	/* -> CODE, CNT */
-};
-.Ed
-.Pp
-The
-.Dv SSCOP_MDATA
-signals are followed by the actual management data, where the
-.Dv SSCOP_MERROR
-signal has the form:
-.Bd -literal
-struct sscop_merr {
-	uint32_t sig;
-	uint32_t err;	/* error code */
-	uint32_t cnt;	/* error count */
-};
-.Ed
-.El
-.Sh CONTROL MESSAGES
-The
-.Nm sscop
-node understands the generic control messages, plus the following:
-.Bl -tag -width foo
-.It Dv NGM_SSCOP_SETPARAM Pq Ic setparam
-Sets operational parameters of the SSCOP instance and takes the
-following structure:
-.Bd -literal
-struct ng_sscop_setparam {
-	uint32_t		mask;
-	struct sscop_param	param;
-};
-.Ed
-.Pp
-The sub-structure
-.Va param
-contains the parameters to set, and the
-.Va mask
-field contains a bit mask, telling which of the parameters to set, and which
-to ignore.
-If a bit is set, the corresponding parameter is set.
-The parameters are:
-.Bd -literal
-struct sscop_param {
-	uint32_t timer_cc;	/* timer_cc in msec */
-	uint32_t timer_poll;	/* timer_poll im msec */
-	uint32_t timer_keep_alive;/* timer_keep_alive in msec */
-	uint32_t timer_no_response;/*timer_no_response in msec */
-	uint32_t timer_idle;	/* timer_idle in msec */
-	uint32_t maxk;		/* maximum user data in bytes */
-	uint32_t maxj;		/* maximum u-u info in bytes */
-	uint32_t maxcc;		/* max. retransmissions for control packets */
-	uint32_t maxpd;		/* max. vt(pd) before sending poll */
-	uint32_t maxstat;	/* max. number of elements in stat list */
-	uint32_t mr;		/* initial window */
-	uint32_t flags;		/* flags */
-};
-.Ed
-.Pp
-The
-.Va flags
-field contains the following flags influencing SSCOP operation:
-.Pp
-.Bl -tag -width ".Dv SSCOP_POLLREX" -offset indent -compact
-.It Dv SSCOP_ROBUST
-enable atmf/97-0216 robustness enhancement
-.It Dv SSCOP_POLLREX
-send POLL after each retransmission
-.El
-.Pp
-The bitmap has the following bits:
-.Pp
-.Bl -tag -width ".Dv SSCOP_SET_POLLREX" -offset indent -compact
-.It Dv SSCOP_SET_TCC
-set
-.Va timer_cc
-.It Dv SSCOP_SET_TPOLL
-set
-.Va timer_poll
-.It Dv SSCOP_SET_TKA
-set
-.Va timer_keep_alive
-.It Dv SSCOP_SET_TNR
-set
-.Va timer_no_response
-.It Dv SSCOP_SET_TIDLE
-set
-.Va timer_idle
-.It Dv SSCOP_SET_MAXK
-set
-.Va maxk
-.It Dv SSCOP_SET_MAXJ
-set
-.Va maxj
-.It Dv SSCOP_SET_MAXCC
-set
-.Va maxcc
-.It Dv SSCOP_SET_MAXPD
-set
-.Va maxpd
-.It Dv SSCOP_SET_MAXSTAT
-set
-.Va maxstat
-.It Dv SSCOP_SET_MR
-set the initial window
-.It Dv SSCOP_SET_ROBUST
-set or clear
-.Dv SSCOP_ROBUST
-.It Dv SSCOP_SET_POLLREX
-set or clear
-.Dv SSCOP_POLLREX
-.El
-.Pp
-The node responds to the
-.Dv NGM_SSCOP_SETPARAM
-message with the following response:
-.Bd -literal
-struct ng_sscop_setparam_resp {
-	uint32_t mask;
-	int32_t	 error;
-};
-.Ed
-.Pp
-Here
-.Va mask
-contains a bitmask of the parameters that the user requested to set,
-but that could not be set and
-.Va error
-is an
-.Xr errno 2
-code describing why the parameter could not be set.
-.It Dv NGM_SSCOP_GETPARAM Pq Ic getparam
-This message returns the current operational parameters of the SSCOP
-instance in a
-.Vt sscop_param
-structure.
-.It Dv NGM_SSCOP_ENABLE Pq Ic enable
-This message creates the actual SSCOP instance and initializes it.
-Until this is done, parameters may neither be retrieved nor set, and all
-messages received on any hook are discarded.
-.It Dv NGM_SSCOP_DISABLE Pq Ic disable
-Destroy the SSCOP instance.
-After this, all messages on any hooks are
-discarded.
-.It Dv NGM_SSCOP_SETDEBUG Pq Ic setdebug
-Set debugging flags.
-The argument is a
-.Vt uint32_t .
-.It Dv NGM_SSCOP_GETDEBUG Pq Ic getdebug
-Retrieve the actual debugging flags.
-Needs no arguments and responds with a
-.Vt uint32_t .
-.It Dv NGM_SSCOP_GETSTATE Pq Ic getstate
-Responds with the current state of the SSCOP instance in a
-.Vt uint32_t .
-If the node is not enabled, the retrieved state is 0.
-.El
-.Sh FLOW CONTROL
-Flow control works on the upper and on the lower layer interface.
-At the lower
-layer interface, the two messages,
-.Dv NGM_HIGH_WATER_PASSED
-and
-.Dv NGM_LOW_WATER_PASSED ,
-are used to declare or clear the
-.Dq "lower layer busy"
-state of the protocol.
-.Pp
-At the upper layer interface, the
-.Nm sscop
-node handles three types of flow control messages:
-.Bl -tag -width foo
-.It Dv NGM_HIGH_WATER_PASSED
-If this message is received, the SSCOP stops moving the receive window.
-Each time a data message is handed over to the upper layer, the receive
-window is moved by one message.
-Stopping these updates
-means that the window will start to close and if the peer has sent
-all messages allowed by the current window, it stops transmission.
-This means that the upper layer must be able to still receive a full window
-amount of messages.
-.It Dv NGM_LOW_WATER_PASSED
-This will re-enable the automatic window updates, and if the space indicated
-in the message is larger than the current window, the window will be opened
-by that amount.
-The space is computed as the difference of the
-.Va max_queuelen_packets
-and
-.Va current
-members of the
-.Vt ngm_queue_state
-structure.
-.It Dv NGM_SYNC_QUEUE_STATE
-If the upper layer buffer filling state, as indicated by
-.Va current ,
-is equal to or greater than
-.Va high_watermark
-then the message is ignored.
-If this is not the case, the amount
-of receiver space is computed as the difference of
-.Va max_queuelen_packets
-and
-.Va current
-if automatic window updates are currently allowed, and as the difference of
-.Va high_water_mark
-and
-.Va current
-if window updates are disabled.
-If the resulting value is larger than the current window, the current window
-is opened up to this value.
-Automatic window updates are enabled if they
-were disabled.
-.El
-.Sh SEE ALSO
-.Xr netgraph 4 ,
-.Xr ng_atm 4 ,
-.Xr ng_sscfu 4 ,
-.Xr ngctl 8
-.Sh AUTHORS
-.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/share/man/man4/ng_uni.4 b/share/man/man4/ng_uni.4
deleted file mode 100644
index 993119d23c70..000000000000
--- a/share/man/man4/ng_uni.4
+++ /dev/null
@@ -1,425 +0,0 @@
-.\"
-.\" Copyright (c) 2001-2003
-.\"	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-.\" 	All rights reserved.
-.\"
-.\" Author: Hartmut Brandt <harti@FreeBSD.org>
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd March 3, 2023
-.Dt NG_UNI 4
-.Os
-.Sh NAME
-.Nm ng_uni
-.Nd netgraph UNI node type
-.Sh SYNOPSIS
-.In netnatm/msg/unistruct.h
-.In netnatm/sig/unidef.h
-.In netgraph/atm/ng_uni.h
-.Sh DEPRECATION NOTICE
-.Nm
-is deprecated and may not be available in
-.Fx 14.0
-and later.
-.Sh DESCRIPTION
-The
-.Nm uni
-netgraph node type implements ATM Forum signalling 4.0.
-.Pp
-After creation of the node, the UNI instance must be created by sending
-an
-.Dq enable
-message to the node.
-If the node is enabled, the UNI parameters
-can be retrieved and modified, and the protocol can be started.
-.Pp
-The node is shut down either by an
-.Dv NGM_SHUTDOWN
-message, or when all hooks are disconnected.
-.Sh HOOKS
-Each
-.Nm uni
-node has three hooks with fixed names:
-.Bl -tag -width ".Va upper"
-.It Va lower
-This hook is the interface of the UNI protocol to the transport layer of
-the ATM control plane.
-The node expects the interface exported by
-.Xr ng_sscfu 4
-at this hook.
-.It Va upper
-This hook is the
-.Dq user
-interface of the UNI protocol.
-Because there is no standardized interface
-at this point, this implementation follows more or less the interface
-specified by the SDL diagrams in ITU-T recommendations Q.2931 and Q.2971.
-Normally either a
-.Xr ng_ccatm 4
-or a switch CAC should be stacked at this interface.
-The message format at the
-.Va upper
-hook is described below.
-Because
-.Xr netgraph 4
-is functional, it makes sometimes sense to switch this hook to queueing mode
-from the peer node upon connection.
-.El
-.Pp
-The
-.Va upper
-interface of the
-.Nm uni
-node is loosely modelled after the interface specified in the ITU-T signalling
-standards.
-There is however one derivation from this: normally there exists
-four kinds of signals: requests, responses, indications and confirmations.
-These signals are usually triggered either by external events (receiving a
-message) or internal events (a timer or another signal).
-This scheme works
-fine for user APIs that are entirely asynchronous, and in cases where
-error handling is not taken into account.
-With synchronous APIs and error
-handling however, there is a problem.
-If, for example, the application
-issues a request to set up a connection,
-it may do it by sending a
-.Dv SETUP.request
-signal to the UNI.
-Normally, the UNI stack will send a SETUP message and
-receive a message from the switch (a RELEASE, CONNECT, CALL PROCEEDING or
-ALERTING), or a timer in the UNI stack will time out.
-In any of these cases,
-the UNI stack is supposed to report an event back to the application, and
-the application will unblock (in the case of a synchronous API) and handle
-the event.
-The problem occurs when an error happens.
-Suppose there is no
-memory to send the SETUP message and to start the timer.
-In this case, the
-application will block forever because no received message and no timer
-will wake it up.
-For this reason this implementation uses an additional message:
-for each signal sent from the application to the stack, the stack will
-respond with an error code.
-If this code is zero, the stack has accepted
-the signal and the application may block; if the code is non-zero, the signal
-is effectively ignored and the code describes what was wrong.
-This system
-makes it very easy to make a blocking interface out of the message based
-netgraph interface.
-.Pp
-The
-.Va upper
-interface uses the following structure:
-.Bd -literal
-struct uni_arg {
-	uint32_t	sig;
-	uint32_t	cookie;
-	u_char		data[];
-};
-.Ed
-The
-.Va sig
-field contains the actual signal that is sent from the user to UNI or from
-UNI to the user.
-The
-.Va cookie
-can be used by the user to correlate requests with events and responses.
-If an error response, a confirmation or an indication was triggered by
-a request or response, the cookie from that request or response is carried in
-the message from the stack to the user.
-The
-.Va cookie
-field is followed by the actual data for the signal.
-.Pp
-The signal is one of the following:
-.Bd -literal
-enum uni_sig {
-    UNIAPI_ERROR,			/* UNI -> API */
-
-    UNIAPI_CALL_CREATED,		/* UNI -> API */
-    UNIAPI_CALL_DESTROYED,		/* UNI -> API */
-    UNIAPI_PARTY_CREATED,		/* UNI -> API */
-    UNIAPI_PARTY_DESTROYED,		/* UNI -> API */
-
-    UNIAPI_LINK_ESTABLISH_request,	/* API -> UNI */
-    UNIAPI_LINK_ESTABLISH_confirm,	/* UNI -> API */
-    UNIAPI_LINK_RELEASE_request,	/* API -> UNI */
-    UNIAPI_LINK_RELEASE_confirm,	/* UNI -> API */
-
-    UNIAPI_RESET_request,		/* API -> UNI */
-    UNIAPI_RESET_confirm,		/* UNI -> API */
-    UNIAPI_RESET_indication,		/* UNI -> API */
-    UNIAPI_RESET_ERROR_indication,	/* UNI -> API */
-    UNIAPI_RESET_response,		/* API -> UNI */
-    UNIAPI_RESET_ERROR_response,	/* API -> UNI */
-    UNIAPI_RESET_STATUS_indication,	/* UNI -> API */
-
-    UNIAPI_SETUP_request,		/* API -> UNI */
-    UNIAPI_SETUP_indication,		/* UNI -> API */
-    UNIAPI_SETUP_response,		/* API -> UNI */
-    UNIAPI_SETUP_confirm,		/* UNI -> API */
-    UNIAPI_SETUP_COMPLETE_indication,	/* UNI -> API */
-    UNIAPI_ALERTING_request,		/* API -> UNI */
-    UNIAPI_ALERTING_indication,		/* UNI -> API */
-    UNIAPI_PROCEEDING_request,		/* API -> UNI */
-    UNIAPI_PROCEEDING_indication,	/* UNI -> API */
-    UNIAPI_RELEASE_request,		/* API -> UNI */
-    UNIAPI_RELEASE_indication,		/* UNI -> API */
-    UNIAPI_RELEASE_response,		/* API -> UNI */
-    UNIAPI_RELEASE_confirm,		/* UNI -> API */
-    UNIAPI_NOTIFY_request,		/* API -> UNI */
-    UNIAPI_NOTIFY_indication,		/* UNI -> API */
-    UNIAPI_STATUS_indication,		/* UNI -> API */
-    UNIAPI_STATUS_ENQUIRY_request,	/* API -> UNI */
-
-    UNIAPI_ADD_PARTY_request,		/* API -> UNI */
-    UNIAPI_ADD_PARTY_indication,	/* UNI -> API */
-    UNIAPI_PARTY_ALERTING_request,	/* API -> UNI */
-    UNIAPI_PARTY_ALERTING_indication,	/* UNI -> API */
-    UNIAPI_ADD_PARTY_ACK_request,	/* API -> UNI */
-    UNIAPI_ADD_PARTY_ACK_indication,	/* UNI -> API */
-    UNIAPI_ADD_PARTY_REJ_request,	/* API -> UNI */
-    UNIAPI_ADD_PARTY_REJ_indication,	/* UNI -> API */
-    UNIAPI_DROP_PARTY_request,		/* API -> UNI */
-    UNIAPI_DROP_PARTY_indication,	/* UNI -> API */
-    UNIAPI_DROP_PARTY_ACK_request,	/* API -> UNI */
-    UNIAPI_DROP_PARTY_ACK_indication,	/* UNI -> API */
-
-    UNIAPI_ABORT_CALL_request,		/* API -> UNI */
-
-    UNIAPI_MAXSIG
-};
-.Ed
-.Pp
-The meaning of most of the signals can be deduced from the ITU-T SDLs.
-A number of signals, however, is unique to this implementation:
-.Bl -tag -width foo
-.It Dv UNIAPI_ERROR
-This is the error response, mentioned earlier.
-It carries an error code or
-zero, if the signal was accepted by the stack.
-.It Dv UNIAPI_CALL_CREATED
-The UNI stack has created a call instance either from an incoming SETUP or
-from the user requesting an outgoing SETUP.
-This may be used to synchronize
-the creation and destroying of call data between the UNI stack and the user.
-.It Dv UNIAPI_CALL_DESTROYED
-A call instance has been destroyed and all resources have been freed.
-.It Dv UNIAPI_PARTY_CREATED
-A new party has been created for an existing point-to-multipoint call.
-This may be used to synchronize the creation and destroying of party data
-between the UNI stack and the user.
-.It Dv UNIAPI_PARTY_DESTROYED
-A party has been destroyed and all resources have been freed.
-.It Dv UNIAPI_ABORT_CALL_request
-This requests the stack to destroy the call instance
-and free all its resources,
-without sending any messages to the network.
-.It Dv UNIAPI_MAXSIG
-This is not a signal, but rather a definition to get the number of defined
-signals.
-.El
-.Pp
-Each of the signals is followed by a fixed size structure defined in
-.In netnatm/sig/unidef.h .
-.Sh CONTROL MESSAGES
-The
-.Nm uni
-node understands the standard control messages, plus the following:
-.Bl -tag -width foo
-.It Dv NGM_UNI_SETDEBUG Pq Ic setdebug
-Set debugging facility levels.
-The UNI stack defines a number of debugging
-facilities, each one associated with a debugging level.
-If the debugging level
-of a facility is non-zero, text output will be generated to the console.
-The message uses the following structure:
-.Bd -literal
-struct ngm_uni_debug {
-	uint32_t	level[UNI_MAXFACILITY];
-};
-.Ed
-.It Dv NGM_UNI_GETDEBUG Pq Ic getdebug
-Get debugging facility levels.
-This returns an
-.Vt ngm_uni_debug
-structure.
-.It Dv NGM_UNI_GET_CONFIG Pq Ic get_config
-Retrieve the current configuration of the UNI instance.
-This message returns a
-.Vt uni_config
-structure:
-.Bd -literal
-struct uni_config {
-	uint32_t proto;		/* which protocol */
-	uint32_t popt;		/* protocol option */
-	uint32_t option;	/* other options */
-	uint32_t timer301;	/* T301 */
-	uint32_t timer303;	/* T303 */
-	uint32_t init303;	/* T303 retransmission count */
-	uint32_t timer308;	/* T308 */
-	uint32_t init308;	/* T308 retransmission count */
-	uint32_t timer309;	/* T309 */
-	uint32_t timer310;	/* T310 */
-	uint32_t timer313;	/* T313 */
-	uint32_t timer316;	/* T316 */
-	uint32_t init316;	/* T316 retransmission count */
-	uint32_t timer317;	/* T317 */
-	uint32_t timer322;	/* T322 */
-	uint32_t init322;	/* T322 retransmission count */
-	uint32_t timer397;	/* T397 */
-	uint32_t timer398;	/* T398 */
-	uint32_t timer399;	/* T399 */
-};
-.Ed
-.Pp
-The field
-.Va proto
-specifies one of the following protocols:
-.Bd -literal
-enum uni_proto {
-	UNIPROTO_UNI40U,	/* UNI4.0 user side */
-	UNIPROTO_UNI40N,	/* UNI4.0 network side */
-	UNIPROTO_PNNI10,	/* PNNI1.0 */
-};
-.Ed
-.Pp
-Some protocols may have options which can be set in
-.Va popt :
-.Bd -literal
-enum uni_popt {
-	UNIPROTO_GFP,		/* enable GFP */
-};
-.Ed
-.Pp
-The
-.Va option
-field controls parsing and checking of messages:
-.Bd -literal
-enum uni_option {
-	UNIOPT_GIT_HARD,	/* harder check of GIT IE */
-	UNIOPT_BEARER_HARD,	/* harder check of BEARER IE */
-	UNIOPT_CAUSE_HARD,	/* harder check of CAUSE IE */
-};
-.Ed
-.Pp
-All timer values are given in milliseconds.
-Note, however, that the actual
-resolution of the timers depend on system configuration (see
-.Xr timeout 9 ) .
-.It Dv NGM_UNI_SET_CONFIG Pq Ic set_config
-Change the UNI configuration.
-This takes a
-.Bd -literal
-struct ngm_uni_set_config {
-	struct uni_config		config;
-	struct ngm_uni_config_mask	mask;
-};
-struct ngm_uni_config_mask {
-	uint32_t	mask;
-	uint32_t	popt_mask;
-	uint32_t	option_mask;
-};
-.Ed
-.Pp
-The fields of the
-.Vt ngm_uni_config_mask
-specify which configuration parameter to change.
-The
-.Va mask
-field contains bit definitions for all timers, retransmission counters
-and the
-.Va proto
-field,
-.Va popt_mask
-selects which of the protocol options to change, and
-.Va option_mask
-specifies which options should be changed.
-The following bits are defined:
-.Bd -literal
-enum uni_config_mask {
-	UNICFG_PROTO,
-	UNICFG_TIMER301,
-	UNICFG_TIMER303,
-	UNICFG_INIT303,
-	UNICFG_TIMER308,
-	UNICFG_INIT308,
-	UNICFG_TIMER309,
-	UNICFG_TIMER310,
-	UNICFG_TIMER313,
-	UNICFG_TIMER316,
-	UNICFG_INIT316,
-	UNICFG_TIMER317,
-	UNICFG_TIMER322,
-	UNICFG_INIT322,
-	UNICFG_TIMER397,
-	UNICFG_TIMER398,
-	UNICFG_TIMER399,
-};
-.Ed
-.Pp
-For
-.Va popt_mask
-and
-.Va option_mask ,
-the definitions from
-.Vt "enum uni_popt"
-and
-.Vt "enum uni_option"
-should be used.
-.It Dv NGM_UNI_ENABLE Pq Ic enable
-Create the UNI instance and enable processing.
-Before the UNI is enabled parameters cannot be retrieved or set.
-.It Dv NGM_UNI_DISABLE Pq Ic disable
-Destroy the UNI instance and free all resources.
-Note, that connections are not released.
-.El
-.Sh SEE ALSO
-.Xr netgraph 4 ,
-.Xr ng_atm 4 ,
-.Xr ng_sscfu 4 ,
-.Xr ng_sscop 4 ,
-.Xr ngctl 8
-.Sh AUTHORS
-The
-.Nm uni
-netgraph node
-and this manual page were written by
-.An Harti Brandt Aq Mt harti@FreeBSD.org
-.Sh BUGS
-.Bl -bullet -compact
-.It
-LIJ (leaf-initiated-join) is not implemented yet.
-.It
-GFP (generic functional protocol, Q.2932.1) is not yet implemented.
-.It
-More testing needed.
-.It
-PNNI not yet implemented.
-.It
-Need to implement connection modification and the Q.2931 amendments.
-.El
diff --git a/share/man/man4/ngatmbase.4 b/share/man/man4/ngatmbase.4
deleted file mode 100644
index 6cdc3eb532fc..000000000000
--- a/share/man/man4/ngatmbase.4
+++ /dev/null
@@ -1,139 +0,0 @@
-.\"
-.\" Copyright (c) 2004
-.\"	Hartmut Brandt.
-.\" 	All rights reserved.
-.\"
-.\" Author: Hartmut Brandt <harti@FreeBSD.org>
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.\" ngatmbase(4) man page
-.\"
-.Dd March 3, 2023
-.Dt NGATMBASE 4
-.Os
-.Sh DEPRECATION NOTICE
-.Nm
-is deprecated and may not be available in
-.Fx 14.0
-and later.
-.Sh NAME
-.Nm ngatmbase
-.Nd netgraph ATM utility module
-.Sh SYNOPSIS
-.In netnatm/unimsg.h
-.In netgraph/atm/ngatmbase.h
-.Ft "struct mbuf *"
-.Fn uni_msg_pack_mbuf "struct uni_msg *msg" "void *hdr" "size_t len"
-.Ft "struct uni_msg *"
-.Fn uni_msg_alloc "size_t len"
-.Ft "struct uni_msg *"
-.Fn uni_msg_build "void *buf" ...
-.Ft void
-.Fn uni_msg_destroy "struct uni_msg *msg"
-.Ft int
-.Fn uni_msg_unpack_mbuf "struct mbuf *m" "struct uni_msg *msgp"
-.Sh DESCRIPTION
-This module provides utility functions for the handling of signalling
-messages to the NgATM modules.
-.Pp
-The
-.Fn uni_msg_pack_mbuf
-function
-packs a message into one or several
-.Vt mbuf Ns s
-optionally prepending a header.
-The header is given by its address
-.Fa hdr
-and length
-.Fa len .
-If
-.Fa hdr
-is
-.Dv NULL
-or
-.Fa len
-equals 0, no header is prepended.
-Either
-.Fa msg
-or
-.Fa hdr
-may be
-.Dv NULL
-but not both.
-The
-.Fn uni_msg_pack_mbuf
-function
-returns a pointer to the allocated
-.Vt mbuf
-chain or
-.Dv NULL
-in the case of an error.
-.Pp
-The
-.Fn uni_msg_alloc
-function
-allocates a new message with space for at least
-.Fa len
-bytes.
-In the case of an error
-.Dv NULL
-is returned.
-.Pp
-The
-.Fn uni_msg_build
-function constructs a message from pieces.
-Each piece is given by a pair of
-arguments, the first of type
-.Vt "void *"
-and the second a
-.Vt size_t .
-The list of pieces must be terminated by
-.Po Vt "void *" Pc Ns Dv NULL .
-.Pp
-The
-.Fn uni_msg_destroy
-function
-destroys the messages and frees all the messages's memory.
-.Pp
-The
-.Fn uni_msg_unpack_mbuf
-function
-unpacks an
-.Vt mbuf
-chain info a
-.Vt uni_msg .
-A pointer to the newly allocated message is stored in
-.Fa msgp
-and 0 is returned.
-In the case of an error (either when no packet header is found
-in the first mbuf or memory cannot be allocated) the function
-returns an appropriate error code.
-.Sh SEE ALSO
-.Xr ng_ccatm 4 ,
-.Xr ng_sscfu 4 ,
-.Xr ng_sscop 4 ,
-.Xr ng_uni 4
-.Sh AUTHORS
-.An Harti Brandt Aq Mt harti@FreeBSD.org
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index e76fe24d5506..35bd7fa98120 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1,2815 +1,2808 @@
 # $FreeBSD$
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
 # Lines that begin with 'device', 'options', 'machine', 'ident', 'maxusers',
 # 'makeoptions', 'hints', etc. go into the kernel configuration that you
 # run config(8) with.
 #
 # Lines that begin with 'envvar hint.' should go into your hints file.
 # See /boot/device.hints and/or the 'hints' config(8) directive.
 #
 # Please use ``make LINT'' to create an old-style LINT file if you want to
 # do kernel test-builds.
 #
 # This file contains machine independent kernel configuration notes.  For
 # machine dependent notes, look in /sys/<arch>/conf/NOTES.
 #
 
 #
 # NOTES conventions and style guide:
 #
 # Large block comments should begin and end with a line containing only a
 # comment character.
 #
 # To describe a particular object, a block comment (if it exists) should
 # come first.  Next should come device, options, and hints lines in that
 # order.  All device and option lines must be described by a comment that
 # doesn't just expand the device or option name.  Use only a concise
 # comment on the same line if possible.  Very detailed descriptions of
 # devices and subsystems belong in man pages.
 #
 # A space followed by a tab separates 'options' from an option name.  Two
 # spaces followed by a tab separate 'device' from a device name.  Comments
 # after an option or device should use one space after the comment character.
 # To comment out a negative option that disables code and thus should not be
 # enabled for LINT builds, precede 'options' with "#!".
 #
 
 #
 # This is the ``identification'' of the kernel.  Usually this should
 # be the same as the name of your kernel.
 #
 ident		LINT
 
 #
 # The `maxusers' parameter controls the static sizing of a number of
 # internal system tables by a formula defined in subr_param.c.
 # Omitting this parameter or setting it to 0 will cause the system to
 # auto-size based on physical memory.
 #
 maxusers	10
 
 # To statically compile in device wiring instead of /boot/device.hints
 #hints		"LINT.hints"		# Default places to look for devices.
 
 # Use the following to compile in values accessible to the kernel
 # through getenv() (or kenv(1) in userland). The format of the file
 # is 'variable=value', see kenv(1)
 #
 #env		"LINT.env"
 
 #
 # The `makeoptions' parameter allows variables to be passed to the
 # generated Makefile in the build area.
 #
 # CONF_CFLAGS gives some extra compiler flags that are added to ${CFLAGS}
 # after most other flags.  Here we use it to inhibit use of non-optimal
 # gcc built-in functions (e.g., memcmp).
 #
 # DEBUG happens to be magic.
 # The following is equivalent to 'config -g KERNELNAME' and creates
 # 'kernel.debug' compiled with -g debugging as well as a normal
 # 'kernel'.  Use 'make install.debug' to install the debug kernel
 # but that isn't normally necessary as the debug symbols are not loaded
 # by the kernel and are not useful there anyway.
 #
 # KERNEL can be overridden so that you can change the default name of your
 # kernel.
 #
 # MODULES_OVERRIDE can be used to limit modules built to a specific list.
 #
 makeoptions	CONF_CFLAGS=-fno-builtin  #Don't allow use of memcmp, etc.
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 #makeoptions	KERNEL=foo		#Build kernel "foo" and install "/foo"
 # Only build ext2fs module plus those parts of the sound system I need.
 #makeoptions	MODULES_OVERRIDE="ext2fs sound/sound sound/driver/maestro3"
 makeoptions	DESTDIR=/tmp
 
 #
 # FreeBSD processes are subject to certain limits to their consumption
 # of system resources.  See getrlimit(2) for more details.  Each
 # resource limit has two values, a "soft" limit and a "hard" limit.
 # The soft limits can be modified during normal system operation, but
 # the hard limits are set at boot time.  Their default values are
 # in sys/<arch>/include/vmparam.h.  There are two ways to change them:
 # 
 # 1.  Set the values at kernel build time.  The options below are one
 #     way to allow that limit to grow to 1GB.  They can be increased
 #     further by changing the parameters:
 #	
 # 2.  In /boot/loader.conf, set the tunables kern.maxswzone,
 #     kern.maxbcache, kern.maxtsiz, kern.dfldsiz, kern.maxdsiz,
 #     kern.dflssiz, kern.maxssiz and kern.sgrowsiz.
 #
 # The options in /boot/loader.conf override anything in the kernel
 # configuration file.  See the function init_param1 in
 # sys/kern/subr_param.c for more details.
 #
 
 options 	MAXDSIZ=(1024UL*1024*1024)
 options 	MAXSSIZ=(128UL*1024*1024)
 options 	DFLDSIZ=(1024UL*1024*1024)
 
 #
 # BLKDEV_IOSIZE sets the default block size used in user block
 # device I/O.  Note that this value will be overridden by the label
 # when specifying a block device from a label with a non-0
 # partition blocksize.  The default is PAGE_SIZE.
 #
 options 	BLKDEV_IOSIZE=8192
 
 #
 # MAXPHYS and DFLTPHYS
 #
 # These are the maximal and safe 'raw' I/O block device access sizes.
 # Reads and writes will be split into MAXPHYS chunks for known good
 # devices and DFLTPHYS for the rest. Some applications have better
 # performance with larger raw I/O access sizes. Note that certain VM
 # parameters are derived from these values and making them too large
 # can make an unbootable kernel.
 #
 # The defaults are 64K and 128K respectively.
 options 	DFLTPHYS=(64*1024)
 options 	MAXPHYS=(128*1024)
 
 
 # This allows you to actually store this configuration file into
 # the kernel binary itself. See config(8) for more details.
 #
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
 #
 # Compile-time defaults for various boot parameters
 #
 options 	BOOTVERBOSE=1
 options 	BOOTHOWTO=RB_MULTIPLE
 
 #
 # Compile-time defaults for dmesg boot tagging
 #
 # Default boot tag; may use 'kern.boot_tag' loader tunable to override.  The
 # current boot's tag is also exposed via the 'kern.boot_tag' sysctl.
 options 	BOOT_TAG=\"\"
 # Maximum boot tag size the kernel's static buffer should accommodate.  Maximum
 # size for both BOOT_TAG and the assocated tunable.
 options 	BOOT_TAG_SZ=32
 
 options 	GEOM_BDE		# Disk encryption.
 options 	GEOM_CACHE		# Disk cache.
 options 	GEOM_CONCAT		# Disk concatenation.
 options 	GEOM_ELI		# Disk encryption.
 options 	GEOM_GATE		# Userland services.
 options 	GEOM_JOURNAL		# Journaling.
 options 	GEOM_LABEL		# Providers labelization.
 options 	GEOM_LINUX_LVM		# Linux LVM2 volumes
 options 	GEOM_MAP		# Map based partitioning
 options 	GEOM_MIRROR		# Disk mirroring.
 options 	GEOM_MULTIPATH		# Disk multipath
 options 	GEOM_NOP		# Test class.
 options 	GEOM_PART_APM		# Apple partitioning
 options 	GEOM_PART_BSD		# BSD disklabel
 options 	GEOM_PART_BSD64		# BSD disklabel64
 options 	GEOM_PART_EBR		# Extended Boot Records
 options 	GEOM_PART_GPT		# GPT partitioning
 options 	GEOM_PART_LDM		# Logical Disk Manager
 options 	GEOM_PART_MBR		# MBR partitioning
 options 	GEOM_PART_VTOC8		# SMI VTOC8 disk label
 options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_RAID3		# RAID3 functionality.
 options 	GEOM_SHSEC		# Shared secret.
 options 	GEOM_STRIPE		# Disk striping.
 options 	GEOM_UZIP		# Read-only compressed disks
 options 	GEOM_VINUM		# Vinum logical volume manager
 options 	GEOM_VIRSTOR		# Virtual storage.
 options 	GEOM_ZERO		# Performance testing helper.
 
 #
 # The root device and filesystem type can be compiled in;
 # this provides a fallback option if the root device cannot
 # be correctly guessed by the bootstrap code, or an override if
 # the RB_DFLTROOT flag (-r) is specified when booting the kernel.
 #
 options 	ROOTDEVNAME=\"ufs:da0s2e\"
 
 
 #####################################################################
 # Scheduler options:
 #
 # Specifying one of SCHED_4BSD or SCHED_ULE is mandatory.  These options
 # select which scheduler is compiled in.
 #
 # SCHED_4BSD is the historical, proven, BSD scheduler.  It has a global run
 # queue and no CPU affinity which makes it suboptimal for SMP.  It has very
 # good interactivity and priority selection.
 #
 # SCHED_ULE provides significant performance advantages over 4BSD on many
 # workloads on SMP machines.  It supports cpu-affinity, per-cpu runqueues
 # and scheduler locks.  It also has a stronger notion of interactivity 
 # which leads to better responsiveness even on uniprocessor machines.  This
 # is the default scheduler.
 #
 # SCHED_STATS is a debugging option which keeps some stats in the sysctl
 # tree at 'kern.sched.stats' and is useful for debugging scheduling decisions.
 #
 options 	SCHED_4BSD
 options 	SCHED_STATS
 #options 	SCHED_ULE
 
 #####################################################################
 # SMP OPTIONS:
 #
 # SMP enables building of a Symmetric MultiProcessor Kernel.
 
 # Mandatory:
 options 	SMP			# Symmetric MultiProcessor Kernel
 
 # EARLY_AP_STARTUP releases the Application Processors earlier in the
 # kernel startup process (before devices are probed) rather than at the
 # end.  This is a temporary option for use during the transition from
 # late to early AP startup.
 options 	EARLY_AP_STARTUP
 
 # MAXCPU defines the maximum number of CPUs that can boot in the system.
 # A default value should be already present, for every architecture.
 options 	MAXCPU=32
 
 # NUMA enables use of Non-Uniform Memory Access policies in various kernel
 # subsystems.
 options 	NUMA
 
 # MAXMEMDOM defines the maximum number of memory domains that can boot in the
 # system.  A default value should already be defined by every architecture.
 options 	MAXMEMDOM=2
 
 # ADAPTIVE_MUTEXES changes the behavior of blocking mutexes to spin
 # if the thread that currently owns the mutex is executing on another
 # CPU.  This behavior is enabled by default, so this option can be used
 # to disable it.
 options 	NO_ADAPTIVE_MUTEXES
 
 # ADAPTIVE_RWLOCKS changes the behavior of reader/writer locks to spin
 # if the thread that currently owns the rwlock is executing on another
 # CPU.  This behavior is enabled by default, so this option can be used
 # to disable it.
 options 	NO_ADAPTIVE_RWLOCKS
 
 # ADAPTIVE_SX changes the behavior of sx locks to spin if the thread that
 # currently owns the sx lock is executing on another CPU.
 # This behavior is enabled by default, so this option can be used to
 # disable it.
 options 	NO_ADAPTIVE_SX
 
 # MUTEX_NOINLINE forces mutex operations to call functions to perform each
 # operation rather than inlining the simple cases.  This can be used to
 # shrink the size of the kernel text segment.  Note that this behavior is
 # already implied by the INVARIANT_SUPPORT, INVARIANTS, KTR, LOCK_PROFILING,
 # and WITNESS options.
 options 	MUTEX_NOINLINE
 
 # RWLOCK_NOINLINE forces rwlock operations to call functions to perform each
 # operation rather than inlining the simple cases.  This can be used to
 # shrink the size of the kernel text segment.  Note that this behavior is
 # already implied by the INVARIANT_SUPPORT, INVARIANTS, KTR, LOCK_PROFILING,
 # and WITNESS options.
 options 	RWLOCK_NOINLINE
 
 # SX_NOINLINE forces sx lock operations to call functions to perform each
 # operation rather than inlining the simple cases.  This can be used to
 # shrink the size of the kernel text segment.  Note that this behavior is
 # already implied by the INVARIANT_SUPPORT, INVARIANTS, KTR, LOCK_PROFILING,
 # and WITNESS options.
 options 	SX_NOINLINE
 
 # SMP Debugging Options:
 #
 # CALLOUT_PROFILING enables rudimentary profiling of the callwheel data
 #	  structure used as backend in callout(9).
 # PREEMPTION allows the threads that are in the kernel to be preempted by
 #	  higher priority [interrupt] threads.  It helps with interactivity
 #	  and allows interrupt threads to run sooner rather than waiting.
 # FULL_PREEMPTION instructs the kernel to preempt non-realtime kernel
 #	  threads.  Its sole use is to expose race conditions and other
 #	  bugs during development.  Enabling this option will reduce
 #	  performance and increase the frequency of kernel panics by
 #	  design.  If you aren't sure that you need it then you don't.
 #	  Relies on the PREEMPTION option.  DON'T TURN THIS ON.
 # SLEEPQUEUE_PROFILING enables rudimentary profiling of the hash table
 #	  used to hold active sleep queues as well as sleep wait message
 #	  frequency.
 # TURNSTILE_PROFILING enables rudimentary profiling of the hash table
 #	  used to hold active lock queues.
 # UMTX_PROFILING enables rudimentary profiling of the hash table used 
 #	  to hold active lock queues.
 # WITNESS enables the witness code which detects deadlocks and cycles
 #         during locking operations.
 # WITNESS_KDB causes the witness code to drop into the kernel debugger if
 #	  a lock hierarchy violation occurs or if locks are held when going to
 #	  sleep.
 # WITNESS_SKIPSPIN disables the witness checks on spin mutexes.
 options 	PREEMPTION
 options 	FULL_PREEMPTION
 options 	WITNESS
 options 	WITNESS_KDB
 options 	WITNESS_SKIPSPIN
 
 # LOCK_PROFILING - Profiling locks.  See LOCK_PROFILING(9) for details.
 options 	LOCK_PROFILING
 # Set the number of buffers and the hash size.  The hash size MUST be larger
 # than the number of buffers.  Hash size should be prime.
 options 	MPROF_BUFFERS="1536"
 options 	MPROF_HASH_SIZE="1543"
 
 # Profiling for the callout(9) backend.
 options 	CALLOUT_PROFILING
 
 # Profiling for internal hash tables.
 options 	SLEEPQUEUE_PROFILING
 options 	TURNSTILE_PROFILING
 options 	UMTX_PROFILING
 
 # Debugging traces for epoch(9) misuse
 options 	EPOCH_TRACE
 
 #####################################################################
 # COMPATIBILITY OPTIONS
 
 # Old tty interface.
 options 	COMPAT_43TTY
 
 # Note that as a general rule, COMPAT_FREEBSD<n> depends on
 # COMPAT_FREEBSD<n+1>, COMPAT_FREEBSD<n+2>, etc.
 
 # Enable FreeBSD4 compatibility syscalls
 options 	COMPAT_FREEBSD4
 
 # Enable FreeBSD5 compatibility syscalls
 options 	COMPAT_FREEBSD5
 
 # Enable FreeBSD6 compatibility syscalls
 options 	COMPAT_FREEBSD6
 
 # Enable FreeBSD7 compatibility syscalls
 options 	COMPAT_FREEBSD7
 
 # Enable FreeBSD9 compatibility syscalls
 options 	COMPAT_FREEBSD9
 
 # Enable FreeBSD10 compatibility syscalls
 options 	COMPAT_FREEBSD10
 
 # Enable FreeBSD11 compatibility syscalls
 options 	COMPAT_FREEBSD11
 
 # Enable FreeBSD12 compatibility syscalls
 options 	COMPAT_FREEBSD12
 
 # Enable FreeBSD13 compatibility syscalls
 options 	COMPAT_FREEBSD13
 
 # Enable Linux Kernel Programming Interface
 options 	COMPAT_LINUXKPI
 
 #
 # These three options provide support for System V Interface
 # Definition-style interprocess communication, in the form of shared
 # memory, semaphores, and message queues, respectively.
 #
 options 	SYSVSHM
 options 	SYSVSEM
 options 	SYSVMSG
 
 
 #####################################################################
 # DEBUGGING OPTIONS
 
 #
 # Compile with kernel debugger related code.
 #
 options 	KDB
 
 #
 # Print a stack trace of the current thread on the console for a panic.
 #
 options 	KDB_TRACE
 
 #
 # Don't enter the debugger for a panic. Intended for unattended operation
 # where you may want to enter the debugger from the console, but still want
 # the machine to recover from a panic.
 #
 options 	KDB_UNATTENDED
 
 #
 # Enable the ddb debugger backend.
 #
 options 	DDB
 
 #
 # Print the numerical value of symbols in addition to the symbolic
 # representation.
 #
 options 	DDB_NUMSYM
 
 #
 # Enable the remote gdb debugger backend.
 #
 options 	GDB
 
 #
 # Trashes list pointers when they become invalid (i.e., the element is
 # removed from a list).  Relatively inexpensive to enable.
 #
 options 	QUEUE_MACRO_DEBUG_TRASH
 
 #
 # Stores information about the last caller to modify the list object
 # in the list object.  Requires additional memory overhead.
 #
 #options 	QUEUE_MACRO_DEBUG_TRACE
 
 #
 # SYSCTL_DEBUG enables a 'sysctl' debug tree that can be used to dump the
 # contents of the registered sysctl nodes on the console.  It is disabled by
 # default because it generates excessively verbose console output that can
 # interfere with serial console operation.
 #
 options 	SYSCTL_DEBUG
 
 #
 # Enable textdump by default, this disables kernel core dumps.
 #
 options 	TEXTDUMP_PREFERRED
 
 #
 # Enable extra debug messages while performing textdumps.
 #
 options 	TEXTDUMP_VERBOSE
 
 #
 # NO_SYSCTL_DESCR omits the sysctl node descriptions to save space in the
 # resulting kernel.
 options 	NO_SYSCTL_DESCR
 
 #
 # MALLOC_DEBUG_MAXZONES enables multiple uma zones for malloc(9)
 # allocations that are smaller than a page.  The purpose is to isolate
 # different malloc types into hash classes, so that any buffer
 # overruns or use-after-free will usually only affect memory from
 # malloc types in that hash class.  This is purely a debugging tool;
 # by varying the hash function and tracking which hash class was
 # corrupted, the intersection of the hash classes from each instance
 # will point to a single malloc type that is being misused.  At this
 # point inspection or memguard(9) can be used to catch the offending
 # code.
 #
 options 	MALLOC_DEBUG_MAXZONES=8
 
 #
 # DEBUG_MEMGUARD builds and enables memguard(9), a replacement allocator
 # for the kernel used to detect modify-after-free scenarios.  See the
 # memguard(9) man page for more information on usage.
 #
 options 	DEBUG_MEMGUARD
 
 #
 # DEBUG_REDZONE enables buffer underflows and buffer overflows detection for
 # malloc(9).
 #
 options 	DEBUG_REDZONE
 
 #
 # EARLY_PRINTF enables support for calling a special printf (eprintf)
 # very early in the kernel (before cn_init() has been called).  This
 # should only be used for debugging purposes early in boot.  Normally,
 # it is not defined.  It is commented out here because this feature
 # isn't generally available. And the required eputc() isn't defined.
 #
 #options 	EARLY_PRINTF
 
 #
 # KTRACE enables the system-call tracing facility ktrace(2).  To be more
 # SMP-friendly, KTRACE uses a worker thread to process most trace events
 # asynchronously to the thread generating the event.  This requires a
 # pre-allocated store of objects representing trace events.  The
 # KTRACE_REQUEST_POOL option specifies the initial size of this store.
 # The size of the pool can be adjusted both at boottime and runtime via
 # the kern.ktrace_request_pool tunable and sysctl.
 #
 options 	KTRACE			#kernel tracing
 options 	KTRACE_REQUEST_POOL=101
 
 #
 # KTR is a kernel tracing facility imported from BSD/OS.  It is
 # enabled with the KTR option.  KTR_ENTRIES defines the number of
 # entries in the circular trace buffer; it may be an arbitrary number.
 # KTR_BOOT_ENTRIES defines the number of entries during the early boot,
 # before malloc(9) is functional.
 # KTR_COMPILE defines the mask of events to compile into the kernel as
 # defined by the KTR_* constants in <sys/ktr.h>.  KTR_MASK defines the
 # initial value of the ktr_mask variable which determines at runtime
 # what events to trace.  KTR_CPUMASK determines which CPU's log
 # events, with bit X corresponding to CPU X.  The layout of the string
 # passed as KTR_CPUMASK must match a series of bitmasks each of them
 # separated by the "," character (ie:
 # KTR_CPUMASK=0xAF,0xFFFFFFFFFFFFFFFF).  KTR_VERBOSE enables
 # dumping of KTR events to the console by default.  This functionality
 # can be toggled via the debug.ktr_verbose sysctl and defaults to off
 # if KTR_VERBOSE is not defined.  See ktr(4) and ktrdump(8) for details.
 #
 options 	KTR
 options 	KTR_BOOT_ENTRIES=1024
 options 	KTR_ENTRIES=(128*1024)
 options 	KTR_COMPILE=(KTR_ALL)
 options 	KTR_MASK=KTR_INTR
 options 	KTR_CPUMASK=0x3
 options 	KTR_VERBOSE
 
 #
 # ALQ(9) is a facility for the asynchronous queuing of records from the kernel
 # to a vnode, and is employed by services such as ktr(4) to produce trace
 # files based on a kernel event stream.  Records are written asynchronously
 # in a worker thread.
 #
 options 	ALQ
 options 	KTR_ALQ
 
 #
 # The INVARIANTS option is used in a number of source files to enable
 # extra sanity checking of internal structures.  This support is not
 # enabled by default because of the extra time it would take to check
 # for these conditions, which can only occur as a result of
 # programming errors.
 #
 options 	INVARIANTS
 
 #
 # The INVARIANT_SUPPORT option makes us compile in support for
 # verifying some of the internal structures.  It is a prerequisite for
 # 'INVARIANTS', as enabling 'INVARIANTS' will make these functions be
 # called.  The intent is that you can set 'INVARIANTS' for single
 # source files (by changing the source file or specifying it on the
 # command line) if you have 'INVARIANT_SUPPORT' enabled.  Also, if you
 # wish to build a kernel module with 'INVARIANTS', then adding
 # 'INVARIANT_SUPPORT' to your kernel will provide all the necessary
 # infrastructure without the added overhead.
 #
 options 	INVARIANT_SUPPORT
 
 #
 # The KASSERT_PANIC_OPTIONAL option allows kasserts to fire without
 # necessarily inducing a panic.  Panic is the default behavior, but
 # runtime options can configure it either entirely off, or off with a
 # limit.
 #
 options 	KASSERT_PANIC_OPTIONAL
 
 #
 # The DIAGNOSTIC option is used to enable extra debugging information
 # and invariants checking.  The added checks are too expensive or noisy
 # for an INVARIANTS kernel and thus are disabled by default.  It is
 # expected that a kernel configured with DIAGNOSTIC will also have the
 # INVARIANTS option enabled.
 #
 options 	DIAGNOSTIC
 
 #
 # REGRESSION causes optional kernel interfaces necessary only for regression
 # testing to be enabled.  These interfaces may constitute security risks
 # when enabled, as they permit processes to easily modify aspects of the
 # run-time environment to reproduce unlikely or unusual (possibly normally
 # impossible) scenarios.
 #
 options 	REGRESSION
 
 #
 # This option lets some drivers co-exist that can't co-exist in a running
 # system.  This is used to be able to compile all kernel code in one go for
 # quality assurance purposes (like this file, which the option takes it name
 # from.)
 #
 options 	COMPILING_LINT
 
 #
 # STACK enables the stack(9) facility, allowing the capture of kernel stack
 # for the purpose of procinfo(1), etc.  stack(9) will also be compiled in
 # automatically if DDB(4) is compiled into the kernel.
 #
 options 	STACK
 
 #
 # The NUM_CORE_FILES option specifies the limit for the number of core
 # files generated by a particular process, when the core file format
 # specifier includes the %I pattern. Since we only have 1 character for
 # the core count in the format string, meaning the range will be 0-9, the
 # maximum value allowed for this option is 10.
 # This core file limit can be adjusted at runtime via the debug.ncores
 # sysctl.
 #
 options 	NUM_CORE_FILES=5
 
 #
 # The TSLOG option enables timestamped logging of events, especially
 # function entries/exits, in order to track the time spent by the kernel.
 # In particular, this is useful when investigating the early boot process,
 # before it is possible to use more sophisticated tools like DTrace.
 # The TSLOGSIZE option controls the size of the (preallocated, fixed
 # length) buffer used for storing these events (default: 262144 records).
 #
 # For security reasons the TSLOG option should not be enabled on systems
 # used in production.
 #
 options 	TSLOG
 options 	TSLOGSIZE=262144
 
 
 #####################################################################
 # PERFORMANCE MONITORING OPTIONS
 
 #
 # The hwpmc driver that allows the use of in-CPU performance monitoring
 # counters for performance monitoring.  The base kernel needs to be configured
 # with the 'options' line, while the hwpmc device can be either compiled
 # in or loaded as a loadable kernel module.
 #
 # Additional configuration options may be required on specific architectures,
 # please see hwpmc(4).
 
 device		hwpmc			# Driver (also a loadable module)
 options 	HWPMC_DEBUG
 options 	HWPMC_HOOKS		# Other necessary kernel hooks
 
 
 #####################################################################
 # NETWORKING OPTIONS
 
 #
 # Protocol families
 #
 options 	INET			#Internet communications protocols
 options 	INET6			#IPv6 communications protocols
 #
 # Note if you include INET/INET6 or both options
 # You *must* define at least one of the congestion control
 # options or the compile will fail. GENERIC defines
 # options CC_CUBIC. You may want to specify a default
 # if multiple congestion controls are compiled in.
 # The string in default is the name of the
 # cc module as it would appear in the sysctl for
 # setting the default. The code defines CUBIC
 # as default, or the sole cc_module compiled in.
 #
 options 	CC_CDG
 options 	CC_CHD
 options 	CC_CUBIC
 options 	CC_DCTCP
 options 	CC_HD
 options 	CC_HTCP
 options 	CC_NEWRENO
 options 	CC_VEGAS
 options 	CC_DEFAULT=\"cubic\"
 options 	RATELIMIT		# TX rate limiting support
 
 options 	ROUTETABLES=2		# allocated fibs up to 65536. default is 1.
 					# but that would be a bad idea as they are large.
 
 options 	TCP_OFFLOAD		# TCP offload support.
 options  	TCP_RFC7413		# TCP Fast Open
 
 options  	TCPHPTS
 makeoptions	WITH_EXTRA_TCP_STACKS=1	# RACK and BBR TCP kernel modules
 
 # In order to enable IPSEC you MUST also add device crypto to 
 # your kernel configuration
 options 	IPSEC			#IP security (requires device crypto)
 
 # Option IPSEC_SUPPORT does not enable IPsec, but makes it possible to 
 # load it as a kernel module. You still MUST add device crypto to your kernel
 # configuration.
 options 	IPSEC_SUPPORT
 #options 	IPSEC_DEBUG		#debug for IP security
 
 
 # TLS framing and encryption/decryption of data over TCP sockets.
 options 	KERN_TLS		# TLS transmit and receive offload
 
 # Netlink kernel/user<>kernel/user messaging interface
 options 	NETLINK
 
 #
 # SMB/CIFS requester
 # NETSMB enables support for SMB protocol, it requires LIBMCHAIN and LIBICONV
 # options.
 options 	NETSMB			#SMB/CIFS requester
 
 # mchain library. It can be either loaded as KLD or compiled into kernel
 options 	LIBMCHAIN
 
 # libalias library, performing NAT
 options 	LIBALIAS
 
 #
 # SCTP is a NEW transport protocol defined by
 # RFC2960 updated by RFC3309 and RFC3758.. and
 # soon to have a new base RFC and many many more
 # extensions. This release supports all the extensions
 # including many drafts (most about to become RFC's).
 # It is the reference implementation of SCTP
 # and is quite well tested.
 #
 # Note YOU MUST have both INET and INET6 defined.
 # You don't have to enable V6, but SCTP is 
 # dual stacked and so far we have not torn apart
 # the V6 and V4.. since an association can span
 # both a V6 and V4 address at the SAME time :-)
 #
 # The SCTP_SUPPORT option does not enable SCTP, but provides the necessary
 # support for loading SCTP as a loadable kernel module.
 #
 options 	SCTP
 options 	SCTP_SUPPORT
 
 # There are bunches of options:
 # this one turns on all sorts of
 # nastily printing that you can
 # do. It's all controlled by a
 # bit mask (settable by socket opt and
 # by sysctl). Including will not cause
 # logging until you set the bits.. but it
 # can be quite verbose.. so without this
 # option we don't do any of the tests for
 # bits and prints.. which makes the code run
 # faster.. if you are not debugging don't use.
 options 	SCTP_DEBUG
 
 #
 # All that options after that turn on specific types of
 # logging. You can monitor CWND growth, flight size
 # and all sorts of things. Go look at the code and
 # see. I have used this to produce interesting 
 # charts and graphs as well :->
 # 
 # I have not yet committed the tools to get and print
 # the logs, I will do that eventually .. before then
 # if you want them send me an email rrs@freebsd.org
 # You basically must have ktr(4) enabled for these
 # and you then set the sysctl to turn on/off various
 # logging bits. Use ktrdump(8) to pull the log and run
 # it through a display program.. and graphs and other
 # things too.
 #
 options 	SCTP_LOCK_LOGGING
 options 	SCTP_MBUF_LOGGING
 options 	SCTP_MBCNT_LOGGING
 options 	SCTP_PACKET_LOGGING
 options 	SCTP_LTRACE_CHUNKS
 options 	SCTP_LTRACE_ERRORS
 
 # altq(9). Enable the base part of the hooks with the ALTQ option.
 # Individual disciplines must be built into the base system and can not be
 # loaded as modules at this point. ALTQ requires a stable TSC so if yours is
 # broken or changes with CPU throttling then you must also have the ALTQ_NOPCC
 # option.
 options 	ALTQ
 options 	ALTQ_CBQ	# Class Based Queueing
 options 	ALTQ_RED	# Random Early Detection
 options 	ALTQ_RIO	# RED In/Out
 options 	ALTQ_CODEL	# CoDel Active Queueing
 options 	ALTQ_HFSC	# Hierarchical Packet Scheduler
 options 	ALTQ_FAIRQ	# Fair Packet Scheduler
 options 	ALTQ_CDNR	# Traffic conditioner
 options 	ALTQ_PRIQ	# Priority Queueing
 options 	ALTQ_NOPCC	# Required if the TSC is unusable
 options 	ALTQ_DEBUG
 
 # netgraph(4). Enable the base netgraph code with the NETGRAPH option.
 # Individual node types can be enabled with the corresponding option
 # listed below; however, this is not strictly necessary as netgraph
 # will automatically load the corresponding KLD module if the node type
 # is not already compiled into the kernel. Each type below has a
 # corresponding man page, e.g., ng_async(8).
 options 	NETGRAPH		# netgraph(4) system
 options 	NETGRAPH_DEBUG		# enable extra debugging, this
 					# affects netgraph(4) and nodes
 # Node types
 options 	NETGRAPH_ASYNC
 options 	NETGRAPH_ATMLLC
 options 	NETGRAPH_BLUETOOTH		# ng_bluetooth(4)
 options 	NETGRAPH_BLUETOOTH_HCI		# ng_hci(4)
 options 	NETGRAPH_BLUETOOTH_L2CAP	# ng_l2cap(4)
 options 	NETGRAPH_BLUETOOTH_SOCKET	# ng_btsocket(4)
 options 	NETGRAPH_BLUETOOTH_UBT		# ng_ubt(4)
 options 	NETGRAPH_BLUETOOTH_UBTBCMFW	# ubtbcmfw(4)
 options 	NETGRAPH_BPF
 options 	NETGRAPH_BRIDGE
 options 	NETGRAPH_CAR
 options 	NETGRAPH_CHECKSUM
 options 	NETGRAPH_CISCO
 options 	NETGRAPH_DEFLATE
 options 	NETGRAPH_DEVICE
 options 	NETGRAPH_ECHO
 options 	NETGRAPH_EIFACE
 options 	NETGRAPH_ETHER
 options 	NETGRAPH_FRAME_RELAY
 options 	NETGRAPH_GIF
 options 	NETGRAPH_GIF_DEMUX
 options 	NETGRAPH_HOLE
 options 	NETGRAPH_IFACE
 options 	NETGRAPH_IP_INPUT
 options 	NETGRAPH_IPFW
 options 	NETGRAPH_KSOCKET
 options 	NETGRAPH_L2TP
 options 	NETGRAPH_LMI
 options 	NETGRAPH_MPPC_COMPRESSION
 options 	NETGRAPH_MPPC_ENCRYPTION
 options 	NETGRAPH_NETFLOW
 options 	NETGRAPH_NAT
 options 	NETGRAPH_ONE2MANY
 options 	NETGRAPH_PATCH
 options 	NETGRAPH_PIPE
 options 	NETGRAPH_PPP
 options 	NETGRAPH_PPPOE
 options 	NETGRAPH_PPTPGRE
 options 	NETGRAPH_PRED1
 options 	NETGRAPH_RFC1490
 options 	NETGRAPH_SOCKET
 options 	NETGRAPH_SPLIT
 options 	NETGRAPH_TAG
 options 	NETGRAPH_TCPMSS
 options 	NETGRAPH_TEE
 options 	NETGRAPH_UI
 options 	NETGRAPH_VJC
 options 	NETGRAPH_VLAN
 
-# NgATM - Netgraph ATM
-options 	NGATM_ATMBASE
-options 	NGATM_SSCOP
-options 	NGATM_SSCFU
-options 	NGATM_UNI
-options 	NGATM_CCATM
-
 # Network stack virtualization.
 options 	VIMAGE
 options 	VNET_DEBUG	# debug for VIMAGE
 
 #
 # Network interfaces:
 #  The `loop' device is MANDATORY when networking is enabled.
 device		loop
 
 #  The `ether' device provides generic code to handle
 #  Ethernets; it is MANDATORY when an Ethernet device driver is
 #  configured.
 device		ether
 
 #  The `vlan' device implements the VLAN tagging of Ethernet frames
 #  according to IEEE 802.1Q.
 device		vlan
 
 # The `vxlan' device implements the VXLAN encapsulation of Ethernet
 # frames in UDP packets according to RFC7348.
 device		vxlan
 
 #  The `wlan' device provides generic code to support 802.11
 #  drivers, including host AP mode; it is MANDATORY for the wi,
 #  and ath drivers and will eventually be required by all 802.11 drivers.
 device		wlan
 options 	IEEE80211_DEBUG		#enable debugging msgs
 options 	IEEE80211_SUPPORT_MESH	#enable 802.11s D3.0 support
 options 	IEEE80211_SUPPORT_TDMA	#enable TDMA support
 
 #  The `wlan_wep', `wlan_tkip', and `wlan_ccmp' devices provide
 #  support for WEP, TKIP, and AES-CCMP crypto protocols optionally
 #  used with 802.11 devices that depend on the `wlan' module.
 device		wlan_wep
 device		wlan_ccmp
 device		wlan_tkip
 
 #  The `wlan_xauth' device provides support for external (i.e. user-mode)
 #  authenticators for use with 802.11 drivers that use the `wlan'
 #  module and support 802.1x and/or WPA security protocols.
 device		wlan_xauth
 
 #  The `wlan_acl' device provides a MAC-based access control mechanism
 #  for use with 802.11 drivers operating in ap mode and using the
 #  `wlan' module.
 #  The 'wlan_amrr' device provides AMRR transmit rate control algorithm
 device		wlan_acl
 device		wlan_amrr
 
 #  The `bpf' device enables the Berkeley Packet Filter.  Be
 #  aware of the legal and administrative consequences of enabling this
 #  option.  DHCP requires bpf.
 device		bpf
 
 #  The `netmap' device implements memory-mapped access to network
 #  devices from userspace, enabling wire-speed packet capture and
 #  generation even at 10Gbit/s. Requires support in the device
 #  driver. Supported drivers are ixgbe, e1000, re.
 device		netmap
 
 #  The `disc' device implements a minimal network interface,
 #  which throws away all packets sent and never receives any.  It is
 #  included for testing and benchmarking purposes.
 device		disc
 
 # The `epair' device implements a virtual back-to-back connected Ethernet
 # like interface pair.
 device		epair
 
 #  The `edsc' device implements a minimal Ethernet interface,
 #  which discards all packets sent and receives none.
 device		edsc
 
 #  The `tuntap' device implements (user-)ppp, nos-tun(8) and a pty-like virtual
 #  Ethernet interface
 device		tuntap
 
 #  The `gif' device implements IPv6 over IP4 tunneling,
 #  IPv4 over IPv6 tunneling, IPv4 over IPv4 tunneling and
 #  IPv6 over IPv6 tunneling.
 #  The `gre' device implements GRE (Generic Routing Encapsulation) tunneling,
 #  as specified in the RFC 2784 and RFC 2890.
 #  The `me' device implements Minimal Encapsulation within IPv4 as
 #  specified in the RFC 2004.
 #  The XBONEHACK option allows the same pair of addresses to be configured on
 #  multiple gif interfaces.
 device		gif
 device		gre
 device		me
 options 	XBONEHACK
 
 #  The `stf' device implements 6to4 encapsulation.
 device		stf
 
 # The pf packet filter consists of three devices:
 #  The `pf' device provides /dev/pf and the firewall code itself.
 #  The `pflog' device provides the pflog0 interface which logs packets.
 #  The `pfsync' device provides the pfsync0 interface used for
 #   synchronization of firewall state tables (over the net).
 device		pf
 device		pflog
 device		pfsync
 
 # Bridge interface.
 device		if_bridge
 
 # Common Address Redundancy Protocol. See carp(4) for more details.
 device		carp
 
 # IPsec interface.
 device		enc
 
 # Link aggregation interface.
 device		lagg
 
 # WireGuard interface.
 device		wg
 
 #
 # Internet family options:
 #
 # MROUTING enables the kernel multicast packet forwarder, which works
 # with mrouted and XORP.
 #
 # IPFIREWALL enables support for IP firewall construction, in
 # conjunction with the `ipfw' program.  IPFIREWALL_VERBOSE sends
 # logged packets to the system logger.  IPFIREWALL_VERBOSE_LIMIT
 # limits the number of times a matching entry can be logged.
 #
 # WARNING:  IPFIREWALL defaults to a policy of "deny ip from any to any"
 # and if you do not add other rules during startup to allow access,
 # YOU WILL LOCK YOURSELF OUT.  It is suggested that you set firewall_type=open
 # in /etc/rc.conf when first enabling this feature, then refining the
 # firewall rules in /etc/rc.firewall after you've tested that the new kernel
 # feature works properly.
 #
 # IPFIREWALL_DEFAULT_TO_ACCEPT causes the default rule (at boot) to
 # allow everything.  Use with care, if a cracker can crash your
 # firewall machine, they can get to your protected machines.  However,
 # if you are using it as an as-needed filter for specific problems as
 # they arise, then this may be for you.  Changing the default to 'allow'
 # means that you won't get stuck if the kernel and /sbin/ipfw binary get
 # out of sync.
 #
 # IPDIVERT enables the divert IP sockets, used by ``ipfw divert''.  It
 # depends on IPFIREWALL if compiled into the kernel.
 #
 # IPFIREWALL_NAT adds support for in kernel nat in ipfw, and it requires
 # LIBALIAS.
 #
 # IPFIREWALL_NAT64 adds support for in kernel NAT64 in ipfw.
 #
 # IPFIREWALL_NPTV6 adds support for in kernel NPTv6 in ipfw.
 #
 # IPFIREWALL_PMOD adds support for protocols modification module. Currently
 # it supports only TCP MSS modification.
 #
 # IPSTEALTH enables code to support stealth forwarding (i.e., forwarding
 # packets without touching the TTL).  This can be useful to hide firewalls
 # from traceroute and similar tools.
 #
 # PF_DEFAULT_TO_DROP causes the default pf(4) rule to deny everything.
 #
 # TCPPCAP enables code which keeps the last n packets sent and received
 # on a TCP socket.
 #
 # TCP_BLACKBOX enables enhanced TCP event logging.
 #
 # TCP_HHOOK enables the hhook(9) framework hooks for the TCP stack.
 #
 # ROUTE_MPATH provides support for multipath routing.
 #
 options 	MROUTING		# Multicast routing
 options 	IPFIREWALL		#firewall
 options 	IPFIREWALL_VERBOSE	#enable logging to syslogd(8)
 options 	IPFIREWALL_VERBOSE_LIMIT=100	#limit verbosity
 options 	IPFIREWALL_DEFAULT_TO_ACCEPT	#allow everything by default
 options 	IPFIREWALL_NAT		#ipfw kernel nat support
 options 	IPFIREWALL_NAT64	#ipfw kernel NAT64 support
 options 	IPFIREWALL_NPTV6	#ipfw kernel IPv6 NPT support
 options 	IPDIVERT		#divert sockets
 options 	IPFILTER		#ipfilter support
 options 	IPFILTER_LOG		#ipfilter logging
 options 	IPFILTER_LOOKUP		#ipfilter pools
 options 	IPFILTER_DEFAULT_BLOCK	#block all packets by default
 options 	IPSTEALTH		#support for stealth forwarding
 options 	PF_DEFAULT_TO_DROP	#drop everything by default
 options 	TCPPCAP
 options 	TCP_BLACKBOX
 options 	TCP_HHOOK
 options 	ROUTE_MPATH
 
 # The MBUF_STRESS_TEST option enables options which create
 # various random failures / extreme cases related to mbuf
 # functions.  See mbuf(9) for a list of available test cases.
 # MBUF_PROFILING enables code to profile the mbuf chains
 # exiting the system (via participating interfaces) and
 # return a logarithmic histogram of monitored parameters
 # (e.g. packet size, wasted space, number of mbufs in chain).
 options 	MBUF_STRESS_TEST
 options 	MBUF_PROFILING
 
 # Statically link in accept filters
 options 	ACCEPT_FILTER_DATA
 options 	ACCEPT_FILTER_DNS
 options 	ACCEPT_FILTER_HTTP
 
 # TCP_SIGNATURE adds support for RFC 2385 (TCP-MD5) digests. These are
 # carried in TCP option 19. This option is commonly used to protect
 # TCP sessions (e.g. BGP) where IPSEC is not available nor desirable.
 # This is enabled on a per-socket basis using the TCP_MD5SIG socket option.
 # This requires the use of 'device crypto' and either 'options IPSEC' or
 # 'options IPSEC_SUPPORT'.
 options 	TCP_SIGNATURE		#include support for RFC 2385
 
 # DUMMYNET enables the "dummynet" bandwidth limiter.  You need IPFIREWALL
 # as well.  See dummynet(4) and ipfw(8) for more info.  When you run
 # DUMMYNET, HZ/kern.hz should be at least 1000 for adequate response.
 options 	DUMMYNET
 
 # The DEBUGNET option enables a basic debug/panic-time networking API.  It
 # is used by NETDUMP and NETGDB.
 options 	DEBUGNET
 
 # The NETDUMP option enables netdump(4) client support in the kernel.
 # This allows a panicking kernel to transmit a kernel dump to a remote host.
 options 	NETDUMP
 
 # The NETGDB option enables netgdb(4) support in the kernel.  This allows a
 # panicking kernel to be debugged as a GDB remote over the network.
 options 	NETGDB
 
 #####################################################################
 # FILESYSTEM OPTIONS
 
 #
 # Only the root filesystem needs to be statically compiled or preloaded
 # as module; everything else will be automatically loaded at mount
 # time.  Some people still prefer to statically compile other
 # filesystems as well.
 #
 # NB: The UNION filesystem was known to be buggy in the past.  It is now
 # being actively maintained, although there are still some issues being
 # resolved.
 #
 
 # One of these is mandatory:
 options 	FFS			#Fast filesystem
 options 	NFSCL			#Network File System client
 
 # The rest are optional:
 options 	AUTOFS			#Automounter filesystem
 options 	CD9660			#ISO 9660 filesystem
 options 	FDESCFS			#File descriptor filesystem
 options 	FUSEFS			#FUSEFS support module
 options 	MSDOSFS			#MS DOS File System (FAT, FAT32)
 options 	NFSLOCKD		#Network Lock Manager
 options 	NFSD			#Network Filesystem Server
 options 	KGSSAPI			#Kernel GSSAPI implementation
 
 options 	NULLFS			#NULL filesystem
 options 	PROCFS			#Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		#Pseudo-filesystem framework
 options 	PSEUDOFS_TRACE		#Debugging support for PSEUDOFS
 options 	SMBFS			#SMB/CIFS filesystem
 options 	TMPFS			#Efficient memory filesystem
 options 	UDF			#Universal Disk Format
 options 	UNIONFS			#Union filesystem
 # The xFS_ROOT options REQUIRE the associated ``options xFS''
 options 	NFS_ROOT		#NFS usable as root device
 
 # Soft updates is a technique for improving filesystem speed and
 # making abrupt shutdown less risky.
 #
 options 	SOFTUPDATES
 
 # Extended attributes allow additional data to be associated with files,
 # and is used for ACLs, Capabilities, and MAC labels.
 # See src/sys/ufs/ufs/README.extattr for more information.
 options 	UFS_EXTATTR
 options 	UFS_EXTATTR_AUTOSTART
 
 # Access Control List support for UFS filesystems.  The current ACL
 # implementation requires extended attribute support, UFS_EXTATTR,
 # for the underlying filesystem.
 # See src/sys/ufs/ufs/README.acls for more information.
 options 	UFS_ACL
 
 # Directory hashing improves the speed of operations on very large
 # directories at the expense of some memory.
 options 	UFS_DIRHASH
 
 # Gjournal-based UFS journaling support.
 options 	UFS_GJOURNAL
 
 # Make space in the kernel for a root filesystem on a md device.
 # Define to the number of kilobytes to reserve for the filesystem.
 # This is now optional.
 # If not defined, the root filesystem passed in as the MFS_IMAGE makeoption
 # will be automatically embedded in the kernel during linking. Its exact size
 # will be consumed within the kernel.
 # If defined, the old way of embedding the filesystem in the kernel will be
 # used. That is to say MD_ROOT_SIZE KB will be allocated in the kernel and
 # later, the filesystem image passed in as the MFS_IMAGE makeoption will be
 # dd'd into the reserved space if it fits.
 options 	MD_ROOT_SIZE=10
 
 # Make the md device a potential root device, either with preloaded
 # images of type mfs_root or md_root.
 options 	MD_ROOT
 
 # Write-protect the md root device so that it may not be mounted writeable.
 options 	MD_ROOT_READONLY
 
 # Allow to read MD image from external memory regions
 options 	MD_ROOT_MEM
 
 # Disk quotas are supported when this option is enabled.
 options 	QUOTA			#enable disk quotas
 
 # If you are running a machine just as a fileserver for PC and MAC
 # users, using SAMBA, you may consider setting this option
 # and keeping all those users' directories on a filesystem that is
 # mounted with the suiddir option. This gives new files the same
 # ownership as the directory (similar to group). It's a security hole
 # if you let these users run programs, so confine it to file-servers
 # (but it'll save you lots of headaches in those cases). Root owned
 # directories are exempt and X bits are cleared. The suid bit must be
 # set on the directory as well; see chmod(1). PC owners can't see/set
 # ownerships so they keep getting their toes trodden on. This saves
 # you all the support calls as the filesystem it's used on will act as
 # they expect: "It's my dir so it must be my file".
 #
 options 	SUIDDIR
 
 # NFS options:
 options 	NFS_MINATTRTIMO=3	# VREG attrib cache timeout in sec
 options 	NFS_MAXATTRTIMO=60
 options 	NFS_MINDIRATTRTIMO=30	# VDIR attrib cache timeout in sec
 options 	NFS_MAXDIRATTRTIMO=60
 options 	NFS_DEBUG		# Enable NFS Debugging
 
 #
 # Add support for the EXT2FS filesystem of Linux fame.  Be a bit
 # careful with this - the ext2fs code has a tendency to lag behind
 # changes and not be exercised very much, so mounting read/write could
 # be dangerous (and even mounting read only could result in panics.)
 #
 options 	EXT2FS
 
 # The system memory devices; /dev/mem, /dev/kmem
 device		mem
 
 # The kernel symbol table device; /dev/ksyms
 device		ksyms
 
 # Optional character code conversion support with LIBICONV.
 # Each option requires their base file system and LIBICONV.
 options 	CD9660_ICONV
 options 	MSDOSFS_ICONV
 options 	UDF_ICONV
 
 
 #####################################################################
 # POSIX P1003.1B
 
 # Real time extensions added in the 1993 POSIX
 # _KPOSIX_PRIORITY_SCHEDULING: Build in _POSIX_PRIORITY_SCHEDULING
 
 options 	_KPOSIX_PRIORITY_SCHEDULING
 # p1003_1b_semaphores are very experimental,
 # user should be ready to assist in debugging if problems arise.
 options 	P1003_1B_SEMAPHORES
 
 # POSIX message queue
 options 	P1003_1B_MQUEUE
 
 #####################################################################
 # SECURITY POLICY PARAMETERS
 
 # Support for BSM audit
 options 	AUDIT
 
 # Support for Mandatory Access Control (MAC):
 options 	MAC
 options 	MAC_BIBA
 options 	MAC_BSDEXTENDED
 options 	MAC_DDB
 options 	MAC_IFOFF
 options 	MAC_LOMAC
 options 	MAC_MLS
 options 	MAC_NONE
 options 	MAC_NTPD
 options 	MAC_PARTITION
 options 	MAC_PORTACL
 options 	MAC_PRIORITY
 options 	MAC_SEEOTHERUIDS
 options 	MAC_STUB
 options 	MAC_TEST
 options 	MAC_VERIEXEC
 options 	MAC_VERIEXEC_SHA1
 options 	MAC_VERIEXEC_SHA256
 options 	MAC_VERIEXEC_SHA384
 options 	MAC_VERIEXEC_SHA512
 device		mac_veriexec_parser
 
 # Support for Capsicum
 options 	CAPABILITIES	# fine-grained rights on file descriptors
 options 	CAPABILITY_MODE	# sandboxes with no global namespace access
 
 
 #####################################################################
 # CLOCK OPTIONS
 
 # The granularity of operation is controlled by the kernel option HZ (default
 # frequency of 1000 Hz or a period 1ms between calls). Virtual machine guests
 # use a value of 100. Lower values may lower overhead at the expense of accuracy
 # of scheduling, though the adaptive tick code reduces that overhead.
 
 options 	HZ=100
 
 # Enable support for the kernel PLL to use an external PPS signal,
 # under supervision of [x]ntpd(8)
 # More info in ntpd documentation: http://www.eecis.udel.edu/~ntp
 
 options 	PPS_SYNC
 
 # Enable support for generic feed-forward clocks in the kernel.
 # The feed-forward clock support is an alternative to the feedback oriented
 # ntpd/system clock approach, and is to be used with a feed-forward
 # synchronization algorithm such as the RADclock:
 # More info here: http://www.synclab.org/radclock
 
 options 	FFCLOCK
 
 
 #####################################################################
 # SCSI DEVICES
 
 # SCSI DEVICE CONFIGURATION
 
 # The SCSI subsystem consists of the `base' SCSI code, a number of
 # high-level SCSI device `type' drivers, and the low-level host-adapter
 # device drivers.  The host adapters are listed in the ISA and PCI
 # device configuration sections below.
 #
 # It is possible to wire down your SCSI devices so that a given bus,
 # target, and LUN always come on line as the same device unit.  In
 # earlier versions the unit numbers were assigned in the order that
 # the devices were probed on the SCSI bus.  This means that if you
 # removed a disk drive, you may have had to rewrite your /etc/fstab
 # file, and also that you had to be careful when adding a new disk
 # as it may have been probed earlier and moved your device configuration
 # around.
 
 # This old behavior is maintained as the default behavior.  The unit
 # assignment begins with the first non-wired down unit for a device
 # type.  For example, if you wire a disk as "da3" then the first
 # non-wired disk will be assigned da4.
 
 # The syntax for wiring down devices is:
 
 envvar		hint.scbus.0.at="ahc0"
 envvar		hint.scbus.1.at="ahc1"
 envvar		hint.scbus.1.bus="0"
 envvar		hint.scbus.3.at="ahc2"
 envvar		hint.scbus.3.bus="0"
 envvar		hint.scbus.2.at="ahc2"
 envvar		hint.scbus.2.bus="1"
 envvar		hint.da.0.at="scbus0"
 envvar		hint.da.0.target="0"
 envvar		hint.da.0.unit="0"
 envvar		hint.da.1.at="scbus3"
 envvar		hint.da.1.target="1"
 envvar		hint.da.2.at="scbus2"
 envvar		hint.da.2.target="3"
 envvar		hint.sa.1.at="scbus1"
 envvar		hint.sa.1.target="6"
 
 # "units" (SCSI logical unit number) that are not specified are
 # treated as if specified as LUN 0.
 
 # All SCSI devices allocate as many units as are required.
 
 # The ch driver drives SCSI Media Changer ("jukebox") devices.
 #
 # The da driver drives SCSI Direct Access ("disk") and Optical Media
 # ("WORM") devices.
 #
 # The sa driver drives SCSI Sequential Access ("tape") devices.
 #
 # The cd driver drives SCSI Read Only Direct Access ("cd") devices.
 #
 # The ses driver drives SCSI Environment Services ("ses") and
 # SAF-TE ("SCSI Accessible Fault-Tolerant Enclosure") devices.
 #
 # The pt driver drives SCSI Processor devices.
 #
 # The sg driver provides a passthrough API that is compatible with the
 # Linux SG driver.  It will work in conjunction with the Linuxulator
 # to run linux SG apps.  It can also stand on its own and provide
 # source level API compatibility for porting apps to FreeBSD.
 #
 # Target Mode support is provided here but also requires that a SIM
 # (SCSI Host Adapter Driver) provide support as well.
 #
 # The targ driver provides target mode support as a Processor type device.
 # It exists to give the minimal context necessary to respond to Inquiry
 # commands. There is a sample user application that shows how the rest
 # of the command support might be done in /usr/share/examples/scsi_target.
 #
 # The targbh driver provides target mode support and exists to respond
 # to incoming commands that do not otherwise have a logical unit assigned
 # to them.
 #
 # The pass driver provides a passthrough API to access the CAM subsystem.
 
 device		scbus		#base SCSI code
 device		ch		#SCSI media changers
 device		da		#SCSI direct access devices (aka disks)
 device		sa		#SCSI tapes
 device		cd		#SCSI CD-ROMs
 device		ses		#Enclosure Services (SES and SAF-TE)
 device		pt		#SCSI processor
 device		targ		#SCSI Target Mode Code
 device		targbh		#SCSI Target Mode Blackhole Device
 device		pass		#CAM passthrough driver
 device		sg		#Linux SCSI passthrough
 device		ctl		#CAM Target Layer
 
 # CAM OPTIONS:
 # debugging options:
 # CAMDEBUG		Compile in all possible debugging.
 # CAM_DEBUG_COMPILE	Debug levels to compile in.
 # CAM_DEBUG_FLAGS	Debug levels to enable on boot.
 # CAM_DEBUG_BUS		Limit debugging to the given bus.
 # CAM_DEBUG_TARGET	Limit debugging to the given target.
 # CAM_DEBUG_LUN		Limit debugging to the given lun.
 # CAM_DEBUG_DELAY	Delay in us after printing each debug line.
 # CAM_IO_STATS		Publish additional CAM device statics by sysctl
 #
 # CAM_MAX_HIGHPOWER: Maximum number of concurrent high power (start unit) cmds
 # SCSI_NO_SENSE_STRINGS: When defined disables sense descriptions
 # SCSI_NO_OP_STRINGS: When defined disables opcode descriptions
 # SCSI_DELAY: The number of MILLISECONDS to freeze the SIM (scsi adapter)
 #             queue after a bus reset, and the number of milliseconds to
 #             freeze the device queue after a bus device reset.  This
 #             can be changed at boot and runtime with the
 #             kern.cam.scsi_delay tunable/sysctl.
 options 	CAMDEBUG
 options 	CAM_DEBUG_COMPILE=-1
 options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
 options 	CAM_DEBUG_BUS=-1
 options 	CAM_DEBUG_TARGET=-1
 options 	CAM_DEBUG_LUN=-1
 options 	CAM_DEBUG_DELAY=1
 options 	CAM_MAX_HIGHPOWER=4
 options 	SCSI_NO_SENSE_STRINGS
 options 	SCSI_NO_OP_STRINGS
 options 	SCSI_DELAY=5000	# Be pessimistic about Joe SCSI device
 options 	CAM_IOSCHED_DYNAMIC
 options 	CAM_IO_STATS
 options 	CAM_TEST_FAILURE
 
 # Options for the CAM CDROM driver:
 # CHANGER_MIN_BUSY_SECONDS: Guaranteed minimum time quantum for a changer LUN
 # CHANGER_MAX_BUSY_SECONDS: Maximum time quantum per changer LUN, only
 #                           enforced if there is I/O waiting for another LUN
 # The compiled in defaults for these variables are 2 and 10 seconds,
 # respectively.
 #
 # These can also be changed on the fly with the following sysctl variables:
 # kern.cam.cd.changer.min_busy_seconds
 # kern.cam.cd.changer.max_busy_seconds
 #
 options 	CHANGER_MIN_BUSY_SECONDS=2
 options 	CHANGER_MAX_BUSY_SECONDS=10
 
 # Options for the CAM sequential access driver:
 # SA_IO_TIMEOUT: Timeout for read/write/wfm  operations, in minutes
 # SA_SPACE_TIMEOUT: Timeout for space operations, in minutes
 # SA_REWIND_TIMEOUT: Timeout for rewind operations, in minutes
 # SA_ERASE_TIMEOUT: Timeout for erase operations, in minutes
 # SA_1FM_AT_EOD: Default to model which only has a default one filemark at EOT.
 options 	SA_IO_TIMEOUT=4
 options 	SA_SPACE_TIMEOUT=60
 options 	SA_REWIND_TIMEOUT=(2*60)
 options 	SA_ERASE_TIMEOUT=(4*60)
 options 	SA_1FM_AT_EOD
 
 # Optional timeout for the CAM processor target (pt) device
 # This is specified in seconds.  The default is 60 seconds.
 options 	SCSI_PT_DEFAULT_TIMEOUT=60
 
 # Optional enable of doing SES passthrough on other devices (e.g., disks)
 #
 # Normally disabled because a lot of newer SCSI disks report themselves
 # as having SES capabilities, but this can then clot up attempts to build
 # a topology with the SES device that's on the box these drives are in....
 options 	SES_ENABLE_PASSTHROUGH
 
 
 #####################################################################
 # MISCELLANEOUS DEVICES AND OPTIONS
 
 device		pty		#BSD-style compatibility pseudo ttys
 device		nmdm		#back-to-back tty devices
 device		md		#Memory/malloc disk
 device		snp		#Snoop device - to look at pty/vty/etc..
 device		ccd		#Concatenated disk driver
 device		firmware	#firmware(9) support
 
 # Kernel side iconv library
 options 	LIBICONV
 
 # Size of the kernel message buffer.  Should be N * pagesize.
 options 	MSGBUF_SIZE=40960
 
 
 #####################################################################
 # HARDWARE BUS CONFIGURATION
 
 #
 # PCI bus & PCI options:
 #
 device		pci
 options 	PCI_HP			# PCI-Express native HotPlug
 options 	PCI_IOV			# PCI SR-IOV support
 
 
 #####################################################################
 # HARDWARE DEVICE CONFIGURATION
 
 # For ISA the required hints are listed.
 # PCI, CardBus, and SD/MMC are self identifying buses, so
 # no hints are needed.
 
 #
 # Mandatory devices:
 #
 
 # These options are valid for other keyboard drivers as well.
 options 	KBD_DISABLE_KEYMAP_LOAD	# refuse to load a keymap
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 
 # Define keyboard latency (try 200/15 for a snappy interactive console)
 options 	KBD_DELAY1=200		# define initial key delay
 options 	KBD_DELAY2=15		# define key delay
 
 device		kbdmux			# keyboard multiplexer
 options 	KBDMUX_DFLT_KEYMAP	# specify the built-in keymap
 makeoptions	KBDMUX_DFLT_KEYMAP=it.iso
 
 options 	FB_DEBUG		# Frame buffer debugging
 
 # Enable experimental features of the syscons terminal emulator (teken).
 options 	TEKEN_CONS25		# cons25-style terminal emulation
 options 	TEKEN_UTF8		# UTF-8 output handling
 
 # The vt video console driver.
 device		vt
 options 	VT_ALT_TO_ESC_HACK=1	# Prepend ESC sequence to ALT keys
 options 	VT_MAXWINDOWS=16	# Number of virtual consoles
 options 	VT_TWOBUTTON_MOUSE	# Use right mouse button to paste
 
 # The following options set the maximum framebuffer size.
 options 	VT_FB_MAX_HEIGHT=480
 options 	VT_FB_MAX_WIDTH=640
 
 # The following options will let you change the default vt terminal colors.
 options 	TERMINAL_NORM_ATTR=(FG_GREEN|BG_BLACK)
 options 	TERMINAL_KERN_ATTR=(FG_LIGHTRED|BG_BLACK)
 
 #
 # Optional devices:
 #
 
 #
 # SCSI host adapters:
 #
 # aacraid: Adaptec by PMC RAID controllers, Series 6/7/8 and upcoming
 #          families. Container interface, CAM required.
 # ahc: Adaptec 274x/284x/2910/293x/294x/394x/3950x/3960x/398X/4944/
 #      19160x/29160x, aic7770/aic78xx
 # ahd: Adaptec 29320/39320 Controllers.
 # isp: Qlogic ISP 1020, 1040 and 1040B PCI SCSI host adapters,
 #      ISP 1240 Dual Ultra SCSI, ISP 1080 and 1280 (Dual) Ultra2,
 #      ISP 12160 Ultra3 SCSI,
 #      Qlogic ISP 2100 and ISP 2200 1Gb Fibre Channel host adapters.
 #      Qlogic ISP 2300 and ISP 2312 2Gb Fibre Channel host adapters.
 #      Qlogic ISP 2322 and ISP 6322 2Gb Fibre Channel host adapters.
 # ispfw: Firmware module for Qlogic host adapters
 # mpr: LSI-Logic MPT/Fusion Gen 3
 # mps: LSI-Logic MPT/Fusion Gen 2
 # mpt: LSI-Logic MPT/Fusion 53c1020 or 53c1030 Ultra4
 #      or FC9x9 Fibre Channel host adapters.
 # sym: Symbios/Logic 53C8XX family of PCI-SCSI I/O processors:
 #      53C810, 53C810A, 53C815, 53C825,  53C825A, 53C860, 53C875,
 #      53C876, 53C885,  53C895, 53C895A, 53C896,  53C897, 53C1510D,
 #      53C1010-33, 53C1010-66.
 
 device		aacraid
 device		ahc
 device		ahd
 device		isp
 envvar		hint.isp.0.disable="1"
 envvar		hint.isp.0.role="3"
 envvar		hint.isp.0.prefer_iomap="1"
 envvar		hint.isp.0.prefer_memmap="1"
 envvar		hint.isp.0.fwload_disable="1"
 envvar		hint.isp.0.ignore_nvram="1"
 envvar		hint.isp.0.fullduplex="1"
 envvar		hint.isp.0.topology="lport"
 envvar		hint.isp.0.topology="nport"
 envvar		hint.isp.0.topology="lport-only"
 envvar		hint.isp.0.topology="nport-only"
 # we can't get u_int64_t types, nor can we get strings if it's got
 # a leading 0x, hence this silly dodge.
 envvar		hint.isp.0.portwnn="w50000000aaaa0000"
 envvar		hint.isp.0.nodewnn="w50000000aaaa0001"
 device		ispfw
 device		mpr			# LSI-Logic MPT-Fusion 3
 device		mps			# LSI-Logic MPT-Fusion 2
 device		mpt			# LSI-Logic MPT-Fusion
 device		sym
 
 # The aic7xxx driver will attempt to use memory mapped I/O for all PCI
 # controllers that have it configured only if this option is set. Unfortunately,
 # this doesn't work on some motherboards, which prevents it from being the
 # default.
 options 	AHC_ALLOW_MEMIO
 
 # Dump the contents of the ahc controller configuration PROM.
 options 	AHC_DUMP_EEPROM
 
 # Bitmap of units to enable targetmode operations.
 options 	AHC_TMODE_ENABLE
 
 # Compile in Aic7xxx Debugging code.
 options 	AHC_DEBUG
 
 # Aic7xxx driver debugging options. See sys/dev/aic7xxx/aic7xxx.h
 options 	AHC_DEBUG_OPTS
 
 # Print register bitfields in debug output.  Adds ~128k to driver
 # See ahc(4).
 options 	AHC_REG_PRETTY_PRINT
 
 # Compile in aic79xx debugging code.
 options 	AHD_DEBUG
 
 # Aic79xx driver debugging options.  Adds ~215k to driver.  See ahd(4).
 options 	AHD_DEBUG_OPTS=0xFFFFFFFF
 
 # Print human-readable register definitions when debugging
 options 	AHD_REG_PRETTY_PRINT
 
 # Bitmap of units to enable targetmode operations.
 options 	AHD_TMODE_ENABLE
 
 # Options used in dev/iscsi (Software iSCSI stack)
 #
 options 	ISCSI_INITIATOR_DEBUG=9
 
 # Options used in dev/isp/ (Qlogic SCSI/FC driver).
 #
 #	ISP_TARGET_MODE		-	enable target mode operation
 #
 options 	ISP_TARGET_MODE=1
 #
 #	ISP_DEFAULT_ROLES	-	default role
 #		none=0
 #		target=1
 #		initiator=2
 #		both=3			(not supported currently)
 #
 #	ISP_INTERNAL_TARGET		(trivial internal disk target, for testing)
 #
 options 	ISP_DEFAULT_ROLES=0
 
 #options 	SYM_SETUP_SCSI_DIFF	#-HVD support for 825a, 875, 885
 					# disabled:0 (default), enabled:1
 #options 	SYM_SETUP_PCI_PARITY	#-PCI parity checking
 					# disabled:0, enabled:1 (default)
 #options 	SYM_SETUP_MAX_LUN	#-Number of LUNs supported
 					# default:8, range:[1..64]
 
 #
 # Compaq "CISS" RAID controllers (SmartRAID 5* series)
 # These controllers have a SCSI-like interface, and require the
 # CAM infrastructure.
 #
 device		ciss
 
 #
 # Compaq Smart RAID, Mylex DAC960 and AMI MegaRAID controllers.  Only
 # one entry is needed; the code will find and configure all supported
 # controllers.
 #
 device		ida		# Compaq Smart RAID
 device		mlx		# Mylex DAC960
 device		mfi		# LSI MegaRAID SAS
 device		mfip		# LSI MegaRAID SAS passthrough, requires CAM
 options 	MFI_DEBUG
 device		mrsas		# LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s
 
 #
 # 3ware ATA RAID
 #
 device		twe		# 3ware ATA RAID
 
 #
 # Serial ATA host controllers:
 #
 # ahci: Advanced Host Controller Interface (AHCI) compatible
 # mvs:  Marvell 88SX50XX/88SX60XX/88SX70XX/SoC controllers
 # siis: SiliconImage SiI3124/SiI3132/SiI3531 controllers
 #
 # These drivers are part of cam(4) subsystem. They supersede less featured
 # ata(4) subsystem drivers, supporting same hardware.
 
 device		ahci
 device		mvs
 device		siis
 
 #
 # The 'ATA' driver supports all legacy ATA/ATAPI controllers, including
 # PC Card devices. You only need one "device ata" for it to find all
 # PCI and PC Card ATA/ATAPI devices on modern machines.
 # Alternatively, individual bus and chipset drivers may be chosen by using
 # the 'atacore' driver then selecting the drivers on a per vendor basis.
 # For example to build a system which only supports a VIA chipset,
 # omit 'ata' and include the 'atacore', 'atapci' and 'atavia' drivers.
 device		ata
 
 # Modular ATA
 #device		atacore		# Core ATA functionality
 #device		ataisa		# ISA bus support
 #device		atapci		# PCI bus support; only generic chipset support
 
 # PCI ATA chipsets
 #device		ataacard	# ACARD
 #device		ataacerlabs	# Acer Labs Inc. (ALI)
 #device		ataamd		# American Micro Devices (AMD)
 #device		ataati		# ATI
 #device		atacenatek	# Cenatek
 #device		atacypress	# Cypress
 #device		atacyrix	# Cyrix
 #device		atahighpoint	# HighPoint
 #device		ataintel	# Intel
 #device		ataite		# Integrated Technology Inc. (ITE)
 #device		atajmicron	# JMicron
 #device		atamarvell	# Marvell
 #device		atamicron	# Micron
 #device		atanational	# National
 #device		atanetcell	# NetCell
 #device		atanvidia	# nVidia
 #device		atapromise	# Promise
 #device		ataserverworks	# ServerWorks
 #device		atasiliconimage	# Silicon Image Inc. (SiI) (formerly CMD)
 #device		atasis		# Silicon Integrated Systems Corp.(SiS)
 #device		atavia		# VIA Technologies Inc.
 
 #
 # For older non-PCI, non-PnPBIOS systems, these are the hints lines to add:
 envvar		hint.ata.0.at="isa"
 envvar		hint.ata.0.port="0x1f0"
 envvar		hint.ata.0.irq="14"
 envvar		hint.ata.1.at="isa"
 envvar		hint.ata.1.port="0x170"
 envvar		hint.ata.1.irq="15"
 
 #
 # uart: generic driver for serial interfaces.
 #
 device		uart
 
 # Options for uart(4)
 options 	UART_PPS_ON_CTS		# Do time pulse capturing using CTS
 					# instead of DCD.
 options 	UART_POLL_FREQ		# Set polling rate, used when hw has
 					# no interrupt support (50 Hz default).
 
 # The following hint should only be used for pure ISA devices.  It is not
 # needed otherwise.  Use of hints is strongly discouraged.
 envvar		hint.uart.0.at="isa"
 
 # The following 3 hints are used when the UART is a system device (i.e., a
 # console or debug port), but only on platforms that don't have any other
 # means to pass the information to the kernel.  The unit number of the hint
 # is only used to bundle the hints together.  There is no relation to the
 # unit number of the probed UART.
 envvar		hint.uart.0.port="0x3f8"
 envvar		hint.uart.0.flags="0x10"
 envvar		hint.uart.0.baud="115200"
 
 # `flags' for serial drivers that support consoles, like uart(4):
 #	0x10	enable console support for this unit.  Other console flags
 #		(if applicable) are ignored unless this is set.  Enabling
 #		console support does not make the unit the preferred console.
 #		Boot with -h or set boot_serial=YES in the loader.
 #		Currently, at most one unit can have console support; the
 #		first one (in config file order) with this flag set is
 #		preferred.
 #	0x80	use this port for serial line gdb support in ddb.  Also known
 #		as debug port.
 #
 
 # Options for serial drivers that support consoles:
 options 	BREAK_TO_DEBUGGER	# A BREAK/DBG on the console goes to
 					# ddb, if available.
 
 # Solaris implements a new BREAK which is initiated by a character
 # sequence CR ~ ^b which is similar to a familiar pattern used on
 # Sun servers by the Remote Console.  There are FreeBSD extensions:
 # CR ~ ^p requests force panic and CR ~ ^r requests a clean reboot.
 options 	ALT_BREAK_TO_DEBUGGER
 
 # Serial Communications Controller
 # Supports the Freescale/NXP QUad Integrated and Zilog Z8530 multi-channel
 # communications controllers.
 device		scc
 
 # PCI Universal Communications driver
 # Supports various multi port PCI I/O cards.
 device		puc
 
 #
 # Network interfaces:
 #
 # MII bus support is required for many PCI Ethernet NICs,
 # namely those which use MII-compliant transceivers or implement
 # transceiver control interfaces that operate like an MII.  Adding
 # "device miibus" to the kernel config pulls in support for the generic
 # miibus API, the common support for bit-bang'ing the MII and all
 # of the PHY drivers, including a generic one for PHYs that aren't
 # specifically handled by an individual driver.  Support for specific
 # PHYs may be built by adding "device mii", "device mii_bitbang" if
 # needed by the NIC driver and then adding the appropriate PHY driver.
 device  	mii		# Minimal MII support
 device  	mii_bitbang	# Common module for bit-bang'ing the MII
 device  	miibus		# MII support w/ bit-bang'ing and all PHYs
 
 device  	acphy		# Altima Communications AC101
 device  	amphy		# AMD AM79c873 / Davicom DM910{1,2}
 device  	atphy		# Attansic/Atheros F1
 device  	axphy		# Asix Semiconductor AX88x9x
 device  	bmtphy		# Broadcom BCM5201/BCM5202 and 3Com 3c905C
 device		bnxt		# Broadcom NetXtreme-C/NetXtreme-E
 device  	brgphy		# Broadcom BCM54xx/57xx 1000baseTX
 device  	cgem		# Cadence GEM Gigabit Ethernet
 device  	ciphy		# Cicada/Vitesse CS/VSC8xxx
 device  	e1000phy	# Marvell 88E1000 1000/100/10-BT
 device  	gentbi		# Generic 10-bit 1000BASE-{LX,SX} fiber ifaces
 device  	icsphy		# ICS ICS1889-1893
 device  	ip1000phy	# IC Plus IP1000A/IP1001
 device  	jmphy		# JMicron JMP211/JMP202
 device  	lxtphy		# Level One LXT-970
 device  	nsgphy		# NatSemi DP8361/DP83865/DP83891
 device  	nsphy		# NatSemi DP83840A
 device  	nsphyter	# NatSemi DP83843/DP83815
 device  	pnaphy		# HomePNA
 device  	qsphy		# Quality Semiconductor QS6612
 device  	rdcphy		# RDC Semiconductor R6040
 device  	rgephy		# RealTek 8169S/8110S/8211B/8211C
 device  	rlphy		# RealTek 8139
 device  	rlswitch	# RealTek 8305
 device  	smcphy		# SMSC LAN91C111
 device  	tdkphy		# TDK 89Q2120
 device  	truephy		# LSI TruePHY
 device		xmphy		# XaQti XMAC II
 
 # ae:   Support for gigabit ethernet adapters based on the Attansic/Atheros
 #       L2 PCI-Express FastEthernet controllers.
 # age:  Support for gigabit ethernet adapters based on the Attansic/Atheros
 #       L1 PCI express gigabit ethernet controllers.
 # alc:  Support for Atheros AR8131/AR8132 PCIe ethernet controllers.
 # ale:  Support for Atheros AR8121/AR8113/AR8114 PCIe ethernet controllers.
 # ath:  Atheros a/b/g WiFi adapters (requires ath_hal and wlan)
 # bce:	Broadcom NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet
 #       adapters.
 # bfe:	Broadcom BCM4401 Ethernet adapter.
 # bge:	Support for gigabit ethernet adapters based on the Broadcom
 #	BCM570x family of controllers, including the 3Com 3c996-T,
 #	the Netgear GA302T, the SysKonnect SK-9D21 and SK-9D41, and
 #	the embedded gigE NICs on Dell PowerEdge 2550 servers.
 # bnxt:	Broadcom NetXtreme-C and NetXtreme-E PCIe 10/25/50G Ethernet adapters.
 # bxe:	Broadcom NetXtreme II (BCM5771X/BCM578XX) PCIe 10Gb Ethernet
 #       adapters.
 # bwi:	Broadcom BCM430* and BCM431* family of wireless adapters.
 # bwn:	Broadcom BCM43xx family of wireless adapters.
 # cas:	Sun Cassini/Cassini+ and National Semiconductor DP83065 Saturn
 # cxgb: Chelsio T3 based 1GbE/10GbE PCIe Ethernet adapters.
 # cxgbe:Chelsio T4, T5, and T6-based 1/10/25/40/100GbE PCIe Ethernet
 #	adapters.
 # cxgbev: Chelsio T4, T5, and T6-based PCIe Virtual Functions.
 # dc:   Support for PCI fast ethernet adapters based on the DEC/Intel 21143
 #       and various workalikes including:
 #       the ADMtek AL981 Comet and AN985 Centaur, the ASIX Electronics
 #       AX88140A and AX88141, the Davicom DM9100 and DM9102, the Lite-On
 #       82c168 and 82c169 PNIC, the Lite-On/Macronix LC82C115 PNIC II
 #       and the Macronix 98713/98713A/98715/98715A/98725 PMAC. This driver
 #       replaces the old al, ax, dm, pn and mx drivers.  List of brands:
 #       Digital DE500-BA, Kingston KNE100TX, D-Link DFE-570TX, SOHOware SFA110,
 #       SVEC PN102-TX, CNet Pro110B, 120A, and 120B, Compex RL100-TX,
 #       LinkSys LNE100TX, LNE100TX V2.0, Jaton XpressNet, Alfa Inc GFC2204,
 #       KNE110TX.
 # em:   Intel Pro/1000 Gigabit Ethernet 82542, 82543, 82544 based adapters.
 # fxp:  Intel EtherExpress Pro/100B
 #	(hint of prefer_iomap can be done to prefer I/O instead of Mem mapping)
 # gem:  Apple GMAC/Sun ERI/Sun GEM
 # jme:  JMicron JMC260 Fast Ethernet/JMC250 Gigabit Ethernet based adapters.
 # le:   AMD Am7900 LANCE and Am79C9xx PCnet
 # lge:	Support for PCI gigabit ethernet adapters based on the Level 1
 #	LXT1001 NetCellerator chipset. This includes the D-Link DGE-500SX,
 #	SMC TigerCard 1000 (SMC9462SX), and some Addtron cards.
 # lio:  Support for Cavium 23XX Ethernet adapters
 # malo: Marvell Libertas wireless NICs.
 # mwl:  Marvell 88W8363 802.11n wireless NICs.
 #	Requires the mwl firmware module
 # mwlfw: Marvell 88W8363 firmware
 # msk:	Support for gigabit ethernet adapters based on the Marvell/SysKonnect
 #	Yukon II Gigabit controllers, including 88E8021, 88E8022, 88E8061,
 #	88E8062, 88E8035, 88E8036, 88E8038, 88E8050, 88E8052, 88E8053,
 #	88E8055, 88E8056 and D-Link 560T/550SX.
 # mlxfw: Mellanox firmware update module.
 # mlx5:	Mellanox ConnectX-4 and ConnectX-4 LX IB and Eth shared code module.
 # mlx5en:Mellanox ConnectX-4 and ConnectX-4 LX PCIe Ethernet adapters.
 # my:	Myson Fast Ethernet (MTD80X, MTD89X)
 # nge:	Support for PCI gigabit ethernet adapters based on the National
 #	Semiconductor DP83820 and DP83821 chipset. This includes the
 #	SMC EZ Card 1000 (SMC9462TX), D-Link DGE-500T, Asante FriendlyNet
 #	GigaNIX 1000TA and 1000TPC, the Addtron AEG320T, the Surecom
 #	EP-320G-TX and the Netgear GA622T.
 # oce:	Emulex 10 Gbit adapters (OneConnect Ethernet)
 # ral:	Ralink Technology IEEE 802.11 wireless adapter
 # re:   RealTek 8139C+/8169/816xS/811xS/8101E PCI/PCIe Ethernet adapter
 # rl:   Support for PCI fast ethernet adapters based on the RealTek 8129/8139
 #       chipset.  Note that the RealTek driver defaults to using programmed
 #       I/O to do register accesses because memory mapped mode seems to cause
 #       severe lockups on SMP hardware.  This driver also supports the
 #       Accton EN1207D `Cheetah' adapter, which uses a chip called
 #       the MPX 5030/5038, which is either a RealTek in disguise or a
 #       RealTek workalike.  Note that the D-Link DFE-530TX+ uses the RealTek
 #       chipset and is supported by this driver, not the 'vr' driver.
 # rtwn: RealTek wireless adapters.
 # rtwnfw: RealTek wireless firmware.
 # sge:  Silicon Integrated Systems SiS190/191 Fast/Gigabit Ethernet adapter
 # sis:  Support for NICs based on the Silicon Integrated Systems SiS 900,
 #       SiS 7016 and NS DP83815 PCI fast ethernet controller chips.
 # sk:   Support for the SysKonnect SK-984x series PCI gigabit ethernet NICs.
 #       This includes the SK-9841 and SK-9842 single port cards (single mode
 #       and multimode fiber) and the SK-9843 and SK-9844 dual port cards
 #       (also single mode and multimode).
 #       The driver will autodetect the number of ports on the card and
 #       attach each one as a separate network interface.
 # ste:  Sundance Technologies ST201 PCI fast ethernet controller, includes
 #       the D-Link DFE-550TX.
 # stge: Support for gigabit ethernet adapters based on the Sundance/Tamarack
 #       TC9021 family of controllers, including the Sundance ST2021/ST2023,
 #       the Sundance/Tamarack TC9021, the D-Link DL-4000 and ASUS NX1101.
 # ti:   Support for PCI gigabit ethernet NICs based on the Alteon Networks
 #       Tigon 1 and Tigon 2 chipsets.  This includes the Alteon AceNIC, the
 #       3Com 3c985, the Netgear GA620 and various others.  Note that you will
 #       probably want to bump up kern.ipc.nmbclusters a lot to use this driver.
 # vr:   Support for various fast ethernet adapters based on the VIA
 #       Technologies VT3043 `Rhine I' and VT86C100A `Rhine II' chips,
 #       including the D-Link DFE520TX and D-Link DFE530TX (see 'rl' for
 #       DFE530TX+), the Hawking Technologies PN102TX, and the AOpen/Acer ALN-320.
 # vte:  DM&P Vortex86 RDC R6040 Fast Ethernet
 # xl:   Support for the 3Com 3c900, 3c905, 3c905B and 3c905C (Fast)
 #       Etherlink XL cards and integrated controllers.  This includes the
 #       integrated 3c905B-TX chips in certain Dell Optiplex and Dell
 #       Precision desktop machines and the integrated 3c905-TX chips
 #       in Dell Latitude laptop docking stations.
 #       Also supported: 3Com 3c980(C)-TX, 3Com 3cSOHO100-TX, 3Com 3c450-TX
 
 # PCI Ethernet NICs that use the common MII bus controller code.
 device		ae		# Attansic/Atheros L2 FastEthernet
 device		age		# Attansic/Atheros L1 Gigabit Ethernet
 device		alc		# Atheros AR8131/AR8132 Ethernet
 device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
 device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
 device		bfe		# Broadcom BCM440x 10/100 Ethernet
 device		bge		# Broadcom BCM570xx Gigabit Ethernet
 device		cas		# Sun Cassini/Cassini+ and NS DP83065 Saturn
 device		dc		# DEC/Intel 21143 and various workalikes
 device		et		# Agere ET1310 10/100/Gigabit Ethernet
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 envvar		hint.fxp.0.prefer_iomap="0"
 device		gem		# Apple GMAC/Sun ERI/Sun GEM
 device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
 device		lge		# Level 1 LXT1001 gigabit Ethernet
 device		lio		# Support for Cavium 23XX Ethernet adapters
 device		mlxfw		# Mellanox firmware update module
 device		mlx5		# Shared code module between IB and Ethernet
 device		mlx5en		# Mellanox ConnectX-4 and ConnectX-4 LX
 device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
 device		my		# Myson Fast Ethernet (MTD80X, MTD89X)
 device		nge		# NatSemi DP83820 gigabit Ethernet
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
 device		sge		# Silicon Integrated Systems SiS190/191
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)
 device		stge		# Sundance/Tamarack TC9021 gigabit Ethernet
 device		vr		# VIA Rhine, Rhine II
 device		vte		# DM&P Vortex86 RDC R6040 Fast Ethernet
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # PCI/PCI-X/PCIe Ethernet NICs that use iflib infrastructure
 device		iflib
 device		em		# Intel Pro/1000 Gigabit Ethernet
 device		ix		# Intel Pro/10Gbe PCIE Ethernet
 device		ixv		# Intel Pro/10Gbe PCIE Ethernet VF
 
 # PCI Ethernet NICs.
 device		cxgb		# Chelsio T3 10 Gigabit Ethernet
 device		cxgb_t3fw	# Chelsio T3 10 Gigabit Ethernet firmware
 device		cxgbe		# Chelsio T4-T6 1/10/25/40/100 Gigabit Ethernet
 device		cxgbev		# Chelsio T4-T6 Virtual Functions
 device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
 device		mxge		# Myricom Myri-10G 10GbE NIC
 device		oce		# Emulex 10 GbE (OneConnect Ethernet)
 device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 
 # PCI IEEE 802.11 Wireless NICs
 device		ath		# Atheros pci/cardbus NIC's
 device		ath_hal		# pci/cardbus chip support
 #device		ath_ar5210	# AR5210 chips
 #device		ath_ar5211	# AR5211 chips
 #device		ath_ar5212	# AR5212 chips
 #device		ath_rf2413
 #device		ath_rf2417
 #device		ath_rf2425
 #device		ath_rf5111
 #device		ath_rf5112
 #device		ath_rf5413
 #device		ath_ar5416	# AR5416 chips
 # All of the AR5212 parts have a problem when paired with the AR71xx
 # CPUS.  These parts have a bug that triggers a fatal bus error on the AR71xx
 # only.  Details of the exact nature of the bug are sketchy, but some can be
 # found at https://forum.openwrt.org/viewtopic.php?pid=70060 on pages 4, 5 and
 # 6.  This option enables this workaround.  There is a performance penalty
 # for this work around, but without it things don't work at all.  The DMA
 # from the card usually bursts 128 bytes, but on the affected CPUs, only
 # 4 are safe.
 options    	AH_RXCFG_SDMAMW_4BYTES
 #device		ath_ar9160	# AR9160 chips
 #device		ath_ar9280	# AR9280 chips
 #device		ath_ar9285	# AR9285 chips
 device		ath_rate_sample	# SampleRate tx rate control for ath
 device		bwi		# Broadcom BCM430* BCM431*
 device		bwn		# Broadcom BCM43xx
 device		malo		# Marvell Libertas wireless NICs.
 device		mwl		# Marvell 88W8363 802.11n wireless NICs.
 device		mwlfw
 device		ral		# Ralink Technology RT2500 wireless NICs.
 device		rtwn		# Realtek wireless NICs
 device		rtwnfw
 
 # Use sf_buf(9) interface for jumbo buffers on ti(4) controllers.
 #options 	TI_SF_BUF_JUMBO
 # Turn on the header splitting option for the ti(4) driver firmware.  This
 # only works for Tigon II chips, and has no effect for Tigon I chips.
 # This option requires the TI_SF_BUF_JUMBO option above.
 #options 	TI_JUMBO_HDRSPLIT
 
 # These two options allow manipulating the mbuf cluster size and mbuf size,
 # respectively.  Be very careful with NIC driver modules when changing
 # these from their default values, because that can potentially cause a
 # mismatch between the mbuf size assumed by the kernel and the mbuf size
 # assumed by a module.  The only driver that currently has the ability to
 # detect a mismatch is ti(4).
 options 	MCLSHIFT=11	# mbuf cluster shift in bits, 11 == 2KB
 options 	MSIZE=256	# mbuf size in bytes
 
 #
 # Sound drivers
 #
 # sound: The generic sound driver.
 #
 
 device		sound
 
 #
 # snd_*: Device-specific drivers.
 #
 # The flags of the device tell the device a bit more info about the
 # device that normally is obtained through the PnP interface.
 #	bit  2..0   secondary DMA channel;
 #	bit  4      set if the board uses two dma channels;
 #	bit 15..8   board type, overrides autodetection; leave it
 #		    zero if don't know what to put in (and you don't,
 #		    since this is unsupported at the moment...).
 #
 # snd_als4000:		Avance Logic ALS4000 PCI.
 # snd_atiixp:		ATI IXP 200/300/400 PCI.
 # snd_cmi:		CMedia CMI8338/CMI8738 PCI.
 # snd_cs4281:		Crystal Semiconductor CS4281 PCI.
 # snd_csa:		Crystal Semiconductor CS461x/428x PCI. (except
 #			4281)
 # snd_emu10k1:		Creative EMU10K1 PCI and EMU10K2 (Audigy) PCI.
 # snd_emu10kx:		Creative SoundBlaster Live! and Audigy
 # snd_envy24:		VIA Envy24 and compatible, needs snd_spicds.
 # snd_envy24ht:		VIA Envy24HT and compatible, needs snd_spicds.
 # snd_es137x:		Ensoniq AudioPCI ES137x PCI.
 # snd_fm801:		Forte Media FM801 PCI.
 # snd_hda:		Intel High Definition Audio (Controller) and
 #			compatible.
 # snd_hdspe:		RME HDSPe AIO and RayDAT.
 # snd_ich:		Intel ICH AC'97 and some more audio controllers
 #			embedded in a chipset, for example nVidia
 #			nForce controllers.
 # snd_maestro3:		ESS Technology Maestro-3/Allegro PCI.
 # snd_neomagic:		Neomagic 256 AV/ZX PCI.
 # snd_solo:		ESS Solo-1x PCI.
 # snd_spicds:		SPI codec driver, needed by Envy24/Envy24HT drivers.
 # snd_t4dwave:		Trident 4DWave DX/NX PCI, Sis 7018 PCI and Acer Labs
 #			M5451 PCI.
 # snd_uaudio:		USB audio.
 # snd_via8233:		VIA VT8233x PCI.
 # snd_via82c686:	VIA VT82C686A PCI.
 # snd_vibes:		S3 Sonicvibes PCI.
 
 device		snd_als4000
 device		snd_atiixp
 device		snd_cmi
 device		snd_cs4281
 device		snd_csa
 device		snd_emu10k1
 device		snd_emu10kx
 device		snd_envy24
 device		snd_envy24ht
 device		snd_es137x
 device		snd_fm801
 device		snd_hda
 device		snd_hdspe
 device		snd_ich
 device		snd_maestro3
 device		snd_neomagic
 device		snd_solo
 device		snd_spicds
 device		snd_t4dwave
 device		snd_uaudio
 device		snd_via8233
 device		snd_via82c686
 device		snd_vibes
 
 # For non-PnP sound cards:
 envvar		hint.pcm.0.at="isa"
 envvar		hint.pcm.0.irq="10"
 envvar		hint.pcm.0.drq="1"
 envvar		hint.pcm.0.flags="0x0"
 envvar		hint.sbc.0.at="isa"
 envvar		hint.sbc.0.port="0x220"
 envvar		hint.sbc.0.irq="5"
 envvar		hint.sbc.0.drq="1"
 envvar		hint.sbc.0.flags="0x15"
 envvar		hint.gusc.0.at="isa"
 envvar		hint.gusc.0.port="0x220"
 envvar		hint.gusc.0.irq="5"
 envvar		hint.gusc.0.drq="1"
 envvar		hint.gusc.0.flags="0x13"
 
 #
 # Following options are intended for debugging/testing purposes:
 #
 # SND_DEBUG                    Enable extra debugging code that includes
 #                              sanity checking and possible increase of
 #                              verbosity.
 #
 # SND_DIAGNOSTIC               Similar in a spirit of INVARIANTS/DIAGNOSTIC,
 #                              zero tolerance against inconsistencies.
 #
 # SND_FEEDER_MULTIFORMAT       By default, only 16/32 bit feeders are compiled
 #                              in. This options enable most feeder converters
 #                              except for 8bit. WARNING: May bloat the kernel.
 #
 # SND_FEEDER_FULL_MULTIFORMAT  Ditto, but includes 8bit feeders as well.
 #
 # SND_FEEDER_RATE_HP           (feeder_rate) High precision 64bit arithmetic
 #                              as much as possible (the default trying to
 #                              avoid it). Possible slowdown.
 #
 # SND_PCM_64                   (Only applicable for i386/32bit arch)
 #                              Process 32bit samples through 64bit
 #                              integer/arithmetic. Slight increase of dynamic
 #                              range at a cost of possible slowdown.
 #
 # SND_OLDSTEREO                Only 2 channels are allowed, effectively
 #                              disabling multichannel processing.
 #
 options 	SND_DEBUG
 options 	SND_DIAGNOSTIC
 options 	SND_FEEDER_MULTIFORMAT
 options 	SND_FEEDER_FULL_MULTIFORMAT
 options 	SND_FEEDER_RATE_HP
 options 	SND_PCM_64
 options 	SND_OLDSTEREO
 
 #
 # Cardbus
 #
 # cbb: pci/CardBus bridge implementing YENTA interface
 # cardbus: CardBus slots
 device		cbb
 device		cardbus
 
 #
 # MMC/SD
 #
 # mmc 		MMC/SD bus
 # mmcsd		MMC/SD memory card
 # sdhci		Generic PCI SD Host Controller
 # rtsx		Realtek SD card reader (RTS5209, RTS5227, ...)
 device		mmc
 device		mmcsd
 device		sdhci
 device		rtsx
 
 #
 # SMB bus
 #
 # System Management Bus support is provided by the 'smbus' device.
 # Access to the SMBus device is via the 'smb' device (/dev/smb*),
 # which is a child of the 'smbus' device.
 #
 # Supported devices:
 # smb		standard I/O through /dev/smb*
 #
 # Supported SMB interfaces:
 # iicsmb	I2C to SMB bridge with any iicbus interface
 # intpm		Intel PIIX4 (82371AB, 82443MX) Power Management Unit
 # alpm		Acer Aladdin-IV/V/Pro2 Power Management Unit
 # ichsmb	Intel ICH SMBus controller chips (82801AA, 82801AB, 82801BA)
 # viapm		VIA VT82C586B/596B/686A and VT8233 Power Management Unit
 # amdpm		AMD 756 Power Management Unit
 # amdsmb	AMD 8111 SMBus 2.0 Controller
 # nfpm		NVIDIA nForce Power Management Unit
 # nfsmb		NVIDIA nForce2/3/4 MCP SMBus 2.0 Controller
 # ismt		Intel SMBus 2.0 controller chips (on Atom S1200, C2000)
 #
 device		smbus		# Bus support, required for smb below.
 
 device		intpm
 device		alpm
 device		ichsmb
 device		viapm
 device		amdpm
 device		amdsmb
 device		nfpm
 device		nfsmb
 device		ismt
 
 device		smb
 
 # SMBus peripheral devices
 #
 # jedec_dimm	Asset and temperature reporting for DDR3 and DDR4 DIMMs
 #
 device		jedec_dimm
 
 # I2C Bus
 #
 # Philips i2c bus support is provided by the `iicbus' device.
 #
 # Supported devices:
 # ic	i2c network interface
 # iic	i2c standard io
 # iicsmb i2c to smb bridge. Allow i2c i/o with smb commands.
 # iicoc simple polling driver for OpenCores I2C controller
 #
 # Other:
 # iicbb	generic I2C bit-banging code (needed by lpbb)
 #
 device		iicbus		# Bus support, required for ic/iic/iicsmb below.
 device		iicbb		# bitbang driver; implements i2c on a pair of gpio pins
 
 device		ic
 device		iic		# userland access to i2c slave devices via ioctl(8)
 device		iicsmb		# smb over i2c bridge
 device		iicoc		# OpenCores I2C controller support
 
 # I2C bus multiplexer (mux) devices
 device		iicmux		# i2c mux core driver
 device		iic_gpiomux	# i2c mux hardware controlled via gpio pins
 device		ltc430x		# LTC4305 and LTC4306 i2c mux chips
 
 # I2C peripheral devices
 #
 device		ad7418		# Analog Devices temp and voltage sensor
 device		ads111x		# Texas Instruments ADS101x and ADS111x ADCs
 device		ds1307		# Dallas DS1307 RTC and compatible
 device		ds13rtc		# All Dallas/Maxim ds13xx chips
 device		ds1672		# Dallas DS1672 RTC
 device		ds3231		# Dallas DS3231 RTC + temperature
 device		fan53555	# Fairchild Semi FAN53555/SYR82x Regulator
 device		icee		# AT24Cxxx and compatible EEPROMs
 device		isl12xx		# Intersil ISL12xx RTC
 device		lm75		# LM75 compatible temperature sensor
 device		nxprtc		# NXP RTCs: PCA/PFC212x PCA/PCF85xx
 device		rtc8583		# Epson RTC-8583
 device		s35390a		# Seiko Instruments S-35390A RTC
 device		sy8106a		# Silergy Corp. SY8106A buck regulator
 
 # Parallel-Port Bus
 #
 # Parallel port bus support is provided by the `ppbus' device.
 # Multiple devices may be attached to the parallel port, devices
 # are automatically probed and attached when found.
 #
 # Supported devices:
 # lpt	Parallel Printer
 # plip	Parallel network interface
 # ppi	General-purpose I/O ("Geek Port") + IEEE1284 I/O
 # pps	Pulse per second Timing Interface
 # lpbb	Philips official parallel port I2C bit-banging interface
 # pcfclock Parallel port clock driver.
 #
 # Supported interfaces:
 # ppc	ISA-bus parallel port interfaces.
 #
 
 options 	PPC_PROBE_CHIPSET # Enable chipset specific detection
 				  # (see flags in ppc(4))
 options 	DEBUG_1284	# IEEE1284 signaling protocol debug
 options 	PERIPH_1284	# Makes your computer act as an IEEE1284
 				# compliant peripheral
 options 	DONTPROBE_1284	# Avoid boot detection of PnP parallel devices
 options 	LPT_DEBUG	# Printer driver debug
 options 	PPC_DEBUG	# Parallel chipset level debug
 options 	PLIP_DEBUG	# Parallel network IP interface debug
 options 	PCFCLOCK_VERBOSE         # Verbose pcfclock driver
 options 	PCFCLOCK_MAX_RETRIES=5   # Maximum read tries (default 10)
 
 device		ppc
 envvar		hint.ppc.0.at="isa"
 envvar		hint.ppc.0.irq="7"
 device		ppbus
 device		lpt
 device		plip
 device		ppi
 device		pps
 device		lpbb
 device		pcfclock
 
 # General Purpose I/O pins
 device		dwgpio		# Synopsys DesignWare APB GPIO Controller
 device  	gpio		# gpio interfaces and bus support
 device  	gpiobacklight	# sysctl control of gpio-based backlight
 device  	gpioiic		# i2c via gpio bitbang
 device  	gpiokeys	# kbd(4) glue for gpio-based key input
 device  	gpioled		# led(4) gpio glue
 device  	gpiopower	# event handler for gpio-based powerdown
 device  	gpiopps		# Pulse per second input from gpio pin
 device  	gpioregulator	# extres/regulator glue for gpio pin
 device  	gpiospi		# SPI via gpio bitbang
 device  	gpioths		# 1-wire temp/humidity sensor on gpio pin
 
 # Pulse width modulation
 device  	pwmbus		# pwm interface and bus support
 device  	pwmc		# userland control access to pwm outputs
 
 #
 # Etherswitch framework and drivers
 #
 # etherswitch	The etherswitch(4) framework
 # miiproxy	Proxy device for miibus(4) functionality
 # 
 # Switch hardware support:
 # arswitch	Atheros switches
 # ip17x 	IC+ 17x family switches
 # rtl8366r	Realtek RTL8366 switches
 # ukswitch	Multi-PHY switches
 #
 device		etherswitch
 device		miiproxy
 device		arswitch
 device		ip17x
 device		rtl8366rb
 device		ukswitch
 
 # Kernel BOOTP support
 
 options 	BOOTP		# Use BOOTP to obtain IP address/hostname
 				# Requires NFSCL and NFS_ROOT
 options 	BOOTP_NFSROOT	# NFS mount root filesystem using BOOTP info
 options 	BOOTP_NFSV3	# Use NFS v3 to NFS mount root
 options 	BOOTP_COMPAT	# Workaround for broken bootp daemons.
 options 	BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP
 options 	BOOTP_BLOCKSIZE=8192 # Override NFS block size
 
 #
 # Enable software watchdog routines, even if hardware watchdog is present.
 # By default, software watchdog timer is enabled only if no hardware watchdog
 # is present.
 #
 options 	SW_WATCHDOG
 
 #
 # Add the software deadlock resolver thread.
 #
 options 	DEADLKRES
 
 #
 # Disable swapping of stack pages.  This option removes all
 # code which actually performs swapping, so it's not possible to turn
 # it back on at run-time.
 #
 # This is sometimes usable for systems which don't have any swap space
 # (see also sysctl "vm.disable_swapspace_pageouts")
 #
 #options 	NO_SWAPPING
 
 # Set the number of sf_bufs to allocate. sf_bufs are virtual buffers
 # for sendfile(2) that are used to map file VM pages, and normally
 # default to a quantity that is roughly 16*MAXUSERS+512. You would
 # typically want about 4 of these for each simultaneous file send.
 #
 options 	NSFBUFS=1024
 
 #
 # Enable extra debugging code for locks.  This stores the filename and
 # line of whatever acquired the lock in the lock itself, and changes a
 # number of function calls to pass around the relevant data.  This is
 # not at all useful unless you are debugging lock code.  Note that
 # modules should be recompiled as this option modifies KBI.
 #
 options 	DEBUG_LOCKS
 
 #####################################################################
 # HID support
 device		hid		# Generic HID support
 options 	HID_DEBUG	# enable debug msgs
 device		hidbus		# HID bus
 device		hidmap		# HID to evdev mapping
 device		hidraw		# Raw access driver
 options 	HIDRAW_MAKE_UHID_ALIAS	# install /dev/uhid alias
 device		hconf		# Multitouch configuration TLC
 device		hcons		# Consumer controls
 device		hgame		# Generic game controllers
 device		hkbd		# HID keyboard
 device		hms		# HID mouse
 device		hmt		# HID multitouch (MS-compatible)
 device		hpen		# Generic pen driver
 device		hsctrl		# System controls
 device		ps4dshock	# Sony PS4 DualShock 4 gamepad driver
 device		xb360gp		# XBox 360 gamepad driver
 
 #####################################################################
 # USB support
 # UHCI controller
 device		uhci
 # OHCI controller
 device		ohci
 # EHCI controller
 device		ehci
 # XHCI controller
 device		xhci
 # SL811 Controller
 #device		slhci
 # General USB code (mandatory for USB)
 device		usb
 #
 # USB Double Bulk Pipe devices
 device		udbp
 # USB temperature meter
 device		ugold
 # USB LED
 device		uled
 # Human Interface Device (anything with buttons and dials)
 device		uhid
 # USB keyboard
 device		ukbd
 # USB printer
 device		ulpt
 # USB mass storage driver (Requires scbus and da)
 device		umass
 # USB mass storage driver for device-side mode
 device		usfs
 # USB support for Belkin F5U109 and Magic Control Technology serial adapters
 device		umct
 # USB modem support
 device		umodem
 # USB mouse
 device		ums
 # USB touchpad(s)
 device		atp
 device		wsp
 # eGalax USB touch screen
 device		uep
 # Diamond Rio 500 MP3 player
 device		urio
 # HID-over-USB driver
 device		usbhid
 
 #
 # USB serial support
 device		ucom
 # USB support for 3G modem cards by Option, Novatel, Huawei and Sierra
 device		u3g
 # USB support for Technologies ARK3116 based serial adapters
 device		uark
 # USB support for Belkin F5U103 and compatible serial adapters
 device		ubsa
 # USB support for serial adapters based on the FT8U100AX and FT8U232AM
 device		uftdi
 # USB support for some Windows CE based serial communication.
 device		uipaq
 # USB support for Prolific PL-2303 serial adapters
 device		uplcom
 # USB support for Silicon Laboratories CP2101/CP2102 based USB serial adapters
 device		uslcom
 # USB Visor and Palm devices
 device		uvisor
 # USB serial support for DDI pocket's PHS
 device		uvscom
 #
 # USB ethernet support
 device		uether
 # ADMtek USB ethernet. Supports the LinkSys USB100TX,
 # the Billionton USB100, the Melco LU-ATX, the D-Link DSB-650TX
 # and the SMC 2202USB. Also works with the ADMtek AN986 Pegasus
 # eval board.
 device		aue
 
 # ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the
 # LinkSys USB200M and various other adapters.
 device		axe
 # ASIX Electronics AX88178A/AX88179 USB 2.0/3.0 gigabit ethernet driver.
 device		axge
 
 #
 # Devices which communicate using Ethernet over USB, particularly
 # Communication Device Class (CDC) Ethernet specification. Supports
 # Sharp Zaurus PDAs, some DOCSIS cable modems and so on.
 device		cdce
 #
 # CATC USB-EL1201A USB ethernet. Supports the CATC Netmate
 # and Netmate II, and the Belkin F5U111.
 device		cue
 #
 # Kawasaki LSI ethernet. Supports the LinkSys USB10T,
 # Entrega USB-NET-E45, Peracom Ethernet Adapter, the
 # 3Com 3c19250, the ADS Technologies USB-10BT, the ATen UC10T,
 # the Netgear EA101, the D-Link DSB-650, the SMC 2102USB
 # and 2104USB, and the Corega USB-T.
 device		kue
 #
 # RealTek RTL8150 USB to fast ethernet. Supports the Melco LUA-KTX
 # and the GREEN HOUSE GH-USB100B.
 device		rue
 #
 # Davicom DM9601E USB to fast ethernet. Supports the Corega FEther USB-TXC.
 device		udav
 #
 # RealTek RTL8152/RTL8153 USB Ethernet driver
 device		ure
 #
 # Moschip MCS7730/MCS7840 USB to fast ethernet. Supports the Sitecom LN030.
 device		mos
 #
 # HSxPA devices from Option N.V
 device		uhso
 
 # Realtek RTL8188SU/RTL8191SU/RTL8192SU wireless driver
 device		rsu
 #
 # Ralink Technology RT2501USB/RT2601USB wireless driver
 device		rum
 # Ralink Technology RT2700U/RT2800U/RT3000U wireless driver
 device		run
 #
 # Atheros AR5523 wireless driver
 device		uath
 #
 # Conexant/Intersil PrismGT wireless driver
 device		upgt
 #
 # Ralink Technology RT2500USB wireless driver
 device		ural
 #
 # RNDIS USB ethernet driver
 device		urndis
 # Realtek RTL8187B/L wireless driver
 device		urtw
 #
 # ZyDas ZD1211/ZD1211B wireless driver
 device		zyd
 #
 # Sierra USB wireless driver
 device		usie
 
 # 
 # debugging options for the USB subsystem
 #
 options 	USB_DEBUG
 options 	U3G_DEBUG
 
 # options for ukbd:
 options 	UKBD_DFLT_KEYMAP	# specify the built-in keymap
 makeoptions	UKBD_DFLT_KEYMAP=jp.106
 
 # options for uplcom:
 options 	UPLCOM_INTR_INTERVAL=100	# interrupt pipe interval
 						# in milliseconds
 
 # options for uvscom:
 options 	UVSCOM_DEFAULT_OPKTSIZE=8	# default output packet size
 options 	UVSCOM_INTR_INTERVAL=100	# interrupt pipe interval
 						# in milliseconds
 
 #####################################################################
 # FireWire support
 
 device		firewire	# FireWire bus code
 device		sbp		# SCSI over Firewire (Requires scbus and da)
 device		sbp_targ	# SBP-2 Target mode  (Requires scbus and targ)
 device		fwe		# Ethernet over FireWire (non-standard!)
 device		fwip		# IP over FireWire (RFC2734 and RFC3146)
 
 #####################################################################
 # dcons support (Dumb Console Device)
 
 device		dcons			# dumb console driver
 device		dcons_crom		# FireWire attachment
 options 	DCONS_BUF_SIZE=16384	# buffer size
 options 	DCONS_POLL_HZ=100	# polling rate
 options 	DCONS_FORCE_CONSOLE=0	# force to be the primary console
 options 	DCONS_FORCE_GDB=1	# force to be the gdb device
 
 #####################################################################
 # crypto subsystem
 #
 # This is a port of the OpenBSD crypto framework.  Include this when
 # configuring IPSEC and when you have a h/w crypto device to accelerate
 # user applications that link to OpenSSL.
 #
 # Drivers are ports from OpenBSD with some simple enhancements that have
 # been fed back to OpenBSD.
 
 device		crypto		# core crypto support
 
 # Only install the cryptodev device if you are running tests, or know
 # specifically why you need it.  In most cases, it is not needed and
 # will make things slower.
 device		cryptodev	# /dev/crypto for access to h/w
 
 device		rndtest		# FIPS 140-2 entropy tester
 
 device		ccr		# Chelsio T6
 
 device		hifn		# Hifn 7951, 7781, etc.
 options 	HIFN_DEBUG	# enable debugging support: hw.hifn.debug
 options 	HIFN_RNDTEST	# enable rndtest support
 
 #####################################################################
 
 
 #
 # Embedded system options:
 #
 # An embedded system might want to run something other than init.
 options 	INIT_PATH=/sbin/init:/rescue/init
 
 # Debug options
 options 	BUS_DEBUG	# enable newbus debugging
 options 	DEBUG_VFS_LOCKS	# enable VFS lock debugging
 options 	SOCKBUF_DEBUG	# enable sockbuf last record/mb tail checking
 options 	IFMEDIA_DEBUG	# enable debugging in net/if_media.c
 
 #
 # Verbose SYSINIT
 #
 # Make the SYSINIT process performed by mi_startup() verbose.  This is very
 # useful when porting to a new architecture.  If DDB is also enabled, this
 # will print function names instead of addresses.  If defined with a value
 # of zero, the verbose code is compiled-in but disabled by default, and can
 # be enabled with the debug.verbose_sysinit=1 tunable.
 options 	VERBOSE_SYSINIT
 
 #####################################################################
 # SYSV IPC KERNEL PARAMETERS
 #
 # Maximum number of System V semaphores that can be used on the system at
 # one time.
 options 	SEMMNI=11
 
 # Total number of semaphores system wide
 options 	SEMMNS=61
 
 # Total number of undo structures in system
 options 	SEMMNU=31
 
 # Maximum number of System V semaphores that can be used by a single process
 # at one time.
 options 	SEMMSL=61
 
 # Maximum number of operations that can be outstanding on a single System V
 # semaphore at one time.
 options 	SEMOPM=101
 
 # Maximum number of undo operations that can be outstanding on a single
 # System V semaphore at one time.
 options 	SEMUME=11
 
 # Maximum number of shared memory pages system wide.
 options 	SHMALL=1025
 
 # Maximum size, in bytes, of a single System V shared memory region.
 options 	SHMMAX=(SHMMAXPGS*PAGE_SIZE+1)
 options 	SHMMAXPGS=1025
 
 # Minimum size, in bytes, of a single System V shared memory region.
 options 	SHMMIN=2
 
 # Maximum number of shared memory regions that can be used on the system
 # at one time.
 options 	SHMMNI=33
 
 # Maximum number of System V shared memory regions that can be attached to
 # a single process at one time.
 options 	SHMSEG=9
 
 # Set the amount of time (in seconds) the system will wait before
 # rebooting automatically when a kernel panic occurs.  If set to (-1),
 # the system will wait indefinitely until a key is pressed on the
 # console.
 options 	PANIC_REBOOT_WAIT_TIME=16
 
 # Attempt to bypass the buffer cache and put data directly into the
 # userland buffer for read operation when O_DIRECT flag is set on the
 # file.  Both offset and length of the read operation must be
 # multiples of the physical media sector size.
 #
 options 	DIRECTIO
 
 # Specify a lower limit for the number of swap I/O buffers.  They are
 # (among other things) used when bypassing the buffer cache due to
 # DIRECTIO kernel option enabled and O_DIRECT flag set on file.
 #
 options 	NSWBUF_MIN=120
 
 #####################################################################
 
 # More undocumented options for linting.
 # Note that documenting these is not considered an affront.
 
 options 	CAM_DEBUG_DELAY
 
 options 	DEBUG
 
 # Kernel filelock debugging.
 options 	LOCKF_DEBUG
 
 # System V compatible message queues
 # Please note that the values provided here are used to test kernel
 # building.  The defaults in the sources provide almost the same numbers.
 # MSGSSZ must be a power of 2 between 8 and 1024.
 options 	MSGMNB=2049	# Max number of chars in queue
 options 	MSGMNI=41	# Max number of message queue identifiers
 options 	MSGSEG=2049	# Max number of message segments
 options 	MSGSSZ=16	# Size of a message segment
 options 	MSGTQL=41	# Max number of messages in system
 
 options 	NBUF=512	# Number of buffer headers
 
 options 	SC_DEBUG_LEVEL=5	# Syscons debug level
 options 	SC_RENDER_DEBUG	# syscons rendering debugging
 
 options 	VFS_BIO_DEBUG	# VFS buffer I/O debugging
 
 options 	KSTACK_MAX_PAGES=32 # Maximum pages to give the kernel stack
 options 	KSTACK_USAGE_PROF
 
 # Adaptec Array Controller driver options
 options 	AAC_DEBUG	# Debugging levels:
 				# 0 - quiet, only emit warnings
 				# 1 - noisy, emit major function
 				#     points and things done
 				# 2 - extremely noisy, emit trace
 				#     items in loops, etc.
 
 # Resource Accounting
 options 	RACCT
 
 # Resource Limits
 options 	RCTL
 
 # Yet more undocumented options for linting.
 options 	MAXFILES=999
 
 # Random number generator
 # Alternative algorithm.
 #options 	RANDOM_FENESTRASX
 # Allow the CSPRNG algorithm to be loaded as a module.
 #options 	RANDOM_LOADABLE
 # Select this to allow high-rate but potentially expensive
 # harvesting of Slab-Allocator entropy. In very high-rate
 # situations the value of doing this is dubious at best.
 options 	RANDOM_ENABLE_UMA	# slab allocator
 
 # Select this to allow high-rate but potentially expensive
 # harvesting of of the m_next pointer in the mbuf. Note that
 # the m_next pointer is NULL except when receiving > 4K
 # jumbo frames or sustained bursts by way of LRO. Thus in
 # the common case it is stirring zero in to the entropy
 # pool. In cases where it is not NULL it is pointing to one
 # of a small (in the thousands to 10s of thousands) number
 # of 256 byte aligned mbufs. Hence it is, even in the best
 # case, a poor source of entropy. And in the absence of actual
 # runtime analysis of entropy collection may mislead the user in
 # to believe that substantially more entropy is being collected
 # than in fact is - leading to a different class of security
 # risk. In high packet rate situations ethernet entropy
 # collection is also very expensive, possibly leading to as
 # much as a 50% drop in packets received.
 # This option is present to maintain backwards compatibility
 # if desired, however it cannot be recommended for use in any
 # environment.
 options 	RANDOM_ENABLE_ETHER	# ether_input
 
 # Module to enable execution of application via emulators like QEMU
 options         IMGACT_BINMISC
 
 # zlib I/O stream support
 # This enables support for compressed core dumps.
 options 	GZIO
 
 # zstd support
 # This enables support for Zstd compressed core dumps, GEOM_UZIP images,
 # and is required by zfs if statically linked.
 options 	ZSTDIO
 
 # BHND(4) drivers
 options 	BHND_LOGLEVEL	# Logging threshold level
 
 # evdev interface 
 device		evdev		# input event device support
 options 	EVDEV_SUPPORT	# evdev support in legacy drivers
 options 	EVDEV_DEBUG	# enable event debug msgs
 device		uinput		# install /dev/uinput cdev
 options 	UINPUT_DEBUG	# enable uinput debug msgs
 
 # Encrypted kernel crash dumps.
 options 	EKCD
 
 # Serial Peripheral Interface (SPI) support.
 device		spibus		# Bus support.
 device		at45d		# DataFlash driver
 device		cqspi		# 
 device		mx25l		# SPIFlash driver
 device		n25q		# 
 device		spigen		# Generic access to SPI devices from userland.
 # Enable legacy /dev/spigenN name aliases for /dev/spigenX.Y devices.
 options 	SPIGEN_LEGACY_CDEVNAME # legacy device names for spigen
 
 # Compression supports.
 device		zlib		# gzip/zlib compression/decompression library
 device		xz		# xz_embedded LZMA de-compression library
 
 # Kernel support for stats(3).
 options 	STATS
diff --git a/sys/conf/files b/sys/conf/files
index 952aab6f1b6e..afdf8e147014 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,5265 +1,5211 @@
 # $FreeBSD$
 #
 # 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.
 #
 acpi_quirks.h			optional acpi				   \
 	dependency	"$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
 	compile-with	"${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"acpi_quirks.h"
 bhnd_nvram_map.h		optional bhnd				   \
 	dependency	"$S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/tools/nvram_map_gen.awk $S/dev/bhnd/nvram/nvram_map" \
 	compile-with	"sh $S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/nvram/nvram_map -h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"bhnd_nvram_map.h"
 bhnd_nvram_map_data.h		optional bhnd				   \
 	dependency	"$S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/tools/nvram_map_gen.awk $S/dev/bhnd/nvram/nvram_map" \
 	compile-with	"sh $S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/nvram/nvram_map -d" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"bhnd_nvram_map_data.h"
 fdt_static_dtb.h		optional fdt fdt_dtb_static \
 	compile-with "sh -c 'MACHINE=${MACHINE} $S/tools/fdt/make_dtbh.sh ${FDT_DTS_FILE} ${.CURDIR}'" \
 	dependency	"${FDT_DTS_FILE:T:R}.dtb" \
 	no-obj no-implicit-rule before-depend \
 	clean		"fdt_static_dtb.h"
 feeder_eq_gen.h			optional sound				   \
 	dependency	"$S/tools/sound/feeder_eq_mkfilter.awk"		   \
 	compile-with	"${AWK} -f $S/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > feeder_eq_gen.h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"feeder_eq_gen.h"
 feeder_rate_gen.h		optional sound				   \
 	dependency	"$S/tools/sound/feeder_rate_mkfilter.awk"	   \
 	compile-with	"${AWK} -f $S/tools/sound/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > feeder_rate_gen.h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"feeder_rate_gen.h"
 font.h				optional	sc_dflt_font		\
 	compile-with	"uudecode < ${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < ${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < ${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h"									\
 	no-obj no-implicit-rule before-depend				\
 	clean		"font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
 snd_fxdiv_gen.h			optional sound				   \
 	dependency	"$S/tools/sound/snd_fxdiv_gen.awk"		   \
 	compile-with	"${AWK} -f $S/tools/sound/snd_fxdiv_gen.awk -- > snd_fxdiv_gen.h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"snd_fxdiv_gen.h"
 miidevs.h			optional miibus | mii			   \
 	dependency	"$S/tools/miidevs2h.awk $S/dev/mii/miidevs"	   \
 	compile-with	"${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"miidevs.h"
 kbdmuxmap.h			optional	kbdmux_dflt_keymap 	   \
 	compile-with	"${KEYMAP} -L ${KBDMUX_DFLT_KEYMAP} | ${KEYMAP_FIX} > ${.TARGET}" \
 	no-obj no-implicit-rule before-depend				\
 	clean		"kbdmuxmap.h"
 teken_state.h		optional sc | vt				   \
 	dependency	"$S/teken/gensequences $S/teken/sequences" \
 	compile-with	"${AWK} -f $S/teken/gensequences $S/teken/sequences > teken_state.h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"teken_state.h"
 ukbdmap.h			optional	ukbd_dflt_keymap	\
 	compile-with	"${KEYMAP} -L ${UKBD_DFLT_KEYMAP} | ${KEYMAP_FIX} > ${.TARGET}" \
 	no-obj no-implicit-rule before-depend				\
 	clean		"ukbdmap.h"
 usbdevs.h			optional usb | hid			   \
 	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
 	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"usbdevs.h"
 usbdevs_data.h			optional usb				   \
 	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
 	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"usbdevs_data.h"
 sdiodevs.h			optional mmccam				   \
 	dependency	"$S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs" \
 	compile-with	"${AWK} -f $S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs -h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"sdiodevs.h"
 sdiodevs_data.h			optional mmccam				   \
 	dependency	"$S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs" \
 	compile-with	"${AWK} -f $S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs -d" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"sdiodevs_data.h"
 cam/cam.c			optional scbus
 cam/cam_compat.c		optional scbus
 cam/cam_iosched.c		optional scbus
 cam/cam_periph.c		optional scbus
 cam/cam_queue.c			optional scbus
 cam/cam_sim.c			optional scbus
 cam/cam_xpt.c			optional scbus
 cam/ata/ata_all.c		optional scbus
 cam/ata/ata_xpt.c		optional scbus
 cam/ata/ata_pmp.c		optional scbus
 cam/nvme/nvme_all.c		optional scbus
 cam/nvme/nvme_da.c		optional nda | da
 cam/nvme/nvme_xpt.c		optional scbus
 cam/scsi/scsi_xpt.c		optional scbus
 cam/scsi/scsi_all.c		optional scbus
 cam/scsi/scsi_cd.c		optional cd
 cam/scsi/scsi_ch.c		optional ch
 cam/ata/ata_da.c		optional ada | da
 cam/ctl/ctl.c			optional ctl
 cam/ctl/ctl_backend.c		optional ctl
 cam/ctl/ctl_backend_block.c	optional ctl
 cam/ctl/ctl_backend_ramdisk.c	optional ctl
 cam/ctl/ctl_cmd_table.c		optional ctl
 cam/ctl/ctl_frontend.c		optional ctl
 cam/ctl/ctl_frontend_cam_sim.c	optional ctl
 cam/ctl/ctl_frontend_ioctl.c	optional ctl
 cam/ctl/ctl_frontend_iscsi.c	optional ctl cfiscsi
 cam/ctl/ctl_ha.c		optional ctl
 cam/ctl/ctl_scsi_all.c		optional ctl
 cam/ctl/ctl_tpc.c		optional ctl
 cam/ctl/ctl_tpc_local.c		optional ctl
 cam/ctl/ctl_error.c		optional ctl
 cam/ctl/ctl_util.c		optional ctl
 cam/ctl/scsi_ctl.c		optional ctl
 cam/mmc/mmc_xpt.c		optional scbus mmccam
 cam/mmc/mmc_sim.c		optional scbus mmccam
 cam/mmc/mmc_sim_if.m		optional scbus mmccam
 cam/mmc/mmc_da.c		optional scbus mmccam da
 cam/scsi/scsi_da.c		optional da
 cam/scsi/scsi_pass.c		optional pass
 cam/scsi/scsi_pt.c		optional pt
 cam/scsi/scsi_sa.c		optional sa
 cam/scsi/scsi_enc.c		optional ses
 cam/scsi/scsi_enc_ses.c		optional ses
 cam/scsi/scsi_enc_safte.c	optional ses
 cam/scsi/scsi_sg.c		optional sg
 cam/scsi/scsi_targ_bh.c		optional targbh
 cam/scsi/scsi_target.c		optional targ
 cam/scsi/smp_all.c		optional scbus
 
 # shared between zfs and dtrace
 cddl/compat/opensolaris/kern/opensolaris.c		optional dtrace compile-with "${CDDL_C}"
 cddl/compat/opensolaris/kern/opensolaris_proc.c		optional zfs | dtrace compile-with "${CDDL_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_misc.c		optional zfs | dtrace compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_cmn_err.c		optional zfs | dtrace compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_taskq.c		optional zfs | dtrace compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_kmem.c		optional zfs | dtrace compile-with "${ZFS_C}"
 
 #zfs solaris portability layer
 contrib/openzfs/module/os/freebsd/spl/acl_common.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/callb.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/list.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_acl.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_dtrace.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_kstat.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_policy.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_string.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_sunddi.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_sysevent.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_uio.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_vfs.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_vm.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_zone.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_procfs_list.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/spl/spl_zlib.c		optional zfs compile-with "${ZFS_C}"
 
 
 # zfs specific
 
 #zfs avl
 contrib/openzfs/module/avl/avl.c				optional zfs compile-with "${ZFS_C}"
 
 # zfs lua support
 contrib/openzfs/module/lua/lapi.c			optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lauxlib.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lbaselib.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lcode.c			optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lcompat.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lcorolib.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lctype.c			optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/ldebug.c			optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/ldo.c			optional zfs compile-with "${ZFS_C} ${NO_WINFINITE_RECURSION}"
 contrib/openzfs/module/lua/lfunc.c			optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lgc.c			optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/llex.c			optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lmem.c			optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lobject.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lopcodes.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lparser.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lstate.c			optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lstring.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lstrlib.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/ltable.c			optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/ltablib.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/ltm.c			optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lvm.c			optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/lua/lzio.c			optional zfs compile-with "${ZFS_C}"
 
 # zfs nvpair support
 contrib/openzfs/module/nvpair/fnvpair.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/nvpair/nvpair.c		optional zfs compile-with "${ZFS_RPC_C} ${NO_WSTRINGOP_OVERREAD}"
 contrib/openzfs/module/nvpair/nvpair_alloc_fixed.c	optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/nvpair/nvpair_alloc_spl.c	optional zfs compile-with "${ZFS_C}"
 
 #zfs platform compatibility code
 contrib/openzfs/module/os/freebsd/zfs/abd_os.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/arc_os.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/crypto_os.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/dmu_os.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/event_os.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/hkdf.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/kmod_core.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/spa_os.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c		optional zfs compile-with "${ZFS_C}  -include $S/modules/zfs/zfs_config.h"
 contrib/openzfs/module/os/freebsd/zfs/vdev_file.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/vdev_label_os.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/vdev_geom.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/zfs_acl.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/zfs_debug.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/zfs_dir.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/zfs_file_os.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_compat.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/zfs_racct.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/os/freebsd/zfs/zvol_os.c		optional zfs compile-with "${ZFS_C}"
 
 #zfs unicode support
 contrib/openzfs/module/unicode/uconv.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/unicode/u8_textprep.c		optional zfs compile-with "${ZFS_C}"
 
 #zfs checksums / zcommon
 contrib/openzfs/module/zcommon/cityhash.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zcommon/zfeature_common.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zcommon/zfs_comutil.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zcommon/zfs_deleg.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zcommon/zfs_fletcher.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zcommon/zfs_fletcher_superscalar.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zcommon/zfs_fletcher_superscalar4.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zcommon/zfs_namecheck.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zcommon/zfs_prop.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zcommon/zpool_prop.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zcommon/zprop_common.c		optional zfs compile-with "${ZFS_C}"
 
 # zfs edon-r hash support
 contrib/openzfs/module/icp/algs/edonr/edonr.c		optional zfs compile-with "${ZFS_C}"
 
 # zfs blake3 hash support
 contrib/openzfs/module/icp/algs/blake3/blake3.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/icp/algs/blake3/blake3_generic.c	optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/icp/algs/blake3/blake3_impl.c	optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/icp/algs/blake3/blake3_x86-64.c	optional zfs compile-with "${ZFS_C}"
 
 #zfs core common code
 contrib/openzfs/module/zfs/abd.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/aggsum.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/arc.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/blake3_zfs.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/blkptr.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/bplist.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/bpobj.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/bptree.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/btree.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/bqueue.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dbuf.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dbuf_stats.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dataset_kstats.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/ddt.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/ddt_zap.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dmu.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dmu_diff.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dmu_object.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dmu_objset.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dmu_recv.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dmu_redact.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dmu_send.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dmu_traverse.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dmu_tx.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dmu_zfetch.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dnode.c		optional zfs compile-with "${ZFS_C} ${NO_WUNUSED_BUT_SET_VARIABLE}" \
 	warning "kernel contains CDDL licensed ZFS filesystem"
 contrib/openzfs/module/zfs/dnode_sync.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dsl_bookmark.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dsl_crypt.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dsl_dataset.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dsl_deadlist.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dsl_deleg.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dsl_destroy.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dsl_dir.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dsl_pool.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dsl_prop.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dsl_scan.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dsl_synctask.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/dsl_userhold.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/edonr_zfs.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/fm.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/gzip.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/lzjb.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/lz4.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/lz4_zfs.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/metaslab.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/mmp.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/multilist.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/objlist.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/pathname.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/range_tree.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/refcount.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/rrwlock.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/sa.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/sha256.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/skein_zfs.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/spa.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/spa_checkpoint.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/spa_config.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/spa_errlog.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/spa_history.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/spa_log_spacemap.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/spa_misc.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/spa_stats.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/space_map.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/space_reftree.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/txg.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/uberblock.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/unique.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_cache.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_draid.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_draid_rand.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_indirect.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_indirect_births.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_indirect_mapping.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_initialize.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_label.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_mirror.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_missing.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_queue.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_raidz.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_raidz_math.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_raidz_math_scalar.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_rebuild.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_removal.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_root.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/vdev_trim.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zap.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zap_leaf.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zap_micro.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zcp.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zcp_get.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zcp_global.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zcp_iter.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zcp_set.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zcp_synctask.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zfeature.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zfs_byteswap.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zfs_chksum.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zfs_fm.c		optional zfs compile-with "${ZFS_C} ${NO_WUNUSED_BUT_SET_VARIABLE}"
 contrib/openzfs/module/zfs/zfs_fuid.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zfs_ioctl.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zfs_log.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zfs_onexit.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zfs_quota.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zfs_ratelimit.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zfs_replay.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zfs_rlock.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zfs_sa.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zfs_vnops.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zstd/zfs_zstd.c		optional zfs zstdio compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zil.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zio.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zio_checksum.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zio_compress.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zio_inject.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zle.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zrlock.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zthr.c		optional zfs compile-with "${ZFS_C}"
 contrib/openzfs/module/zfs/zvol.c		optional zfs compile-with "${ZFS_C}"
 
 # dtrace specific
 cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c	optional dtrace compile-with "${DTRACE_C}" \
 							warning "kernel contains CDDL licensed DTRACE"
 cddl/contrib/opensolaris/uts/common/dtrace/dtrace_xoroshiro128_plus.c	optional dtrace compile-with "${DTRACE_C}"
 cddl/dev/dtmalloc/dtmalloc.c		optional dtmalloc        | dtraceall compile-with "${CDDL_C}"
 cddl/dev/profile/profile.c		optional dtrace_profile  | dtraceall compile-with "${CDDL_C}"
 cddl/dev/sdt/sdt.c			optional dtrace_sdt      | dtraceall compile-with "${CDDL_C}"
 cddl/dev/fbt/fbt.c			optional dtrace_fbt      | dtraceall compile-with "${FBT_C}"
 cddl/dev/systrace/systrace.c		optional dtrace_systrace | dtraceall compile-with "${CDDL_C}"
 cddl/dev/prototype.c			optional dtrace_prototype | dtraceall compile-with "${CDDL_C}"
 fs/nfsclient/nfs_clkdtrace.c		optional dtnfscl nfscl   | dtraceall nfscl compile-with "${CDDL_C}"
 compat/freebsd32/freebsd32_abort2.c	optional compat_freebsd32
 compat/freebsd32/freebsd32_capability.c	optional compat_freebsd32
 compat/freebsd32/freebsd32_ioctl.c	optional compat_freebsd32
 compat/freebsd32/freebsd32_misc.c	optional compat_freebsd32
 compat/freebsd32/freebsd32_syscalls.c	optional compat_freebsd32
 compat/freebsd32/freebsd32_sysent.c	optional compat_freebsd32
 contrib/ck/src/ck_array.c				standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_barrier_centralized.c			standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_barrier_combining.c			standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_barrier_dissemination.c		standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_barrier_mcs.c				standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_barrier_tournament.c			standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_epoch.c				standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_hp.c					standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_hs.c					standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_ht.c					standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/ck/src/ck_rhs.c					standard compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 contrib/dev/acpica/common/ahids.c			optional acpi acpi_debug
 contrib/dev/acpica/common/ahuuids.c			optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbcmds.c		optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbconvert.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbdisply.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbexec.c		optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbhistry.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbinput.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbmethod.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbnames.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbobject.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbstats.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbtest.c		optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbutils.c	optional acpi acpi_debug
 contrib/dev/acpica/components/debugger/dbxface.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmbuffer.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmcstyle.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmdeferred.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmnames.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmopcode.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmresrc.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmresrcl.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmresrcl2.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmresrcs.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmutils.c	optional acpi acpi_debug
 contrib/dev/acpica/components/disassembler/dmwalk.c	optional acpi acpi_debug
 contrib/dev/acpica/components/dispatcher/dsargs.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dscontrol.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsdebug.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsfield.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsinit.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsmethod.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsmthdat.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsobject.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsopcode.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dspkginit.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dsutils.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dswexec.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dswload.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dswload2.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dswscope.c	optional acpi
 contrib/dev/acpica/components/dispatcher/dswstate.c	optional acpi
 contrib/dev/acpica/components/events/evevent.c		optional acpi
 contrib/dev/acpica/components/events/evglock.c		optional acpi
 contrib/dev/acpica/components/events/evgpe.c		optional acpi
 contrib/dev/acpica/components/events/evgpeblk.c		optional acpi
 contrib/dev/acpica/components/events/evgpeinit.c	optional acpi
 contrib/dev/acpica/components/events/evgpeutil.c	optional acpi
 contrib/dev/acpica/components/events/evhandler.c	optional acpi
 contrib/dev/acpica/components/events/evmisc.c		optional acpi
 contrib/dev/acpica/components/events/evregion.c		optional acpi
 contrib/dev/acpica/components/events/evrgnini.c		optional acpi
 contrib/dev/acpica/components/events/evsci.c		optional acpi
 contrib/dev/acpica/components/events/evxface.c		optional acpi
 contrib/dev/acpica/components/events/evxfevnt.c		optional acpi
 contrib/dev/acpica/components/events/evxfgpe.c		optional acpi
 contrib/dev/acpica/components/events/evxfregn.c		optional acpi
 contrib/dev/acpica/components/executer/exconcat.c	optional acpi
 contrib/dev/acpica/components/executer/exconfig.c	optional acpi
 contrib/dev/acpica/components/executer/exconvrt.c	optional acpi
 contrib/dev/acpica/components/executer/excreate.c	optional acpi
 contrib/dev/acpica/components/executer/exdebug.c	optional acpi
 contrib/dev/acpica/components/executer/exdump.c		optional acpi
 contrib/dev/acpica/components/executer/exfield.c	optional acpi
 contrib/dev/acpica/components/executer/exfldio.c	optional acpi
 contrib/dev/acpica/components/executer/exmisc.c		optional acpi
 contrib/dev/acpica/components/executer/exmutex.c	optional acpi
 contrib/dev/acpica/components/executer/exnames.c	optional acpi
 contrib/dev/acpica/components/executer/exoparg1.c	optional acpi
 contrib/dev/acpica/components/executer/exoparg2.c	optional acpi
 contrib/dev/acpica/components/executer/exoparg3.c	optional acpi
 contrib/dev/acpica/components/executer/exoparg6.c	optional acpi
 contrib/dev/acpica/components/executer/exprep.c		optional acpi
 contrib/dev/acpica/components/executer/exregion.c	optional acpi
 contrib/dev/acpica/components/executer/exresnte.c	optional acpi
 contrib/dev/acpica/components/executer/exresolv.c	optional acpi
 contrib/dev/acpica/components/executer/exresop.c	optional acpi
 contrib/dev/acpica/components/executer/exserial.c	optional acpi
 contrib/dev/acpica/components/executer/exstore.c	optional acpi
 contrib/dev/acpica/components/executer/exstoren.c	optional acpi
 contrib/dev/acpica/components/executer/exstorob.c	optional acpi
 contrib/dev/acpica/components/executer/exsystem.c	optional acpi
 contrib/dev/acpica/components/executer/extrace.c	optional acpi
 contrib/dev/acpica/components/executer/exutils.c	optional acpi
 contrib/dev/acpica/components/hardware/hwacpi.c		optional acpi
 contrib/dev/acpica/components/hardware/hwesleep.c	optional acpi
 contrib/dev/acpica/components/hardware/hwgpe.c		optional acpi
 contrib/dev/acpica/components/hardware/hwpci.c		optional acpi
 contrib/dev/acpica/components/hardware/hwregs.c		optional acpi
 contrib/dev/acpica/components/hardware/hwsleep.c	optional acpi
 contrib/dev/acpica/components/hardware/hwtimer.c	optional acpi
 contrib/dev/acpica/components/hardware/hwvalid.c	optional acpi
 contrib/dev/acpica/components/hardware/hwxface.c	optional acpi
 contrib/dev/acpica/components/hardware/hwxfsleep.c	optional acpi
 contrib/dev/acpica/components/namespace/nsaccess.c	optional acpi \
 	compile-with "${NORMAL_C} ${NO_WUNUSED_BUT_SET_VARIABLE}"
 contrib/dev/acpica/components/namespace/nsalloc.c	optional acpi
 contrib/dev/acpica/components/namespace/nsarguments.c	optional acpi
 contrib/dev/acpica/components/namespace/nsconvert.c	optional acpi
 contrib/dev/acpica/components/namespace/nsdump.c	optional acpi
 contrib/dev/acpica/components/namespace/nseval.c	optional acpi
 contrib/dev/acpica/components/namespace/nsinit.c	optional acpi
 contrib/dev/acpica/components/namespace/nsload.c	optional acpi
 contrib/dev/acpica/components/namespace/nsnames.c	optional acpi
 contrib/dev/acpica/components/namespace/nsobject.c	optional acpi
 contrib/dev/acpica/components/namespace/nsparse.c	optional acpi
 contrib/dev/acpica/components/namespace/nspredef.c	optional acpi
 contrib/dev/acpica/components/namespace/nsprepkg.c	optional acpi
 contrib/dev/acpica/components/namespace/nsrepair.c	optional acpi
 contrib/dev/acpica/components/namespace/nsrepair2.c	optional acpi
 contrib/dev/acpica/components/namespace/nssearch.c	optional acpi
 contrib/dev/acpica/components/namespace/nsutils.c	optional acpi
 contrib/dev/acpica/components/namespace/nswalk.c	optional acpi
 contrib/dev/acpica/components/namespace/nsxfeval.c	optional acpi
 contrib/dev/acpica/components/namespace/nsxfname.c	optional acpi
 contrib/dev/acpica/components/namespace/nsxfobj.c	optional acpi
 contrib/dev/acpica/components/parser/psargs.c		optional acpi
 contrib/dev/acpica/components/parser/psloop.c		optional acpi
 contrib/dev/acpica/components/parser/psobject.c		optional acpi
 contrib/dev/acpica/components/parser/psopcode.c		optional acpi
 contrib/dev/acpica/components/parser/psopinfo.c		optional acpi
 contrib/dev/acpica/components/parser/psparse.c		optional acpi
 contrib/dev/acpica/components/parser/psscope.c		optional acpi
 contrib/dev/acpica/components/parser/pstree.c		optional acpi
 contrib/dev/acpica/components/parser/psutils.c		optional acpi
 contrib/dev/acpica/components/parser/pswalk.c		optional acpi
 contrib/dev/acpica/components/parser/psxface.c		optional acpi
 contrib/dev/acpica/components/resources/rsaddr.c	optional acpi
 contrib/dev/acpica/components/resources/rscalc.c	optional acpi
 contrib/dev/acpica/components/resources/rscreate.c	optional acpi
 contrib/dev/acpica/components/resources/rsdump.c	optional acpi acpi_debug
 contrib/dev/acpica/components/resources/rsdumpinfo.c	optional acpi
 contrib/dev/acpica/components/resources/rsinfo.c	optional acpi
 contrib/dev/acpica/components/resources/rsio.c		optional acpi
 contrib/dev/acpica/components/resources/rsirq.c		optional acpi
 contrib/dev/acpica/components/resources/rslist.c	optional acpi
 contrib/dev/acpica/components/resources/rsmemory.c	optional acpi
 contrib/dev/acpica/components/resources/rsmisc.c	optional acpi
 contrib/dev/acpica/components/resources/rsserial.c	optional acpi
 contrib/dev/acpica/components/resources/rsutils.c	optional acpi
 contrib/dev/acpica/components/resources/rsxface.c	optional acpi
 contrib/dev/acpica/components/tables/tbdata.c		optional acpi
 contrib/dev/acpica/components/tables/tbfadt.c		optional acpi
 contrib/dev/acpica/components/tables/tbfind.c		optional acpi
 contrib/dev/acpica/components/tables/tbinstal.c		optional acpi
 contrib/dev/acpica/components/tables/tbprint.c		optional acpi
 contrib/dev/acpica/components/tables/tbutils.c		optional acpi
 contrib/dev/acpica/components/tables/tbxface.c		optional acpi
 contrib/dev/acpica/components/tables/tbxfload.c		optional acpi
 contrib/dev/acpica/components/tables/tbxfroot.c		optional acpi
 contrib/dev/acpica/components/utilities/utaddress.c	optional acpi
 contrib/dev/acpica/components/utilities/utalloc.c	optional acpi
 contrib/dev/acpica/components/utilities/utascii.c	optional acpi
 contrib/dev/acpica/components/utilities/utbuffer.c	optional acpi
 contrib/dev/acpica/components/utilities/utcache.c	optional acpi
 contrib/dev/acpica/components/utilities/utcksum.c	optional acpi
 contrib/dev/acpica/components/utilities/utcopy.c	optional acpi
 contrib/dev/acpica/components/utilities/utdebug.c	optional acpi
 contrib/dev/acpica/components/utilities/utdecode.c	optional acpi
 contrib/dev/acpica/components/utilities/utdelete.c	optional acpi
 contrib/dev/acpica/components/utilities/uterror.c	optional acpi
 contrib/dev/acpica/components/utilities/uteval.c	optional acpi
 contrib/dev/acpica/components/utilities/utexcep.c	optional acpi
 contrib/dev/acpica/components/utilities/utglobal.c	optional acpi
 contrib/dev/acpica/components/utilities/uthex.c		optional acpi
 contrib/dev/acpica/components/utilities/utids.c		optional acpi
 contrib/dev/acpica/components/utilities/utinit.c	optional acpi
 contrib/dev/acpica/components/utilities/utlock.c	optional acpi
 contrib/dev/acpica/components/utilities/utmath.c	optional acpi
 contrib/dev/acpica/components/utilities/utmisc.c	optional acpi
 contrib/dev/acpica/components/utilities/utmutex.c	optional acpi
 contrib/dev/acpica/components/utilities/utnonansi.c	optional acpi
 contrib/dev/acpica/components/utilities/utobject.c	optional acpi
 contrib/dev/acpica/components/utilities/utosi.c		optional acpi
 contrib/dev/acpica/components/utilities/utownerid.c	optional acpi
 contrib/dev/acpica/components/utilities/utpredef.c	optional acpi
 contrib/dev/acpica/components/utilities/utresdecode.c	optional acpi acpi_debug
 contrib/dev/acpica/components/utilities/utresrc.c	optional acpi
 contrib/dev/acpica/components/utilities/utstate.c	optional acpi
 contrib/dev/acpica/components/utilities/utstring.c	optional acpi
 contrib/dev/acpica/components/utilities/utstrsuppt.c	optional acpi
 contrib/dev/acpica/components/utilities/utstrtoul64.c	optional acpi
 contrib/dev/acpica/components/utilities/utuuid.c	optional acpi acpi_debug
 contrib/dev/acpica/components/utilities/utxface.c	optional acpi
 contrib/dev/acpica/components/utilities/utxferror.c	optional acpi
 contrib/dev/acpica/components/utilities/utxfinit.c	optional acpi
 contrib/dev/acpica/os_specific/service_layers/osgendbg.c	optional acpi acpi_debug
 netpfil/ipfilter/netinet/fil.c	optional ipfilter inet \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/ip_auth.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/ip_frag.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/ip_log.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/ip_nat.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/ip_proxy.c optional ipfilter inet \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/ip_state.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/ip_lookup.c optional ipfilter inet \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -Wno-unused -Wno-error -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/ip_pool.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/ip_htable.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter ${NO_WTAUTOLOGICAL_POINTER_COMPARE}"
 netpfil/ipfilter/netinet/ip_sync.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/ip_nat6.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/ip_rules.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/ip_scan.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/ip_dstlist.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -Wno-unused -I$S/netpfil/ipfilter"
 netpfil/ipfilter/netinet/radix_ipf.c optional ipfilter inet \
 	compile-with "${NORMAL_C} -I$S/netpfil/ipfilter"
 contrib/libfdt/fdt.c		optional fdt
 contrib/libfdt/fdt_ro.c		optional fdt
 contrib/libfdt/fdt_rw.c		optional fdt
 contrib/libfdt/fdt_strerror.c	optional fdt
 contrib/libfdt/fdt_sw.c		optional fdt
 contrib/libfdt/fdt_wip.c	optional fdt
 contrib/libnv/cnvlist.c		standard
 contrib/libnv/dnvlist.c		standard
 contrib/libnv/nvlist.c		standard
 contrib/libnv/bsd_nvpair.c		standard
-contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm \
-	compile-with "${NORMAL_C_NOWERROR} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/api/cc_dump.c optional ngatm_ccatm \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/api/cc_port.c optional ngatm_ccatm \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/api/cc_sig.c optional ngatm_ccatm \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/api/cc_user.c optional ngatm_ccatm \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/api/unisap.c optional ngatm_ccatm \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/misc/straddr.c optional ngatm_atmbase \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/msg/traffic.c optional ngatm_atmbase \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/msg/uni_ie.c optional ngatm_atmbase \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/msg/uni_msg.c optional ngatm_atmbase \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/saal/saal_sscfu.c	optional ngatm_sscfu \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/saal/saal_sscop.c	optional ngatm_sscop \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/sig/sig_call.c optional ngatm_uni \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/sig/sig_coord.c optional ngatm_uni \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/sig/sig_party.c optional ngatm_uni \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/sig/sig_print.c optional ngatm_uni \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/sig/sig_reset.c optional ngatm_uni \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/sig/sig_uni.c optional ngatm_uni \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional ngatm_uni \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 # xz
 dev/xz/xz_mod.c	optional xz \
 	compile-with "${NORMAL_C} -DXZ_USE_CRC64 -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 contrib/xz-embedded/linux/lib/xz/xz_crc32.c	optional xz \
 	compile-with "${NORMAL_C} -DXZ_USE_CRC64 -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 contrib/xz-embedded/linux/lib/xz/xz_crc64.c	optional xz \
 	compile-with "${NORMAL_C} -DXZ_USE_CRC64 -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 contrib/xz-embedded/linux/lib/xz/xz_dec_bcj.c	optional xz \
 	compile-with "${NORMAL_C} -DXZ_USE_CRC64 -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 contrib/xz-embedded/linux/lib/xz/xz_dec_lzma2.c	optional xz \
 	compile-with "${NORMAL_C} -DXZ_USE_CRC64 -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 contrib/xz-embedded/linux/lib/xz/xz_dec_stream.c optional xz \
 	compile-with "${NORMAL_C} -DXZ_USE_CRC64 -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/"
 # Zstd
 contrib/zstd/lib/freebsd/zstd_kmalloc.c		optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/common/zstd_common.c		optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/common/fse_decompress.c	optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/common/entropy_common.c	optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/common/error_private.c		optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/common/xxhash.c		optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/compress/zstd_compress.c	optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/compress/zstd_compress_literals.c	optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/compress/zstd_compress_sequences.c	optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/compress/zstd_compress_superblock.c	optional zstdio compile-with "${ZSTD_C} ${NO_WUNUSED_BUT_SET_VARIABLE}"
 contrib/zstd/lib/compress/fse_compress.c	optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/compress/hist.c		optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/compress/huf_compress.c	optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/compress/zstd_double_fast.c	optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/compress/zstd_fast.c		optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/compress/zstd_lazy.c		optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/compress/zstd_ldm.c		optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/compress/zstd_opt.c		optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/decompress/zstd_ddict.c	optional zstdio compile-with ${ZSTD_C}
 contrib/zstd/lib/decompress/zstd_decompress.c	optional zstdio compile-with ${ZSTD_C}
 # See comment in sys/conf/kern.pre.mk
 contrib/zstd/lib/decompress/zstd_decompress_block.c	optional zstdio \
 	compile-with "${ZSTD_C} ${ZSTD_DECOMPRESS_BLOCK_FLAGS}"
 contrib/zstd/lib/decompress/huf_decompress.c	optional zstdio compile-with "${ZSTD_C} ${NO_WBITWISE_INSTEAD_OF_LOGICAL}"
 # Blake 2
 contrib/libb2/blake2b-ref.c	optional crypto | !random_loadable random_fenestrasx \
 	compile-with "${NORMAL_C} -I$S/crypto/blake2 -Wno-cast-qual -DSUFFIX=_ref -Wno-unused-function"
 contrib/libb2/blake2s-ref.c	optional crypto \
 	compile-with "${NORMAL_C} -I$S/crypto/blake2 -Wno-cast-qual -DSUFFIX=_ref -Wno-unused-function"
 crypto/blake2/blake2-sw.c	optional crypto \
 	compile-with "${NORMAL_C} -I$S/crypto/blake2 -Wno-cast-qual"
 crypto/camellia/camellia.c	optional crypto
 crypto/camellia/camellia-api.c	optional crypto
 crypto/chacha20/chacha.c	standard
 crypto/chacha20/chacha-sw.c	optional crypto
 crypto/chacha20_poly1305.c	optional crypto
 crypto/curve25519.c		optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium"
 crypto/des/des_ecb.c		optional netsmb
 crypto/des/des_setkey.c		optional netsmb
 crypto/openssl/ossl.c		optional ossl
 crypto/openssl/ossl_aes.c	optional ossl
 crypto/openssl/ossl_chacha20.c	optional ossl
 crypto/openssl/ossl_poly1305.c	optional ossl
 crypto/openssl/ossl_sha1.c	optional ossl
 crypto/openssl/ossl_sha256.c	optional ossl
 crypto/openssl/ossl_sha512.c	optional ossl
 crypto/rc4/rc4.c		optional netgraph_mppc_encryption
 crypto/rijndael/rijndael-alg-fst.c optional crypto | ekcd | geom_bde | \
 	!random_loadable | wlan_ccmp
 crypto/rijndael/rijndael-api-fst.c optional ekcd | geom_bde | !random_loadable
 crypto/rijndael/rijndael-api.c	optional crypto | wlan_ccmp
 crypto/sha1.c			optional carp | crypto | ether | \
 	netgraph_mppc_encryption | sctp
 crypto/sha2/sha256c.c		optional crypto | ekcd | geom_bde | \
 	!random_loadable | sctp | zfs
 crypto/sha2/sha512c.c		optional crypto | geom_bde | zfs
 crypto/skein/skein.c		optional crypto | zfs
 crypto/skein/skein_block.c	optional crypto | zfs
 crypto/siphash/siphash.c	optional inet | inet6 | wg
 crypto/siphash/siphash_test.c	optional inet | inet6 | wg
 ddb/db_access.c			optional ddb
 ddb/db_break.c			optional ddb
 ddb/db_capture.c		optional ddb
 ddb/db_command.c		optional ddb
 ddb/db_examine.c		optional ddb
 ddb/db_expr.c			optional ddb
 ddb/db_input.c			optional ddb
 ddb/db_lex.c			optional ddb
 ddb/db_main.c			optional ddb
 ddb/db_output.c			optional ddb
 ddb/db_print.c			optional ddb
 ddb/db_ps.c			optional ddb
 ddb/db_run.c			optional ddb
 ddb/db_script.c			optional ddb
 ddb/db_sym.c			optional ddb
 ddb/db_thread.c			optional ddb
 ddb/db_textdump.c		optional ddb
 ddb/db_variables.c		optional ddb
 ddb/db_watch.c			optional ddb
 ddb/db_write_cmd.c		optional ddb
 dev/aac/aac.c			optional aac
 dev/aac/aac_cam.c		optional aacp aac
 dev/aac/aac_debug.c		optional aac
 dev/aac/aac_disk.c		optional aac
 dev/aac/aac_pci.c		optional aac pci
 dev/aacraid/aacraid.c		optional aacraid
 dev/aacraid/aacraid_cam.c	optional aacraid scbus
 dev/aacraid/aacraid_debug.c	optional aacraid
 dev/aacraid/aacraid_pci.c	optional aacraid pci
 dev/acpi_support/acpi_wmi.c	optional acpi_wmi acpi
 dev/acpi_support/acpi_asus.c	optional acpi_asus acpi
 dev/acpi_support/acpi_asus_wmi.c	optional acpi_asus_wmi acpi
 dev/acpi_support/acpi_fujitsu.c	optional acpi_fujitsu acpi
 dev/acpi_support/acpi_hp.c	optional acpi_hp acpi
 dev/acpi_support/acpi_ibm.c	optional acpi_ibm acpi
 dev/acpi_support/acpi_panasonic.c optional acpi_panasonic acpi
 dev/acpi_support/acpi_sony.c	optional acpi_sony acpi
 dev/acpi_support/acpi_toshiba.c	optional acpi_toshiba acpi
 dev/acpi_support/atk0110.c	optional aibs acpi
 dev/acpica/Osd/OsdDebug.c	optional acpi
 dev/acpica/Osd/OsdHardware.c	optional acpi
 dev/acpica/Osd/OsdInterrupt.c	optional acpi
 dev/acpica/Osd/OsdMemory.c	optional acpi
 dev/acpica/Osd/OsdSchedule.c	optional acpi
 dev/acpica/Osd/OsdStream.c	optional acpi
 dev/acpica/Osd/OsdSynch.c	optional acpi
 dev/acpica/Osd/OsdTable.c	optional acpi
 dev/acpica/acpi.c		optional acpi
 dev/acpica/acpi_acad.c		optional acpi
 dev/acpica/acpi_apei.c		optional acpi
 dev/acpica/acpi_battery.c	optional acpi
 dev/acpica/acpi_button.c	optional acpi
 dev/acpica/acpi_cmbat.c		optional acpi
 dev/acpica/acpi_cpu.c		optional acpi
 dev/acpica/acpi_ec.c		optional acpi
 dev/acpica/acpi_ged.c		optional acpi_ged acpi
 dev/acpica/acpi_isab.c		optional acpi isa
 dev/acpica/acpi_lid.c		optional acpi
 dev/acpica/acpi_package.c	optional acpi
 dev/acpica/acpi_perf.c		optional acpi
 dev/acpica/acpi_powerres.c	optional acpi
 dev/acpica/acpi_quirk.c		optional acpi
 dev/acpica/acpi_resource.c	optional acpi
 dev/acpica/acpi_container.c	optional acpi
 dev/acpica/acpi_smbat.c		optional acpi
 dev/acpica/acpi_thermal.c	optional acpi
 dev/acpica/acpi_throttle.c	optional acpi
 dev/acpica/acpi_video.c		optional acpi_video acpi
 dev/acpica/acpi_dock.c		optional acpi_dock acpi
 dev/adlink/adlink.c		optional adlink
 dev/ae/if_ae.c			optional ae pci
 dev/age/if_age.c		optional age pci
 dev/agp/agp.c			optional agp pci
 dev/agp/agp_if.m		optional agp pci
 dev/ahci/ahci.c			optional ahci
 dev/ahci/ahciem.c		optional ahci
 dev/ahci/ahci_pci.c		optional ahci pci
 dev/aic7xxx/ahc_isa.c		optional ahc isa
 dev/aic7xxx/ahc_pci.c		optional ahc pci \
 	compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}"
 dev/aic7xxx/ahd_pci.c		optional ahd pci \
 	compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}"
 dev/aic7xxx/aic7770.c		optional ahc
 dev/aic7xxx/aic79xx.c		optional ahd pci
 dev/aic7xxx/aic79xx_osm.c	optional ahd pci
 dev/aic7xxx/aic79xx_pci.c	optional ahd pci
 dev/aic7xxx/aic79xx_reg_print.c	optional ahd pci ahd_reg_pretty_print
 dev/aic7xxx/aic7xxx.c		optional ahc
 dev/aic7xxx/aic7xxx_93cx6.c	optional ahc
 dev/aic7xxx/aic7xxx_osm.c	optional ahc
 dev/aic7xxx/aic7xxx_pci.c	optional ahc pci
 dev/aic7xxx/aic7xxx_reg_print.c	optional ahc ahc_reg_pretty_print
 dev/al_eth/al_eth.c				optional al_eth	fdt	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${.IMPSRC}"
 dev/al_eth/al_init_eth_lm.c			optional al_eth	fdt	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${.IMPSRC}"
 dev/al_eth/al_init_eth_kr.c			optional al_eth	fdt	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${.IMPSRC}"
 contrib/alpine-hal/al_hal_iofic.c		optional al_iofic	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${.IMPSRC}"
 contrib/alpine-hal/al_hal_serdes_25g.c		optional al_serdes	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${.IMPSRC}"
 contrib/alpine-hal/al_hal_serdes_hssp.c		optional al_serdes	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${.IMPSRC}"
 contrib/alpine-hal/al_hal_udma_config.c		optional al_udma	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${.IMPSRC}"
 contrib/alpine-hal/al_hal_udma_debug.c		optional al_udma	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${.IMPSRC}"
 contrib/alpine-hal/al_hal_udma_iofic.c		optional al_udma	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${.IMPSRC}"
 contrib/alpine-hal/al_hal_udma_main.c		optional al_udma	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${.IMPSRC}"
 contrib/alpine-hal/al_serdes.c			optional al_serdes	\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${.IMPSRC}"
 contrib/alpine-hal/eth/al_hal_eth_kr.c		optional al_eth		\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${.IMPSRC}"
 contrib/alpine-hal/eth/al_hal_eth_main.c	optional al_eth		\
 	no-depend	\
 	compile-with "${CC} -c -o ${.TARGET} ${CFLAGS} -I$S/contrib/alpine-hal -I$S/contrib/alpine-hal/eth ${.IMPSRC}"
 dev/alc/if_alc.c		optional alc pci
 dev/ale/if_ale.c		optional ale pci
 dev/alpm/alpm.c			optional alpm pci
 dev/altera/avgen/altera_avgen.c		optional altera_avgen
 dev/altera/avgen/altera_avgen_fdt.c	optional altera_avgen fdt
 dev/altera/avgen/altera_avgen_nexus.c	optional altera_avgen
 dev/altera/msgdma/msgdma.c		optional altera_msgdma xdma
 dev/altera/sdcard/altera_sdcard.c	optional altera_sdcard
 dev/altera/sdcard/altera_sdcard_disk.c	optional altera_sdcard
 dev/altera/sdcard/altera_sdcard_io.c	optional altera_sdcard
 dev/altera/sdcard/altera_sdcard_fdt.c	optional altera_sdcard fdt
 dev/altera/sdcard/altera_sdcard_nexus.c	optional altera_sdcard
 dev/altera/softdma/softdma.c	optional altera_softdma xdma fdt
 dev/altera/pio/pio.c		optional altera_pio
 dev/altera/pio/pio_if.m		optional altera_pio
 dev/amdpm/amdpm.c		optional amdpm pci | nfpm pci
 dev/amdsmb/amdsmb.c		optional amdsmb pci
 #
 dev/ata/ata_if.m		optional ata | atacore
 dev/ata/ata-all.c		optional ata | atacore
 dev/ata/ata-dma.c		optional ata | atacore
 dev/ata/ata-lowlevel.c		optional ata | atacore
 dev/ata/ata-sata.c		optional ata | atacore
 dev/ata/ata-isa.c		optional ata isa | ataisa
 dev/ata/ata-pci.c		optional ata pci | atapci
 dev/ata/chipsets/ata-acard.c	optional ata pci | ataacard
 dev/ata/chipsets/ata-acerlabs.c	optional ata pci | ataacerlabs
 dev/ata/chipsets/ata-amd.c	optional ata pci | ataamd
 dev/ata/chipsets/ata-ati.c	optional ata pci | ataati
 dev/ata/chipsets/ata-cenatek.c	optional ata pci | atacenatek
 dev/ata/chipsets/ata-cypress.c	optional ata pci | atacypress
 dev/ata/chipsets/ata-cyrix.c	optional ata pci | atacyrix
 dev/ata/chipsets/ata-highpoint.c	optional ata pci | atahighpoint
 dev/ata/chipsets/ata-intel.c	optional ata pci | ataintel
 dev/ata/chipsets/ata-ite.c	optional ata pci | ataite
 dev/ata/chipsets/ata-jmicron.c	optional ata pci | atajmicron
 dev/ata/chipsets/ata-marvell.c	optional ata pci | atamarvell
 dev/ata/chipsets/ata-micron.c	optional ata pci | atamicron
 dev/ata/chipsets/ata-national.c	optional ata pci | atanational
 dev/ata/chipsets/ata-netcell.c	optional ata pci | atanetcell
 dev/ata/chipsets/ata-nvidia.c	optional ata pci | atanvidia
 dev/ata/chipsets/ata-promise.c	optional ata pci | atapromise
 dev/ata/chipsets/ata-serverworks.c	optional ata pci | ataserverworks
 dev/ata/chipsets/ata-siliconimage.c	optional ata pci | atasiliconimage | ataati
 dev/ata/chipsets/ata-sis.c	optional ata pci | atasis
 dev/ata/chipsets/ata-via.c	optional ata pci | atavia
 #
 dev/ath/if_ath_pci.c		optional ath_pci pci \
 	compile-with "${ATH_C}"
 #
 dev/ath/if_ath_ahb.c		optional ath_ahb \
 	compile-with "${ATH_C}"
 #
 dev/ath/if_ath.c		optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_alq.c		optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_beacon.c		optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_btcoex.c		optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_btcoex_mci.c	optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_debug.c		optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_descdma.c	optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_keycache.c	optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_ioctl.c		optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_led.c		optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_lna_div.c	optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_tx.c		optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_tx_edma.c	optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_tx_ht.c		optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_tdma.c		optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_sysctl.c		optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_rx.c		optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_rx_edma.c	optional ath \
 	compile-with "${ATH_C}"
 dev/ath/if_ath_spectral.c	optional ath \
 	compile-with "${ATH_C}"
 dev/ath/ah_osdep.c		optional ath \
 	compile-with "${ATH_C}"
 #
 dev/ath/ath_hal/ah.c		optional ath \
 	compile-with "${ATH_C}"
 dev/ath/ath_hal/ah_eeprom_v1.c	optional ath_hal | ath_ar5210 \
 	compile-with "${ATH_C}"
 dev/ath/ath_hal/ah_eeprom_v3.c	optional ath_hal | ath_ar5211 | ath_ar5212 \
 	compile-with "${ATH_C}"
 dev/ath/ath_hal/ah_eeprom_v14.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 \
 	compile-with "${ATH_C}"
 dev/ath/ath_hal/ah_eeprom_v4k.c \
 	optional ath_hal | ath_ar9285 \
 	compile-with "${ATH_C}"
 dev/ath/ath_hal/ah_eeprom_9287.c \
 	optional ath_hal | ath_ar9287 \
 	compile-with "${ATH_C}"
 dev/ath/ath_hal/ah_regdomain.c	optional ath \
 	compile-with "${ATH_C} ${NO_WSHIFT_COUNT_NEGATIVE} ${NO_WSHIFT_COUNT_OVERFLOW}"
 # ar5210
 dev/ath/ath_hal/ar5210/ar5210_attach.c		optional ath_hal | ath_ar5210 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_beacon.c		optional ath_hal | ath_ar5210 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_interrupts.c	optional ath_hal | ath_ar5210 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_keycache.c	optional ath_hal | ath_ar5210 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_misc.c		optional ath_hal | ath_ar5210 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_phy.c		optional ath_hal | ath_ar5210 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_power.c		optional ath_hal | ath_ar5210 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_recv.c		optional ath_hal | ath_ar5210 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_reset.c		optional ath_hal | ath_ar5210 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5210/ar5210_xmit.c		optional ath_hal | ath_ar5210 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 # ar5211
 dev/ath/ath_hal/ar5211/ar5211_attach.c		optional ath_hal | ath_ar5211 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_beacon.c		optional ath_hal | ath_ar5211 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_interrupts.c	optional ath_hal | ath_ar5211 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_keycache.c	optional ath_hal | ath_ar5211 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_misc.c		optional ath_hal | ath_ar5211 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_phy.c		optional ath_hal | ath_ar5211 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_power.c		optional ath_hal | ath_ar5211 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_recv.c		optional ath_hal | ath_ar5211 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_reset.c		optional ath_hal | ath_ar5211 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5211/ar5211_xmit.c		optional ath_hal | ath_ar5211 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 # ar5212
 dev/ath/ath_hal/ar5212/ar5212_ani.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_attach.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_beacon.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_eeprom.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_gpio.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_interrupts.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_keycache.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_misc.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_phy.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_power.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_recv.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_reset.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_rfgain.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5212_xmit.c \
 	optional ath_hal | ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 | \
 	ath_ar9285 ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 # ar5416 (depends on ar5212)
 dev/ath/ath_hal/ar5416/ar5416_ani.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_attach.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_beacon.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_btcoex.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_cal.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_cal_iq.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_eeprom.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_gpio.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_interrupts.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_keycache.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_misc.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_phy.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_power.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_radar.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_recv.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_reset.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_spectral.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar5416_xmit.c \
 	optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \
 	ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 # ar9130 (depends upon ar5416) - also requires AH_SUPPORT_AR9130
 #
 # Since this is an embedded MAC SoC, there's no need to compile it into the
 # default HAL.
 dev/ath/ath_hal/ar9001/ar9130_attach.c optional ath_ar9130 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9001/ar9130_phy.c optional ath_ar9130 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9001/ar9130_eeprom.c optional ath_ar9130 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 # ar9160 (depends on ar5416)
 dev/ath/ath_hal/ar9001/ar9160_attach.c optional ath_hal | ath_ar9160 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 # ar9280 (depends on ar5416)
 dev/ath/ath_hal/ar9002/ar9280_attach.c optional ath_hal | ath_ar9280 | \
 	ath_ar9285 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9280_olc.c optional ath_hal | ath_ar9280 | \
 	ath_ar9285 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 # ar9285 (depends on ar5416 and ar9280)
 dev/ath/ath_hal/ar9002/ar9285_attach.c optional ath_hal | ath_ar9285 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9285_btcoex.c optional ath_hal | ath_ar9285 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9285_reset.c optional ath_hal | ath_ar9285 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9285_cal.c optional ath_hal | ath_ar9285 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9285_phy.c optional ath_hal | ath_ar9285 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9285_diversity.c optional ath_hal | ath_ar9285 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 # ar9287 (depends on ar5416)
 dev/ath/ath_hal/ar9002/ar9287_attach.c optional ath_hal | ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9287_reset.c optional ath_hal | ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9287_cal.c optional ath_hal | ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9287_olc.c optional ath_hal | ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 
 # ar9300
 contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal ${NO_WCONSTANT_CONVERSION}"
 contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_gpio.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_interrupts.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_keycache.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_mci.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_paprd.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_phy.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_power.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_radar.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_radio.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_recv.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal ${NO_WSOMETIMES_UNINITIALIZED} -Wno-unused-function"
 contrib/dev/ath/ath_hal/ar9300/ar9300_stub.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_stub_funcs.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_spectral.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_timer.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 contrib/dev/ath/ath_hal/ar9300/ar9300_xmit_ds.c optional ath_hal | ath_ar9300 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal -I$S/contrib/dev/ath/ath_hal"
 
 # rf backends
 dev/ath/ath_hal/ar5212/ar2316.c	optional ath_rf2316 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar2317.c	optional ath_rf2317 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar2413.c	optional ath_hal | ath_rf2413 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar2425.c	optional ath_hal | ath_rf2425 | ath_rf2417 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5111.c	optional ath_hal | ath_rf5111 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5112.c	optional ath_hal | ath_rf5112 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5212/ar5413.c	optional ath_hal | ath_rf5413 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar5416/ar2133.c optional ath_hal | ath_ar5416 | \
 	ath_ar9130 | ath_ar9160 | ath_ar9280 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9280.c optional ath_hal | ath_ar9280 | ath_ar9285 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9285.c optional ath_hal | ath_ar9285 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 dev/ath/ath_hal/ar9002/ar9287.c optional ath_hal | ath_ar9287 \
 	compile-with "${ATH_C} -I$S/dev/ath/ath_hal"
 
 # ath rate control algorithms
 dev/ath/ath_rate/amrr/amrr.c	optional ath_rate_amrr \
 	compile-with "${ATH_C}"
 dev/ath/ath_rate/onoe/onoe.c	optional ath_rate_onoe \
 	compile-with "${ATH_C}"
 dev/ath/ath_rate/sample/sample.c	optional ath_rate_sample \
 	compile-with "${ATH_C}"
 # ath DFS modules
 dev/ath/ath_dfs/null/dfs_null.c	optional ath \
 	compile-with "${ATH_C}"
 #
 dev/backlight/backlight_if.m		optional backlight | compat_linuxkpi
 dev/backlight/backlight.c		optional backlight | compat_linuxkpi
 dev/bce/if_bce.c			optional bce
 dev/bfe/if_bfe.c			optional bfe
 dev/bge/if_bge.c			optional bge
 dev/bhnd/bhnd.c				optional bhnd
 dev/bhnd/bhnd_erom.c			optional bhnd
 dev/bhnd/bhnd_erom_if.m			optional bhnd
 dev/bhnd/bhnd_subr.c			optional bhnd
 dev/bhnd/bhnd_bus_if.m			optional bhnd
 dev/bhnd/bhndb/bhnd_bhndb.c		optional bhndb bhnd
 dev/bhnd/bhndb/bhndb.c			optional bhndb bhnd
 dev/bhnd/bhndb/bhndb_bus_if.m		optional bhndb bhnd
 dev/bhnd/bhndb/bhndb_hwdata.c		optional bhndb bhnd
 dev/bhnd/bhndb/bhndb_if.m		optional bhndb bhnd
 dev/bhnd/bhndb/bhndb_pci.c		optional bhndb_pci bhndb bhnd pci
 dev/bhnd/bhndb/bhndb_pci_hwdata.c 	optional bhndb_pci bhndb bhnd pci
 dev/bhnd/bhndb/bhndb_pci_sprom.c	optional bhndb_pci bhndb bhnd pci
 dev/bhnd/bhndb/bhndb_subr.c		optional bhndb bhnd
 dev/bhnd/bcma/bcma.c			optional bcma bhnd
 dev/bhnd/bcma/bcma_bhndb.c		optional bcma bhnd bhndb
 dev/bhnd/bcma/bcma_erom.c		optional bcma bhnd
 dev/bhnd/bcma/bcma_subr.c		optional bcma bhnd
 dev/bhnd/cores/chipc/bhnd_chipc_if.m	optional bhnd
 dev/bhnd/cores/chipc/bhnd_sprom_chipc.c	optional bhnd
 dev/bhnd/cores/chipc/bhnd_pmu_chipc.c	optional bhnd
 dev/bhnd/cores/chipc/chipc.c		optional bhnd
 dev/bhnd/cores/chipc/chipc_cfi.c	optional bhnd cfi 
 dev/bhnd/cores/chipc/chipc_gpio.c	optional bhnd gpio
 dev/bhnd/cores/chipc/chipc_slicer.c	optional bhnd cfi | bhnd spibus
 dev/bhnd/cores/chipc/chipc_spi.c	optional bhnd spibus
 dev/bhnd/cores/chipc/chipc_subr.c	optional bhnd
 dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl.c	optional bhnd
 dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_if.m	optional bhnd
 dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_hostb_if.m	optional bhnd
 dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_subr.c	optional bhnd
 dev/bhnd/cores/pci/bhnd_pci.c		optional bhnd pci
 dev/bhnd/cores/pci/bhnd_pci_hostb.c	optional bhndb bhnd pci
 dev/bhnd/cores/pci/bhnd_pcib.c		optional bhnd_pcib bhnd pci
 dev/bhnd/cores/pcie2/bhnd_pcie2.c	optional bhnd pci
 dev/bhnd/cores/pcie2/bhnd_pcie2_hostb.c	optional bhndb bhnd pci
 dev/bhnd/cores/pcie2/bhnd_pcie2b.c	optional bhnd_pcie2b bhnd pci
 dev/bhnd/cores/pmu/bhnd_pmu.c		optional bhnd
 dev/bhnd/cores/pmu/bhnd_pmu_core.c	optional bhnd
 dev/bhnd/cores/pmu/bhnd_pmu_if.m	optional bhnd
 dev/bhnd/cores/pmu/bhnd_pmu_subr.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_data.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_data_bcm.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_data_bcmraw.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_data_btxt.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_data_sprom.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_data_sprom_subr.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_data_tlv.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_if.m		optional bhnd
 dev/bhnd/nvram/bhnd_nvram_io.c		optional bhnd
 dev/bhnd/nvram/bhnd_nvram_iobuf.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_ioptr.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_iores.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_plist.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_store.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_store_subr.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_subr.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_value.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_value_fmts.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_value_prf.c	optional bhnd
 dev/bhnd/nvram/bhnd_nvram_value_subr.c	optional bhnd
 dev/bhnd/nvram/bhnd_sprom.c		optional bhnd
 dev/bhnd/siba/siba.c			optional siba bhnd
 dev/bhnd/siba/siba_bhndb.c		optional siba bhnd bhndb
 dev/bhnd/siba/siba_erom.c		optional siba bhnd
 dev/bhnd/siba/siba_subr.c		optional siba bhnd
 #
 dev/bnxt/bnxt_hwrm.c		optional bnxt iflib pci
 dev/bnxt/bnxt_mgmt.c		optional bnxt iflib pci
 dev/bnxt/bnxt_sysctl.c		optional bnxt iflib pci
 dev/bnxt/bnxt_txrx.c		optional bnxt iflib pci
 dev/bnxt/if_bnxt.c		optional bnxt iflib pci
 dev/bwi/bwimac.c		optional bwi
 dev/bwi/bwiphy.c		optional bwi
 dev/bwi/bwirf.c			optional bwi
 dev/bwi/if_bwi.c		optional bwi
 dev/bwi/if_bwi_pci.c		optional bwi pci
 dev/bwn/if_bwn.c		optional bwn bhnd
 dev/bwn/if_bwn_pci.c		optional bwn pci bhnd bhndb bhndb_pci
 dev/bwn/if_bwn_phy_common.c	optional bwn bhnd
 dev/bwn/if_bwn_phy_g.c		optional bwn bhnd
 dev/bwn/if_bwn_phy_lp.c		optional bwn bhnd
 dev/bwn/if_bwn_phy_n.c		optional bwn bhnd
 dev/bwn/if_bwn_util.c		optional bwn bhnd
 dev/cadence/if_cgem.c		optional cgem fdt
 dev/cardbus/card_if.m		standard
 dev/cardbus/cardbus.c		optional cardbus
 dev/cardbus/cardbus_cis.c	optional cardbus
 dev/cardbus/cardbus_device.c	optional cardbus
 dev/cardbus/power_if.m		standard
 dev/cas/if_cas.c		optional cas
 dev/cfi/cfi_bus_fdt.c		optional cfi fdt
 dev/cfi/cfi_bus_nexus.c		optional cfi
 dev/cfi/cfi_core.c		optional cfi
 dev/cfi/cfi_dev.c		optional cfi
 dev/cfi/cfi_disk.c		optional cfid
 dev/chromebook_platform/chromebook_platform.c	optional chromebook_platform
 dev/ciss/ciss.c			optional ciss
 dev/cpufreq/ichss.c		optional cpufreq pci
 dev/cxgb/cxgb_main.c		optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/cxgb_sge.c		optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_mc5.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_vsc7323.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_vsc8211.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_ael1002.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_aq100x.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_mv88e1xxx.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_xgmac.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_t3_hw.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/common/cxgb_tn1010.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/sys/uipc_mvec.c	optional cxgb pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgb/cxgb_t3fw.c		optional cxgb cxgb_t3fw \
 	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cxgbe/t4_clip.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_filter.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_if.m		optional cxgbe pci
 dev/cxgbe/t4_iov.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_mp_ring.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_main.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_netmap.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_sched.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_sge.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_smt.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_l2t.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_tracer.c		optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/t4_vf.c		optional cxgbev pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/common/t4_hw.c	optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/common/t4vf_hw.c	optional cxgbev pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/crypto/t6_kern_tls.c	optional cxgbe pci kern_tls \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/crypto/t4_keyctx.c	optional cxgbe pci \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/cudbg/cudbg_common.c	optional cxgbe \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/cudbg/cudbg_flash_utils.c	optional cxgbe \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/cudbg/cudbg_lib.c	optional cxgbe \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/cudbg/cudbg_wtp.c	optional cxgbe \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/cudbg/fastlz.c	optional cxgbe \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/cudbg/fastlz_api.c	optional cxgbe \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 t4fw_cfg.c		optional cxgbe					\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk t4fw_cfg.fw:t4fw_cfg t4fw_cfg_uwire.fw:t4fw_cfg_uwire t4fw.fw:t4fw -mt4fw_cfg -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"t4fw_cfg.c"
 t4fw_cfg.fwo		optional cxgbe					\
 	dependency	"t4fw_cfg.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t4fw_cfg.fwo"
 t4fw_cfg.fw		optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t4fw_cfg.txt"		\
 	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t4fw_cfg.fw"
 t4fw_cfg_uwire.fwo	optional cxgbe					\
 	dependency	"t4fw_cfg_uwire.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t4fw_cfg_uwire.fwo"
 t4fw_cfg_uwire.fw	optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t4fw_cfg_uwire.txt"	\
 	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t4fw_cfg_uwire.fw"
 t4fw.fwo		optional cxgbe					\
 	dependency	"t4fw.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t4fw.fwo"
 t4fw.fw			optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t4fw-1.27.0.0.bin"	\
 	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t4fw.fw"
 t5fw_cfg.c		optional cxgbe					\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk t5fw_cfg.fw:t5fw_cfg t5fw_cfg_uwire.fw:t5fw_cfg_uwire t5fw.fw:t5fw -mt5fw_cfg -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"t5fw_cfg.c"
 t5fw_cfg.fwo		optional cxgbe					\
 	dependency	"t5fw_cfg.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t5fw_cfg.fwo"
 t5fw_cfg.fw		optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t5fw_cfg.txt"		\
 	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t5fw_cfg.fw"
 t5fw_cfg_uwire.fwo	optional cxgbe					\
 	dependency	"t5fw_cfg_uwire.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t5fw_cfg_uwire.fwo"
 t5fw_cfg_uwire.fw	optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t5fw_cfg_uwire.txt"	\
 	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t5fw_cfg_uwire.fw"
 t5fw.fwo		optional cxgbe					\
 	dependency	"t5fw.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t5fw.fwo"
 t5fw.fw			optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t5fw-1.27.0.0.bin"	\
 	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t5fw.fw"
 t6fw_cfg.c		optional cxgbe					\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk t6fw_cfg.fw:t6fw_cfg t6fw_cfg_uwire.fw:t6fw_cfg_uwire t6fw.fw:t6fw -mt6fw_cfg -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"t6fw_cfg.c"
 t6fw_cfg.fwo		optional cxgbe					\
 	dependency	"t6fw_cfg.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t6fw_cfg.fwo"
 t6fw_cfg.fw		optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t6fw_cfg.txt"		\
 	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t6fw_cfg.fw"
 t6fw_cfg_uwire.fwo	optional cxgbe					\
 	dependency	"t6fw_cfg_uwire.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t6fw_cfg_uwire.fwo"
 t6fw_cfg_uwire.fw	optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t6fw_cfg_uwire.txt"	\
 	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t6fw_cfg_uwire.fw"
 t6fw.fwo		optional cxgbe					\
 	dependency	"t6fw.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"t6fw.fwo"
 t6fw.fw			optional cxgbe					\
 	dependency	"$S/dev/cxgbe/firmware/t6fw-1.27.0.0.bin"	\
 	compile-with	"${CP} ${.ALLSRC} ${.TARGET}"			\
 	no-obj no-implicit-rule						\
 	clean		"t6fw.fw"
 dev/cxgbe/crypto/t4_crypto.c	optional ccr \
 	compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cyapa/cyapa.c		optional cyapa iicbus
 dev/dc/if_dc.c			optional dc pci
 dev/dc/dcphy.c			optional dc pci
 dev/dc/pnphy.c			optional dc pci
 dev/dcons/dcons.c		optional dcons
 dev/dcons/dcons_crom.c		optional dcons_crom
 dev/dcons/dcons_os.c		optional dcons
 dev/dialog/da9063/da9063_if.m	optional da9063_pmic
 dev/dialog/da9063/da9063_iic.c	optional da9063_pmic iicbus fdt
 dev/dialog/da9063/da9063_rtc.c	optional da9063_rtc fdt
 dev/drm2/drm_agpsupport.c	optional drm2
 dev/drm2/drm_auth.c		optional drm2
 dev/drm2/drm_bufs.c		optional drm2
 dev/drm2/drm_buffer.c		optional drm2
 dev/drm2/drm_context.c		optional drm2
 dev/drm2/drm_crtc.c		optional drm2
 dev/drm2/drm_crtc_helper.c	optional drm2
 dev/drm2/drm_dma.c		optional drm2
 dev/drm2/drm_dp_helper.c	optional drm2
 dev/drm2/drm_dp_iic_helper.c	optional drm2
 dev/drm2/drm_drv.c		optional drm2
 dev/drm2/drm_edid.c		optional drm2
 dev/drm2/drm_fb_helper.c	optional drm2
 dev/drm2/drm_fops.c		optional drm2
 dev/drm2/drm_gem.c		optional drm2
 dev/drm2/drm_gem_names.c	optional drm2
 dev/drm2/drm_global.c		optional drm2
 dev/drm2/drm_hashtab.c		optional drm2
 dev/drm2/drm_ioctl.c		optional drm2
 dev/drm2/drm_irq.c		optional drm2
 dev/drm2/drm_linux_list_sort.c	optional drm2
 dev/drm2/drm_lock.c		optional drm2
 dev/drm2/drm_memory.c		optional drm2
 dev/drm2/drm_mm.c		optional drm2
 dev/drm2/drm_modes.c		optional drm2
 dev/drm2/drm_pci.c		optional drm2
 dev/drm2/drm_platform.c		optional drm2
 dev/drm2/drm_scatter.c		optional drm2
 dev/drm2/drm_stub.c		optional drm2
 dev/drm2/drm_sysctl.c		optional drm2
 dev/drm2/drm_vm.c		optional drm2
 dev/drm2/drm_os_freebsd.c	optional drm2
 dev/drm2/ttm/ttm_agp_backend.c	optional drm2
 dev/drm2/ttm/ttm_lock.c		optional drm2
 dev/drm2/ttm/ttm_object.c	optional drm2
 dev/drm2/ttm/ttm_tt.c		optional drm2
 dev/drm2/ttm/ttm_bo_util.c	optional drm2
 dev/drm2/ttm/ttm_bo.c		optional drm2
 dev/drm2/ttm/ttm_bo_manager.c	optional drm2
 dev/drm2/ttm/ttm_execbuf_util.c	optional drm2
 dev/drm2/ttm/ttm_memory.c	optional drm2
 dev/drm2/ttm/ttm_page_alloc.c	optional drm2
 dev/drm2/ttm/ttm_bo_vm.c	optional drm2
 dev/efidev/efidev.c		optional efirt
 dev/efidev/efirt.c		optional efirt
 dev/efidev/efirtc.c		optional efirt
 dev/e1000/if_em.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/em_txrx.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/igb_txrx.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_80003es2lan.c	optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_82540.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_82541.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_82542.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_82543.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_82571.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_82575.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_ich8lan.c	optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_i210.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_api.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_base.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_mac.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_manage.c	optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_nvm.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_phy.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_vf.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_mbx.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/e1000/e1000_osdep.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/et/if_et.c			optional et
 dev/ena/ena.c			optional ena \
 	compile-with "${NORMAL_C} -I$S/contrib"
 dev/ena/ena_datapath.c		optional ena \
 	compile-with "${NORMAL_C} -I$S/contrib"
 dev/ena/ena_netmap.c		optional ena \
 	compile-with "${NORMAL_C} -I$S/contrib"
 dev/ena/ena_rss.c		optional ena \
 	compile-with "${NORMAL_C} -I$S/contrib"
 dev/ena/ena_sysctl.c 		optional ena \
 	compile-with "${NORMAL_C} -I$S/contrib"
 contrib/ena-com/ena_com.c	optional ena
 contrib/ena-com/ena_eth_com.c	optional ena
 dev/etherswitch/arswitch/arswitch.c		optional arswitch
 dev/etherswitch/arswitch/arswitch_reg.c		optional arswitch
 dev/etherswitch/arswitch/arswitch_phy.c		optional arswitch
 dev/etherswitch/arswitch/arswitch_8216.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_8226.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_8316.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_8327.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_7240.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_9340.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_vlans.c	optional arswitch
 dev/etherswitch/etherswitch.c		optional etherswitch
 dev/etherswitch/etherswitch_if.m	optional etherswitch
 dev/etherswitch/ip17x/ip17x.c		optional ip17x
 dev/etherswitch/ip17x/ip175c.c		optional ip17x
 dev/etherswitch/ip17x/ip175d.c		optional ip17x
 dev/etherswitch/ip17x/ip17x_phy.c	optional ip17x
 dev/etherswitch/ip17x/ip17x_vlans.c	optional ip17x
 dev/etherswitch/miiproxy.c		optional miiproxy
 dev/etherswitch/rtl8366/rtl8366rb.c	optional rtl8366rb
 dev/etherswitch/e6000sw/e6000sw.c	optional e6000sw fdt
 dev/etherswitch/e6000sw/e6060sw.c	optional e6060sw
 dev/etherswitch/infineon/adm6996fc.c	optional adm6996fc
 dev/etherswitch/micrel/ksz8995ma.c	optional ksz8995ma
 dev/etherswitch/ukswitch/ukswitch.c	optional ukswitch
 dev/evdev/cdev.c			optional evdev
 dev/evdev/evdev.c			optional evdev
 dev/evdev/evdev_mt.c			optional evdev
 dev/evdev/evdev_utils.c			optional evdev
 dev/evdev/uinput.c			optional evdev uinput
 dev/exca/exca.c			optional cbb
 dev/extres/clk/clk.c		optional clk
 dev/extres/clk/clkdev_if.m	optional clk
 dev/extres/clk/clknode_if.m	optional clk
 dev/extres/clk/clk_bus.c	optional clk fdt
 dev/extres/clk/clk_div.c	optional clk
 dev/extres/clk/clk_fixed.c	optional clk
 dev/extres/clk/clk_gate.c	optional clk
 dev/extres/clk/clk_link.c	optional clk
 dev/extres/clk/clk_mux.c	optional clk
 dev/extres/phy/phy.c		optional phy
 dev/extres/phy/phydev_if.m	optional phy fdt
 dev/extres/phy/phynode_if.m	optional phy
 dev/extres/phy/phy_usb.c	optional phy
 dev/extres/phy/phynode_usb_if.m	optional phy
 dev/extres/hwreset/hwreset.c	optional hwreset
 dev/extres/hwreset/hwreset_array.c	optional hwreset
 dev/extres/hwreset/hwreset_if.m	optional hwreset
 dev/extres/nvmem/nvmem.c	optional nvmem fdt
 dev/extres/nvmem/nvmem_if.m	optional nvmem
 dev/extres/regulator/regdev_if.m	optional regulator fdt
 dev/extres/regulator/regnode_if.m	optional regulator
 dev/extres/regulator/regulator.c	optional regulator
 dev/extres/regulator/regulator_bus.c	optional regulator fdt
 dev/extres/regulator/regulator_fixed.c	optional regulator
 dev/extres/syscon/syscon.c		optional syscon
 dev/extres/syscon/syscon_generic.c	optional syscon fdt
 dev/extres/syscon/syscon_if.m		optional syscon
 dev/extres/syscon/syscon_power.c	optional syscon syscon_power
 dev/fb/fbd.c			optional fbd | vt
 dev/fb/fb_if.m			standard
 dev/fb/splash.c			optional sc splash
 dev/fdt/fdt_clock.c		optional fdt fdt_clock
 dev/fdt/fdt_clock_if.m		optional fdt fdt_clock
 dev/fdt/fdt_common.c		optional fdt
 dev/fdt/fdt_pinctrl.c		optional fdt fdt_pinctrl
 dev/fdt/fdt_pinctrl_if.m	optional fdt fdt_pinctrl
 dev/fdt/fdt_slicer.c		optional fdt cfi | fdt mx25l | fdt n25q | fdt at45d
 dev/fdt/fdt_static_dtb.S	optional fdt fdt_dtb_static \
 	dependency	"${FDT_DTS_FILE:T:R}.dtb"
 dev/fdt/simplebus.c		optional fdt
 dev/fdt/simple_mfd.c		optional syscon fdt
 dev/filemon/filemon.c		optional filemon
 dev/firewire/firewire.c		optional firewire
 dev/firewire/fwcrom.c		optional firewire
 dev/firewire/fwdev.c		optional firewire
 dev/firewire/fwdma.c		optional firewire
 dev/firewire/fwmem.c		optional firewire
 dev/firewire/fwohci.c		optional firewire
 dev/firewire/fwohci_pci.c	optional firewire pci
 dev/firewire/if_fwe.c		optional fwe
 dev/firewire/if_fwip.c		optional fwip
 dev/firewire/sbp.c		optional sbp
 dev/firewire/sbp_targ.c		optional sbp_targ
 dev/flash/at45d.c		optional at45d
 dev/flash/cqspi.c		optional cqspi fdt xdma
 dev/flash/mx25l.c		optional mx25l
 dev/flash/n25q.c		optional n25q fdt
 dev/flash/qspi_if.m		optional cqspi fdt | n25q fdt
 dev/fxp/if_fxp.c		optional fxp
 dev/fxp/inphy.c			optional fxp
 dev/gem/if_gem.c		optional gem
 dev/gem/if_gem_pci.c		optional gem pci
 dev/goldfish/goldfish_rtc.c	optional goldfish_rtc fdt
 dev/gpio/dwgpio/dwgpio.c	optional gpio dwgpio fdt
 dev/gpio/dwgpio/dwgpio_bus.c	optional gpio dwgpio fdt
 dev/gpio/dwgpio/dwgpio_if.m	optional gpio dwgpio fdt
 dev/gpio/gpiobacklight.c	optional gpiobacklight fdt
 dev/gpio/gpiokeys.c		optional gpiokeys fdt
 dev/gpio/gpiokeys_codes.c	optional gpiokeys fdt
 dev/gpio/gpiobus.c		optional gpio				\
 	dependency	"gpiobus_if.h"
 dev/gpio/gpioc.c		optional gpio				\
 	dependency	"gpio_if.h"
 dev/gpio/gpioiic.c		optional gpioiic
 dev/gpio/gpioled.c		optional gpioled !fdt
 dev/gpio/gpioled_fdt.c		optional gpioled fdt
 dev/gpio/gpiomdio.c		optional gpiomdio mii_bitbang
 dev/gpio/gpiopower.c		optional gpiopower fdt
 dev/gpio/gpioregulator.c	optional gpioregulator fdt
 dev/gpio/gpiospi.c		optional gpiospi
 dev/gpio/gpioths.c		optional gpioths
 dev/gpio/gpio_if.m		optional gpio
 dev/gpio/gpiobus_if.m		optional gpio
 dev/gpio/gpiopps.c		optional gpiopps fdt
 dev/gpio/ofw_gpiobus.c		optional fdt gpio
 dev/hid/bcm5974.c		optional bcm5974
 dev/hid/hconf.c			optional hconf
 dev/hid/hcons.c			optional hcons
 dev/hid/hgame.c			optional hgame
 dev/hid/hid.c			optional hid
 dev/hid/hid_if.m		optional hid
 dev/hid/hidbus.c		optional hidbus
 dev/hid/hidmap.c		optional hidmap
 dev/hid/hidquirk.c		optional hid
 dev/hid/hidraw.c		optional hidraw
 dev/hid/hkbd.c			optional hkbd
 dev/hid/hms.c			optional hms
 dev/hid/hmt.c			optional hmt hconf
 dev/hid/hpen.c			optional hpen
 dev/hid/hsctrl.c		optional hsctrl
 dev/hid/ietp.c			optional ietp
 dev/hid/ps4dshock.c		optional ps4dshock
 dev/hid/xb360gp.c		optional xb360gp
 dev/hifn/hifn7751.c		optional hifn
 dev/hptiop/hptiop.c		optional hptiop scbus
 dev/hwpmc/hwpmc_logging.c	optional hwpmc
 dev/hwpmc/hwpmc_mod.c		optional hwpmc
 dev/hwpmc/hwpmc_soft.c		optional hwpmc
 dev/ichiic/ig4_acpi.c		optional ig4 acpi iicbus
 dev/ichiic/ig4_iic.c		optional ig4 iicbus
 dev/ichiic/ig4_pci.c		optional ig4 pci iicbus
 dev/ichsmb/ichsmb.c		optional ichsmb
 dev/ichsmb/ichsmb_pci.c		optional ichsmb pci
 dev/ida/ida.c			optional ida
 dev/ida/ida_disk.c		optional ida
 dev/ida/ida_pci.c		optional ida pci
 dev/iicbus/acpi_iicbus.c	optional acpi iicbus | acpi compat_linuxkpi
 dev/iicbus/ad7418.c		optional ad7418
 dev/iicbus/ads111x.c		optional ads111x
 dev/iicbus/ds1307.c		optional ds1307
 dev/iicbus/ds13rtc.c		optional ds13rtc | ds133x | ds1374
 dev/iicbus/ds1672.c		optional ds1672
 dev/iicbus/ds3231.c		optional ds3231
 dev/iicbus/htu21.c		optional htu21
 dev/iicbus/icee.c		optional icee
 dev/iicbus/if_ic.c		optional ic
 dev/iicbus/iic.c		optional iic
 dev/iicbus/iic_recover_bus.c	optional iicbus | compat_linuxkpi
 dev/iicbus/iicbb.c		optional iicbb | compat_linuxkpi
 dev/iicbus/iicbb_if.m		optional iicbb | compat_linuxkpi
 dev/iicbus/iicbus.c		optional iicbus | compat_linuxkpi
 dev/iicbus/iicbus_if.m		optional iicbus | compat_linuxkpi
 dev/iicbus/iichid.c		optional iichid acpi hid iicbus
 dev/iicbus/iiconf.c		optional iicbus | compat_linuxkpi
 dev/iicbus/iicsmb.c		optional iicsmb				\
 	dependency	"iicbus_if.h"
 dev/iicbus/iicoc.c		optional iicoc
 dev/iicbus/iicoc_fdt.c		optional iicoc fdt
 dev/iicbus/iicoc_pci.c		optional iicoc pci
 dev/iicbus/isl12xx.c		optional isl12xx
 dev/iicbus/lm75.c		optional lm75
 dev/iicbus/max44009.c		optional max44009
 dev/iicbus/mux/iicmux.c		optional iicmux
 dev/iicbus/mux/iicmux_if.m	optional iicmux
 dev/iicbus/mux/iic_gpiomux.c	optional iic_gpiomux fdt
 dev/iicbus/mux/ltc430x.c	optional ltc430x
 dev/iicbus/mux/pca954x.c	optional pca954x iicbus iicmux
 dev/iicbus/nxprtc.c		optional nxprtc | pcf8563
 dev/iicbus/ofw_iicbus.c		optional fdt iicbus
 dev/iicbus/ofw_iicbus_if.m	optional fdt iicbus
 dev/iicbus/pcf8574.c		optional pcf8574
 dev/iicbus/pcf8591.c		optional pcf8591
 dev/iicbus/rtc8583.c		optional rtc8583
 dev/iicbus/rtc/pcf85063.c	optional pcf85063 iicbus fdt
 dev/iicbus/rtc/rx8803.c		optional rx8803 iicbus fdt
 dev/iicbus/s35390a.c		optional s35390a
 dev/iicbus/sy8106a.c		optional sy8106a fdt
 dev/iicbus/syr827.c		optional syr827 fdt
 dev/iicbus/gpio/tca64xx.c	optional tca64xx fdt gpio
 dev/iicbus/pmic/fan53555.c	optional fan53555 fdt | tcs4525 fdt
 dev/igc/if_igc.c		optional igc iflib pci
 dev/igc/igc_api.c		optional igc iflib pci
 dev/igc/igc_base.c		optional igc iflib pci
 dev/igc/igc_i225.c		optional igc iflib pci
 dev/igc/igc_mac.c		optional igc iflib pci
 dev/igc/igc_nvm.c		optional igc iflib pci
 dev/igc/igc_phy.c		optional igc iflib pci
 dev/igc/igc_txrx.c		optional igc iflib pci
 dev/intpm/intpm.c		optional intpm pci
 # XXX Work around clang warning, until maintainer approves fix.
 dev/ips/ips.c			optional ips \
 	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
 dev/ips/ips_commands.c		optional ips
 dev/ips/ips_disk.c		optional ips
 dev/ips/ips_ioctl.c		optional ips
 dev/ips/ips_pci.c		optional ips pci
 dev/ipw/if_ipw.c		optional ipw
 ipwbssfw.c			optional ipwbssfw | ipwfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk ipw_bss.fw:ipw_bss:130 -lintel_ipw -mipw_bss -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"ipwbssfw.c"
 ipw_bss.fwo			optional ipwbssfw | ipwfw		\
 	dependency	"ipw_bss.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"ipw_bss.fwo"
 ipw_bss.fw			optional ipwbssfw | ipwfw		\
 	dependency	"$S/contrib/dev/ipw/ipw2100-1.3.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"ipw_bss.fw"
 ipwibssfw.c			optional ipwibssfw | ipwfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk ipw_ibss.fw:ipw_ibss:130 -lintel_ipw -mipw_ibss -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"ipwibssfw.c"
 ipw_ibss.fwo			optional ipwibssfw | ipwfw		\
 	dependency	"ipw_ibss.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"ipw_ibss.fwo"
 ipw_ibss.fw			optional ipwibssfw | ipwfw		\
 	dependency	"$S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"ipw_ibss.fw"
 ipwmonitorfw.c			optional ipwmonitorfw | ipwfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk ipw_monitor.fw:ipw_monitor:130 -lintel_ipw -mipw_monitor -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"ipwmonitorfw.c"
 ipw_monitor.fwo			optional ipwmonitorfw | ipwfw		\
 	dependency	"ipw_monitor.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"ipw_monitor.fwo"
 ipw_monitor.fw			optional ipwmonitorfw | ipwfw		\
 	dependency	"$S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"ipw_monitor.fw"
 dev/iscsi/icl.c			optional iscsi
 dev/iscsi/icl_conn_if.m		optional cfiscsi | iscsi
 dev/iscsi/icl_soft.c		optional iscsi
 dev/iscsi/icl_soft_proxy.c	optional iscsi
 dev/iscsi/iscsi.c		optional iscsi scbus
 dev/ismt/ismt.c			optional ismt
 dev/isl/isl.c			optional isl iicbus
 dev/isp/isp.c			optional isp
 dev/isp/isp_freebsd.c		optional isp
 dev/isp/isp_library.c		optional isp
 dev/isp/isp_pci.c		optional isp pci
 dev/isp/isp_target.c		optional isp
 dev/ispfw/ispfw.c		optional ispfw
 dev/iwi/if_iwi.c		optional iwi
 iwibssfw.c			optional iwibssfw | iwifw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwi_bss.fw:iwi_bss:300 -lintel_iwi -miwi_bss -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwibssfw.c"
 iwi_bss.fwo			optional iwibssfw | iwifw		\
 	dependency	"iwi_bss.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwi_bss.fwo"
 iwi_bss.fw			optional iwibssfw | iwifw		\
 	dependency	"$S/contrib/dev/iwi/ipw2200-bss.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwi_bss.fw"
 iwiibssfw.c			optional iwiibssfw | iwifw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwi_ibss.fw:iwi_ibss:300 -lintel_iwi -miwi_ibss -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwiibssfw.c"
 iwi_ibss.fwo			optional iwiibssfw | iwifw		\
 	dependency	"iwi_ibss.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwi_ibss.fwo"
 iwi_ibss.fw			optional iwiibssfw | iwifw		\
 	dependency	"$S/contrib/dev/iwi/ipw2200-ibss.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwi_ibss.fw"
 iwimonitorfw.c			optional iwimonitorfw | iwifw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwi_monitor.fw:iwi_monitor:300 -lintel_iwi -miwi_monitor -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwimonitorfw.c"
 iwi_monitor.fwo			optional iwimonitorfw | iwifw		\
 	dependency	"iwi_monitor.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwi_monitor.fwo"
 iwi_monitor.fw			optional iwimonitorfw | iwifw		\
 	dependency	"$S/contrib/dev/iwi/ipw2200-sniffer.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwi_monitor.fw"
 dev/iwm/if_iwm.c		optional iwm
 dev/iwm/if_iwm_7000.c		optional iwm
 dev/iwm/if_iwm_8000.c		optional iwm
 dev/iwm/if_iwm_9000.c		optional iwm
 dev/iwm/if_iwm_9260.c		optional iwm
 dev/iwm/if_iwm_binding.c	optional iwm
 dev/iwm/if_iwm_fw.c		optional iwm
 dev/iwm/if_iwm_led.c		optional iwm
 dev/iwm/if_iwm_mac_ctxt.c	optional iwm
 dev/iwm/if_iwm_notif_wait.c	optional iwm
 dev/iwm/if_iwm_pcie_trans.c	optional iwm
 dev/iwm/if_iwm_phy_ctxt.c	optional iwm
 dev/iwm/if_iwm_phy_db.c		optional iwm
 dev/iwm/if_iwm_power.c		optional iwm
 dev/iwm/if_iwm_scan.c		optional iwm
 dev/iwm/if_iwm_sf.c		optional iwm
 dev/iwm/if_iwm_sta.c		optional iwm
 dev/iwm/if_iwm_time_event.c	optional iwm
 dev/iwm/if_iwm_util.c		optional iwm
 iwm3160fw.c			optional iwm3160fw | iwmfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwm3160.fw:iwm3160fw -miwm3160fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwm3160fw.c"
 iwm3160fw.fwo			optional iwm3160fw | iwmfw		\
 	dependency	"iwm3160.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwm3160fw.fwo"
 iwm3160.fw			optional iwm3160fw | iwmfw		\
 	dependency	"$S/contrib/dev/iwm/iwm-3160-17.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm3160.fw"
 iwm3168fw.c			optional iwm3168fw | iwmfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwm3168.fw:iwm3168fw -miwm3168fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwm3168fw.c"
 iwm3168fw.fwo			optional iwm3168fw | iwmfw		\
 	dependency	"iwm3168.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwm3168fw.fwo"
 iwm3168.fw			optional iwm3168fw | iwmfw		\
 	dependency	"$S/contrib/dev/iwm/iwm-3168-22.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm3168.fw"
 iwm7260fw.c			optional iwm7260fw | iwmfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwm7260.fw:iwm7260fw -miwm7260fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwm7260fw.c"
 iwm7260fw.fwo			optional iwm7260fw | iwmfw		\
 	dependency	"iwm7260.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwm7260fw.fwo"
 iwm7260.fw			optional iwm7260fw | iwmfw		\
 	dependency	"$S/contrib/dev/iwm/iwm-7260-17.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm7260.fw"
 iwm7265fw.c			optional iwm7265fw | iwmfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwm7265.fw:iwm7265fw -miwm7265fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwm7265fw.c"
 iwm7265fw.fwo			optional iwm7265fw | iwmfw		\
 	dependency	"iwm7265.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwm7265fw.fwo"
 iwm7265.fw			optional iwm7265fw | iwmfw		\
 	dependency	"$S/contrib/dev/iwm/iwm-7265-17.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm7265.fw"
 iwm7265Dfw.c			optional iwm7265Dfw | iwmfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwm7265D.fw:iwm7265Dfw -miwm7265Dfw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwm7265Dfw.c"
 iwm7265Dfw.fwo			optional iwm7265Dfw | iwmfw		\
 	dependency	"iwm7265D.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwm7265Dfw.fwo"
 iwm7265D.fw			optional iwm7265Dfw | iwmfw		\
 	dependency	"$S/contrib/dev/iwm/iwm-7265D-17.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm7265D.fw"
 iwm8000Cfw.c			optional iwm8000Cfw | iwmfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwm8000C.fw:iwm8000Cfw -miwm8000Cfw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwm8000Cfw.c"
 iwm8000Cfw.fwo			optional iwm8000Cfw | iwmfw		\
 	dependency	"iwm8000C.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwm8000Cfw.fwo"
 iwm8000C.fw			optional iwm8000Cfw | iwmfw		\
 	dependency	"$S/contrib/dev/iwm/iwm-8000C-16.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm8000C.fw"
 iwm8265.fw			optional iwm8265fw | iwmfw		\
 	dependency	"$S/contrib/dev/iwm/iwm-8265-22.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwm8265.fw"
 iwm8265fw.c			optional iwm8265fw | iwmfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwm8265.fw:iwm8265fw -miwm8265fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwm8265fw.c"
 iwm8265fw.fwo			optional iwm8265fw | iwmfw		\
 	dependency	"iwm8265.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwm8265fw.fwo"
 dev/iwn/if_iwn.c		optional iwn
 iwn1000fw.c			optional iwn1000fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn1000.fw:iwn1000fw -miwn1000fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwn1000fw.c"
 iwn1000fw.fwo			optional iwn1000fw | iwnfw		\
 	dependency	"iwn1000.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn1000fw.fwo"
 iwn1000.fw			optional iwn1000fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-1000-39.31.5.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn1000.fw"
 iwn100fw.c			optional iwn100fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn100.fw:iwn100fw -miwn100fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwn100fw.c"
 iwn100fw.fwo			optional iwn100fw | iwnfw		\
 	dependency	"iwn100.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn100fw.fwo"
 iwn100.fw			optional iwn100fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn100.fw"
 iwn105fw.c			optional iwn105fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn105.fw:iwn105fw -miwn105fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwn105fw.c"
 iwn105fw.fwo			optional iwn105fw | iwnfw		\
 	dependency	"iwn105.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn105fw.fwo"
 iwn105.fw			optional iwn105fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn105.fw"
 iwn135fw.c			optional iwn135fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn135.fw:iwn135fw -miwn135fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwn135fw.c"
 iwn135fw.fwo			optional iwn135fw | iwnfw		\
 	dependency	"iwn135.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn135fw.fwo"
 iwn135.fw			optional iwn135fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-135-6-18.168.6.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn135.fw"
 iwn2000fw.c			optional iwn2000fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn2000.fw:iwn2000fw -miwn2000fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwn2000fw.c"
 iwn2000fw.fwo			optional iwn2000fw | iwnfw		\
 	dependency	"iwn2000.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn2000fw.fwo"
 iwn2000.fw			optional iwn2000fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-2000-18.168.6.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn2000.fw"
 iwn2030fw.c			optional iwn2030fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn2030.fw:iwn2030fw -miwn2030fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwn2030fw.c"
 iwn2030fw.fwo			optional iwn2030fw | iwnfw		\
 	dependency	"iwn2030.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn2030fw.fwo"
 iwn2030.fw			optional iwn2030fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwnwifi-2030-18.168.6.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn2030.fw"
 iwn4965fw.c			optional iwn4965fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn4965.fw:iwn4965fw -miwn4965fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwn4965fw.c"
 iwn4965fw.fwo			optional iwn4965fw | iwnfw		\
 	dependency	"iwn4965.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn4965fw.fwo"
 iwn4965.fw			optional iwn4965fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-4965-228.61.2.24.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn4965.fw"
 iwn5000fw.c			optional iwn5000fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn5000.fw:iwn5000fw -miwn5000fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwn5000fw.c"
 iwn5000fw.fwo		optional iwn5000fw | iwnfw			\
 	dependency	"iwn5000.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn5000fw.fwo"
 iwn5000.fw			optional iwn5000fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-5000-8.83.5.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn5000.fw"
 iwn5150fw.c			optional iwn5150fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn5150.fw:iwn5150fw -miwn5150fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwn5150fw.c"
 iwn5150fw.fwo			optional iwn5150fw | iwnfw		\
 	dependency	"iwn5150.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn5150fw.fwo"
 iwn5150.fw			optional iwn5150fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-5150-8.24.2.2.fw.uu"\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn5150.fw"
 iwn6000fw.c			optional iwn6000fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6000.fw:iwn6000fw -miwn6000fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwn6000fw.c"
 iwn6000fw.fwo			optional iwn6000fw | iwnfw		\
 	dependency	"iwn6000.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn6000fw.fwo"
 iwn6000.fw			optional iwn6000fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn6000.fw"
 iwn6000g2afw.c			optional iwn6000g2afw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6000g2a.fw:iwn6000g2afw -miwn6000g2afw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwn6000g2afw.c"
 iwn6000g2afw.fwo		optional iwn6000g2afw | iwnfw		\
 	dependency	"iwn6000g2a.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn6000g2afw.fwo"
 iwn6000g2a.fw			optional iwn6000g2afw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-6000g2a-18.168.6.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn6000g2a.fw"
 iwn6000g2bfw.c			optional iwn6000g2bfw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6000g2b.fw:iwn6000g2bfw -miwn6000g2bfw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwn6000g2bfw.c"
 iwn6000g2bfw.fwo		optional iwn6000g2bfw | iwnfw		\
 	dependency	"iwn6000g2b.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn6000g2bfw.fwo"
 iwn6000g2b.fw			optional iwn6000g2bfw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-6000g2b-18.168.6.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn6000g2b.fw"
 iwn6050fw.c			optional iwn6050fw | iwnfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk iwn6050.fw:iwn6050fw -miwn6050fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"iwn6050fw.c"
 iwn6050fw.fwo			optional iwn6050fw | iwnfw		\
 	dependency	"iwn6050.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"iwn6050fw.fwo"
 iwn6050.fw			optional iwn6050fw | iwnfw		\
 	dependency	"$S/contrib/dev/iwn/iwlwifi-6050-41.28.5.1.fw.uu" \
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"iwn6050.fw"
 dev/ixgbe/if_ix.c		optional ix inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP"
 dev/ixgbe/if_ixv.c		optional ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP"
 dev/ixgbe/if_bypass.c		optional ix inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/if_fdir.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/if_sriov.c		optional ix inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ix_txrx.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_osdep.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_phy.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_api.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_common.c	optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_mbx.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_vf.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_82598.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_82599.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_x540.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_x550.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_dcb.c		optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_dcb_82598.c	optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_dcb_82599.c	optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/jedec_dimm/jedec_dimm.c	optional jedec_dimm smbus
 dev/jme/if_jme.c		optional jme pci
 dev/kbd/kbd.c			optional atkbd | pckbd | sc | ukbd | vt | hkbd
 dev/kbdmux/kbdmux.c		optional kbdmux
 dev/ksyms/ksyms.c		optional ksyms
 dev/le/am7990.c			optional le
 dev/le/am79900.c		optional le
 dev/le/if_le_pci.c		optional le pci
 dev/le/lance.c			optional le
 dev/led/led.c			standard
 dev/lge/if_lge.c		optional lge
 dev/liquidio/base/cn23xx_pf_device.c		optional lio	\
 	compile-with "${NORMAL_C}				\
 	-I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP"
 dev/liquidio/base/lio_console.c			optional lio	\
 	compile-with "${NORMAL_C}				\
 	-I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP"
 dev/liquidio/base/lio_ctrl.c			optional lio	\
 	compile-with "${NORMAL_C} 				\
 	-I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP"
 dev/liquidio/base/lio_device.c			optional lio	\
 	compile-with "${NORMAL_C} 				\
 	-I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP"
 dev/liquidio/base/lio_droq.c			optional lio	\
 	compile-with "${NORMAL_C} 				\
 	-I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP"
 dev/liquidio/base/lio_mem_ops.c			optional lio	\
 	compile-with "${NORMAL_C} 				\
 	-I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP"
 dev/liquidio/base/lio_request_manager.c		optional lio	\
 	compile-with "${NORMAL_C} 				\
 	-I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP"
 dev/liquidio/base/lio_response_manager.c	optional lio	\
 	compile-with "${NORMAL_C} 				\
 	-I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP"
 dev/liquidio/lio_core.c				optional lio	\
 	compile-with "${NORMAL_C} 				\
 	-I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP"
 dev/liquidio/lio_ioctl.c			optional lio	\
 	compile-with "${NORMAL_C} 				\
 	-I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP"
 dev/liquidio/lio_main.c				optional lio	\
 	compile-with "${NORMAL_C} 				\
 	-I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP"
 dev/liquidio/lio_rss.c				optional lio	\
 	compile-with "${NORMAL_C} 				\
 	-I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP"
 dev/liquidio/lio_rxtx.c				optional lio	\
 	compile-with "${NORMAL_C} 				\
 	-I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP"
 dev/liquidio/lio_sysctl.c			optional lio	\
 	compile-with "${NORMAL_C} 				\
 	-I$S/dev/liquidio -I$S/dev/liquidio/base -DSMP"
 lio.c	optional lio						\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk lio_23xx_nic.bin.fw:lio_23xx_nic.bin -mlio_23xx_nic.bin -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local	\
 	clean		"lio.c"
 lio_23xx_nic.bin.fw.fwo optional lio				\
 	dependency	"lio_23xx_nic.bin.fw"			\
 	compile-with	"${NORMAL_FWO}"				\
 	no-implicit-rule					\
 	clean		"lio_23xx_nic.bin.fw.fwo"
 lio_23xx_nic.bin.fw	optional lio					\
 	dependency	"$S/contrib/dev/liquidio/lio_23xx_nic.bin.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"lio_23xx_nic.bin.fw"
 dev/malo/if_malo.c		optional malo
 dev/malo/if_malohal.c		optional malo
 dev/malo/if_malo_pci.c		optional malo pci
 dev/md/md.c			optional md
 dev/mdio/mdio_if.m		optional miiproxy | mdio
 dev/mdio/mdio.c			optional miiproxy | mdio
 dev/mem/memdev.c		optional mem
 dev/mem/memutil.c		optional mem
 dev/mfi/mfi.c			optional mfi
 dev/mfi/mfi_debug.c		optional mfi
 dev/mfi/mfi_pci.c		optional mfi pci
 dev/mfi/mfi_disk.c		optional mfi
 dev/mfi/mfi_syspd.c		optional mfi
 dev/mfi/mfi_tbolt.c		optional mfi
 dev/mfi/mfi_cam.c		optional mfip scbus
 dev/mii/acphy.c			optional miibus | acphy
 dev/mii/amphy.c			optional miibus | amphy
 dev/mii/atphy.c			optional miibus | atphy
 dev/mii/axphy.c			optional miibus | axphy
 dev/mii/bmtphy.c		optional miibus | bmtphy
 dev/mii/brgphy.c		optional miibus | brgphy
 dev/mii/ciphy.c			optional miibus | ciphy
 dev/mii/dp83822phy.c		optional miibus | dp83822phy
 dev/mii/dp83867phy.c		optional miibus | dp83867phy
 dev/mii/e1000phy.c		optional miibus | e1000phy
 dev/mii/gentbi.c		optional miibus | gentbi
 dev/mii/icsphy.c		optional miibus | icsphy
 dev/mii/ip1000phy.c		optional miibus | ip1000phy
 dev/mii/jmphy.c			optional miibus | jmphy
 dev/mii/lxtphy.c		optional miibus | lxtphy
 dev/mii/mcommphy.c		optional miibus | mcommphy
 dev/mii/micphy.c		optional miibus fdt | micphy fdt
 dev/mii/mii.c			optional miibus | mii
 dev/mii/mii_bitbang.c		optional miibus | mii_bitbang
 dev/mii/mii_physubr.c		optional miibus | mii
 dev/mii/mii_fdt.c		optional miibus fdt | mii fdt
 dev/mii/miibus_if.m		optional miibus | mii
 dev/mii/mv88e151x.c		optional miibus | mv88e151x
 dev/mii/nsgphy.c		optional miibus | nsgphy
 dev/mii/nsphy.c			optional miibus | nsphy
 dev/mii/nsphyter.c		optional miibus | nsphyter
 dev/mii/pnaphy.c		optional miibus | pnaphy
 dev/mii/qsphy.c			optional miibus | qsphy
 dev/mii/rdcphy.c		optional miibus | rdcphy
 dev/mii/rgephy.c		optional miibus | rgephy
 dev/mii/rlphy.c			optional miibus | rlphy
 dev/mii/rlswitch.c		optional rlswitch
 dev/mii/smcphy.c		optional miibus | smcphy
 dev/mii/smscphy.c		optional miibus | smscphy
 dev/mii/tdkphy.c		optional miibus | tdkphy
 dev/mii/truephy.c		optional miibus | truephy
 dev/mii/ukphy.c			optional miibus | mii
 dev/mii/ukphy_subr.c		optional miibus | mii
 dev/mii/vscphy.c		optional miibus | vscphy
 dev/mii/xmphy.c			optional miibus | xmphy
 dev/mlxfw/mlxfw_fsm.c			optional mlxfw \
 	compile-with "${MLXFW_C}"
 dev/mlxfw/mlxfw_mfa2.c			optional mlxfw \
 	compile-with "${MLXFW_C}"
 dev/mlxfw/mlxfw_mfa2_tlv_multi.c	optional mlxfw \
 	compile-with "${MLXFW_C}"
 dev/mlx/mlx.c			optional mlx
 dev/mlx/mlx_disk.c		optional mlx
 dev/mlx/mlx_pci.c		optional mlx pci
 dev/mmc/mmc_subr.c		optional mmc | mmcsd !mmccam
 dev/mmc/mmc.c			optional mmc !mmccam
 dev/mmc/mmcbr_if.m		standard
 dev/mmc/mmcbus_if.m		standard
 dev/mmc/mmcsd.c			optional mmcsd !mmccam
 dev/mmc/mmc_fdt_helpers.c	optional mmc regulator clk fdt | mmccam regulator clk fdt
 dev/mmc/mmc_helpers.c		optional mmc gpio regulator clk | mmccam gpio regulator clk
 dev/mmc/mmc_pwrseq.c		optional mmc clk regulator fdt | mmccam clk regulator fdt
 dev/mmc/mmc_pwrseq_if.m		optional mmc clk regulator fdt | mmccam clk regulator fdt
 dev/mmcnull/mmcnull.c		optional mmcnull
 dev/mpr/mpr.c			optional mpr
 dev/mpr/mpr_config.c		optional mpr
 # XXX Work around clang warning, until maintainer approves fix.
 dev/mpr/mpr_mapping.c		optional mpr \
 	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
 dev/mpr/mpr_pci.c		optional mpr pci
 dev/mpr/mpr_sas.c		optional mpr \
 	compile-with "${NORMAL_C} ${NO_WUNNEEDED_INTERNAL_DECL}"
 dev/mpr/mpr_sas_lsi.c		optional mpr
 dev/mpr/mpr_table.c		optional mpr
 dev/mpr/mpr_user.c		optional mpr
 dev/mps/mps.c			optional mps
 dev/mps/mps_config.c		optional mps
 # XXX Work around clang warning, until maintainer approves fix.
 dev/mps/mps_mapping.c		optional mps \
 	compile-with "${NORMAL_C} ${NO_WSOMETIMES_UNINITIALIZED}"
 dev/mps/mps_pci.c		optional mps pci
 dev/mps/mps_sas.c		optional mps \
 	compile-with "${NORMAL_C} ${NO_WUNNEEDED_INTERNAL_DECL}"
 dev/mps/mps_sas_lsi.c		optional mps
 dev/mps/mps_table.c		optional mps
 dev/mps/mps_user.c		optional mps
 dev/mpt/mpt.c			optional mpt
 dev/mpt/mpt_cam.c		optional mpt
 dev/mpt/mpt_debug.c		optional mpt
 dev/mpt/mpt_pci.c		optional mpt pci
 dev/mpt/mpt_raid.c		optional mpt
 dev/mpt/mpt_user.c		optional mpt
 dev/mrsas/mrsas.c		optional mrsas
 dev/mrsas/mrsas_cam.c		optional mrsas
 dev/mrsas/mrsas_ioctl.c		optional mrsas
 dev/mrsas/mrsas_fp.c		optional mrsas
 dev/msk/if_msk.c		optional msk
 dev/mvs/mvs.c			optional mvs
 dev/mvs/mvs_if.m		optional mvs
 dev/mvs/mvs_pci.c		optional mvs pci
 dev/mwl/if_mwl.c		optional mwl
 dev/mwl/if_mwl_pci.c		optional mwl pci
 dev/mwl/mwlhal.c		optional mwl
 mwlfw.c				optional mwlfw				\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk mw88W8363.fw:mw88W8363fw mwlboot.fw:mwlboot -mmwl -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"mwlfw.c"
 mw88W8363.fwo		optional mwlfw					\
 	dependency	"mw88W8363.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"mw88W8363.fwo"
 mw88W8363.fw		optional mwlfw					\
 	dependency	"$S/contrib/dev/mwl/mw88W8363.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"mw88W8363.fw"
 mwlboot.fwo		optional mwlfw					\
 	dependency	"mwlboot.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"mwlboot.fwo"
 mwlboot.fw		optional mwlfw					\
 	dependency	"$S/contrib/dev/mwl/mwlboot.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"mwlboot.fw"
 dev/mxge/if_mxge.c		optional mxge pci
 dev/mxge/mxge_eth_z8e.c		optional mxge pci
 dev/mxge/mxge_ethp_z8e.c	optional mxge pci
 dev/mxge/mxge_rss_eth_z8e.c	optional mxge pci
 dev/mxge/mxge_rss_ethp_z8e.c	optional mxge pci
 dev/my/if_my.c			optional my
 dev/netmap/if_ptnet.c		optional netmap inet
 dev/netmap/netmap.c		optional netmap
 dev/netmap/netmap_bdg.c		optional netmap
 dev/netmap/netmap_freebsd.c	optional netmap
 dev/netmap/netmap_generic.c	optional netmap
 dev/netmap/netmap_kloop.c	optional netmap
 dev/netmap/netmap_legacy.c	optional netmap
 dev/netmap/netmap_mbq.c		optional netmap
 dev/netmap/netmap_mem2.c	optional netmap
 dev/netmap/netmap_monitor.c	optional netmap
 dev/netmap/netmap_null.c	optional netmap
 dev/netmap/netmap_offloadings.c	optional netmap
 dev/netmap/netmap_pipe.c	optional netmap
 dev/netmap/netmap_vale.c	optional netmap
 # compile-with "${NORMAL_C} -Wconversion -Wextra"
 dev/nfsmb/nfsmb.c		optional nfsmb pci
 dev/nge/if_nge.c		optional nge
 dev/nmdm/nmdm.c			optional nmdm
 dev/null/null.c			standard
 dev/nvd/nvd.c			optional nvd nvme
 dev/nvme/nvme.c			optional nvme
 dev/nvme/nvme_ahci.c		optional nvme ahci
 dev/nvme/nvme_ctrlr.c		optional nvme
 dev/nvme/nvme_ctrlr_cmd.c	optional nvme
 dev/nvme/nvme_ns.c		optional nvme
 dev/nvme/nvme_ns_cmd.c		optional nvme
 dev/nvme/nvme_pci.c		optional nvme pci
 dev/nvme/nvme_qpair.c		optional nvme
 dev/nvme/nvme_sim.c		optional nvme scbus
 dev/nvme/nvme_sysctl.c		optional nvme
 dev/nvme/nvme_test.c		optional nvme
 dev/nvme/nvme_util.c		optional nvme
 dev/oce/oce_hw.c		optional oce pci
 dev/oce/oce_if.c		optional oce pci
 dev/oce/oce_mbox.c		optional oce pci
 dev/oce/oce_queue.c		optional oce pci
 dev/oce/oce_sysctl.c		optional oce pci
 dev/oce/oce_util.c		optional oce pci
 dev/ocs_fc/ocs_gendump.c	optional ocs_fc pci
 dev/ocs_fc/ocs_pci.c		optional ocs_fc pci
 dev/ocs_fc/ocs_ioctl.c		optional ocs_fc pci
 dev/ocs_fc/ocs_os.c		optional ocs_fc pci
 dev/ocs_fc/ocs_utils.c		optional ocs_fc pci
 dev/ocs_fc/ocs_hw.c		optional ocs_fc pci
 dev/ocs_fc/ocs_hw_queues.c	optional ocs_fc pci
 dev/ocs_fc/sli4.c		optional ocs_fc pci
 dev/ocs_fc/ocs_sm.c		optional ocs_fc pci
 dev/ocs_fc/ocs_device.c		optional ocs_fc pci
 dev/ocs_fc/ocs_xport.c		optional ocs_fc pci
 dev/ocs_fc/ocs_domain.c		optional ocs_fc pci
 dev/ocs_fc/ocs_sport.c		optional ocs_fc pci
 dev/ocs_fc/ocs_els.c		optional ocs_fc pci
 dev/ocs_fc/ocs_fabric.c		optional ocs_fc pci
 dev/ocs_fc/ocs_io.c		optional ocs_fc pci
 dev/ocs_fc/ocs_node.c		optional ocs_fc pci
 dev/ocs_fc/ocs_scsi.c		optional ocs_fc pci
 dev/ocs_fc/ocs_unsol.c		optional ocs_fc pci
 dev/ocs_fc/ocs_ddump.c		optional ocs_fc pci
 dev/ocs_fc/ocs_mgmt.c		optional ocs_fc pci
 dev/ocs_fc/ocs_cam.c		optional ocs_fc pci
 dev/ofw/ofw_bus_if.m		optional fdt
 dev/ofw/ofw_bus_subr.c		optional fdt
 dev/ofw/ofw_cpu.c		optional fdt
 dev/ofw/ofw_fdt.c		optional fdt
 dev/ofw/ofw_if.m		optional fdt
 dev/ofw/ofw_graph.c		optional fdt
 dev/ofw/ofw_subr.c		optional fdt
 dev/ofw/ofwbus.c		optional fdt
 dev/ofw/openfirm.c		optional fdt
 dev/ofw/openfirmio.c		optional fdt
 dev/ow/ow.c			optional ow				\
 	dependency	"owll_if.h"					\
 	dependency	"own_if.h"
 dev/ow/owll_if.m		optional ow
 dev/ow/own_if.m			optional ow
 dev/ow/ow_temp.c		optional ow_temp
 dev/ow/owc_gpiobus.c		optional owc gpio
 dev/pbio/pbio.c			optional pbio isa
 dev/pccbb/pccbb.c		optional cbb
 dev/pccbb/pccbb_pci.c		optional cbb pci
 dev/pcf/pcf.c			optional pcf
 dev/pci/fixup_pci.c		optional pci
 dev/pci/hostb_pci.c		optional pci
 dev/pci/ignore_pci.c		optional pci
 dev/pci/isa_pci.c		optional pci isa
 dev/pci/pci.c			optional pci
 dev/pci/pci_if.m		standard
 dev/pci/pci_iov.c		optional pci pci_iov
 dev/pci/pci_iov_if.m		standard
 dev/pci/pci_iov_schema.c	optional pci pci_iov
 dev/pci/pci_pci.c		optional pci
 dev/pci/pci_subr.c		optional pci
 dev/pci/pci_user.c		optional pci
 dev/pci/pcib_if.m		standard
 dev/pci/pcib_support.c		standard
 dev/pci/vga_pci.c		optional pci
 dev/pms/freebsd/driver/ini/src/agtiapi.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sadisc.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/mpi.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/saframe.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sahw.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sainit.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/saint.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sampicmd.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sampirsp.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/saphy.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/saport.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sasata.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sasmp.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sassp.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/satimer.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/sautil.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/saioctlcmd.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sallsdk/spc/mpidebug.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/discovery/dm/dminit.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/discovery/dm/dmsmp.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/discovery/dm/dmdisc.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/discovery/dm/dmport.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/discovery/dm/dmtimer.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/discovery/dm/dmmisc.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sat/src/sminit.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sat/src/smmisc.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sat/src/smsat.c				optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sat/src/smsatcb.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sat/src/smsathw.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/sat/src/smtimer.c			optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdinit.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdmisc.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdesgl.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdport.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdint.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdioctl.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdhw.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/ossacmnapi.c	optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tddmcmnapi.c	optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdsmcmnapi.c	optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/common/tdtimers.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/sas/ini/itdio.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/sas/ini/itdcb.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/sas/ini/itdinit.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/sas/ini/itddisc.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/sata/host/sat.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/sata/host/ossasat.c	optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/pms/RefTisa/tisa/sassata/sata/host/sathw.c		optional pmspcv \
 	compile-with "${NORMAL_C} -Wunused-variable -Woverflow -Wparentheses -w"
 dev/ppbus/if_plip.c		optional plip
 dev/ppbus/lpbb.c		optional lpbb
 dev/ppbus/lpt.c			optional lpt
 dev/ppbus/pcfclock.c		optional pcfclock
 dev/ppbus/ppb_1284.c		optional ppbus
 dev/ppbus/ppb_base.c		optional ppbus
 dev/ppbus/ppb_msq.c		optional ppbus
 dev/ppbus/ppbconf.c		optional ppbus
 dev/ppbus/ppbus_if.m		optional ppbus
 dev/ppbus/ppi.c			optional ppi
 dev/ppbus/pps.c			optional pps
 dev/ppc/ppc.c			optional ppc
 dev/ppc/ppc_acpi.c		optional ppc acpi
 dev/ppc/ppc_isa.c		optional ppc isa
 dev/ppc/ppc_pci.c		optional ppc pci
 dev/ppc/ppc_puc.c		optional ppc puc
 dev/proto/proto_bus_isa.c	optional proto acpi | proto isa
 dev/proto/proto_bus_pci.c	optional proto pci
 dev/proto/proto_busdma.c	optional proto
 dev/proto/proto_core.c		optional proto
 dev/pst/pst-iop.c		optional pst
 dev/pst/pst-pci.c		optional pst pci
 dev/pst/pst-raid.c		optional pst
 dev/pty/pty.c			optional pty
 dev/puc/puc.c			optional puc
 dev/puc/puc_cfg.c		optional puc
 dev/puc/puc_pci.c		optional puc pci
 dev/pwm/pwmc.c			optional pwm | pwmc
 dev/pwm/pwmbus.c		optional pwm | pwmbus
 dev/pwm/pwmbus_if.m		optional pwm | pwmbus
 dev/pwm/ofw_pwm.c		optional pwm fdt | pwmbus fdt
 dev/pwm/ofw_pwmbus.c		optional pwm fdt | pwmbus fdt
 dev/pwm/pwm_backlight.c		optional pwm pwm_backlight fdt
 dev/quicc/quicc_core.c		optional quicc
 dev/ral/rt2560.c		optional ral
 dev/ral/rt2661.c		optional ral
 dev/ral/rt2860.c		optional ral
 dev/ral/if_ral_pci.c		optional ral pci
 rt2561fw.c			optional rt2561fw | ralfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2561.fw:rt2561fw -mrt2561 -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"rt2561fw.c"
 rt2561fw.fwo			optional rt2561fw | ralfw		\
 	dependency	"rt2561.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rt2561fw.fwo"
 rt2561.fw			optional rt2561fw | ralfw		\
 	dependency	"$S/contrib/dev/ral/rt2561.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rt2561.fw"
 rt2561sfw.c			optional rt2561sfw | ralfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2561s.fw:rt2561sfw -mrt2561s -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"rt2561sfw.c"
 rt2561sfw.fwo			optional rt2561sfw | ralfw		\
 	dependency	"rt2561s.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rt2561sfw.fwo"
 rt2561s.fw			optional rt2561sfw | ralfw		\
 	dependency	"$S/contrib/dev/ral/rt2561s.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rt2561s.fw"
 rt2661fw.c			optional rt2661fw | ralfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2661.fw:rt2661fw -mrt2661 -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"rt2661fw.c"
 rt2661fw.fwo			optional rt2661fw | ralfw		\
 	dependency	"rt2661.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rt2661fw.fwo"
 rt2661.fw			optional rt2661fw | ralfw		\
 	dependency	"$S/contrib/dev/ral/rt2661.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rt2661.fw"
 rt2860fw.c			optional rt2860fw | ralfw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rt2860.fw:rt2860fw -mrt2860 -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"rt2860fw.c"
 rt2860fw.fwo			optional rt2860fw | ralfw		\
 	dependency	"rt2860.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rt2860fw.fwo"
 rt2860.fw			optional rt2860fw | ralfw		\
 	dependency	"$S/contrib/dev/ral/rt2860.fw.uu"		\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rt2860.fw"
 dev/random/random_infra.c	standard
 dev/random/random_harvestq.c	standard
 dev/random/randomdev.c		optional !random_loadable
 dev/random/fenestrasX/fx_brng.c	optional !random_loadable random_fenestrasx
 dev/random/fenestrasX/fx_main.c	optional !random_loadable random_fenestrasx \
 	compile-with "${NORMAL_C} -I$S/crypto/blake2"
 dev/random/fenestrasX/fx_pool.c	optional !random_loadable random_fenestrasx \
 	compile-with "${NORMAL_C} -I$S/crypto/blake2"
 dev/random/fenestrasX/fx_rng.c	optional !random_loadable random_fenestrasx \
 	compile-with "${NORMAL_C} -I$S/crypto/blake2"
 dev/random/fortuna.c		optional !random_loadable !random_fenestrasx
 dev/random/hash.c		optional !random_loadable
 dev/rccgpio/rccgpio.c		optional rccgpio gpio
 dev/re/if_re.c			optional re
 dev/rl/if_rl.c			optional rl pci
 dev/rndtest/rndtest.c		optional rndtest
 #
 dev/rtsx/rtsx.c			optional rtsx pci
 #
 dev/rtwn/if_rtwn.c		optional rtwn
 dev/rtwn/if_rtwn_beacon.c	optional rtwn
 dev/rtwn/if_rtwn_calib.c	optional rtwn
 dev/rtwn/if_rtwn_cam.c		optional rtwn
 dev/rtwn/if_rtwn_efuse.c	optional rtwn
 dev/rtwn/if_rtwn_fw.c		optional rtwn
 dev/rtwn/if_rtwn_rx.c		optional rtwn
 dev/rtwn/if_rtwn_task.c		optional rtwn
 dev/rtwn/if_rtwn_tx.c		optional rtwn
 #
 dev/rtwn/pci/rtwn_pci_attach.c	optional rtwn_pci pci
 dev/rtwn/pci/rtwn_pci_reg.c	optional rtwn_pci pci
 dev/rtwn/pci/rtwn_pci_rx.c	optional rtwn_pci pci
 dev/rtwn/pci/rtwn_pci_tx.c	optional rtwn_pci pci
 #
 dev/rtwn/usb/rtwn_usb_attach.c	optional rtwn_usb
 dev/rtwn/usb/rtwn_usb_ep.c	optional rtwn_usb
 dev/rtwn/usb/rtwn_usb_reg.c	optional rtwn_usb
 dev/rtwn/usb/rtwn_usb_rx.c	optional rtwn_usb
 dev/rtwn/usb/rtwn_usb_tx.c	optional rtwn_usb
 # RTL8188E
 dev/rtwn/rtl8188e/r88e_beacon.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_calib.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_chan.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_fw.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_init.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_led.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_tx.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_rf.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_rom.c	optional rtwn
 dev/rtwn/rtl8188e/r88e_rx.c	optional rtwn
 dev/rtwn/rtl8188e/pci/r88ee_attach.c	optional rtwn_pci pci
 dev/rtwn/rtl8188e/pci/r88ee_init.c	optional rtwn_pci pci
 dev/rtwn/rtl8188e/pci/r88ee_rx.c	optional rtwn_pci pci
 dev/rtwn/rtl8188e/usb/r88eu_attach.c	optional rtwn_usb
 dev/rtwn/rtl8188e/usb/r88eu_init.c	optional rtwn_usb
 # RTL8192C
 dev/rtwn/rtl8192c/r92c_attach.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_beacon.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_calib.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_chan.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_fw.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_init.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_llt.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_rf.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_rom.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_rx.c	optional rtwn
 dev/rtwn/rtl8192c/r92c_tx.c	optional rtwn
 dev/rtwn/rtl8192c/pci/r92ce_attach.c	optional rtwn_pci pci
 dev/rtwn/rtl8192c/pci/r92ce_calib.c	optional rtwn_pci pci
 dev/rtwn/rtl8192c/pci/r92ce_fw.c	optional rtwn_pci pci
 dev/rtwn/rtl8192c/pci/r92ce_init.c	optional rtwn_pci pci
 dev/rtwn/rtl8192c/pci/r92ce_led.c	optional rtwn_pci pci
 dev/rtwn/rtl8192c/pci/r92ce_rx.c	optional rtwn_pci pci
 dev/rtwn/rtl8192c/pci/r92ce_tx.c	optional rtwn_pci pci
 dev/rtwn/rtl8192c/usb/r92cu_attach.c	optional rtwn_usb
 dev/rtwn/rtl8192c/usb/r92cu_init.c	optional rtwn_usb
 dev/rtwn/rtl8192c/usb/r92cu_led.c	optional rtwn_usb
 dev/rtwn/rtl8192c/usb/r92cu_rx.c	optional rtwn_usb
 dev/rtwn/rtl8192c/usb/r92cu_tx.c	optional rtwn_usb
 # RTL8192E
 dev/rtwn/rtl8192e/r92e_chan.c	optional rtwn
 dev/rtwn/rtl8192e/r92e_fw.c	optional rtwn
 dev/rtwn/rtl8192e/r92e_init.c	optional rtwn
 dev/rtwn/rtl8192e/r92e_led.c	optional rtwn
 dev/rtwn/rtl8192e/r92e_rf.c	optional rtwn
 dev/rtwn/rtl8192e/r92e_rom.c	optional rtwn
 dev/rtwn/rtl8192e/r92e_rx.c	optional rtwn
 dev/rtwn/rtl8192e/usb/r92eu_attach.c	optional rtwn_usb
 dev/rtwn/rtl8192e/usb/r92eu_init.c	optional rtwn_usb
 # RTL8812A
 dev/rtwn/rtl8812a/r12a_beacon.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_calib.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_caps.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_chan.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_fw.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_init.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_led.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_rf.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_rom.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_rx.c	optional rtwn
 dev/rtwn/rtl8812a/r12a_tx.c	optional rtwn
 dev/rtwn/rtl8812a/usb/r12au_attach.c	optional rtwn_usb
 dev/rtwn/rtl8812a/usb/r12au_init.c	optional rtwn_usb
 dev/rtwn/rtl8812a/usb/r12au_rx.c	optional rtwn_usb
 dev/rtwn/rtl8812a/usb/r12au_tx.c	optional rtwn_usb
 # RTL8821A
 dev/rtwn/rtl8821a/r21a_beacon.c	optional rtwn
 dev/rtwn/rtl8821a/r21a_calib.c	optional rtwn
 dev/rtwn/rtl8821a/r21a_chan.c	optional rtwn
 dev/rtwn/rtl8821a/r21a_fw.c	optional rtwn
 dev/rtwn/rtl8821a/r21a_init.c	optional rtwn
 dev/rtwn/rtl8821a/r21a_led.c	optional rtwn
 dev/rtwn/rtl8821a/r21a_rom.c	optional rtwn
 dev/rtwn/rtl8821a/r21a_rx.c	optional rtwn
 dev/rtwn/rtl8821a/usb/r21au_attach.c	optional rtwn_usb
 dev/rtwn/rtl8821a/usb/r21au_dfs.c	optional rtwn_usb
 dev/rtwn/rtl8821a/usb/r21au_init.c	optional rtwn_usb
 rtwn-rtl8188eefw.c		optional rtwn-rtl8188eefw | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8188eefw.fw:rtwn-rtl8188eefw:111 -mrtwn-rtl8188eefw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"rtwn-rtl8188eefw.c"
 rtwn-rtl8188eefw.fwo		optional rtwn-rtl8188eefw | rtwnfw	\
 	dependency	"rtwn-rtl8188eefw.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8188eefw.fwo"
 rtwn-rtl8188eefw.fw		optional rtwn-rtl8188eefw | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8188eefw.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8188eefw.fw"
 rtwn-rtl8188eufw.c		optional rtwn-rtl8188eufw | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8188eufw.fw:rtwn-rtl8188eufw:111 -mrtwn-rtl8188eufw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"rtwn-rtl8188eufw.c"
 rtwn-rtl8188eufw.fwo		optional rtwn-rtl8188eufw | rtwnfw	\
 	dependency	"rtwn-rtl8188eufw.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8188eufw.fwo"
 rtwn-rtl8188eufw.fw		optional rtwn-rtl8188eufw | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8188eufw.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8188eufw.fw"
 rtwn-rtl8192cfwE.c		optional rtwn-rtl8192cfwE | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8192cfwE.fw:rtwn-rtl8192cfwE:111 -mrtwn-rtl8192cfwE -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"rtwn-rtl8192cfwE.c"
 rtwn-rtl8192cfwE.fwo		optional rtwn-rtl8192cfwE | rtwnfw	\
 	dependency	"rtwn-rtl8192cfwE.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwE.fwo"
 rtwn-rtl8192cfwE.fw		optional rtwn-rtl8192cfwE | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8192cfwE.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwE.fw"
 rtwn-rtl8192cfwE_B.c		optional rtwn-rtl8192cfwE_B | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8192cfwE_B.fw:rtwn-rtl8192cfwE_B:111 -mrtwn-rtl8192cfwE_B -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"rtwn-rtl8192cfwE_B.c"
 rtwn-rtl8192cfwE_B.fwo		optional rtwn-rtl8192cfwE_B | rtwnfw	\
 	dependency	"rtwn-rtl8192cfwE_B.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwE_B.fwo"
 rtwn-rtl8192cfwE_B.fw		optional rtwn-rtl8192cfwE_B | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8192cfwE_B.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwE_B.fw"
 rtwn-rtl8192cfwT.c		optional rtwn-rtl8192cfwT | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8192cfwT.fw:rtwn-rtl8192cfwT:111 -mrtwn-rtl8192cfwT -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"rtwn-rtl8192cfwT.c"
 rtwn-rtl8192cfwT.fwo		optional rtwn-rtl8192cfwT | rtwnfw	\
 	dependency	"rtwn-rtl8192cfwT.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwT.fwo"
 rtwn-rtl8192cfwT.fw		optional rtwn-rtl8192cfwT | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8192cfwT.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwT.fw"
 rtwn-rtl8192cfwU.c		optional rtwn-rtl8192cfwU | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8192cfwU.fw:rtwn-rtl8192cfwU:111 -mrtwn-rtl8192cfwU -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"rtwn-rtl8192cfwU.c"
 rtwn-rtl8192cfwU.fwo		optional rtwn-rtl8192cfwU | rtwnfw	\
 	dependency	"rtwn-rtl8192cfwU.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwU.fwo"
 rtwn-rtl8192cfwU.fw		optional rtwn-rtl8192cfwU | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8192cfwU.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8192cfwU.fw"
 rtwn-rtl8192eufw.c		optional rtwn-rtl8192eufw | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8192eufw.fw:rtwn-rtl8192eufw:111 -mrtwn-rtl8192eufw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"rtwn-rtl8192eufw.c"
 rtwn-rtl8192eufw.fwo		optional rtwn-rtl8192eufw | rtwnfw	\
 	dependency	"rtwn-rtl8192eufw.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8192eufw.fwo"
 rtwn-rtl8192eufw.fw		optional rtwn-rtl8192eufw | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8192eufw.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8192eufw.fw"
 rtwn-rtl8812aufw.c		optional rtwn-rtl8812aufw | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8812aufw.fw:rtwn-rtl8812aufw:111 -mrtwn-rtl8812aufw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"rtwn-rtl8812aufw.c"
 rtwn-rtl8812aufw.fwo		optional rtwn-rtl8812aufw | rtwnfw	\
 	dependency	"rtwn-rtl8812aufw.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8812aufw.fwo"
 rtwn-rtl8812aufw.fw		optional rtwn-rtl8812aufw | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8812aufw.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8812aufw.fw"
 rtwn-rtl8821aufw.c		optional rtwn-rtl8821aufw | rtwnfw	\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rtwn-rtl8821aufw.fw:rtwn-rtl8821aufw:111 -mrtwn-rtl8821aufw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"rtwn-rtl8821aufw.c"
 rtwn-rtl8821aufw.fwo		optional rtwn-rtl8821aufw | rtwnfw	\
 	dependency	"rtwn-rtl8821aufw.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rtwn-rtl8821aufw.fwo"
 rtwn-rtl8821aufw.fw		optional rtwn-rtl8821aufw | rtwnfw	\
 	dependency	"$S/contrib/dev/rtwn/rtwn-rtl8821aufw.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rtwn-rtl8821aufw.fw"
 dev/safe/safe.c			optional safe
 dev/scc/scc_if.m		optional scc
 dev/scc/scc_bfe_quicc.c		optional scc quicc
 dev/scc/scc_core.c		optional scc
 dev/scc/scc_dev_quicc.c		optional scc quicc
 dev/scc/scc_dev_z8530.c		optional scc
 dev/sdhci/sdhci.c		optional sdhci
 dev/sdhci/sdhci_fdt.c		optional sdhci fdt regulator clk
 dev/sdhci/sdhci_fdt_gpio.c	optional sdhci fdt gpio
 dev/sdhci/sdhci_fsl_fdt.c	optional sdhci fdt gpio regulator clk
 dev/sdhci/sdhci_if.m		optional sdhci
 dev/sdhci/sdhci_acpi.c		optional sdhci acpi
 dev/sdhci/sdhci_pci.c		optional sdhci pci
 dev/sdio/sdio_if.m		optional mmccam
 dev/sdio/sdio_subr.c		optional mmccam
 dev/sdio/sdiob.c		optional mmccam
 dev/sge/if_sge.c		optional sge pci
 dev/siis/siis.c			optional siis pci
 dev/sis/if_sis.c		optional sis pci
 dev/sk/if_sk.c			optional sk pci
 dev/smbios/smbios.c		optional smbios
 dev/smbus/smb.c			optional smb
 dev/smbus/smbconf.c		optional smbus
 dev/smbus/smbus.c		optional smbus
 dev/smbus/smbus_if.m		optional smbus
 dev/smc/if_smc.c		optional smc
 dev/smc/if_smc_acpi.c		optional smc acpi
 dev/smc/if_smc_fdt.c		optional smc fdt
 dev/snp/snp.c			optional snp
 dev/sound/clone.c		optional sound
 dev/sound/unit.c		optional sound
 dev/sound/pci/als4000.c		optional snd_als4000 pci
 dev/sound/pci/atiixp.c		optional snd_atiixp pci
 dev/sound/pci/cmi.c		optional snd_cmi pci
 dev/sound/pci/cs4281.c		optional snd_cs4281 pci
 dev/sound/pci/csa.c		optional snd_csa pci
 dev/sound/pci/csapcm.c		optional snd_csa pci
 dev/sound/pci/emu10k1.c		optional snd_emu10k1 pci
 dev/sound/pci/emu10kx.c		optional snd_emu10kx pci
 dev/sound/pci/emu10kx-pcm.c	optional snd_emu10kx pci
 dev/sound/pci/emu10kx-midi.c	optional snd_emu10kx pci
 dev/sound/pci/envy24.c		optional snd_envy24 pci
 dev/sound/pci/envy24ht.c	optional snd_envy24ht pci
 dev/sound/pci/es137x.c		optional snd_es137x pci
 dev/sound/pci/fm801.c		optional snd_fm801 pci
 dev/sound/pci/ich.c		optional snd_ich pci
 dev/sound/pci/maestro3.c	optional snd_maestro3 pci
 dev/sound/pci/neomagic.c	optional snd_neomagic pci
 dev/sound/pci/solo.c		optional snd_solo pci
 dev/sound/pci/spicds.c		optional snd_spicds pci
 dev/sound/pci/t4dwave.c		optional snd_t4dwave pci
 dev/sound/pci/via8233.c		optional snd_via8233 pci
 dev/sound/pci/via82c686.c	optional snd_via82c686 pci
 dev/sound/pci/vibes.c		optional snd_vibes pci
 dev/sound/pci/hda/hdaa.c	optional snd_hda pci
 dev/sound/pci/hda/hdaa_patches.c	optional snd_hda pci
 dev/sound/pci/hda/hdac.c	optional snd_hda pci
 dev/sound/pci/hda/hdac_if.m	optional snd_hda pci
 dev/sound/pci/hda/hdacc.c	optional snd_hda pci
 dev/sound/pci/hdspe.c		optional snd_hdspe pci
 dev/sound/pci/hdspe-pcm.c	optional snd_hdspe pci
 dev/sound/pcm/ac97.c		optional sound
 dev/sound/pcm/ac97_if.m		optional sound
 dev/sound/pcm/ac97_patch.c	optional sound
 dev/sound/pcm/buffer.c		optional sound	\
 	dependency	"snd_fxdiv_gen.h"
 dev/sound/pcm/channel.c		optional sound
 dev/sound/pcm/channel_if.m	optional sound
 dev/sound/pcm/dsp.c		optional sound
 dev/sound/pcm/feeder.c		optional sound
 dev/sound/pcm/feeder_chain.c	optional sound
 dev/sound/pcm/feeder_eq.c	optional sound	\
 	dependency	"feeder_eq_gen.h"	\
 	dependency	"snd_fxdiv_gen.h"
 dev/sound/pcm/feeder_if.m	optional sound
 dev/sound/pcm/feeder_format.c	optional sound  \
 	dependency	"snd_fxdiv_gen.h"
 dev/sound/pcm/feeder_matrix.c	optional sound  \
 	dependency	"snd_fxdiv_gen.h"
 dev/sound/pcm/feeder_mixer.c	optional sound  \
 	dependency	"snd_fxdiv_gen.h"
 dev/sound/pcm/feeder_rate.c	optional sound	\
 	dependency	"feeder_rate_gen.h"	\
 	dependency	"snd_fxdiv_gen.h"
 dev/sound/pcm/feeder_volume.c	optional sound  \
 	dependency	"snd_fxdiv_gen.h"
 dev/sound/pcm/mixer.c		optional sound
 dev/sound/pcm/mixer_if.m	optional sound
 dev/sound/pcm/sndstat.c		optional sound
 dev/sound/pcm/sound.c		optional sound
 dev/sound/pcm/vchan.c		optional sound
 dev/sound/usb/uaudio.c		optional snd_uaudio usb
 dev/sound/usb/uaudio_pcm.c	optional snd_uaudio usb
 dev/sound/midi/midi.c		optional sound
 dev/sound/midi/mpu401.c		optional sound
 dev/sound/midi/mpu_if.m		optional sound
 dev/sound/midi/mpufoi_if.m	optional sound
 dev/sound/midi/sequencer.c	optional sound
 dev/sound/midi/synth_if.m	optional sound
 dev/spibus/ofw_spibus.c		optional fdt spibus
 dev/spibus/spibus.c		optional spibus				\
 	dependency	"spibus_if.h"
 dev/spibus/spigen.c		optional spigen
 dev/spibus/spibus_if.m		optional spibus
 dev/ste/if_ste.c		optional ste pci
 dev/stge/if_stge.c		optional stge
 dev/sym/sym_hipd.c		optional sym				\
 	dependency	"$S/dev/sym/sym_{conf,defs}.h"
 dev/syscons/blank/blank_saver.c	optional blank_saver
 dev/syscons/daemon/daemon_saver.c optional daemon_saver
 dev/syscons/dragon/dragon_saver.c optional dragon_saver
 dev/syscons/fade/fade_saver.c	optional fade_saver
 dev/syscons/fire/fire_saver.c	optional fire_saver
 dev/syscons/green/green_saver.c	optional green_saver
 dev/syscons/logo/logo.c		optional logo_saver
 dev/syscons/logo/logo_saver.c	optional logo_saver
 dev/syscons/rain/rain_saver.c	optional rain_saver
 dev/syscons/schistory.c		optional sc
 dev/syscons/scmouse.c		optional sc
 dev/syscons/scterm.c		optional sc
 dev/syscons/scterm-dumb.c	optional sc !SC_NO_TERM_DUMB
 dev/syscons/scterm-sc.c		optional sc !SC_NO_TERM_SC
 dev/syscons/scterm-teken.c	optional sc !SC_NO_TERM_TEKEN
 dev/syscons/scvidctl.c		optional sc
 dev/syscons/scvtb.c		optional sc
 dev/syscons/snake/snake_saver.c	optional snake_saver
 dev/syscons/star/star_saver.c	optional star_saver
 dev/syscons/syscons.c		optional sc
 dev/syscons/sysmouse.c		optional sc
 dev/syscons/warp/warp_saver.c	optional warp_saver
 dev/tcp_log/tcp_log_dev.c	optional tcp_blackbox inet | tcp_blackbox inet6
 dev/tdfx/tdfx_pci.c		optional tdfx pci
 dev/ti/if_ti.c			optional ti pci
 dev/twe/twe.c			optional twe
 dev/twe/twe_freebsd.c		optional twe
 dev/tws/tws.c			optional tws
 dev/tws/tws_cam.c		optional tws
 dev/tws/tws_hdm.c		optional tws
 dev/tws/tws_services.c		optional tws
 dev/tws/tws_user.c		optional tws
 dev/uart/uart_bus_acpi.c	optional uart acpi
 dev/uart/uart_bus_fdt.c		optional uart fdt
 dev/uart/uart_bus_isa.c		optional uart isa
 dev/uart/uart_bus_pci.c		optional uart pci
 dev/uart/uart_bus_puc.c		optional uart puc
 dev/uart/uart_bus_scc.c		optional uart scc
 dev/uart/uart_core.c		optional uart
 dev/uart/uart_cpu_acpi.c	optional uart acpi
 dev/uart/uart_dbg.c		optional uart gdb
 dev/uart/uart_dev_imx.c		optional uart uart_imx fdt
 dev/uart/uart_dev_msm.c		optional uart uart_msm fdt
 dev/uart/uart_dev_mvebu.c	optional uart uart_mvebu fdt
 dev/uart/uart_dev_ns8250.c	optional uart uart_ns8250 | uart uart_snps
 dev/uart/uart_dev_pl011.c	optional uart pl011
 dev/uart/uart_dev_quicc.c	optional uart quicc
 dev/uart/uart_dev_snps.c	optional uart uart_snps fdt
 dev/uart/uart_dev_z8530.c	optional uart uart_z8530 | uart scc
 dev/uart/uart_if.m		optional uart
 dev/uart/uart_subr.c		optional uart
 dev/uart/uart_tty.c		optional uart
 #
 # USB controller drivers
 #
 dev/usb/controller/musb_otg.c		optional musb
 dev/usb/controller/dwc_otg.c		optional dwcotg
 dev/usb/controller/dwc_otg_fdt.c	optional dwcotg fdt
 dev/usb/controller/dwc_otg_acpi.c	optional dwcotg acpi
 dev/usb/controller/ehci.c		optional ehci
 dev/usb/controller/ehci_msm.c		optional ehci_msm fdt
 dev/usb/controller/ehci_pci.c		optional ehci pci
 dev/usb/controller/ohci.c		optional ohci
 dev/usb/controller/ohci_pci.c		optional ohci pci
 dev/usb/controller/uhci.c		optional uhci
 dev/usb/controller/uhci_pci.c		optional uhci pci
 dev/usb/controller/xhci.c		optional xhci
 dev/usb/controller/xhci_pci.c		optional xhci pci
 dev/usb/controller/saf1761_otg.c	optional saf1761otg
 dev/usb/controller/saf1761_otg_fdt.c	optional saf1761otg fdt
 dev/usb/controller/uss820dci.c		optional uss820dci
 dev/usb/controller/usb_controller.c	optional usb
 #
 # USB storage drivers
 #
 dev/usb/storage/cfumass.c	optional cfumass ctl
 dev/usb/storage/umass.c		optional umass
 dev/usb/storage/urio.c		optional urio
 dev/usb/storage/ustorage_fs.c	optional usfs
 #
 # USB core
 #
 dev/usb/usb_busdma.c		optional usb
 dev/usb/usb_core.c		optional usb
 dev/usb/usb_debug.c		optional usb
 dev/usb/usb_dev.c		optional usb
 dev/usb/usb_device.c		optional usb
 dev/usb/usb_dynamic.c		optional usb
 dev/usb/usb_error.c		optional usb
 dev/usb/usb_fdt_support.c	optional usb fdt
 dev/usb/usb_generic.c		optional usb
 dev/usb/usb_handle_request.c	optional usb
 dev/usb/usb_hid.c		optional usb
 dev/usb/usb_hub.c		optional usb
 dev/usb/usb_hub_acpi.c		optional uacpi acpi
 dev/usb/usb_if.m		optional usb
 dev/usb/usb_lookup.c		optional usb
 dev/usb/usb_mbuf.c		optional usb
 dev/usb/usb_msctest.c		optional usb
 dev/usb/usb_parse.c		optional usb
 dev/usb/usb_pf.c		optional usb
 dev/usb/usb_process.c		optional usb
 dev/usb/usb_request.c		optional usb
 dev/usb/usb_transfer.c		optional usb
 dev/usb/usb_util.c		optional usb
 #
 # USB network drivers
 #
 dev/usb/net/if_aue.c		optional aue
 dev/usb/net/if_axe.c		optional axe
 dev/usb/net/if_axge.c		optional axge
 dev/usb/net/if_cdce.c		optional cdce
 dev/usb/net/if_cdceem.c		optional cdceem
 dev/usb/net/if_cue.c		optional cue
 dev/usb/net/if_ipheth.c		optional ipheth
 dev/usb/net/if_kue.c		optional kue
 dev/usb/net/if_mos.c		optional mos
 dev/usb/net/if_muge.c		optional muge
 dev/usb/net/if_rue.c		optional rue
 dev/usb/net/if_smsc.c		optional smsc
 dev/usb/net/if_udav.c		optional udav
 dev/usb/net/if_ure.c		optional ure
 dev/usb/net/if_usie.c		optional usie
 dev/usb/net/if_urndis.c		optional urndis
 dev/usb/net/ruephy.c		optional rue
 dev/usb/net/usb_ethernet.c	optional uether | aue | axe | axge | cdce | \
 					 cdceem | cue | ipheth | kue | mos | \
 					 rue | smsc | udav | ure | urndis | muge
 dev/usb/net/uhso.c		optional uhso
 #
 # USB WLAN drivers
 #
 dev/usb/wlan/if_rsu.c		optional rsu
 rsu-rtl8712fw.c			optional rsu-rtl8712fw | rsufw		\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk rsu-rtl8712fw.fw:rsu-rtl8712fw:120 -mrsu-rtl8712fw -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"rsu-rtl8712fw.c"
 rsu-rtl8712fw.fwo		optional rsu-rtl8712fw | rsufw		\
 	dependency	"rsu-rtl8712fw.fw"				\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"rsu-rtl8712fw.fwo"
 rsu-rtl8712fw.fw		optional rsu-rtl8712.fw | rsufw		\
 	dependency	"$S/contrib/dev/rsu/rsu-rtl8712fw.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"rsu-rtl8712fw.fw"
 dev/usb/wlan/if_rum.c		optional rum
 dev/usb/wlan/if_run.c		optional run
 runfw.c				optional runfw							\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk run.fw:runfw -mrunfw -c${.TARGET}"	\
 	no-ctfconvert no-implicit-rule before-depend local					\
 	clean		"runfw.c"
 runfw.fwo			optional runfw							\
 	dependency	"run.fw"								\
 	compile-with	"${NORMAL_FWO}"								\
 	no-implicit-rule									\
 	clean		"runfw.fwo"
 run.fw				optional runfw							\
 	dependency	"$S/contrib/dev/run/rt2870.fw.uu"					\
 	compile-with	"${NORMAL_FW}"								\
 	no-obj no-implicit-rule									\
 	clean		"run.fw"
 dev/usb/wlan/if_uath.c		optional uath
 dev/usb/wlan/if_upgt.c		optional upgt
 dev/usb/wlan/if_ural.c		optional ural
 dev/usb/wlan/if_urtw.c		optional urtw
 dev/usb/wlan/if_zyd.c		optional zyd
 #
 # USB serial and parallel port drivers
 #
 dev/usb/serial/u3g.c		optional u3g
 dev/usb/serial/uark.c		optional uark
 dev/usb/serial/ubsa.c		optional ubsa
 dev/usb/serial/ubser.c		optional ubser
 dev/usb/serial/uchcom.c		optional uchcom
 dev/usb/serial/ucycom.c		optional ucycom
 dev/usb/serial/ufoma.c		optional ufoma
 dev/usb/serial/uftdi.c		optional uftdi
 dev/usb/serial/ugensa.c		optional ugensa
 dev/usb/serial/uipaq.c		optional uipaq
 dev/usb/serial/ulpt.c		optional ulpt
 dev/usb/serial/umcs.c		optional umcs
 dev/usb/serial/umct.c		optional umct
 dev/usb/serial/umodem.c		optional umodem
 dev/usb/serial/umoscom.c	optional umoscom
 dev/usb/serial/uplcom.c		optional uplcom
 dev/usb/serial/uslcom.c		optional uslcom
 dev/usb/serial/uvisor.c		optional uvisor
 dev/usb/serial/uvscom.c		optional uvscom
 dev/usb/serial/usb_serial.c 	optional ucom | u3g | uark | ubsa | ubser | \
 					 uchcom | ucycom | ufoma | uftdi | \
 					 ugensa | uipaq | umcs | umct | \
 					 umodem | umoscom | uplcom | usie | \
 					 uslcom | uvisor | uvscom
 #
 # USB misc drivers
 #
 dev/usb/misc/cp2112.c		optional cp2112
 dev/usb/misc/udbp.c		optional udbp
 dev/usb/misc/ugold.c		optional ugold
 dev/usb/misc/uled.c		optional uled
 #
 # USB input drivers
 #
 dev/usb/input/atp.c		optional atp
 dev/usb/input/uep.c		optional uep
 dev/usb/input/uhid.c		optional uhid
 dev/usb/input/uhid_snes.c	optional uhid_snes
 dev/usb/input/ukbd.c		optional ukbd
 dev/usb/input/ums.c		optional ums
 dev/usb/input/usbhid.c		optional usbhid
 dev/usb/input/wmt.c		optional wmt
 dev/usb/input/wsp.c		optional wsp
 #
 # USB quirks
 #
 dev/usb/quirk/usb_quirk.c	optional usb
 #
 # USB templates
 #
 dev/usb/template/usb_template.c		optional usb_template
 dev/usb/template/usb_template_audio.c	optional usb_template
 dev/usb/template/usb_template_cdce.c	optional usb_template
 dev/usb/template/usb_template_kbd.c	optional usb_template
 dev/usb/template/usb_template_modem.c	optional usb_template
 dev/usb/template/usb_template_mouse.c	optional usb_template
 dev/usb/template/usb_template_msc.c	optional usb_template
 dev/usb/template/usb_template_mtp.c	optional usb_template
 dev/usb/template/usb_template_phone.c	optional usb_template
 dev/usb/template/usb_template_serialnet.c	optional usb_template
 dev/usb/template/usb_template_midi.c	optional usb_template
 dev/usb/template/usb_template_multi.c	optional usb_template
 dev/usb/template/usb_template_cdceem.c	optional usb_template
 #
 # USB video drivers
 #
 dev/usb/video/udl.c			optional udl
 #
 # USB END
 #
 dev/videomode/videomode.c		optional videomode
 dev/videomode/edid.c			optional videomode
 dev/videomode/pickmode.c		optional videomode
 dev/videomode/vesagtf.c			optional videomode
 dev/veriexec/verified_exec.c	optional mac_veriexec
 dev/vge/if_vge.c		optional vge
 dev/viapm/viapm.c		optional viapm pci
 dev/virtio/virtio.c			optional	virtio
 dev/virtio/virtqueue.c			optional	virtio
 dev/virtio/virtio_bus_if.m		optional	virtio
 dev/virtio/virtio_if.m			optional	virtio
 dev/virtio/pci/virtio_pci.c		optional	virtio_pci
 dev/virtio/pci/virtio_pci_if.m		optional	virtio_pci
 dev/virtio/pci/virtio_pci_legacy.c	optional	virtio_pci
 dev/virtio/pci/virtio_pci_modern.c	optional	virtio_pci
 dev/virtio/mmio/virtio_mmio.c		optional	virtio_mmio
 dev/virtio/mmio/virtio_mmio_acpi.c	optional	virtio_mmio acpi
 dev/virtio/mmio/virtio_mmio_cmdline.c	optional	virtio_mmio
 dev/virtio/mmio/virtio_mmio_fdt.c	optional	virtio_mmio fdt
 dev/virtio/mmio/virtio_mmio_if.m	optional	virtio_mmio
 dev/virtio/network/if_vtnet.c		optional	vtnet
 dev/virtio/block/virtio_blk.c		optional	virtio_blk
 dev/virtio/balloon/virtio_balloon.c	optional	virtio_balloon
 dev/virtio/scsi/virtio_scsi.c		optional	virtio_scsi
 dev/virtio/random/virtio_random.c	optional	virtio_random
 dev/virtio/console/virtio_console.c	optional	virtio_console
 dev/vkbd/vkbd.c			optional vkbd
 dev/vmgenc/vmgenc_acpi.c	optional acpi
 dev/vmware/vmxnet3/if_vmx.c		optional vmx
 dev/vmware/vmci/vmci.c			optional vmci
 dev/vmware/vmci/vmci_datagram.c		optional vmci
 dev/vmware/vmci/vmci_doorbell.c		optional vmci
 dev/vmware/vmci/vmci_driver.c		optional vmci
 dev/vmware/vmci/vmci_event.c		optional vmci
 dev/vmware/vmci/vmci_hashtable.c	optional vmci
 dev/vmware/vmci/vmci_kernel_if.c	optional vmci
 dev/vmware/vmci/vmci_qpair.c		optional vmci
 dev/vmware/vmci/vmci_queue_pair.c	optional vmci
 dev/vmware/vmci/vmci_resource.c		optional vmci
 dev/vmware/pvscsi/pvscsi.c		optional pvscsi
 dev/vr/if_vr.c			optional vr pci
 dev/vt/colors/vt_termcolors.c	optional vt
 dev/vt/font/vt_font_default.c	optional vt
 dev/vt/font/vt_mouse_cursor.c	optional vt
 dev/vt/hw/efifb/efifb.c		optional vt_efifb
 dev/vt/hw/vbefb/vbefb.c		optional vt_vbefb
 dev/vt/hw/fb/vt_fb.c		optional vt
 dev/vt/hw/vga/vt_vga.c		optional vt vt_vga
 dev/vt/logo/logo_freebsd.c	optional vt splash
 dev/vt/logo/logo_beastie.c	optional vt splash
 dev/vt/vt_buf.c			optional vt
 dev/vt/vt_consolectl.c		optional vt
 dev/vt/vt_core.c		optional vt
 dev/vt/vt_cpulogos.c		optional vt splash
 dev/vt/vt_font.c		optional vt
 dev/vt/vt_sysmouse.c		optional vt
 dev/vte/if_vte.c		optional vte pci
 dev/watchdog/watchdog.c		standard
 dev/wg/if_wg.c			optional wg				\
 	compile-with "${NORMAL_C} -include $S/dev/wg/compat.h"
 dev/wg/wg_cookie.c		optional wg				\
 	compile-with "${NORMAL_C} -include $S/dev/wg/compat.h"
 dev/wg/wg_crypto.c		optional wg				\
 	compile-with "${NORMAL_C} -include $S/dev/wg/compat.h"
 dev/wg/wg_noise.c		optional wg				\
 	compile-with "${NORMAL_C} -include $S/dev/wg/compat.h"
 dev/wpi/if_wpi.c		optional wpi pci
 wpifw.c			optional wpifw					\
 	compile-with	"${AWK} -f $S/tools/fw_stub.awk wpi.fw:wpifw:153229 -mwpi -c${.TARGET}" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean		"wpifw.c"
 wpifw.fwo			optional wpifw				\
 	dependency	"wpi.fw"					\
 	compile-with	"${NORMAL_FWO}"					\
 	no-implicit-rule						\
 	clean		"wpifw.fwo"
 wpi.fw			optional wpifw					\
 	dependency	"$S/contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"wpi.fw"
 dev/xdma/controller/pl330.c	optional xdma pl330 fdt
 dev/xdma/xdma.c			optional xdma
 dev/xdma/xdma_bank.c		optional xdma
 dev/xdma/xdma_bio.c		optional xdma
 dev/xdma/xdma_fdt_test.c	optional xdma xdma_test fdt
 dev/xdma/xdma_if.m		optional xdma
 dev/xdma/xdma_iommu.c		optional xdma
 dev/xdma/xdma_mbuf.c		optional xdma
 dev/xdma/xdma_queue.c		optional xdma
 dev/xdma/xdma_sg.c		optional xdma
 dev/xdma/xdma_sglist.c		optional xdma
 dev/xen/balloon/balloon.c	optional xenhvm
 dev/xen/blkfront/blkfront.c	optional xenhvm
 dev/xen/blkback/blkback.c	optional xenhvm
 dev/xen/bus/xenpv.c		optional xenhvm
 dev/xen/console/xen_console.c	optional xenhvm
 dev/xen/control/control.c	optional xenhvm
 dev/xen/cpu/xen_acpi_cpu.c	optional xenhvm
 dev/xen/efi/pvefi.c		optional xenhvm efirt
 dev/xen/grant_table/grant_table.c	optional xenhvm
 dev/xen/netback/netback.c	optional xenhvm
 dev/xen/netfront/netfront.c	optional xenhvm
 dev/xen/timer/xen_timer.c	optional xenhvm xentimer
 dev/xen/xenpci/xenpci.c		optional xenpci
 dev/xen/xenstore/xenstore.c	optional xenhvm
 dev/xen/xenstore/xenstore_dev.c	optional xenhvm
 dev/xen/xenstore/xenstored_dev.c	optional xenhvm
 dev/xen/evtchn/evtchn_dev.c	optional xenhvm
 dev/xen/privcmd/privcmd.c	optional xenhvm
 dev/xen/gntdev/gntdev.c		optional xenhvm
 dev/xen/debug/debug.c		optional xenhvm
 dev/xl/if_xl.c			optional xl pci
 dev/xl/xlphy.c			optional xl pci
 fs/autofs/autofs.c		optional autofs
 fs/autofs/autofs_vfsops.c	optional autofs
 fs/autofs/autofs_vnops.c	optional autofs
 fs/deadfs/dead_vnops.c		standard
 fs/devfs/devfs_devs.c		standard
 fs/devfs/devfs_dir.c		standard
 fs/devfs/devfs_rule.c		standard
 fs/devfs/devfs_vfsops.c		standard
 fs/devfs/devfs_vnops.c		standard
 fs/fdescfs/fdesc_vfsops.c	optional fdescfs
 fs/fdescfs/fdesc_vnops.c	optional fdescfs
 fs/fifofs/fifo_vnops.c		standard
 fs/cuse/cuse.c			optional cuse
 fs/fuse/fuse_device.c		optional fusefs
 fs/fuse/fuse_file.c		optional fusefs
 fs/fuse/fuse_internal.c		optional fusefs
 fs/fuse/fuse_io.c		optional fusefs
 fs/fuse/fuse_ipc.c		optional fusefs
 fs/fuse/fuse_main.c		optional fusefs
 fs/fuse/fuse_node.c		optional fusefs
 fs/fuse/fuse_vfsops.c		optional fusefs
 fs/fuse/fuse_vnops.c		optional fusefs
 fs/mntfs/mntfs_vnops.c		standard
 fs/msdosfs/msdosfs_conv.c	optional msdosfs
 fs/msdosfs/msdosfs_denode.c	optional msdosfs
 fs/msdosfs/msdosfs_fat.c	optional msdosfs
 fs/msdosfs/msdosfs_iconv.c	optional msdosfs_iconv
 fs/msdosfs/msdosfs_lookup.c	optional msdosfs
 fs/msdosfs/msdosfs_vfsops.c	optional msdosfs
 fs/msdosfs/msdosfs_vnops.c	optional msdosfs
 fs/nfs/nfs_commonkrpc.c		optional nfscl | nfslockd | nfsd
 fs/nfs/nfs_commonsubs.c		optional nfscl | nfslockd | nfsd
 fs/nfs/nfs_commonport.c		optional nfscl | nfslockd | nfsd
 fs/nfs/nfs_commonacl.c		optional nfscl | nfslockd | nfsd
 fs/nfsclient/nfs_clcomsubs.c	optional nfscl
 fs/nfsclient/nfs_clsubs.c	optional nfscl
 fs/nfsclient/nfs_clstate.c	optional nfscl
 fs/nfsclient/nfs_clkrpc.c	optional nfscl
 fs/nfsclient/nfs_clrpcops.c	optional nfscl
 fs/nfsclient/nfs_clvnops.c	optional nfscl
 fs/nfsclient/nfs_clnode.c	optional nfscl
 fs/nfsclient/nfs_clvfsops.c	optional nfscl
 fs/nfsclient/nfs_clport.c	optional nfscl
 fs/nfsclient/nfs_clbio.c	optional nfscl
 fs/nfsclient/nfs_clnfsiod.c	optional nfscl
 fs/nfsserver/nfs_fha_new.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdsocket.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdsubs.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdstate.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdkrpc.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdserv.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdport.c	optional nfsd inet
 fs/nfsserver/nfs_nfsdcache.c	optional nfsd inet
 fs/nullfs/null_subr.c		optional nullfs
 fs/nullfs/null_vfsops.c		optional nullfs
 fs/nullfs/null_vnops.c		optional nullfs
 fs/procfs/procfs.c		optional procfs
 fs/procfs/procfs_dbregs.c	optional procfs
 fs/procfs/procfs_fpregs.c	optional procfs
 fs/procfs/procfs_map.c		optional procfs
 fs/procfs/procfs_mem.c		optional procfs
 fs/procfs/procfs_note.c		optional procfs
 fs/procfs/procfs_osrel.c	optional procfs
 fs/procfs/procfs_regs.c		optional procfs
 fs/procfs/procfs_rlimit.c	optional procfs
 fs/procfs/procfs_status.c	optional procfs
 fs/procfs/procfs_type.c		optional procfs
 fs/pseudofs/pseudofs.c		optional pseudofs
 fs/pseudofs/pseudofs_fileno.c	optional pseudofs
 fs/pseudofs/pseudofs_vncache.c	optional pseudofs
 fs/pseudofs/pseudofs_vnops.c	optional pseudofs
 fs/smbfs/smbfs_io.c		optional smbfs
 fs/smbfs/smbfs_node.c		optional smbfs
 fs/smbfs/smbfs_smb.c		optional smbfs
 fs/smbfs/smbfs_subr.c		optional smbfs
 fs/smbfs/smbfs_vfsops.c		optional smbfs
 fs/smbfs/smbfs_vnops.c		optional smbfs
 fs/tarfs/tarfs_io.c		optional tarfs compile-with "${NORMAL_C} -I$S/contrib/zstd/lib/freebsd"
 fs/tarfs/tarfs_subr.c		optional tarfs
 fs/tarfs/tarfs_vfsops.c		optional tarfs
 fs/tarfs/tarfs_vnops.c		optional tarfs
 fs/udf/osta.c			optional udf
 fs/udf/udf_iconv.c		optional udf_iconv
 fs/udf/udf_vfsops.c		optional udf
 fs/udf/udf_vnops.c		optional udf
 fs/unionfs/union_subr.c		optional unionfs
 fs/unionfs/union_vfsops.c	optional unionfs
 fs/unionfs/union_vnops.c	optional unionfs
 fs/tmpfs/tmpfs_vnops.c		optional tmpfs
 fs/tmpfs/tmpfs_fifoops.c 	optional tmpfs
 fs/tmpfs/tmpfs_vfsops.c 	optional tmpfs
 fs/tmpfs/tmpfs_subr.c 		optional tmpfs
 gdb/gdb_cons.c			optional gdb
 gdb/gdb_main.c			optional gdb
 gdb/gdb_packet.c		optional gdb
 gdb/netgdb.c			optional ddb debugnet gdb netgdb inet
 geom/bde/g_bde.c		optional geom_bde
 geom/bde/g_bde_crypt.c		optional geom_bde
 geom/bde/g_bde_lock.c		optional geom_bde
 geom/bde/g_bde_work.c		optional geom_bde
 geom/cache/g_cache.c		optional geom_cache
 geom/concat/g_concat.c		optional geom_concat
 geom/eli/g_eli.c		optional geom_eli
 geom/eli/g_eli_crypto.c		optional geom_eli
 geom/eli/g_eli_ctl.c		optional geom_eli
 geom/eli/g_eli_hmac.c		optional geom_eli
 geom/eli/g_eli_integrity.c	optional geom_eli
 geom/eli/g_eli_key.c		optional geom_eli
 geom/eli/g_eli_key_cache.c	optional geom_eli
 geom/eli/g_eli_privacy.c	optional geom_eli
 geom/eli/pkcs5v2.c		optional geom_eli
 geom/gate/g_gate.c		optional geom_gate
 geom/geom_bsd_enc.c		optional geom_part_bsd
 geom/geom_ccd.c			optional ccd | geom_ccd
 geom/geom_ctl.c			standard
 geom/geom_dev.c			standard
 geom/geom_disk.c		standard
 geom/geom_dump.c		standard
 geom/geom_event.c		standard
 geom/geom_flashmap.c		optional fdt cfi | fdt mx25l | mmcsd | fdt n25q | fdt at45d
 geom/geom_io.c			standard
 geom/geom_kern.c		standard
 geom/geom_map.c			optional geom_map
 geom/geom_redboot.c		optional geom_redboot
 geom/geom_slice.c		standard
 geom/geom_subr.c		standard
 geom/geom_vfs.c			standard
 geom/journal/g_journal.c	optional geom_journal
 geom/journal/g_journal_ufs.c	optional geom_journal
 geom/label/g_label.c		optional geom_label | geom_label_gpt
 geom/label/g_label_ext2fs.c	optional geom_label
 geom/label/g_label_flashmap.c	optional geom_label
 geom/label/g_label_iso9660.c	optional geom_label
 geom/label/g_label_msdosfs.c	optional geom_label
 geom/label/g_label_ntfs.c	optional geom_label
 geom/label/g_label_reiserfs.c	optional geom_label
 geom/label/g_label_ufs.c	optional geom_label
 geom/label/g_label_gpt.c	optional geom_label | geom_label_gpt
 geom/label/g_label_disk_ident.c	optional geom_label
 geom/linux_lvm/g_linux_lvm.c	optional geom_linux_lvm
 geom/mirror/g_mirror.c		optional geom_mirror
 geom/mirror/g_mirror_ctl.c	optional geom_mirror
 geom/mountver/g_mountver.c	optional geom_mountver
 geom/multipath/g_multipath.c	optional geom_multipath
 geom/nop/g_nop.c		optional geom_nop
 geom/part/g_part.c		standard
 geom/part/g_part_if.m		standard
 geom/part/g_part_apm.c		optional geom_part_apm
 geom/part/g_part_bsd.c		optional geom_part_bsd
 geom/part/g_part_bsd64.c	optional geom_part_bsd64
 geom/part/g_part_ebr.c		optional geom_part_ebr
 geom/part/g_part_gpt.c		optional geom_part_gpt
 geom/part/g_part_ldm.c		optional geom_part_ldm
 geom/part/g_part_mbr.c		optional geom_part_mbr
 geom/part/g_part_vtoc8.c	optional geom_part_vtoc8
 geom/raid/g_raid.c		optional geom_raid
 geom/raid/g_raid_ctl.c		optional geom_raid
 geom/raid/g_raid_md_if.m	optional geom_raid
 geom/raid/g_raid_tr_if.m	optional geom_raid
 geom/raid/md_ddf.c		optional geom_raid
 geom/raid/md_intel.c		optional geom_raid
 geom/raid/md_jmicron.c		optional geom_raid
 geom/raid/md_nvidia.c		optional geom_raid
 geom/raid/md_promise.c		optional geom_raid
 geom/raid/md_sii.c		optional geom_raid
 geom/raid/tr_concat.c		optional geom_raid
 geom/raid/tr_raid0.c		optional geom_raid
 geom/raid/tr_raid1.c		optional geom_raid
 geom/raid/tr_raid1e.c		optional geom_raid
 geom/raid/tr_raid5.c		optional geom_raid
 geom/raid3/g_raid3.c		optional geom_raid3
 geom/raid3/g_raid3_ctl.c	optional geom_raid3
 geom/shsec/g_shsec.c		optional geom_shsec
 geom/stripe/g_stripe.c		optional geom_stripe
 geom/union/g_union.c		optional geom_union
 geom/uzip/g_uzip.c		optional geom_uzip
 geom/uzip/g_uzip_lzma.c		optional geom_uzip
 geom/uzip/g_uzip_wrkthr.c	optional geom_uzip
 geom/uzip/g_uzip_zlib.c		optional geom_uzip
 geom/uzip/g_uzip_zstd.c		optional geom_uzip zstdio \
 	compile-with "${NORMAL_C} -I$S/contrib/zstd/lib/freebsd"
 geom/vinum/geom_vinum.c		optional geom_vinum
 geom/vinum/geom_vinum_create.c	optional geom_vinum
 geom/vinum/geom_vinum_drive.c	optional geom_vinum
 geom/vinum/geom_vinum_plex.c	optional geom_vinum
 geom/vinum/geom_vinum_volume.c	optional geom_vinum
 geom/vinum/geom_vinum_subr.c	optional geom_vinum
 geom/vinum/geom_vinum_raid5.c	optional geom_vinum
 geom/vinum/geom_vinum_share.c	optional geom_vinum
 geom/vinum/geom_vinum_list.c	optional geom_vinum
 geom/vinum/geom_vinum_rm.c	optional geom_vinum
 geom/vinum/geom_vinum_init.c	optional geom_vinum
 geom/vinum/geom_vinum_state.c	optional geom_vinum
 geom/vinum/geom_vinum_rename.c	optional geom_vinum
 geom/vinum/geom_vinum_move.c	optional geom_vinum
 geom/vinum/geom_vinum_events.c	optional geom_vinum
 geom/virstor/binstream.c	optional geom_virstor
 geom/virstor/g_virstor.c	optional geom_virstor
 geom/virstor/g_virstor_md.c	optional geom_virstor
 geom/zero/g_zero.c		optional geom_zero
 fs/ext2fs/ext2_acl.c		optional ext2fs
 fs/ext2fs/ext2_alloc.c		optional ext2fs
 fs/ext2fs/ext2_balloc.c		optional ext2fs
 fs/ext2fs/ext2_bmap.c		optional ext2fs
 fs/ext2fs/ext2_csum.c		optional ext2fs
 fs/ext2fs/ext2_extattr.c	optional ext2fs
 fs/ext2fs/ext2_extents.c	optional ext2fs
 fs/ext2fs/ext2_inode.c		optional ext2fs
 fs/ext2fs/ext2_inode_cnv.c	optional ext2fs
 fs/ext2fs/ext2_hash.c		optional ext2fs
 fs/ext2fs/ext2_htree.c		optional ext2fs
 fs/ext2fs/ext2_lookup.c		optional ext2fs
 fs/ext2fs/ext2_subr.c		optional ext2fs
 fs/ext2fs/ext2_vfsops.c		optional ext2fs
 fs/ext2fs/ext2_vnops.c		optional ext2fs
 #
 isa/isa_if.m			standard
 isa/isa_common.c		optional isa
 isa/isahint.c			optional isa
 isa/pnp.c			optional isa isapnp
 isa/pnpparse.c			optional isa isapnp
 fs/cd9660/cd9660_bmap.c	optional cd9660
 fs/cd9660/cd9660_lookup.c	optional cd9660
 fs/cd9660/cd9660_node.c	optional cd9660
 fs/cd9660/cd9660_rrip.c	optional cd9660
 fs/cd9660/cd9660_util.c	optional cd9660
 fs/cd9660/cd9660_vfsops.c	optional cd9660
 fs/cd9660/cd9660_vnops.c	optional cd9660
 fs/cd9660/cd9660_iconv.c	optional cd9660_iconv
 gnu/gcov/gcc_4_7.c		optional gcov  \
 	warning "kernel contains GPL licensed gcov support"
 gnu/gcov/gcov_fs.c		optional gcov  lindebugfs \
 	compile-with "${LINUXKPI_C}"
 gnu/gcov/gcov_subr.c		optional gcov
 
 kern/bus_if.m			standard
 kern/clock_if.m			standard
 kern/cpufreq_if.m		standard
 kern/device_if.m		standard
 kern/imgact_binmisc.c		optional imgact_binmisc
 kern/imgact_elf.c		standard
 kern/imgact_elf32.c		optional compat_freebsd32
 kern/imgact_shell.c		standard
 kern/init_main.c		standard
 kern/init_sysent.c		standard
 kern/ksched.c			optional _kposix_priority_scheduling
 kern/kern_acct.c		standard
 kern/kern_alq.c			optional alq
 kern/kern_boottrace.c		standard
 kern/kern_clock.c		standard
 kern/kern_clocksource.c		standard
 kern/kern_condvar.c		standard
 kern/kern_conf.c		standard
 kern/kern_cons.c		standard
 kern/kern_cpu.c			standard
 kern/kern_cpuset.c		standard
 kern/kern_context.c		standard
 kern/kern_descrip.c		standard
 kern/kern_devctl.c		standard
 kern/kern_dtrace.c		optional kdtrace_hooks
 kern/kern_dump.c		standard
 kern/kern_environment.c		standard
 kern/kern_et.c			standard
 kern/kern_event.c		standard
 kern/kern_exec.c		standard
 kern/kern_exit.c		standard
 kern/kern_fail.c		standard
 kern/kern_ffclock.c		standard
 kern/kern_fork.c		standard
 kern/kern_hhook.c		standard
 kern/kern_idle.c		standard
 kern/kern_intr.c		standard
 kern/kern_jail.c		standard
 kern/kern_kcov.c		optional kcov			\
 	compile-with "${NORMAL_C:N-fsanitize*} ${NORMAL_C:M-fsanitize=kernel-memory}"
 kern/kern_khelp.c		standard
 kern/kern_kthread.c		standard
 kern/kern_ktr.c			optional ktr
 kern/kern_ktrace.c		standard
 kern/kern_linker.c		standard
 kern/kern_lock.c		standard
 kern/kern_lockf.c		standard
 kern/kern_lockstat.c		optional kdtrace_hooks
 kern/kern_loginclass.c		standard
 kern/kern_malloc.c		standard
 kern/kern_mbuf.c		standard
 kern/kern_mib.c			standard
 kern/kern_module.c		standard
 kern/kern_mtxpool.c		standard
 kern/kern_mutex.c		standard
 kern/kern_ntptime.c		standard
 kern/kern_osd.c			standard
 kern/kern_physio.c		standard
 kern/kern_pmc.c			standard
 kern/kern_poll.c		optional device_polling
 kern/kern_priv.c		standard
 kern/kern_proc.c		standard
 kern/kern_procctl.c		standard
 kern/kern_prot.c		standard
 kern/kern_racct.c		standard
 kern/kern_rangelock.c		standard
 kern/kern_rctl.c		standard
 kern/kern_resource.c		standard
 kern/kern_rmlock.c		standard
 kern/kern_rwlock.c		standard
 kern/kern_sdt.c			optional kdtrace_hooks
 kern/kern_sema.c		standard
 kern/kern_sendfile.c		standard
 kern/kern_sharedpage.c		standard
 kern/kern_shutdown.c		standard
 kern/kern_sig.c			standard
 kern/kern_switch.c		standard
 kern/kern_sx.c			standard
 kern/kern_synch.c		standard
 kern/kern_syscalls.c		standard
 kern/kern_sysctl.c		standard
 kern/kern_tc.c			standard
 kern/kern_thr.c			standard
 kern/kern_thread.c		standard
 kern/kern_time.c		standard
 kern/kern_timeout.c		standard
 kern/kern_tslog.c		optional tslog
 kern/kern_ubsan.c		optional kubsan
 kern/kern_umtx.c		standard
 kern/kern_uuid.c		standard
 kern/kern_vnodedumper.c		standard
 kern/kern_xxx.c			standard
 kern/link_elf.c			standard
 kern/linker_if.m		standard
 kern/md4c.c			optional netsmb
 kern/md5c.c			standard
 kern/p1003_1b.c			standard
 kern/posix4_mib.c		standard
 kern/sched_4bsd.c		optional sched_4bsd
 kern/sched_ule.c		optional sched_ule
 kern/serdev_if.m		standard
 kern/stack_protector.c		standard \
 	compile-with "${NORMAL_C:N-fstack-protector*}"
 kern/subr_acl_nfs4.c		optional ufs_acl | zfs
 kern/subr_acl_posix1e.c		optional ufs_acl
 kern/subr_asan.c		optional kasan \
 	compile-with "${NORMAL_C:N-fsanitize*:N-fstack-protector*}"
 kern/subr_autoconf.c		standard
 kern/subr_blist.c		standard
 kern/subr_boot.c		standard
 kern/subr_bus.c			standard
 kern/subr_bus_dma.c		standard
 kern/subr_bufring.c		standard
 kern/subr_capability.c		standard
 kern/subr_clock.c		standard
 kern/subr_compressor.c		standard \
 	compile-with "${NORMAL_C} -I$S/contrib/zstd/lib/freebsd"
 kern/subr_coverage.c		optional coverage \
 	compile-with "${NORMAL_C:N-fsanitize*}"
 kern/subr_counter.c		standard
 kern/subr_csan.c		optional kcsan \
 	compile-with "${NORMAL_C:N-fsanitize*:N-fstack-protector*}"
 kern/subr_devstat.c		standard
 kern/subr_disk.c		standard
 kern/subr_early.c		standard
 kern/subr_epoch.c		standard
 kern/subr_eventhandler.c	standard
 kern/subr_fattime.c		standard
 kern/subr_firmware.c		optional firmware
 kern/subr_filter.c		standard
 kern/subr_gtaskqueue.c		standard
 kern/subr_hash.c		standard
 kern/subr_hints.c		standard
 kern/subr_kdb.c			standard
 kern/subr_kobj.c		standard
 kern/subr_lock.c		standard
 kern/subr_log.c			standard
 kern/subr_mchain.c		optional libmchain
 kern/subr_module.c		standard
 kern/subr_msan.c		optional kmsan \
 	compile-with "${NORMAL_C:N-fsanitize*:N-fstack-protector*}"
 kern/subr_msgbuf.c		standard
 kern/subr_param.c		standard
 kern/subr_pcpu.c		standard
 kern/subr_pctrie.c		standard
 kern/subr_pidctrl.c		standard
 kern/subr_power.c		standard
 kern/subr_prf.c			standard
 kern/subr_prng.c		standard
 kern/subr_prof.c		standard
 kern/subr_rangeset.c		standard
 kern/subr_rman.c		standard
 kern/subr_rtc.c			standard
 kern/subr_sbuf.c		standard
 kern/subr_scanf.c		standard
 kern/subr_sglist.c		standard
 kern/subr_sleepqueue.c		standard
 kern/subr_smp.c			standard
 kern/subr_smr.c			standard
 kern/subr_stack.c		optional ddb | stack | ktr
 kern/subr_stats.c		optional stats
 kern/subr_taskqueue.c		standard
 kern/subr_terminal.c		optional vt
 kern/subr_trap.c		standard
 kern/subr_turnstile.c		standard
 kern/subr_uio.c			standard
 kern/subr_unit.c		standard
 kern/subr_vmem.c		standard
 kern/subr_witness.c		optional witness
 kern/sys_capability.c		standard
 kern/sys_eventfd.c		standard
 kern/sys_generic.c		standard
 kern/sys_getrandom.c		standard
 kern/sys_pipe.c			standard
 kern/sys_procdesc.c		standard
 kern/sys_process.c		standard
 kern/sys_socket.c		standard
 kern/syscalls.c			standard
 kern/sysv_ipc.c			standard
 kern/sysv_msg.c			optional sysvmsg
 kern/sysv_sem.c			optional sysvsem
 kern/sysv_shm.c			optional sysvshm
 kern/tty.c			standard
 kern/tty_compat.c		optional compat_43tty
 kern/tty_info.c			standard
 kern/tty_inq.c			standard
 kern/tty_outq.c			standard
 kern/tty_pts.c			standard
 kern/tty_tty.c			standard
 kern/tty_ttydisc.c		standard
 kern/uipc_accf.c		standard
 kern/uipc_debug.c		optional ddb
 kern/uipc_domain.c		standard
 kern/uipc_ktls.c		optional kern_tls
 kern/uipc_mbuf.c		standard
 kern/uipc_mbuf2.c		standard
 kern/uipc_mbufhash.c		standard
 kern/uipc_mqueue.c		optional p1003_1b_mqueue
 kern/uipc_sem.c			optional p1003_1b_semaphores
 kern/uipc_shm.c			standard
 kern/uipc_sockbuf.c		standard
 kern/uipc_socket.c		standard
 kern/uipc_syscalls.c		standard
 kern/uipc_usrreq.c		standard
 kern/vfs_acl.c			standard
 kern/vfs_aio.c			standard
 kern/vfs_bio.c			standard
 kern/vfs_cache.c		standard
 kern/vfs_cluster.c		standard
 kern/vfs_default.c		standard
 kern/vfs_export.c		standard
 kern/vfs_extattr.c		standard
 kern/vfs_hash.c			standard
 kern/vfs_init.c			standard
 kern/vfs_lookup.c		standard
 kern/vfs_mount.c		standard
 kern/vfs_mountroot.c		standard
 kern/vfs_subr.c			standard
 kern/vfs_syscalls.c		standard
 kern/vfs_vnops.c		standard
 #
 # Kernel GSS-API
 #
 gssd.h				optional kgssapi			\
 	dependency		"$S/kgssapi/gssd.x"			\
 	compile-with		"RPCGEN_CPP='${CPP}' rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h" \
 	no-obj no-implicit-rule before-depend local			\
 	clean			"gssd.h"
 gssd_xdr.c			optional kgssapi			\
 	dependency		"$S/kgssapi/gssd.x gssd.h"		\
 	compile-with		"RPCGEN_CPP='${CPP}' rpcgen -c $S/kgssapi/gssd.x -o gssd_xdr.c" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean			"gssd_xdr.c"
 gssd_clnt.c			optional kgssapi			\
 	dependency		"$S/kgssapi/gssd.x gssd.h"		\
 	compile-with		"RPCGEN_CPP='${CPP}' rpcgen -lM $S/kgssapi/gssd.x | grep -v string.h > gssd_clnt.c" \
 	no-ctfconvert no-implicit-rule before-depend local		\
 	clean			"gssd_clnt.c"
 kgssapi/gss_accept_sec_context.c optional kgssapi
 kgssapi/gss_add_oid_set_member.c optional kgssapi
 kgssapi/gss_acquire_cred.c	optional kgssapi
 kgssapi/gss_canonicalize_name.c	optional kgssapi
 kgssapi/gss_create_empty_oid_set.c optional kgssapi
 kgssapi/gss_delete_sec_context.c optional kgssapi
 kgssapi/gss_display_status.c	optional kgssapi
 kgssapi/gss_export_name.c	optional kgssapi
 kgssapi/gss_get_mic.c		optional kgssapi
 kgssapi/gss_init_sec_context.c	optional kgssapi
 kgssapi/gss_impl.c		optional kgssapi
 kgssapi/gss_import_name.c	optional kgssapi
 kgssapi/gss_names.c		optional kgssapi
 kgssapi/gss_pname_to_uid.c	optional kgssapi
 kgssapi/gss_release_buffer.c	optional kgssapi
 kgssapi/gss_release_cred.c	optional kgssapi
 kgssapi/gss_release_name.c	optional kgssapi
 kgssapi/gss_release_oid_set.c	optional kgssapi
 kgssapi/gss_set_cred_option.c	optional kgssapi
 kgssapi/gss_test_oid_set_member.c optional kgssapi
 kgssapi/gss_unwrap.c		optional kgssapi
 kgssapi/gss_verify_mic.c	optional kgssapi
 kgssapi/gss_wrap.c		optional kgssapi
 kgssapi/gss_wrap_size_limit.c	optional kgssapi
 kgssapi/gssd_prot.c		optional kgssapi
 kgssapi/krb5/krb5_mech.c	optional kgssapi
 kgssapi/krb5/kcrypto.c		optional kgssapi
 kgssapi/krb5/kcrypto_aes.c	optional kgssapi
 kgssapi/kgss_if.m		optional kgssapi
 kgssapi/gsstest.c		optional kgssapi_debug
 # These files in libkern/ are those needed by all architectures.  Some
 # of the files in libkern/ are only needed on some architectures, e.g.,
 # libkern/divdi3.c is needed by i386 but not alpha.  Also, some of these
 # routines may be optimized for a particular platform.  In either case,
 # the file should be moved to conf/files.<arch> from here.
 #
 libkern/arc4random.c		standard
 libkern/arc4random_uniform.c	standard
 libkern/asprintf.c		standard
 libkern/bcd.c			standard
 libkern/bsearch.c		standard
 libkern/explicit_bzero.c	standard
 libkern/fnmatch.c		standard
 libkern/gsb_crc32.c		standard
 libkern/iconv.c			optional libiconv
 libkern/iconv_converter_if.m	optional libiconv
 libkern/iconv_ucs.c		optional libiconv
 libkern/iconv_xlat.c		optional libiconv
 libkern/iconv_xlat16.c		optional libiconv
 libkern/inet_aton.c		standard
 libkern/inet_ntoa.c		standard
 libkern/inet_ntop.c		standard
 libkern/inet_pton.c		standard
 libkern/jenkins_hash.c		standard
 libkern/murmur3_32.c		standard
 libkern/memcchr.c		standard
 libkern/memchr.c		standard
 libkern/memmem.c		optional gdb
 libkern/qsort.c			standard
 libkern/qsort_r.c		standard
 libkern/random.c		standard
 libkern/scanc.c			standard
 libkern/strcasecmp.c		standard
 libkern/strcasestr.c		standard
 libkern/strcat.c		standard
 libkern/strchr.c		standard
 libkern/strchrnul.c		optional gdb
 libkern/strcpy.c		standard
 libkern/strcspn.c		standard
 libkern/strdup.c		standard
 libkern/strndup.c		standard
 libkern/strlcat.c		standard
 libkern/strlcpy.c		standard
 libkern/strncat.c		standard
 libkern/strncpy.c		standard
 libkern/strnlen.c		standard
 libkern/strnstr.c		standard
 libkern/strrchr.c		standard
 libkern/strsep.c		standard
 libkern/strspn.c		standard
 libkern/strstr.c		standard
 libkern/strtol.c		standard
 libkern/strtoq.c		standard
 libkern/strtoul.c		standard
 libkern/strtouq.c		standard
 libkern/strvalid.c		standard
 libkern/timingsafe_bcmp.c	standard
 contrib/zlib/adler32.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
 	compile-with "${ZLIB_C}"
 contrib/zlib/compress.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
 	compile-with "${ZLIB_C}"
 contrib/zlib/crc32.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
 	compile-with "${ZLIB_C}"
 contrib/zlib/deflate.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
 	compile-with "${ZLIB_C}"
 contrib/zlib/inffast.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
 	compile-with "${ZLIB_C}"
 contrib/zlib/inflate.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
 	compile-with "${ZLIB_C}"
 contrib/zlib/inftrees.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
 	compile-with "${ZLIB_C}"
 contrib/zlib/trees.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
 	compile-with "${ZLIB_C}"
 contrib/zlib/uncompr.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
 	compile-with "${ZLIB_C}"
 contrib/zlib/zutil.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
 	compile-with "${ZLIB_C}"
 dev/zlib/zlib_mod.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib
 dev/zlib/zcalloc.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib
 net/altq/altq_cbq.c		optional altq
 net/altq/altq_codel.c		optional altq
 net/altq/altq_hfsc.c		optional altq
 net/altq/altq_fairq.c		optional altq
 net/altq/altq_priq.c		optional altq
 net/altq/altq_red.c		optional altq
 net/altq/altq_rio.c		optional altq
 net/altq/altq_rmclass.c		optional altq
 net/altq/altq_subr.c		optional altq
 net/bpf.c			standard
 net/bpf_buffer.c		optional bpf
 net/bpf_jitter.c		optional bpf_jitter
 net/bpf_filter.c		optional bpf | netgraph_bpf
 net/bpf_zerocopy.c		optional bpf
 net/bridgestp.c			optional bridge | if_bridge
 net/ieee8023ad_lacp.c		optional lagg
 net/if.c			standard
 net/ifq.c			standard
 net/if_bridge.c			optional bridge inet | if_bridge inet
 net/if_clone.c			standard
 net/if_dead.c			standard
 net/if_disc.c			optional disc
 net/if_edsc.c			optional edsc
 net/if_enc.c			optional enc inet | enc inet6
 net/if_epair.c			optional epair
 net/if_ethersubr.c		optional ether
 net/if_fwsubr.c			optional fwip
 net/if_gif.c			optional gif inet | gif inet6 | \
 					 netgraph_gif inet | netgraph_gif inet6
 net/if_gre.c			optional gre inet | gre inet6
 net/if_ipsec.c			optional inet ipsec | inet6 ipsec
 net/if_lagg.c			optional lagg
 net/if_loop.c			optional loop
 net/if_llatbl.c			standard
 net/if_me.c			optional me inet
 net/if_media.c			standard
 net/if_mib.c			standard
 net/if_ovpn.c			optional ovpn inet | ovpn inet6
 net/if_stf.c			optional stf inet inet6
 net/if_tuntap.c			optional tuntap
 net/if_vlan.c			optional vlan
 net/if_vxlan.c			optional vxlan inet | vxlan inet6
 net/ifdi_if.m			optional ether pci iflib
 net/iflib.c			optional ether pci iflib
 net/iflib_clone.c		optional ether pci iflib
 net/mp_ring.c			optional ether iflib
 net/mppcc.c			optional netgraph_mppc_compression
 net/mppcd.c			optional netgraph_mppc_compression
 net/netisr.c			standard
 net/debugnet.c			optional inet debugnet
 net/debugnet_inet.c		optional inet debugnet
 net/pfil.c			optional ether | inet
 net/radix.c			standard
 net/route.c			standard
 net/route/nhgrp.c		optional route_mpath
 net/route/nhgrp_ctl.c		optional route_mpath
 net/route/nhop.c		standard
 net/route/nhop_ctl.c		standard
 net/route/nhop_utils.c		standard
 net/route/fib_algo.c		optional fib_algo
 net/route/route_ctl.c		standard
 net/route/route_ddb.c		optional ddb
 net/route/route_helpers.c	standard
 net/route/route_ifaddrs.c	standard
 net/route/route_rtentry.c	standard
 net/route/route_subscription.c	standard
 net/route/route_tables.c	standard
 net/route/route_temporal.c	standard
 net/rss_config.c		optional inet rss | inet6 rss
 net/rtsock.c			standard
 net/slcompress.c		optional netgraph_vjc
 net/toeplitz.c			optional inet rss | inet6 rss | route_mpath
 net/vnet.c			optional vimage
 net80211/ieee80211.c		optional wlan
 net80211/ieee80211_acl.c	optional wlan wlan_acl
 net80211/ieee80211_action.c	optional wlan
 net80211/ieee80211_adhoc.c	optional wlan \
 	compile-with "${NORMAL_C} -Wno-unused-function"
 net80211/ieee80211_ageq.c	optional wlan
 net80211/ieee80211_amrr.c	optional wlan | wlan_amrr
 net80211/ieee80211_crypto.c	optional wlan \
 	compile-with "${NORMAL_C} -Wno-unused-function"
 net80211/ieee80211_crypto_ccmp.c optional wlan wlan_ccmp
 net80211/ieee80211_crypto_none.c optional wlan
 net80211/ieee80211_crypto_tkip.c optional wlan wlan_tkip
 net80211/ieee80211_crypto_wep.c	optional wlan wlan_wep
 net80211/ieee80211_ddb.c	optional wlan ddb
 net80211/ieee80211_dfs.c	optional wlan
 net80211/ieee80211_freebsd.c	optional wlan
 net80211/ieee80211_hostap.c	optional wlan \
 	compile-with "${NORMAL_C} -Wno-unused-function"
 net80211/ieee80211_ht.c		optional wlan
 net80211/ieee80211_hwmp.c	optional wlan ieee80211_support_mesh
 net80211/ieee80211_input.c	optional wlan
 net80211/ieee80211_ioctl.c	optional wlan
 net80211/ieee80211_mesh.c	optional wlan ieee80211_support_mesh \
 	compile-with "${NORMAL_C} -Wno-unused-function"
 net80211/ieee80211_monitor.c	optional wlan
 net80211/ieee80211_node.c	optional wlan
 net80211/ieee80211_output.c	optional wlan
 net80211/ieee80211_phy.c	optional wlan
 net80211/ieee80211_power.c	optional wlan
 net80211/ieee80211_proto.c	optional wlan
 net80211/ieee80211_radiotap.c	optional wlan
 net80211/ieee80211_ratectl.c	optional wlan
 net80211/ieee80211_ratectl_none.c optional wlan
 net80211/ieee80211_regdomain.c	optional wlan
 net80211/ieee80211_rssadapt.c	optional wlan wlan_rssadapt
 net80211/ieee80211_scan.c	optional wlan
 net80211/ieee80211_scan_sta.c	optional wlan
 net80211/ieee80211_sta.c	optional wlan \
 	compile-with "${NORMAL_C} -Wno-unused-function"
 net80211/ieee80211_superg.c	optional wlan ieee80211_support_superg
 net80211/ieee80211_scan_sw.c	optional wlan
 net80211/ieee80211_tdma.c	optional wlan ieee80211_support_tdma
 net80211/ieee80211_vht.c	optional wlan
 net80211/ieee80211_wds.c	optional wlan
 net80211/ieee80211_xauth.c	optional wlan wlan_xauth
 net80211/ieee80211_alq.c	optional wlan ieee80211_alq
-netgraph/atm/ccatm/ng_ccatm.c	optional ngatm_ccatm \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-netgraph/atm/ngatmbase.c	optional ngatm_atmbase \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-netgraph/atm/sscfu/ng_sscfu.c	optional ngatm_sscfu \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-netgraph/atm/sscop/ng_sscop.c optional ngatm_sscop \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-netgraph/atm/uni/ng_uni.c	optional ngatm_uni \
-	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 netgraph/bluetooth/common/ng_bluetooth.c optional netgraph_bluetooth
 netgraph/bluetooth/drivers/ubt/ng_ubt.c optional netgraph_bluetooth_ubt usb
 netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c optional netgraph_bluetooth_ubt usb
 netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c optional netgraph_bluetooth_ubtbcmfw usb
 netgraph/bluetooth/hci/ng_hci_cmds.c optional netgraph_bluetooth_hci
 netgraph/bluetooth/hci/ng_hci_evnt.c optional netgraph_bluetooth_hci
 netgraph/bluetooth/hci/ng_hci_main.c optional netgraph_bluetooth_hci
 netgraph/bluetooth/hci/ng_hci_misc.c optional netgraph_bluetooth_hci
 netgraph/bluetooth/hci/ng_hci_ulpi.c optional netgraph_bluetooth_hci
 netgraph/bluetooth/l2cap/ng_l2cap_cmds.c optional netgraph_bluetooth_l2cap
 netgraph/bluetooth/l2cap/ng_l2cap_evnt.c optional netgraph_bluetooth_l2cap
 netgraph/bluetooth/l2cap/ng_l2cap_llpi.c optional netgraph_bluetooth_l2cap
 netgraph/bluetooth/l2cap/ng_l2cap_main.c optional netgraph_bluetooth_l2cap
 netgraph/bluetooth/l2cap/ng_l2cap_misc.c optional netgraph_bluetooth_l2cap
 netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c optional netgraph_bluetooth_l2cap
 netgraph/bluetooth/socket/ng_btsocket.c optional netgraph_bluetooth_socket
 netgraph/bluetooth/socket/ng_btsocket_hci_raw.c	optional netgraph_bluetooth_socket
 netgraph/bluetooth/socket/ng_btsocket_l2cap.c optional netgraph_bluetooth_socket
 netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c optional netgraph_bluetooth_socket
 netgraph/bluetooth/socket/ng_btsocket_rfcomm.c optional netgraph_bluetooth_socket
 netgraph/bluetooth/socket/ng_btsocket_sco.c optional netgraph_bluetooth_socket
 netgraph/netflow/netflow.c	optional netgraph_netflow
 netgraph/netflow/netflow_v9.c	optional netgraph_netflow
 netgraph/netflow/ng_netflow.c	optional netgraph_netflow
 netgraph/ng_UI.c		optional netgraph_UI
 netgraph/ng_async.c		optional netgraph_async
 netgraph/ng_atmllc.c		optional netgraph_atmllc
 netgraph/ng_base.c		optional netgraph
 netgraph/ng_bpf.c		optional netgraph_bpf
 netgraph/ng_bridge.c		optional netgraph_bridge
 netgraph/ng_car.c		optional netgraph_car
 netgraph/ng_checksum.c		optional netgraph_checksum
 netgraph/ng_cisco.c		optional netgraph_cisco
 netgraph/ng_deflate.c		optional netgraph_deflate
 netgraph/ng_device.c		optional netgraph_device
 netgraph/ng_echo.c		optional netgraph_echo
 netgraph/ng_eiface.c		optional netgraph_eiface
 netgraph/ng_ether.c		optional netgraph_ether
 netgraph/ng_ether_echo.c	optional netgraph_ether_echo
 netgraph/ng_frame_relay.c	optional netgraph_frame_relay
 netgraph/ng_gif.c		optional netgraph_gif inet6 | netgraph_gif inet
 netgraph/ng_gif_demux.c		optional netgraph_gif_demux
 netgraph/ng_hole.c		optional netgraph_hole
 netgraph/ng_iface.c		optional netgraph_iface
 netgraph/ng_ip_input.c		optional netgraph_ip_input
 netgraph/ng_ipfw.c		optional netgraph_ipfw inet ipfirewall
 netgraph/ng_ksocket.c		optional netgraph_ksocket
 netgraph/ng_l2tp.c		optional netgraph_l2tp
 netgraph/ng_lmi.c		optional netgraph_lmi
 netgraph/ng_macfilter.c		optional netgraph_macfilter
 netgraph/ng_mppc.c		optional netgraph_mppc_compression | \
 					 netgraph_mppc_encryption
 netgraph/ng_nat.c		optional netgraph_nat inet libalias
 netgraph/ng_one2many.c		optional netgraph_one2many
 netgraph/ng_parse.c		optional netgraph
 netgraph/ng_patch.c		optional netgraph_patch
 netgraph/ng_pipe.c		optional netgraph_pipe
 netgraph/ng_ppp.c		optional netgraph_ppp
 netgraph/ng_pppoe.c		optional netgraph_pppoe
 netgraph/ng_pptpgre.c		optional netgraph_pptpgre
 netgraph/ng_pred1.c		optional netgraph_pred1
 netgraph/ng_rfc1490.c		optional netgraph_rfc1490
 netgraph/ng_socket.c		optional netgraph_socket
 netgraph/ng_split.c		optional netgraph_split
 netgraph/ng_tag.c		optional netgraph_tag
 netgraph/ng_tcpmss.c		optional netgraph_tcpmss
 netgraph/ng_tee.c		optional netgraph_tee
 netgraph/ng_tty.c		optional netgraph_tty
 netgraph/ng_vjc.c		optional netgraph_vjc
 netgraph/ng_vlan.c		optional netgraph_vlan
 netgraph/ng_vlan_rotate.c	optional netgraph_vlan_rotate
 netinet/accf_data.c		optional accept_filter_data inet
 netinet/accf_dns.c		optional accept_filter_dns inet
 netinet/accf_http.c		optional accept_filter_http inet
 netinet/if_ether.c		optional inet ether
 netinet/igmp.c			optional inet
 netinet/in.c			optional inet
 netinet/in_cksum.c		optional inet | inet6
 netinet/in_debug.c		optional inet ddb
 netinet/in_kdtrace.c		optional inet | inet6
 netinet/ip_carp.c		optional inet carp | inet6 carp
 netinet/in_fib.c		optional inet
 netinet/in_fib_algo.c		optional inet fib_algo
 netinet/in_gif.c		optional gif inet | netgraph_gif inet
 netinet/ip_gre.c		optional gre inet
 netinet/ip_id.c			optional inet
 netinet/in_jail.c		optional inet
 netinet/in_mcast.c		optional inet
 netinet/in_pcb.c		optional inet | inet6
 netinet/in_prot.c		optional inet | inet6
 netinet/in_proto.c		optional inet | inet6
 netinet/in_rmx.c		optional inet
 netinet/in_rss.c		optional inet rss
 netinet/ip_divert.c		optional ipdivert inet | ipdivert inet6
 netinet/ip_ecn.c		optional inet | inet6
 netinet/ip_encap.c		optional inet | inet6
 netinet/ip_fastfwd.c		optional inet
 netinet/ip_icmp.c		optional inet | inet6
 netinet/ip_input.c		optional inet
 netinet/ip_mroute.c		optional mrouting inet
 netinet/ip_options.c		optional inet
 netinet/ip_output.c		optional inet
 netinet/ip_reass.c		optional inet
 netinet/raw_ip.c		optional inet | inet6
 netinet/cc/cc.c			optional cc_newreno inet | cc_vegas inet | \
 	cc_htcp inet | cc_hd inet | cc_dctcp inet | cc_cubic inet | \
 	cc_chd inet | cc_cdg inet | cc_newreno inet6 | cc_vegas inet6 | \
 	cc_htcp inet6 | cc_hd inet6 |cc_dctcp inet6 | cc_cubic inet6 | \
 	cc_chd inet6 | cc_cdg inet6
 netinet/cc/cc_cdg.c		optional inet cc_cdg tcp_hhook
 netinet/cc/cc_chd.c		optional inet cc_chd tcp_hhook
 netinet/cc/cc_cubic.c		optional inet cc_cubic | inet6 cc_cubic
 netinet/cc/cc_dctcp.c		optional inet cc_dctcp | inet6 cc_dctcp
 netinet/cc/cc_hd.c		optional inet cc_hd tcp_hhook
 netinet/cc/cc_htcp.c		optional inet cc_htcp | inet6 cc_htcp
 netinet/cc/cc_newreno.c		optional inet cc_newreno | inet6 cc_newreno
 netinet/cc/cc_vegas.c		optional inet cc_vegas tcp_hhook
 netinet/khelp/h_ertt.c		optional inet tcp_hhook
 netinet/sctp_asconf.c		optional inet sctp | inet6 sctp
 netinet/sctp_auth.c		optional inet sctp | inet6 sctp
 netinet/sctp_bsd_addr.c		optional inet sctp | inet6 sctp
 netinet/sctp_cc_functions.c	optional inet sctp | inet6 sctp
 netinet/sctp_crc32.c		optional inet | inet6
 netinet/sctp_indata.c		optional inet sctp | inet6 sctp
 netinet/sctp_input.c		optional inet sctp | inet6 sctp
 netinet/sctp_kdtrace.c		optional inet sctp | inet6 sctp
 netinet/sctp_output.c		optional inet sctp | inet6 sctp
 netinet/sctp_pcb.c		optional inet sctp | inet6 sctp
 netinet/sctp_peeloff.c		optional inet sctp | inet6 sctp
 netinet/sctp_ss_functions.c	optional inet sctp | inet6 sctp
 netinet/sctp_syscalls.c		optional inet sctp | inet6 sctp
 netinet/sctp_sysctl.c		optional inet sctp | inet6 sctp
 netinet/sctp_timer.c		optional inet sctp | inet6 sctp
 netinet/sctp_usrreq.c		optional inet sctp | inet6 sctp
 netinet/sctputil.c		optional inet sctp | inet6 sctp
 netinet/siftr.c			optional inet siftr alq | inet6 siftr alq
 netinet/tcp_ecn.c		optional inet | inet6
 netinet/tcp_fastopen.c		optional inet tcp_rfc7413 | inet6 tcp_rfc7413
 netinet/tcp_hostcache.c		optional inet | inet6
 netinet/tcp_input.c		optional inet | inet6
 netinet/tcp_log_buf.c		optional tcp_blackbox inet | tcp_blackbox inet6
 netinet/tcp_lro.c		optional inet | inet6
 netinet/tcp_output.c		optional inet | inet6
 netinet/tcp_offload.c		optional tcp_offload inet | tcp_offload inet6
 netinet/tcp_hpts.c		optional tcphpts inet | tcphpts inet6
 netinet/tcp_ratelimit.c		optional ratelimit inet | ratelimit inet6
 netinet/tcp_pcap.c		optional inet tcppcap | inet6 tcppcap \
 	compile-with "${NORMAL_C} ${NO_WNONNULL}"
 netinet/tcp_reass.c		optional inet | inet6
 netinet/tcp_sack.c		optional inet | inet6
 netinet/tcp_stats.c		optional stats inet | stats inet6
 netinet/tcp_subr.c		optional inet | inet6
 netinet/tcp_syncache.c		optional inet | inet6
 netinet/tcp_timer.c		optional inet | inet6
 netinet/tcp_timewait.c		optional inet | inet6
 netinet/tcp_usrreq.c		optional inet | inet6
 netinet/udp_usrreq.c		optional inet | inet6
 netinet/libalias/alias.c	optional libalias inet | netgraph_nat inet
 netinet/libalias/alias_db.c	optional libalias inet | netgraph_nat inet
 netinet/libalias/alias_mod.c	optional libalias | netgraph_nat
 netinet/libalias/alias_proxy.c	optional libalias inet | netgraph_nat inet
 netinet/libalias/alias_util.c	optional libalias inet | netgraph_nat inet
 netinet/libalias/alias_sctp.c	optional libalias inet | netgraph_nat inet
 netinet/netdump/netdump_client.c optional inet debugnet netdump
 netinet6/dest6.c		optional inet6
 netinet6/frag6.c		optional inet6
 netinet6/icmp6.c		optional inet6
 netinet6/in6.c			optional inet6
 netinet6/in6_cksum.c		optional inet6
 netinet6/in6_fib.c		optional inet6
 netinet6/in6_fib_algo.c		optional inet6 fib_algo
 netinet6/in6_gif.c		optional gif inet6 | netgraph_gif inet6
 netinet6/in6_ifattach.c		optional inet6
 netinet6/in6_jail.c		optional inet6
 netinet6/in6_mcast.c		optional inet6
 netinet6/in6_pcb.c		optional inet6
 netinet6/in6_proto.c		optional inet6
 netinet6/in6_rmx.c		optional inet6
 netinet6/in6_rss.c		optional inet6 rss
 netinet6/in6_src.c		optional inet6
 netinet6/ip6_fastfwd.c		optional inet6
 netinet6/ip6_forward.c		optional inet6
 netinet6/ip6_gre.c		optional gre inet6
 netinet6/ip6_id.c		optional inet6
 netinet6/ip6_input.c		optional inet6
 netinet6/ip6_mroute.c		optional mrouting inet6
 netinet6/ip6_output.c		optional inet6
 netinet6/mld6.c			optional inet6
 netinet6/nd6.c			optional inet6
 netinet6/nd6_nbr.c		optional inet6
 netinet6/nd6_rtr.c		optional inet6
 netinet6/raw_ip6.c		optional inet6
 netinet6/route6.c		optional inet6
 netinet6/scope6.c		optional inet6
 netinet6/sctp6_usrreq.c		optional inet6 sctp
 netinet6/udp6_usrreq.c		optional inet6
 netipsec/ipsec.c		optional ipsec inet | ipsec inet6
 netipsec/ipsec_input.c		optional ipsec inet | ipsec inet6
 netipsec/ipsec_mbuf.c		optional ipsec inet | ipsec inet6
 netipsec/ipsec_mod.c		optional ipsec inet | ipsec inet6
 netipsec/ipsec_output.c		optional ipsec inet | ipsec inet6
 netipsec/ipsec_pcb.c		optional ipsec inet | ipsec inet6 | \
 	ipsec_support inet | ipsec_support inet6
 netipsec/key.c			optional ipsec inet | ipsec inet6 | \
 	ipsec_support inet | ipsec_support inet6
 netipsec/key_debug.c		optional ipsec inet | ipsec inet6 | \
 	ipsec_support inet | ipsec_support inet6
 netipsec/keysock.c		optional ipsec inet | ipsec inet6 | \
 	ipsec_support inet | ipsec_support inet6
 netipsec/subr_ipsec.c		optional ipsec inet | ipsec inet6 | \
 	ipsec_support inet | ipsec_support inet6
 netipsec/udpencap.c		optional ipsec inet
 netipsec/xform_ah.c		optional ipsec inet | ipsec inet6
 netipsec/xform_esp.c		optional ipsec inet | ipsec inet6
 netipsec/xform_ipcomp.c		optional ipsec inet | ipsec inet6
 netipsec/xform_tcp.c		optional ipsec inet tcp_signature | \
 	 ipsec inet6 tcp_signature | ipsec_support inet tcp_signature | \
 	 ipsec_support inet6 tcp_signature
 netlink/netlink_domain.c	optional netlink
 netlink/netlink_generic.c	optional netlink
 netlink/netlink_io.c		optional netlink
 netlink/netlink_message_parser.c	optional netlink
 netlink/netlink_message_writer.c	optional netlink
 netlink/netlink_module.c	optional netlink
 netlink/netlink_route.c		optional netlink
 netlink/route/iface_drivers.c	optional netlink
 netlink/route/iface.c		optional netlink
 netlink/route/neigh.c		optional netlink
 netlink/route/nexthop.c		optional netlink
 netlink/route/rt.c		optional netlink
 netpfil/ipfw/dn_aqm_codel.c	optional inet dummynet
 netpfil/ipfw/dn_aqm_pie.c	optional inet dummynet
 netpfil/ipfw/dn_heap.c		optional inet dummynet
 netpfil/ipfw/dn_sched_fifo.c	optional inet dummynet
 netpfil/ipfw/dn_sched_fq_codel.c	optional inet dummynet
 netpfil/ipfw/dn_sched_fq_pie.c	optional inet dummynet
 netpfil/ipfw/dn_sched_prio.c	optional inet dummynet
 netpfil/ipfw/dn_sched_qfq.c	optional inet dummynet
 netpfil/ipfw/dn_sched_rr.c	optional inet dummynet
 netpfil/ipfw/dn_sched_wf2q.c	optional inet dummynet
 netpfil/ipfw/ip_dummynet.c	optional inet dummynet
 netpfil/ipfw/ip_dn_io.c		optional inet dummynet
 netpfil/ipfw/ip_dn_glue.c	optional inet dummynet
 netpfil/ipfw/ip_fw2.c		optional inet ipfirewall
 netpfil/ipfw/ip_fw_bpf.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_dynamic.c	optional inet ipfirewall \
 	compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 netpfil/ipfw/ip_fw_eaction.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_log.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_pfil.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_sockopt.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_table.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_table_algo.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_table_value.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_iface.c	optional inet ipfirewall
 netpfil/ipfw/ip_fw_nat.c	optional inet ipfirewall_nat
 netpfil/ipfw/nat64/ip_fw_nat64.c	optional inet inet6 ipfirewall \
 	ipfirewall_nat64
 netpfil/ipfw/nat64/nat64clat.c	optional inet inet6 ipfirewall \
 	ipfirewall_nat64
 netpfil/ipfw/nat64/nat64clat_control.c	optional inet inet6 ipfirewall \
 	ipfirewall_nat64
 netpfil/ipfw/nat64/nat64lsn.c	optional inet inet6 ipfirewall \
 	ipfirewall_nat64 compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 netpfil/ipfw/nat64/nat64lsn_control.c	optional inet inet6 ipfirewall \
 	ipfirewall_nat64 compile-with "${NORMAL_C} -I$S/contrib/ck/include"
 netpfil/ipfw/nat64/nat64stl.c	optional inet inet6 ipfirewall \
 	ipfirewall_nat64
 netpfil/ipfw/nat64/nat64stl_control.c	optional inet inet6 ipfirewall \
 	ipfirewall_nat64
 netpfil/ipfw/nat64/nat64_translate.c	optional inet inet6 ipfirewall \
 	ipfirewall_nat64
 netpfil/ipfw/nptv6/ip_fw_nptv6.c	optional inet inet6 ipfirewall \
 	ipfirewall_nptv6
 netpfil/ipfw/nptv6/nptv6.c	optional inet inet6 ipfirewall \
 	ipfirewall_nptv6
 netpfil/ipfw/pmod/ip_fw_pmod.c	optional inet ipfirewall_pmod
 netpfil/ipfw/pmod/tcpmod.c	optional inet ipfirewall_pmod
 netpfil/pf/if_pflog.c		optional pflog pf inet
 netpfil/pf/if_pfsync.c		optional pfsync pf inet
 netpfil/pf/pf.c			optional pf inet
 netpfil/pf/pf_if.c		optional pf inet
 netpfil/pf/pf_ioctl.c		optional pf inet
 netpfil/pf/pf_lb.c		optional pf inet
 netpfil/pf/pf_norm.c		optional pf inet
 netpfil/pf/pf_nv.c		optional pf inet
 netpfil/pf/pf_osfp.c		optional pf inet
 netpfil/pf/pf_ruleset.c		optional pf inet
 netpfil/pf/pf_syncookies.c	optional pf inet
 netpfil/pf/pf_table.c		optional pf inet
 netpfil/pf/pfsync_nv.c		optional pfsync pf inet
 netpfil/pf/in4_cksum.c		optional pf inet
 netsmb/smb_conn.c		optional netsmb
 netsmb/smb_crypt.c		optional netsmb
 netsmb/smb_dev.c		optional netsmb
 netsmb/smb_iod.c		optional netsmb
 netsmb/smb_rq.c			optional netsmb
 netsmb/smb_smb.c		optional netsmb
 netsmb/smb_subr.c		optional netsmb
 netsmb/smb_trantcp.c		optional netsmb
 netsmb/smb_usr.c		optional netsmb
 nfs/bootp_subr.c		optional bootp nfscl
 nfs/krpc_subr.c			optional bootp nfscl
 nfs/nfs_diskless.c		optional nfscl nfs_root
 nfs/nfs_nfssvc.c		optional nfscl | nfslockd | nfsd
 nlm/nlm_advlock.c		optional nfslockd | nfsd
 nlm/nlm_prot_clnt.c		optional nfslockd | nfsd
 nlm/nlm_prot_impl.c		optional nfslockd | nfsd
 nlm/nlm_prot_server.c		optional nfslockd | nfsd
 nlm/nlm_prot_svc.c		optional nfslockd | nfsd
 nlm/nlm_prot_xdr.c		optional nfslockd | nfsd
 nlm/sm_inter_xdr.c		optional nfslockd | nfsd
 
 # Linux Kernel Programming Interface
 compat/linuxkpi/common/src/linux_80211.c	optional compat_linuxkpi wlan \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_80211_macops.c	optional compat_linuxkpi wlan \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_kmod.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_acpi.c		optional compat_linuxkpi acpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_compat.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_current.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_devres.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_dmi.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_domain.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_firmware.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_fpu.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_hrtimer.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_i2c.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_i2cbb.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_interrupt.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_kthread.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_lock.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_netdev.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_page.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_pci.c		optional compat_linuxkpi pci \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_tasklet.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_idr.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_radix.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_rcu.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C} -I$S/contrib/ck/include"
 compat/linuxkpi/common/src/linux_schedule.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_shmemfs.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_shrinker.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_skbuff.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_slab.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_usb.c		optional compat_linuxkpi usb \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_work.c		optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_xarray.c	optional compat_linuxkpi \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/lkpi_iic_if.m	optional compat_linuxkpi
 
 compat/linuxkpi/common/src/linux_seq_file.c	optional compat_linuxkpi | lindebugfs \
 	compile-with "${LINUXKPI_C}"
 compat/linuxkpi/common/src/linux_simple_attr.c	optional compat_linuxkpi | lindebugfs \
 	compile-with "${LINUXKPI_C}"
 compat/lindebugfs/lindebugfs.c			optional lindebugfs \
 	compile-with "${LINUXKPI_C}"
 
 # OpenFabrics Enterprise Distribution (Infiniband)
 net/if_infiniband.c					optional ofed | lagg
 ofed/drivers/infiniband/core/ib_addr.c			optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_agent.c			optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_cache.c			optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_cm.c			optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_cma.c			optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_core_uverbs.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_cq.c			optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_device.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_fmr_pool.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_iwcm.c			optional ofed	\
 	compile-with "${OFED_C} ${NO_WUNUSED_BUT_SET_VARIABLE}"
 ofed/drivers/infiniband/core/ib_iwpm_msg.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_iwpm_util.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_mad.c			optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_mad_rmpp.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_multicast.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_packer.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_rdma_core.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_sa_query.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_smi.c			optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_sysfs.c			optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_ucm.c			optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_ucma.c			optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_ud_header.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_umem.c			optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_user_mad.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_uverbs_cmd.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_uverbs_ioctl.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_uverbs_main.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_uverbs_marshall.c	optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_uverbs_std_types.c	optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_uverbs_std_types_async_fd.c	optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_uverbs_std_types_counters.c	optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_uverbs_std_types_cq.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_uverbs_std_types_device.c	optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_uverbs_std_types_dm.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_uverbs_std_types_flow_action.c	optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_uverbs_std_types_mr.c	optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_uverbs_uapi.c		optional ofed	\
 	compile-with "${OFED_C}"
 ofed/drivers/infiniband/core/ib_verbs.c			optional ofed	\
 	compile-with "${OFED_C}"
 
 ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c	optional ipoib		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
 #ofed/drivers/infiniband/ulp/ipoib/ipoib_fs.c	optional ipoib		\
 #	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
 ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c	optional ipoib		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
 ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c	optional ipoib		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
 ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c	optional ipoib	\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
 ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c	optional ipoib		\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
 #ofed/drivers/infiniband/ulp/ipoib/ipoib_vlan.c	optional ipoib		\
 #	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/ipoib/"
 
 ofed/drivers/infiniband/ulp/sdp/sdp_bcopy.c	optional sdp inet	\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/"
 ofed/drivers/infiniband/ulp/sdp/sdp_main.c	optional sdp inet 	\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/"
 ofed/drivers/infiniband/ulp/sdp/sdp_rx.c	optional sdp inet 	\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/ ${NO_WUNUSED_BUT_SET_VARIABLE}"
 ofed/drivers/infiniband/ulp/sdp/sdp_cma.c	optional sdp inet 	\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/"
 ofed/drivers/infiniband/ulp/sdp/sdp_tx.c	optional sdp inet 	\
 	compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/ ${NO_WUNUSED_BUT_SET_VARIABLE}"
 
 dev/irdma/icrdma.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 dev/irdma/irdma_cm.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 dev/irdma/irdma_ctrl.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 dev/irdma/irdma_hmc.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 dev/irdma/irdma_hw.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 dev/irdma/icrdma_hw.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 dev/irdma/fbsd_kcompat.c	optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 dev/irdma/irdma_kcompat.c	optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 dev/irdma/irdma_pble.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 dev/irdma/irdma_puda.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 dev/irdma/irdma_uda.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 dev/irdma/irdma_uk.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 dev/irdma/irdma_utils.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 dev/irdma/irdma_verbs.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 dev/irdma/irdma_ws.c		optional irdma ice inet inet6 pci ofed \
 	compile-with "${OFED_C} -I$S/dev/ice/"
 
 dev/mthca/mthca_allocator.c		optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_av.c			optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_catas.c			optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_cmd.c			optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_cq.c			optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_eq.c			optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_mad.c			optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_main.c			optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_mcg.c			optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_memfree.c		optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_mr.c			optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_pd.c			optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_profile.c		optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_provider.c		optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_qp.c			optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_reset.c			optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_srq.c			optional mthca pci ofed \
 	compile-with "${OFED_C}"
 dev/mthca/mthca_uar.c			optional mthca pci ofed \
 	compile-with "${OFED_C}"
 
 dev/mlx4/mlx4_ib/mlx4_ib_alias_GUID.c		optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_mcg.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_sysfs.c		optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_cm.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_ah.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_cq.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_doorbell.c		optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_mad.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_main.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_mr.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_qp.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_srq.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_ib/mlx4_ib_wc.c			optional mlx4ib pci ofed \
 	compile-with "${OFED_C}"
 
 dev/mlx4/mlx4_core/mlx4_alloc.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_catas.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_cmd.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_cq.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_eq.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_fw.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_fw_qos.c		optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_icm.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_intf.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_main.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_mcg.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_mr.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_pd.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_port.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_profile.c		optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_qp.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_reset.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_sense.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_srq.c			optional mlx4 pci \
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_core/mlx4_resource_tracker.c	optional mlx4 pci \
 	compile-with "${OFED_C}"
 
 dev/mlx4/mlx4_en/mlx4_en_cq.c			optional mlx4en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_en/mlx4_en_main.c			optional mlx4en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_en/mlx4_en_netdev.c		optional mlx4en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_en/mlx4_en_port.c			optional mlx4en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_en/mlx4_en_resources.c		optional mlx4en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_en/mlx4_en_rx.c			optional mlx4en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx4/mlx4_en/mlx4_en_tx.c			optional mlx4en pci inet inet6	\
 	compile-with "${OFED_C}"
 
 dev/mlx5/mlx5_ib/mlx5_ib_ah.c			optional mlx5ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_ib/mlx5_ib_cong.c			optional mlx5ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_ib/mlx5_ib_cq.c			optional mlx5ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_ib/mlx5_ib_devx.c			optional mlx5ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_ib/mlx5_ib_doorbell.c		optional mlx5ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_ib/mlx5_ib_gsi.c			optional mlx5ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_ib/mlx5_ib_mad.c			optional mlx5ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_ib/mlx5_ib_main.c			optional mlx5ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_ib/mlx5_ib_mem.c			optional mlx5ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_ib/mlx5_ib_mr.c			optional mlx5ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_ib/mlx5_ib_qp.c			optional mlx5ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_ib/mlx5_ib_srq.c			optional mlx5ib pci ofed \
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_ib/mlx5_ib_virt.c			optional mlx5ib pci ofed \
 	compile-with "${OFED_C}"
 
 dev/mlx5/mlx5_core/mlx5_alloc.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_cmd.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_cq.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_diagnostics.c		optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_eq.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_eswitch.c		optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_fs_cmd.c		optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_fs_tcp.c		optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_fs_tree.c		optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_fw.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_fwdump.c		optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_health.c		optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_mad.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_main.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_mcg.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_mpfs.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_mr.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_pagealloc.c		optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_pd.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_port.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_qp.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_rl.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_srq.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_tls.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_transobj.c		optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_uar.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_vport.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_vsc.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_core/mlx5_wq.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_lib/mlx5_gid.c			optional mlx5 pci	\
 	compile-with "${OFED_C}"
 
 dev/mlx5/mlx5_en/mlx5_en_dim.c			optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_ethtool.c		optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_main.c			optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_tx.c			optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_flow_table.c		optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_hw_tls.c		optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_hw_tls_rx.c		optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_iq.c			optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_rx.c			optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_rl.c			optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_txrx.c			optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 dev/mlx5/mlx5_en/mlx5_en_port_buffer.c		optional mlx5en pci inet inet6	\
 	compile-with "${OFED_C}"
 
 # crypto support
 opencrypto/cbc_mac.c		optional crypto
 opencrypto/criov.c		optional crypto
 opencrypto/crypto.c		optional crypto
 opencrypto/cryptodev.c		optional cryptodev
 opencrypto/cryptodev_if.m	optional crypto
 opencrypto/cryptosoft.c		optional crypto
 opencrypto/cryptodeflate.c	optional crypto
 opencrypto/gmac.c		optional crypto
 opencrypto/gfmult.c		optional crypto
 opencrypto/ktls_ocf.c		optional kern_tls
 opencrypto/rmd160.c		optional crypto
 opencrypto/xform_aes_cbc.c	optional crypto
 opencrypto/xform_aes_icm.c	optional crypto
 opencrypto/xform_aes_xts.c	optional crypto
 opencrypto/xform_cbc_mac.c	optional crypto
 opencrypto/xform_chacha20_poly1305.c	optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium"
 opencrypto/xform_cml.c		optional crypto
 opencrypto/xform_deflate.c	optional crypto
 opencrypto/xform_gmac.c		optional crypto
 opencrypto/xform_null.c		optional crypto
 opencrypto/xform_poly1305.c	optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium"
 opencrypto/xform_rmd160.c	optional crypto
 opencrypto/xform_sha1.c		optional crypto
 opencrypto/xform_sha2.c		optional crypto
 contrib/libsodium/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c \
 	optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium -Wno-unused-function"
 contrib/libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.c \
 	optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
 contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c \
 	optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
 contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.c \
 	optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
 contrib/libsodium/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c \
 	optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
 contrib/libsodium/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c \
 	optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium -Wno-unused-function"
 contrib/libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c \
 	optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
 contrib/libsodium/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.c \
 	optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
 contrib/libsodium/src/libsodium/crypto_verify/sodium/verify.c \
 	optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
 crypto/libsodium/randombytes.c	optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium"
 crypto/libsodium/utils.c	optional crypto \
 	compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium"
 
 rpc/auth_none.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/auth_unix.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/authunix_prot.c		optional krpc | nfslockd | nfscl | nfsd
 rpc/clnt_bck.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/clnt_dg.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/clnt_rc.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/clnt_vc.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/getnetconfig.c		optional krpc | nfslockd | nfscl | nfsd
 rpc/replay.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/rpc_callmsg.c		optional krpc | nfslockd | nfscl | nfsd
 rpc/rpc_generic.c		optional krpc | nfslockd | nfscl | nfsd
 rpc/rpc_prot.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/rpcb_clnt.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/rpcb_prot.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/svc.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/svc_auth.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/svc_auth_unix.c		optional krpc | nfslockd | nfscl | nfsd
 rpc/svc_dg.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/svc_generic.c		optional krpc | nfslockd | nfscl | nfsd
 rpc/svc_vc.c			optional krpc | nfslockd | nfscl | nfsd
 #
 # Kernel RPC-over-TLS
 #
 rpctlscd.h			optional krpc | nfslockd | nfscl | nfsd	\
 	dependency		"$S/rpc/rpcsec_tls/rpctlscd.x"			\
 	compile-with		"RPCGEN_CPP='${CPP}' rpcgen -hM $S/rpc/rpcsec_tls/rpctlscd.x | grep -v pthread.h > rpctlscd.h" \
 	no-obj no-implicit-rule before-depend local			\
 	clean			"rpctlscd.h"
 rpctlscd_xdr.c			optional krpc | nfslockd | nfscl | nfsd	\
 	dependency		"$S/rpc/rpcsec_tls/rpctlscd.x rpctlscd.h"		\
 	compile-with		"RPCGEN_CPP='${CPP}' rpcgen -c $S/rpc/rpcsec_tls/rpctlscd.x -o rpctlscd_xdr.c" no-ctfconvert \
 	no-implicit-rule before-depend local				\
 	clean			"rpctlscd_xdr.c"
 rpctlscd_clnt.c			optional krpc | nfslockd | nfscl | nfsd	\
 	dependency		"$S/rpc/rpcsec_tls/rpctlscd.x rpctlscd.h"		\
 	compile-with		"RPCGEN_CPP='${CPP}' rpcgen -lM $S/rpc/rpcsec_tls/rpctlscd.x | grep -v string.h > rpctlscd_clnt.c" no-ctfconvert \
 	no-implicit-rule before-depend local				\
 	clean			"rpctlscd_clnt.c"
 rpctlssd.h			optional krpc | nfslockd | nfscl | nfsd	\
 	dependency		"$S/rpc/rpcsec_tls/rpctlssd.x"			\
 	compile-with		"RPCGEN_CPP='${CPP}' rpcgen -hM $S/rpc/rpcsec_tls/rpctlssd.x | grep -v pthread.h > rpctlssd.h" \
 	no-obj no-implicit-rule before-depend local			\
 	clean			"rpctlssd.h"
 rpctlssd_xdr.c			optional krpc | nfslockd | nfscl | nfsd	\
 	dependency		"$S/rpc/rpcsec_tls/rpctlssd.x rpctlssd.h"		\
 	compile-with		"RPCGEN_CPP='${CPP}' rpcgen -c $S/rpc/rpcsec_tls/rpctlssd.x -o rpctlssd_xdr.c" no-ctfconvert \
 	no-implicit-rule before-depend local				\
 	clean			"rpctlssd_xdr.c"
 rpctlssd_clnt.c			optional krpc | nfslockd | nfscl | nfsd	\
 	dependency		"$S/rpc/rpcsec_tls/rpctlssd.x rpctlssd.h"		\
 	compile-with		"RPCGEN_CPP='${CPP}' rpcgen -lM $S/rpc/rpcsec_tls/rpctlssd.x | grep -v string.h > rpctlssd_clnt.c" no-ctfconvert \
 	no-implicit-rule before-depend local				\
 	clean			"rpctlssd_clnt.c"
 rpc/rpcsec_tls/rpctls_impl.c	optional krpc | nfslockd | nfscl | nfsd
 rpc/rpcsec_tls/auth_tls.c	optional krpc | nfslockd | nfscl | nfsd
 rpc/rpcsec_gss/rpcsec_gss.c	optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi
 rpc/rpcsec_gss/rpcsec_gss_conf.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi
 rpc/rpcsec_gss/rpcsec_gss_misc.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi
 rpc/rpcsec_gss/rpcsec_gss_prot.c optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi
 rpc/rpcsec_gss/svc_rpcsec_gss.c	optional krpc kgssapi | nfslockd kgssapi | nfscl kgssapi | nfsd kgssapi
 security/audit/audit.c		optional audit
 security/audit/audit_arg.c	optional audit
 security/audit/audit_bsm.c	optional audit
 security/audit/audit_bsm_db.c	optional audit
 security/audit/audit_bsm_klib.c	optional audit
 security/audit/audit_dtrace.c	optional dtaudit audit | dtraceall audit compile-with "${CDDL_C}"
 security/audit/audit_pipe.c	optional audit
 security/audit/audit_syscalls.c	standard
 security/audit/audit_trigger.c	optional audit
 security/audit/audit_worker.c	optional audit
 security/audit/bsm_domain.c	optional audit
 security/audit/bsm_errno.c	optional audit
 security/audit/bsm_fcntl.c	optional audit
 security/audit/bsm_socket_type.c	optional audit
 security/audit/bsm_token.c	optional audit
 security/mac/mac_audit.c	optional mac audit
 security/mac/mac_cred.c		optional mac
 security/mac/mac_kdb.c		optional mac
 security/mac/mac_framework.c	optional mac
 security/mac/mac_inet.c		optional mac inet | mac inet6
 security/mac/mac_inet6.c	optional mac inet6
 security/mac/mac_label.c	optional mac
 security/mac/mac_net.c		optional mac
 security/mac/mac_pipe.c		optional mac
 security/mac/mac_posix_sem.c	optional mac
 security/mac/mac_posix_shm.c	optional mac
 security/mac/mac_priv.c		optional mac
 security/mac/mac_process.c	optional mac
 security/mac/mac_socket.c	optional mac
 security/mac/mac_syscalls.c	standard
 security/mac/mac_system.c	optional mac
 security/mac/mac_sysv_msg.c	optional mac
 security/mac/mac_sysv_sem.c	optional mac
 security/mac/mac_sysv_shm.c	optional mac
 security/mac/mac_vfs.c		optional mac
 security/mac_biba/mac_biba.c	optional mac_biba
 security/mac_ddb/mac_ddb.c	optional mac_ddb
 security/mac_bsdextended/mac_bsdextended.c	optional mac_bsdextended
 security/mac_bsdextended/ugidfw_system.c	optional mac_bsdextended
 security/mac_bsdextended/ugidfw_vnode.c		optional mac_bsdextended
 security/mac_ifoff/mac_ifoff.c	optional mac_ifoff
 security/mac_lomac/mac_lomac.c	optional mac_lomac
 security/mac_mls/mac_mls.c	optional mac_mls
 security/mac_none/mac_none.c	optional mac_none
 security/mac_ntpd/mac_ntpd.c	optional mac_ntpd
 security/mac_partition/mac_partition.c optional mac_partition
 security/mac_portacl/mac_portacl.c optional mac_portacl
 security/mac_priority/mac_priority.c	optional mac_priority
 security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids
 security/mac_stub/mac_stub.c	optional mac_stub
 security/mac_test/mac_test.c	optional mac_test
 security/mac_veriexec/mac_veriexec.c			optional mac_veriexec
 security/mac_veriexec/veriexec_fingerprint.c		optional mac_veriexec
 security/mac_veriexec/veriexec_metadata.c		optional mac_veriexec
 security/mac_veriexec_parser/mac_veriexec_parser.c	optional mac_veriexec mac_veriexec_parser
 security/mac_veriexec/mac_veriexec_rmd160.c		optional mac_veriexec_rmd160
 security/mac_veriexec/mac_veriexec_sha1.c		optional mac_veriexec_sha1
 security/mac_veriexec/mac_veriexec_sha256.c		optional mac_veriexec_sha256
 security/mac_veriexec/mac_veriexec_sha384.c		optional mac_veriexec_sha384
 security/mac_veriexec/mac_veriexec_sha512.c		optional mac_veriexec_sha512
 teken/teken.c			optional sc !SC_NO_TERM_TEKEN | vt
 ufs/ffs/ffs_alloc.c		optional ffs
 ufs/ffs/ffs_balloc.c		optional ffs
 ufs/ffs/ffs_inode.c		optional ffs
 ufs/ffs/ffs_snapshot.c		optional ffs
 ufs/ffs/ffs_softdep.c		optional ffs
 ufs/ffs/ffs_subr.c		optional ffs | geom_label
 ufs/ffs/ffs_tables.c		optional ffs | geom_label
 ufs/ffs/ffs_vfsops.c		optional ffs
 ufs/ffs/ffs_vnops.c		optional ffs
 ufs/ffs/ffs_rawread.c		optional ffs directio
 ufs/ffs/ffs_suspend.c		optional ffs
 ufs/ufs/ufs_acl.c		optional ffs
 ufs/ufs/ufs_bmap.c		optional ffs
 ufs/ufs/ufs_dirhash.c		optional ffs
 ufs/ufs/ufs_extattr.c		optional ffs
 ufs/ufs/ufs_gjournal.c		optional ffs UFS_GJOURNAL
 ufs/ufs/ufs_inode.c		optional ffs
 ufs/ufs/ufs_lookup.c		optional ffs
 ufs/ufs/ufs_quota.c		optional ffs
 ufs/ufs/ufs_vfsops.c		optional ffs
 ufs/ufs/ufs_vnops.c		optional ffs
 vm/device_pager.c		standard
 vm/phys_pager.c			standard
 vm/redzone.c			optional DEBUG_REDZONE
 vm/sg_pager.c			standard
 vm/swap_pager.c			standard
 vm/uma_core.c			standard
 vm/uma_dbg.c			standard
 vm/memguard.c			optional DEBUG_MEMGUARD
 vm/vm_domainset.c		standard
 vm/vm_fault.c			standard
 vm/vm_glue.c			standard
 vm/vm_init.c			standard
 vm/vm_kern.c			standard
 vm/vm_map.c			standard
 vm/vm_meter.c			standard
 vm/vm_mmap.c			standard
 vm/vm_object.c			standard
 vm/vm_page.c			standard
 vm/vm_pageout.c			standard
 vm/vm_pager.c			standard
 vm/vm_phys.c			standard
 vm/vm_radix.c			standard
 vm/vm_reserv.c			standard
 vm/vm_swapout.c			optional !NO_SWAPPING
 vm/vm_swapout_dummy.c		optional NO_SWAPPING
 vm/vm_unix.c			standard
 vm/vnode_pager.c		standard
 xen/features.c			optional xenhvm
 xen/xenbus/xenbus_if.m		optional xenhvm
 xen/xenbus/xenbus.c		optional xenhvm
 xen/xenbus/xenbusb_if.m		optional xenhvm
 xen/xenbus/xenbusb.c		optional xenhvm
 xen/xenbus/xenbusb_front.c	optional xenhvm
 xen/xenbus/xenbusb_back.c	optional xenhvm
 xen/xenmem/xenmem_if.m		optional xenhvm
 xdr/xdr.c			optional xdr | krpc | nfslockd | nfscl | nfsd
 xdr/xdr_array.c			optional xdr | krpc | nfslockd | nfscl | nfsd
 xdr/xdr_mbuf.c			optional xdr | krpc | nfslockd | nfscl | nfsd
 xdr/xdr_mem.c			optional xdr | krpc | nfslockd | nfscl | nfsd
 xdr/xdr_reference.c		optional xdr | krpc | nfslockd | nfscl | nfsd
 xdr/xdr_sizeof.c		optional xdr | krpc | nfslockd | nfscl | nfsd
diff --git a/sys/conf/options b/sys/conf/options
index af83bc967670..a1b278491a73 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,1034 +1,1027 @@
 # $FreeBSD$
 #
 #        On the handling of kernel options
 #
 # All kernel options should be listed in NOTES, with suitable
 # descriptions.  Negative options (options that make some code not
 # compile) should be commented out; LINT (generated from NOTES) should
 # compile as much code as possible.  Try to structure option-using
 # code so that a single option only switch code on, or only switch
 # code off, to make it possible to have a full compile-test.  If
 # necessary, you can check for COMPILING_LINT to get maximum code
 # coverage.
 #
 # All new options shall also be listed in either "conf/options" or
 # "conf/options.<machine>".  Options that affect a single source-file
 # <xxx>.[c|s] should be directed into "opt_<xxx>.h", while options
 # that affect multiple files should either go in "opt_global.h" if
 # this is a kernel-wide option (used just about everywhere), or in
 # "opt_<option-name-in-lower-case>.h" if it affects only some files.
 # Note that the effect of listing only an option without a
 # header-file-name in conf/options (and cousins) is that the last
 # convention is followed.
 #
 # This handling scheme is not yet fully implemented.
 #
 #
 # Format of this file:
 # Option name	filename
 #
 # If filename is missing, the default is
 # opt_<name-of-option-in-lower-case>.h
 
 AAC_DEBUG		opt_aac.h
 AACRAID_DEBUG		opt_aacraid.h
 AHC_ALLOW_MEMIO		opt_aic7xxx.h
 AHC_TMODE_ENABLE	opt_aic7xxx.h
 AHC_DUMP_EEPROM		opt_aic7xxx.h
 AHC_DEBUG		opt_aic7xxx.h
 AHC_DEBUG_OPTS		opt_aic7xxx.h
 AHC_REG_PRETTY_PRINT	opt_aic7xxx.h
 AHD_DEBUG		opt_aic79xx.h
 AHD_DEBUG_OPTS		opt_aic79xx.h
 AHD_TMODE_ENABLE	opt_aic79xx.h	
 AHD_REG_PRETTY_PRINT	opt_aic79xx.h
 
 # Debugging options.
 ALT_BREAK_TO_DEBUGGER	opt_kdb.h
 BREAK_TO_DEBUGGER	opt_kdb.h
 BUF_TRACKING		opt_global.h
 DDB
 DDB_BUFR_SIZE	opt_ddb.h
 DDB_CAPTURE_DEFAULTBUFSIZE	opt_ddb.h
 DDB_CAPTURE_MAXBUFSIZE	opt_ddb.h
 DDB_CTF		opt_ddb.h
 DDB_NUMSYM	opt_ddb.h
 EARLY_PRINTF	opt_global.h
 FULL_BUF_TRACKING	opt_global.h
 GDB
 KDB		opt_global.h
 KDB_TRACE	opt_kdb.h
 KDB_UNATTENDED	opt_kdb.h
 KLD_DEBUG	opt_kld.h
 NUM_CORE_FILES	opt_global.h
 QUEUE_MACRO_DEBUG_TRACE	opt_global.h
 QUEUE_MACRO_DEBUG_TRASH	opt_global.h
 SYSCTL_DEBUG	opt_sysctl.h
 TEXTDUMP_PREFERRED	opt_ddb.h
 TEXTDUMP_VERBOSE	opt_ddb.h
 TSLOG	opt_global.h
 TSLOGSIZE	opt_global.h
 
 # Miscellaneous options.
 ALQ
 ALTERA_SDCARD_FAST_SIM	opt_altera_sdcard.h
 ATSE_CFI_HACK	opt_cfi.h
 AUDIT		opt_global.h
 BOOTHOWTO	opt_global.h
 BOOTVERBOSE	opt_global.h
 CALLOUT_PROFILING
 CAPABILITIES	opt_capsicum.h
 CAPABILITY_MODE	opt_capsicum.h
 CC_CDG		opt_global.h
 CC_CHD		opt_global.h
 CC_CUBIC	opt_global.h
 CC_DEFAULT	opt_cc.h
 CC_DCTCP	opt_global.h
 CC_HD		opt_global.h
 CC_HTCP		opt_global.h
 CC_NEWRENO	opt_global.h
 CC_VEGAS	opt_global.h
 COMPAT_43	opt_global.h
 COMPAT_43TTY	opt_global.h
 COMPAT_FREEBSD4	opt_global.h
 COMPAT_FREEBSD5	opt_global.h
 COMPAT_FREEBSD6	opt_global.h
 COMPAT_FREEBSD7	opt_global.h
 COMPAT_FREEBSD9	opt_global.h
 COMPAT_FREEBSD10	opt_global.h
 COMPAT_FREEBSD11	opt_global.h
 COMPAT_FREEBSD12	opt_global.h
 COMPAT_FREEBSD13	opt_global.h
 COMPAT_LINUXKPI	opt_dontuse.h
 COMPILING_LINT	opt_global.h
 CY_PCI_FASTINTR
 DEADLKRES	opt_watchdog.h
 EXPERIMENTAL	opt_global.h
 DIRECTIO
 FILEMON		opt_dontuse.h
 FFCLOCK
 FULL_PREEMPTION	opt_sched.h
 GZIO		opt_gzio.h
 IMGACT_BINMISC		opt_dontuse.h
 IPI_PREEMPTION	opt_sched.h
 GEOM_BDE	opt_geom.h
 GEOM_CACHE	opt_geom.h
 GEOM_CONCAT	opt_geom.h
 GEOM_ELI	opt_geom.h
 GEOM_GATE	opt_geom.h
 GEOM_JOURNAL	opt_geom.h
 GEOM_LABEL	opt_geom.h
 GEOM_LABEL_GPT	opt_geom.h
 GEOM_LINUX_LVM	opt_geom.h
 GEOM_MAP	opt_geom.h
 GEOM_MIRROR	opt_geom.h
 GEOM_MOUNTVER	opt_geom.h
 GEOM_MULTIPATH	opt_geom.h
 GEOM_NOP	opt_geom.h
 GEOM_PART_APM	opt_geom.h
 GEOM_PART_BSD	opt_geom.h
 GEOM_PART_BSD64	opt_geom.h
 GEOM_PART_EBR	opt_geom.h
 GEOM_PART_GPT	opt_geom.h
 GEOM_PART_LDM	opt_geom.h
 GEOM_PART_MBR	opt_geom.h
 GEOM_PART_VTOC8	opt_geom.h
 GEOM_RAID	opt_geom.h
 GEOM_RAID3	opt_geom.h
 GEOM_SHSEC	opt_geom.h
 GEOM_STRIPE	opt_geom.h
 GEOM_UZIP	opt_geom.h
 GEOM_UZIP_DEBUG	opt_geom.h
 GEOM_VINUM	opt_geom.h
 GEOM_VIRSTOR	opt_geom.h
 GEOM_ZERO	opt_geom.h
 IFLIB		opt_iflib.h
 KDTRACE_HOOKS	opt_global.h
 KDTRACE_FRAME	opt_kdtrace.h
 KN_HASHSIZE	opt_kqueue.h
 KSTACK_MAX_PAGES
 KSTACK_PAGES
 KSTACK_USAGE_PROF
 KTRACE
 KTRACE_REQUEST_POOL	opt_ktrace.h
 LIBICONV
 MAC		opt_global.h
 MAC_BIBA	opt_dontuse.h
 MAC_BSDEXTENDED	opt_dontuse.h
 MAC_DDB		opt_dontuse.h
 MAC_IFOFF	opt_dontuse.h
 MAC_LOMAC	opt_dontuse.h
 MAC_MLS		opt_dontuse.h
 MAC_NONE	opt_dontuse.h
 MAC_NTPD	opt_dontuse.h
 MAC_PARTITION	opt_dontuse.h
 MAC_PORTACL	opt_dontuse.h
 MAC_PRIORITY	opt_dontuse.h
 MAC_SEEOTHERUIDS	opt_dontuse.h
 MAC_STATIC	opt_mac.h
 MAC_STUB	opt_dontuse.h
 MAC_TEST	opt_dontuse.h
 MAC_VERIEXEC	opt_dontuse.h
 MAC_VERIEXEC_SHA1	opt_dontuse.h
 MAC_VERIEXEC_SHA256	opt_dontuse.h
 MAC_VERIEXEC_SHA384	opt_dontuse.h
 MAC_VERIEXEC_SHA512	opt_dontuse.h
 MD_ROOT		opt_md.h
 MD_ROOT_FSTYPE	opt_md.h
 MD_ROOT_READONLY	opt_md.h
 MD_ROOT_SIZE	opt_md.h
 MD_ROOT_MEM	opt_md.h
 MFI_DEBUG	opt_mfi.h
 MFI_DECODE_LOG	opt_mfi.h
 MPROF_BUFFERS	opt_mprof.h
 MPROF_HASH_SIZE	opt_mprof.h
 NEW_PCIB	opt_global.h
 NO_ADAPTIVE_MUTEXES	opt_adaptive_mutexes.h
 NO_ADAPTIVE_RWLOCKS
 NO_ADAPTIVE_SX
 NO_OBSOLETE_CODE	opt_global.h
 NO_SYSCTL_DESCR	opt_global.h
 NSWBUF_MIN	opt_param.h
 MBUF_PACKET_ZONE_DISABLE	opt_global.h
 PANIC_REBOOT_WAIT_TIME	opt_panic.h
 PCI_HP		opt_pci.h
 PCI_IOV		opt_global.h
 PPC_DEBUG	opt_ppc.h
 PPC_PROBE_CHIPSET	opt_ppc.h
 PPS_SYNC	opt_ntp.h
 PREEMPTION	opt_sched.h
 QUOTA
 SCHED_4BSD	opt_sched.h
 SCHED_STATS	opt_sched.h
 SCHED_ULE	opt_sched.h
 SLEEPQUEUE_PROFILING
 SLHCI_DEBUG	opt_slhci.h
 STACK		opt_stack.h
 SUIDDIR
 MSGMNB		opt_sysvipc.h
 MSGMNI		opt_sysvipc.h
 MSGSEG		opt_sysvipc.h
 MSGSSZ		opt_sysvipc.h
 MSGTQL		opt_sysvipc.h
 SEMMNI		opt_sysvipc.h
 SEMMNS		opt_sysvipc.h
 SEMMNU		opt_sysvipc.h
 SEMMSL		opt_sysvipc.h
 SEMOPM		opt_sysvipc.h
 SEMUME		opt_sysvipc.h
 SHMALL		opt_sysvipc.h
 SHMMAX		opt_sysvipc.h
 SHMMAXPGS	opt_sysvipc.h
 SHMMIN		opt_sysvipc.h
 SHMMNI		opt_sysvipc.h
 SHMSEG		opt_sysvipc.h
 SYSVMSG		opt_sysvipc.h
 SYSVSEM		opt_sysvipc.h
 SYSVSHM		opt_sysvipc.h
 SW_WATCHDOG	opt_watchdog.h
 TCPHPTS         opt_inet.h
 TURNSTILE_PROFILING
 UMTX_PROFILING
 UMTX_CHAINS	opt_global.h
 VERBOSE_SYSINIT
 ZSTDIO		opt_zstdio.h
 
 # Sanitizers
 COVERAGE	opt_global.h
 KASAN		opt_global.h
 KCOV
 KCSAN		opt_global.h
 KMSAN		opt_global.h
 KUBSAN		opt_global.h
 
 # POSIX kernel options
 P1003_1B_MQUEUE			opt_posix.h
 P1003_1B_SEMAPHORES		opt_posix.h
 _KPOSIX_PRIORITY_SCHEDULING	opt_posix.h
 
 # Do we want the config file compiled into the kernel?
 INCLUDE_CONFIG_FILE	opt_config.h
 
 # Options for static filesystems.  These should only be used at config
 # time, since the corresponding lkms cannot work if there are any static
 # dependencies.  Unusability is enforced by hiding the defines for the
 # options in a never-included header.
 AUTOFS		opt_dontuse.h
 CD9660		opt_dontuse.h
 EXT2FS		opt_dontuse.h
 FDESCFS		opt_dontuse.h
 FFS		opt_dontuse.h
 FUSEFS		opt_dontuse.h
 MSDOSFS		opt_dontuse.h
 NULLFS		opt_dontuse.h
 PROCFS		opt_dontuse.h
 PSEUDOFS	opt_dontuse.h
 SMBFS		opt_dontuse.h
 TARFS		opt_dontuse.h
 TMPFS		opt_dontuse.h
 UDF		opt_dontuse.h
 UNIONFS		opt_dontuse.h
 ZFS		opt_dontuse.h
 
 # Pseudofs debugging
 PSEUDOFS_TRACE	opt_pseudofs.h
 
 # Tarfs debugging
 TARFS_DEBUG	opt_tarfs.h
 
 # In-kernel GSS-API
 KGSSAPI		opt_kgssapi.h
 KGSSAPI_DEBUG	opt_kgssapi.h
 
 # These static filesystems have one slightly bogus static dependency in
 # sys/i386/i386/autoconf.c.  If any of these filesystems are
 # statically compiled into the kernel, code for mounting them as root
 # filesystems will be enabled - but look below.
 # NFSCL - client
 # NFSD - server
 NFSCL		opt_nfs.h
 NFSD		opt_nfs.h
 
 # filesystems and libiconv bridge
 CD9660_ICONV	opt_dontuse.h
 MSDOSFS_ICONV	opt_dontuse.h
 UDF_ICONV	opt_dontuse.h
 
 # If you are following the conditions in the copyright,
 # you can enable soft-updates which will speed up a lot of thigs
 # and make the system safer from crashes at the same time.
 # otherwise a STUB module will be compiled in.
 SOFTUPDATES	opt_ffs.h
 
 # On small, embedded systems, it can be useful to turn off support for
 # snapshots.  It saves about 30-40k for a feature that would be lightly
 # used, if it is used at all.
 NO_FFS_SNAPSHOT	opt_ffs.h
 
 # Enabling this option turns on support for Access Control Lists in UFS,
 # which can be used to support high security configurations.  Depends on
 # UFS_EXTATTR.
 UFS_ACL		opt_ufs.h
 
 # Enabling this option turns on support for extended attributes in UFS-based
 # filesystems, which can be used to support high security configurations
 # as well as new filesystem features.
 UFS_EXTATTR	opt_ufs.h
 UFS_EXTATTR_AUTOSTART	opt_ufs.h
 
 # Enable fast hash lookups for large directories on UFS-based filesystems.
 UFS_DIRHASH	opt_ufs.h
 
 # Enable gjournal-based UFS journal.
 UFS_GJOURNAL	opt_ufs.h
 
 # The below sentence is not in English, and neither is this one.
 # We plan to remove the static dependences above, with a
 # <filesystem>_ROOT option to control if it usable as root.  This list
 # allows these options to be present in config files already (though
 # they won't make any difference yet).
 NFS_ROOT	opt_nfsroot.h
 
 # SMB/CIFS requester
 NETSMB		opt_netsmb.h
 
 # Enable debugnet(4) networking support.
 DEBUGNET 	opt_global.h
 # Enable netdump(4) client support.
 NETDUMP 	opt_global.h
 # Enable netgdb(4) support.
 NETGDB 		opt_global.h
 
 # Options used only in subr_param.c.
 HZ		opt_param.h
 MAXFILES	opt_param.h
 NBUF		opt_param.h
 NSFBUFS		opt_param.h
 VM_BCACHE_SIZE_MAX	opt_param.h
 VM_SWZONE_SIZE_MAX	opt_param.h
 MAXUSERS
 DFLDSIZ		opt_param.h
 MAXDSIZ		opt_param.h
 MAXSSIZ		opt_param.h
 
 # Generic SCSI options.
 CAM_MAX_HIGHPOWER	opt_cam.h
 CAMDEBUG		opt_cam.h
 CAM_DEBUG_COMPILE	opt_cam.h
 CAM_DEBUG_DELAY		opt_cam.h
 CAM_DEBUG_BUS		opt_cam.h
 CAM_DEBUG_TARGET	opt_cam.h
 CAM_DEBUG_LUN		opt_cam.h
 CAM_DEBUG_FLAGS		opt_cam.h
 CAM_BOOT_DELAY		opt_cam.h
 CAM_IOSCHED_DYNAMIC	opt_cam.h
 CAM_IO_STATS		opt_cam.h
 CAM_TEST_FAILURE	opt_cam.h
 SCSI_DELAY		opt_scsi.h
 SCSI_NO_SENSE_STRINGS	opt_scsi.h
 SCSI_NO_OP_STRINGS	opt_scsi.h
 
 # Options used only in cam/ata/ata_da.c
 ATA_STATIC_ID		opt_ada.h
 
 # Options used only in cam/scsi/scsi_cd.c
 CHANGER_MIN_BUSY_SECONDS	opt_cd.h
 CHANGER_MAX_BUSY_SECONDS	opt_cd.h
 
 # Options used only in cam/scsi/scsi_da.c
 DA_TRACK_REFS		opt_da.h
 
 # Options used only in cam/scsi/scsi_sa.c.
 SA_IO_TIMEOUT		opt_sa.h
 SA_SPACE_TIMEOUT	opt_sa.h
 SA_REWIND_TIMEOUT	opt_sa.h
 SA_ERASE_TIMEOUT	opt_sa.h
 SA_1FM_AT_EOD		opt_sa.h
 
 # Options used only in cam/scsi/scsi_pt.c
 SCSI_PT_DEFAULT_TIMEOUT	opt_pt.h
 
 # Options used only in cam/scsi/scsi_ses.c
 SES_ENABLE_PASSTHROUGH	opt_ses.h
 
 # Options used in dev/sym/ (Symbios SCSI driver).
 SYM_SETUP_SCSI_DIFF	opt_sym.h	#-HVD support for 825a, 875, 885
 					# disabled:0 (default), enabled:1
 SYM_SETUP_PCI_PARITY	opt_sym.h	#-PCI parity checking
 					# disabled:0, enabled:1 (default)
 SYM_SETUP_MAX_LUN	opt_sym.h	#-Number of LUNs supported
 					# default:8, range:[1..64]
 
 # Options used only in dev/isp/*
 ISP_TARGET_MODE		opt_isp.h
 ISP_FW_CRASH_DUMP	opt_isp.h
 ISP_DEFAULT_ROLES	opt_isp.h
 ISP_INTERNAL_TARGET	opt_isp.h
 ISP_FCTAPE_OFF		opt_isp.h
 
 # Options used only in dev/iscsi
 ISCSI_INITIATOR_DEBUG	opt_iscsi_initiator.h
 
 # Net stuff.
 ACCEPT_FILTER_DATA
 ACCEPT_FILTER_DNS
 ACCEPT_FILTER_HTTP
 ALTQ			opt_global.h
 ALTQ_CBQ		opt_altq.h
 ALTQ_CDNR		opt_altq.h
 ALTQ_CODEL		opt_altq.h
 ALTQ_DEBUG		opt_altq.h
 ALTQ_HFSC		opt_altq.h
 ALTQ_FAIRQ		opt_altq.h
 ALTQ_NOPCC		opt_altq.h
 ALTQ_PRIQ		opt_altq.h
 ALTQ_RED		opt_altq.h
 ALTQ_RIO		opt_altq.h
 BOOTP			opt_bootp.h
 BOOTP_BLOCKSIZE		opt_bootp.h
 BOOTP_COMPAT		opt_bootp.h
 BOOTP_NFSROOT		opt_bootp.h
 BOOTP_NFSV3		opt_bootp.h
 BOOTP_WIRED_TO		opt_bootp.h
 DEVICE_POLLING
 DUMMYNET		opt_ipdn.h
 RATELIMIT		opt_ratelimit.h
 RATELIMIT_DEBUG		opt_ratelimit.h
 INET			opt_inet.h
 INET6			opt_inet6.h
 STATS			opt_global.h
 IPDIVERT
 IPFILTER		opt_ipfilter.h
 IPFILTER_DEFAULT_BLOCK	opt_ipfilter.h
 IPFILTER_LOG		opt_ipfilter.h
 IPFILTER_LOOKUP		opt_ipfilter.h
 IPFIREWALL		opt_ipfw.h
 IPFIREWALL_DEFAULT_TO_ACCEPT	opt_ipfw.h
 IPFIREWALL_NAT		opt_ipfw.h
 IPFIREWALL_NAT64	opt_ipfw.h
 IPFIREWALL_NPTV6	opt_ipfw.h
 IPFIREWALL_VERBOSE	opt_ipfw.h
 IPFIREWALL_VERBOSE_LIMIT	opt_ipfw.h
 IPFIREWALL_PMOD		opt_ipfw.h
 IPSEC			opt_ipsec.h
 IPSEC_DEBUG		opt_ipsec.h
 IPSEC_SUPPORT		opt_ipsec.h
 IPSTEALTH
 KERN_TLS
 KRPC
 LIBALIAS
 LIBMCHAIN
 MBUF_PROFILING
 MBUF_STRESS_TEST
 MROUTING		opt_mrouting.h
 NFSLOCKD
 NETLINK
 PF_DEFAULT_TO_DROP	opt_pf.h
 ROUTE_MPATH		opt_route.h
 ROUTETABLES		opt_route.h
 FIB_ALGO		opt_route.h
 RSS			opt_rss.h
 SLIP_IFF_OPTS		opt_slip.h
 TCPPCAP		opt_global.h
 SIFTR
 TCP_BLACKBOX		opt_global.h
 TCP_HHOOK		opt_global.h
 TCP_OFFLOAD		opt_inet.h # Enable code to dispatch TCP offloading
 TCP_RFC7413		opt_inet.h
 TCP_RFC7413_MAX_KEYS	opt_inet.h
 TCP_RFC7413_MAX_PSKS	opt_inet.h
 TCP_SIGNATURE		opt_ipsec.h
 VLAN_ARRAY		opt_vlan.h
 XDR
 XBONEHACK
 
 #
 # SCTP
 #
 SCTP			opt_sctp.h
 SCTP_SUPPORT		opt_sctp.h
 SCTP_DEBUG		opt_sctp.h # Enable debug printfs
 SCTP_LOCK_LOGGING	opt_sctp.h # Log to KTR lock activity
 SCTP_MBUF_LOGGING	opt_sctp.h # Log to KTR general mbuf aloc/free
 SCTP_MBCNT_LOGGING	opt_sctp.h # Log to KTR mbcnt activity
 SCTP_PACKET_LOGGING	opt_sctp.h # Log to a packet buffer last N packets
 SCTP_LTRACE_CHUNKS	opt_sctp.h # Log to KTR chunks processed
 SCTP_LTRACE_ERRORS	opt_sctp.h # Log to KTR error returns.
 SCTP_USE_PERCPU_STAT	opt_sctp.h # Use per cpu stats.
 SCTP_MCORE_INPUT	opt_sctp.h # Have multiple input threads for input mbufs
 SCTP_LOCAL_TRACE_BUF	opt_sctp.h # Use tracebuffer exported via sysctl
 SCTP_DETAILED_STR_STATS	opt_sctp.h # Use per PR-SCTP policy stream stats
 #
 #
 #
 
 # Netgraph(4). Use option NETGRAPH to enable the base netgraph code.
 # Each netgraph node type can be either be compiled into the kernel
 # or loaded dynamically. To get the former, include the corresponding
 # option below. Each type has its own man page, e.g. ng_async(4).
 NETGRAPH
 NETGRAPH_DEBUG		opt_netgraph.h
 NETGRAPH_ASYNC		opt_netgraph.h
 NETGRAPH_ATMLLC		opt_netgraph.h
 NETGRAPH_BLUETOOTH	opt_netgraph.h
 NETGRAPH_BLUETOOTH_BT3C	opt_netgraph.h
 NETGRAPH_BLUETOOTH_H4	opt_netgraph.h
 NETGRAPH_BLUETOOTH_HCI	opt_netgraph.h
 NETGRAPH_BLUETOOTH_L2CAP	opt_netgraph.h
 NETGRAPH_BLUETOOTH_SOCKET	opt_netgraph.h
 NETGRAPH_BLUETOOTH_UBT	opt_netgraph.h
 NETGRAPH_BLUETOOTH_UBTBCMFW	opt_netgraph.h
 NETGRAPH_BPF		opt_netgraph.h
 NETGRAPH_BRIDGE		opt_netgraph.h
 NETGRAPH_CAR		opt_netgraph.h
 NETGRAPH_CHECKSUM	opt_netgraph.h
 NETGRAPH_CISCO		opt_netgraph.h
 NETGRAPH_DEFLATE	opt_netgraph.h
 NETGRAPH_DEVICE		opt_netgraph.h
 NETGRAPH_ECHO		opt_netgraph.h
 NETGRAPH_EIFACE		opt_netgraph.h
 NETGRAPH_ETHER		opt_netgraph.h
 NETGRAPH_ETHER_ECHO	opt_netgraph.h
 NETGRAPH_FEC		opt_netgraph.h
 NETGRAPH_FRAME_RELAY	opt_netgraph.h
 NETGRAPH_GIF		opt_netgraph.h
 NETGRAPH_GIF_DEMUX	opt_netgraph.h
 NETGRAPH_HOLE		opt_netgraph.h
 NETGRAPH_IFACE		opt_netgraph.h
 NETGRAPH_IP_INPUT	opt_netgraph.h
 NETGRAPH_IPFW		opt_netgraph.h
 NETGRAPH_KSOCKET	opt_netgraph.h
 NETGRAPH_L2TP		opt_netgraph.h
 NETGRAPH_LMI		opt_netgraph.h
 NETGRAPH_MPPC_COMPRESSION	opt_netgraph.h
 NETGRAPH_MPPC_ENCRYPTION	opt_netgraph.h
 NETGRAPH_NAT		opt_netgraph.h
 NETGRAPH_NETFLOW	opt_netgraph.h
 NETGRAPH_ONE2MANY	opt_netgraph.h
 NETGRAPH_PATCH		opt_netgraph.h
 NETGRAPH_PIPE		opt_netgraph.h
 NETGRAPH_PPP		opt_netgraph.h
 NETGRAPH_PPPOE		opt_netgraph.h
 NETGRAPH_PPTPGRE	opt_netgraph.h
 NETGRAPH_PRED1		opt_netgraph.h
 NETGRAPH_RFC1490	opt_netgraph.h
 NETGRAPH_SOCKET		opt_netgraph.h
 NETGRAPH_SPLIT		opt_netgraph.h
 NETGRAPH_SPPP		opt_netgraph.h
 NETGRAPH_TAG		opt_netgraph.h
 NETGRAPH_TCPMSS		opt_netgraph.h
 NETGRAPH_TEE		opt_netgraph.h
 NETGRAPH_TTY		opt_netgraph.h
 NETGRAPH_UI		opt_netgraph.h
 NETGRAPH_VJC		opt_netgraph.h
 NETGRAPH_VLAN		opt_netgraph.h
 
-# NgATM options
-NGATM_ATMBASE		opt_netgraph.h
-NGATM_SSCOP		opt_netgraph.h
-NGATM_SSCFU		opt_netgraph.h
-NGATM_UNI		opt_netgraph.h
-NGATM_CCATM		opt_netgraph.h
-
 # DRM options
 DRM_DEBUG		opt_drm.h
 
 TI_SF_BUF_JUMBO		opt_ti.h
 TI_JUMBO_HDRSPLIT	opt_ti.h
 
 # Misc debug flags.  Most of these should probably be replaced with
 # 'DEBUG', and then let people recompile just the interesting modules
 # with 'make CC="cc -DDEBUG"'.
 DEBUG_1284		opt_ppb_1284.h
 LPT_DEBUG		opt_lpt.h
 PLIP_DEBUG		opt_plip.h
 LOCKF_DEBUG		opt_debug_lockf.h
 SI_DEBUG		opt_debug_si.h
 IFMEDIA_DEBUG		opt_ifmedia.h
 
 # Fb options
 FB_DEBUG		opt_fb.h
 
 # ppbus related options
 PERIPH_1284		opt_ppb_1284.h
 DONTPROBE_1284		opt_ppb_1284.h
 
 # smbus related options
 ENABLE_ALART		opt_intpm.h
 
 # These cause changes all over the kernel
 BLKDEV_IOSIZE		opt_global.h
 BURN_BRIDGES		opt_global.h
 DEBUG			opt_global.h
 DEBUG_LOCKS		opt_global.h
 DEBUG_VFS_LOCKS		opt_global.h
 DFLTPHYS		opt_global.h
 DIAGNOSTIC		opt_global.h
 INVARIANT_SUPPORT	opt_global.h
 INVARIANTS		opt_global.h
 KASSERT_PANIC_OPTIONAL	opt_global.h
 MAXCPU			opt_global.h
 MAXMEMDOM		opt_global.h
 MAXPHYS			opt_maxphys.h
 MCLSHIFT		opt_global.h
 MUTEX_NOINLINE		opt_global.h
 LOCK_PROFILING		opt_global.h
 MSIZE			opt_global.h
 REGRESSION		opt_global.h
 RWLOCK_NOINLINE		opt_global.h
 SX_NOINLINE		opt_global.h
 VFS_BIO_DEBUG		opt_global.h
 
 # These are VM related options
 VM_KMEM_SIZE		opt_vm.h
 VM_KMEM_SIZE_SCALE	opt_vm.h
 VM_KMEM_SIZE_MAX	opt_vm.h
 VM_NRESERVLEVEL		opt_vm.h
 VM_LEVEL_0_ORDER	opt_vm.h
 NO_SWAPPING		opt_vm.h
 MALLOC_MAKE_FAILURES	opt_vm.h
 MALLOC_PROFILE		opt_vm.h
 MALLOC_DEBUG_MAXZONES	opt_vm.h
 
 # The MemGuard replacement allocator used for tamper-after-free detection
 DEBUG_MEMGUARD		opt_vm.h
 
 # The RedZone malloc(9) protection
 DEBUG_REDZONE		opt_vm.h
 
 # Standard SMP options
 EARLY_AP_STARTUP	opt_global.h
 SMP			opt_global.h
 NUMA			opt_global.h
 
 # Size of the kernel message buffer
 MSGBUF_SIZE		opt_msgbuf.h
 
 # NFS options
 NFS_MINATTRTIMO		opt_nfs.h
 NFS_MAXATTRTIMO		opt_nfs.h
 NFS_MINDIRATTRTIMO	opt_nfs.h
 NFS_MAXDIRATTRTIMO	opt_nfs.h
 NFS_DEBUG		opt_nfs.h
 
 # TMPFS options
 TMPFS_PAGES_MINRESERVED		opt_tmpfs.h
 
 # Options for uart(4)
 UART_PPS_ON_CTS		opt_uart.h
 UART_POLL_FREQ		opt_uart.h
 UART_DEV_TOLERANCE_PCT	opt_uart.h
 
 # options for bus/device framework
 BUS_DEBUG		opt_bus.h
 
 # options for USB support
 USB_DEBUG		opt_usb.h
 USB_HOST_ALIGN		opt_usb.h
 USB_REQ_DEBUG		opt_usb.h
 USB_TEMPLATE		opt_usb.h
 USB_VERBOSE		opt_usb.h
 USB_DMA_SINGLE_ALLOC	opt_usb.h
 USB_EHCI_BIG_ENDIAN_DESC	opt_usb.h
 U3G_DEBUG		opt_u3g.h
 UKBD_DFLT_KEYMAP	opt_ukbd.h
 UPLCOM_INTR_INTERVAL	opt_uplcom.h
 UVSCOM_DEFAULT_OPKTSIZE	opt_uvscom.h
 UVSCOM_INTR_INTERVAL	opt_uvscom.h
 
 # options for the Realtek rtwn driver
 RTWN_DEBUG		opt_rtwn.h
 RTWN_WITHOUT_UCODE	opt_rtwn.h
 
 # Embedded system options
 INIT_PATH
 
 ROOTDEVNAME
 
 FDC_DEBUG 		opt_fdc.h
 PCFCLOCK_VERBOSE	opt_pcfclock.h
 PCFCLOCK_MAX_RETRIES	opt_pcfclock.h
 
 KTR			opt_global.h
 KTR_ALQ			opt_ktr.h
 KTR_MASK		opt_ktr.h
 KTR_CPUMASK		opt_ktr.h
 KTR_COMPILE		opt_global.h
 KTR_BOOT_ENTRIES	opt_global.h
 KTR_ENTRIES		opt_global.h
 KTR_VERBOSE		opt_ktr.h
 WITNESS			opt_global.h
 WITNESS_KDB		opt_witness.h
 WITNESS_NO_VNODE	opt_witness.h
 WITNESS_SKIPSPIN	opt_witness.h
 WITNESS_COUNT		opt_witness.h
 OPENSOLARIS_WITNESS	opt_global.h
 
 EPOCH_TRACE		opt_global.h
 
 # options for ACPI support
 ACPI_DEBUG		opt_acpi.h
 ACPI_MAX_TASKS		opt_acpi.h
 ACPI_MAX_THREADS	opt_acpi.h
 DEV_ACPI		opt_acpi.h
 ACPI_EARLY_EPYC_WAR	opt_acpi.h
 
 # options for IOMMU support
 IOMMU			opt_iommu.h
 
 # ISA support
 DEV_ISA			opt_isa.h
 ISAPNP			opt_dontuse.h
 
 # various 'device presence' options.
 DEV_BPF			opt_bpf.h
 DEV_CARP		opt_carp.h
 DEV_NETMAP		opt_global.h
 DEV_PCI			opt_pci.h
 DEV_PF			opt_pf.h
 DEV_PFLOG		opt_pf.h
 DEV_PFSYNC		opt_pf.h
 DEV_SPLASH		opt_splash.h
 DEV_VLAN		opt_vlan.h
 
 # bce driver
 BCE_DEBUG		opt_bce.h
 BCE_NVRAM_WRITE_SUPPORT	opt_bce.h
 
 SOCKBUF_DEBUG		opt_global.h
 
 
 # options for hifn driver
 HIFN_DEBUG		opt_hifn.h
 HIFN_RNDTEST		opt_hifn.h
 
 # options for safenet driver
 SAFE_DEBUG		opt_safe.h
 SAFE_NO_RNG		opt_safe.h
 SAFE_RNDTEST		opt_safe.h
 
 # syscons/vt options
 MAXCONS			opt_syscons.h
 SC_ALT_MOUSE_IMAGE	opt_syscons.h
 SC_CUT_SPACES2TABS	opt_syscons.h
 SC_CUT_SEPCHARS		opt_syscons.h
 SC_DEBUG_LEVEL		opt_syscons.h
 SC_DFLT_FONT		opt_syscons.h
 SC_DFLT_TERM		opt_syscons.h
 SC_DISABLE_KDBKEY	opt_syscons.h
 SC_DISABLE_REBOOT	opt_syscons.h
 SC_HISTORY_SIZE		opt_syscons.h
 SC_KERNEL_CONS_ATTR	opt_syscons.h
 SC_KERNEL_CONS_ATTRS	opt_syscons.h
 SC_KERNEL_CONS_REV_ATTR	opt_syscons.h
 SC_MOUSE_CHAR		opt_syscons.h
 SC_NO_CUTPASTE		opt_syscons.h
 SC_NO_FONT_LOADING	opt_syscons.h
 SC_NO_HISTORY		opt_syscons.h
 SC_NO_MODE_CHANGE	opt_syscons.h
 SC_NO_SUSPEND_VTYSWITCH	opt_syscons.h
 SC_NO_SYSMOUSE		opt_syscons.h
 SC_NO_TERM_DUMB		opt_syscons.h
 SC_NO_TERM_SC		opt_syscons.h
 SC_NO_TERM_TEKEN	opt_syscons.h
 SC_NORM_ATTR		opt_syscons.h
 SC_NORM_REV_ATTR	opt_syscons.h
 SC_PIXEL_MODE		opt_syscons.h
 SC_RENDER_DEBUG		opt_syscons.h
 SC_TWOBUTTON_MOUSE	opt_syscons.h
 VT_ALT_TO_ESC_HACK	opt_syscons.h
 VT_FB_MAX_WIDTH		opt_syscons.h
 VT_FB_MAX_HEIGHT	opt_syscons.h
 VT_MAXWINDOWS		opt_syscons.h
 VT_TWOBUTTON_MOUSE	opt_syscons.h
 DEV_SC			opt_syscons.h
 DEV_VT			opt_syscons.h
 
 # teken terminal emulator options
 TEKEN_CONS25		opt_teken.h
 TEKEN_UTF8		opt_teken.h
 TERMINAL_KERN_ATTR	opt_teken.h
 TERMINAL_NORM_ATTR	opt_teken.h
 
 # options for printf
 PRINTF_BUFR_SIZE	opt_printf.h
 BOOT_TAG		opt_printf.h
 BOOT_TAG_SZ		opt_printf.h
 
 # kbd options
 KBD_DISABLE_KEYMAP_LOAD	opt_kbd.h
 KBD_INSTALL_CDEV	opt_kbd.h
 KBD_MAXRETRY		opt_kbd.h
 KBD_MAXWAIT		opt_kbd.h
 KBD_RESETDELAY		opt_kbd.h
 KBD_DELAY1		opt_kbd.h
 KBD_DELAY2		opt_kbd.h
 KBDIO_DEBUG		opt_kbd.h
 KBDMUX_DFLT_KEYMAP	opt_kbdmux.h
 
 # options for the Atheros driver
 ATH_DEBUG		opt_ath.h
 ATH_TXBUF		opt_ath.h
 ATH_RXBUF		opt_ath.h
 ATH_DIAGAPI		opt_ath.h
 ATH_TX99_DIAG		opt_ath.h
 ATH_ENABLE_11N		opt_ath.h
 ATH_ENABLE_DFS		opt_ath.h
 ATH_EEPROM_FIRMWARE	opt_ath.h
 ATH_ENABLE_RADIOTAP_VENDOR_EXT	opt_ath.h
 ATH_DEBUG_ALQ		opt_ath.h
 ATH_KTR_INTR_DEBUG	opt_ath.h
 
 # options for the Atheros hal
 # XXX For now, this breaks non-AR9130 chipsets, so only use it
 # XXX when actually targeting AR9130.
 AH_SUPPORT_AR9130	opt_ah.h
 
 # This is required for AR933x SoC support
 AH_SUPPORT_AR9330	opt_ah.h
 AH_SUPPORT_AR9340	opt_ah.h
 AH_SUPPORT_QCA9530	opt_ah.h
 AH_SUPPORT_QCA9550	opt_ah.h
 
 AH_DEBUG		opt_ah.h
 AH_ASSERT		opt_ah.h
 AH_DEBUG_ALQ		opt_ah.h
 AH_REGOPS_FUNC		opt_ah.h
 AH_WRITE_REGDOMAIN	opt_ah.h
 AH_DEBUG_COUNTRY	opt_ah.h
 AH_WRITE_EEPROM		opt_ah.h
 AH_PRIVATE_DIAG		opt_ah.h
 AH_NEED_DESC_SWAP	opt_ah.h
 AH_USE_INIPDGAIN	opt_ah.h
 AH_MAXCHAN		opt_ah.h
 AH_RXCFG_SDMAMW_4BYTES	opt_ah.h
 AH_INTERRUPT_DEBUGGING	opt_ah.h
 # AR5416 and later interrupt mitigation
 # XXX do not use this for AR9130
 AH_AR5416_INTERRUPT_MITIGATION	opt_ah.h
 
 # options for the Altera mSGDMA driver (altera_msgdma)
 ALTERA_MSGDMA_DESC_STD		opt_altera_msgdma.h
 ALTERA_MSGDMA_DESC_EXT		opt_altera_msgdma.h
 ALTERA_MSGDMA_DESC_PF_STD	opt_altera_msgdma.h
 ALTERA_MSGDMA_DESC_PF_EXT	opt_altera_msgdma.h
 
 # options for the Broadcom BCM43xx driver (bwi)
 BWI_DEBUG		opt_bwi.h
 BWI_DEBUG_VERBOSE	opt_bwi.h
 
 # options for the Brodacom BCM43xx driver (bwn)
 BWN_DEBUG		opt_bwn.h
 BWN_GPL_PHY		opt_bwn.h
 BWN_USE_SIBA		opt_bwn.h
 
 # Options for the SIBA driver
 SIBA_DEBUG		opt_siba.h
 
 # options for the Marvell 8335 wireless driver
 MALO_DEBUG		opt_malo.h
 MALO_TXBUF		opt_malo.h
 MALO_RXBUF		opt_malo.h
 
 # options for the Marvell wireless driver
 MWL_DEBUG		opt_mwl.h
 MWL_TXBUF		opt_mwl.h
 MWL_RXBUF		opt_mwl.h
 MWL_DIAGAPI		opt_mwl.h
 MWL_AGGR_SIZE		opt_mwl.h
 MWL_TX_NODROP		opt_mwl.h
 
 # Options for the Marvell NETA driver
 MVNETA_MULTIQUEUE	opt_mvneta.h
 MVNETA_KTR		opt_mvneta.h
 
 # Options for the Intel 802.11ac wireless driver
 IWM_DEBUG		opt_iwm.h
 
 # Options for the Intel 802.11n wireless driver
 IWN_DEBUG		opt_iwn.h
 
 # Options for the Intel 3945ABG wireless driver
 WPI_DEBUG		opt_wpi.h
 
 # dcons options 
 DCONS_BUF_SIZE		opt_dcons.h
 DCONS_POLL_HZ		opt_dcons.h
 DCONS_FORCE_CONSOLE	opt_dcons.h
 DCONS_FORCE_GDB		opt_dcons.h
 
 # HWPMC options
 HWPMC_DEBUG		opt_global.h
 HWPMC_HOOKS
 HWPMC_MIPS_BACKTRACE 	opt_hwpmc_hooks.h
 
 # 802.11 support layer
 IEEE80211_DEBUG		opt_wlan.h
 IEEE80211_DEBUG_REFCNT	opt_wlan.h
 IEEE80211_SUPPORT_MESH	opt_wlan.h
 IEEE80211_SUPPORT_SUPERG	opt_wlan.h
 IEEE80211_SUPPORT_TDMA	opt_wlan.h
 IEEE80211_ALQ		opt_wlan.h
 IEEE80211_DFS_DEBUG	opt_wlan.h
 
 # 802.11 TDMA support
 TDMA_SLOTLEN_DEFAULT	opt_tdma.h
 TDMA_SLOTCNT_DEFAULT	opt_tdma.h
 TDMA_BINTVAL_DEFAULT	opt_tdma.h
 TDMA_TXRATE_11B_DEFAULT	opt_tdma.h
 TDMA_TXRATE_11G_DEFAULT	opt_tdma.h
 TDMA_TXRATE_11A_DEFAULT	opt_tdma.h
 TDMA_TXRATE_TURBO_DEFAULT	opt_tdma.h
 TDMA_TXRATE_HALF_DEFAULT	opt_tdma.h
 TDMA_TXRATE_QUARTER_DEFAULT	opt_tdma.h
 TDMA_TXRATE_11NA_DEFAULT	opt_tdma.h
 TDMA_TXRATE_11NG_DEFAULT	opt_tdma.h
 
 # VideoMode
 PICKMODE_DEBUG			opt_videomode.h
 
 # Network stack virtualization options
 VIMAGE			opt_global.h
 VNET_DEBUG		opt_global.h
 
 # Common Flash Interface (CFI) options
 CFI_SUPPORT_STRATAFLASH	opt_cfi.h
 CFI_ARMEDANDDANGEROUS	opt_cfi.h
 CFI_HARDWAREBYTESWAP	opt_cfi.h
 
 # Sound options
 SND_DEBUG		opt_snd.h
 SND_DIAGNOSTIC		opt_snd.h
 SND_FEEDER_MULTIFORMAT	opt_snd.h
 SND_FEEDER_FULL_MULTIFORMAT	opt_snd.h
 SND_FEEDER_RATE_HP	opt_snd.h
 SND_PCM_64		opt_snd.h
 SND_OLDSTEREO		opt_snd.h
 
 X86BIOS
 
 # Flattened device tree options
 FDT		opt_platform.h
 FDT_DTB_STATIC	opt_platform.h
 
 # OFED Infiniband stack
 OFED		opt_ofed.h
 OFED_DEBUG_INIT	opt_ofed.h
 SDP		opt_ofed.h
 SDP_DEBUG	opt_ofed.h
 IPOIB		opt_ofed.h
 IPOIB_DEBUG	opt_ofed.h
 IPOIB_CM	opt_ofed.h
 
 # Resource Accounting
 RACCT		opt_global.h
 RACCT_DEFAULT_TO_DISABLED	opt_global.h
 
 # Resource Limits
 RCTL		opt_global.h
 
 # Random number generator(s)
 # Alternative RNG algorithm.
 RANDOM_FENESTRASX	opt_global.h
 # With this, no entropy processor is loaded, but the entropy
 # harvesting infrastructure is present. This means an entropy
 # processor may be loaded as a module.
 RANDOM_LOADABLE	opt_global.h
 # This turns on high-rate and potentially expensive harvesting in
 # the uma slab allocator.
 RANDOM_ENABLE_UMA	opt_global.h
 RANDOM_ENABLE_ETHER	opt_global.h
 
 # This options turns TPM into entropy source.
 TPM_HARVEST	opt_tpm.h
 
 # BHND(4) driver
 BHND_LOGLEVEL	opt_global.h
 
 # GPIO and child devices
 GPIO_SPI_DEBUG	opt_gpio.h
 
 # SPI devices
 SPIGEN_LEGACY_CDEVNAME	opt_spi.h
 
 # etherswitch(4) driver
 RTL8366_SOFT_RESET opt_etherswitch.h
 
 # evdev protocol support
 EVDEV_SUPPORT	opt_evdev.h
 EVDEV_DEBUG	opt_evdev.h
 UINPUT_DEBUG	opt_evdev.h
 
 # Hyper-V network driver
 HN_DEBUG	opt_hn.h
 
 # CAM-based MMC stack
 MMCCAM
 # Encrypted kernel crash dumps
 EKCD		opt_ekcd.h
 
 # NVME options
 NVME_USE_NVD	opt_nvme.h
 NVME_2X_RESET	opt_nvme.h
 
 # amdsbwd options
 AMDSBWD_DEBUG	opt_amdsbwd.h
 
 # gcov support
 GCOV		opt_global.h
 LINDEBUGFS
 
 # options for HID support
 HID_DEBUG	opt_hid.h
 IICHID_DEBUG	opt_hid.h
 IICHID_SAMPLING	opt_hid.h
 HKBD_DFLT_KEYMAP	opt_hkbd.h
 HIDRAW_MAKE_UHID_ALIAS	opt_hid.h
 
 # kenv options
 # The early kernel environment (loader environment, config(8)-provided static)
 # is typically cleared after the dynamic environment comes up to ensure that
 # we're not inadvertently holding on to 'secret' values in these stale envs.
 # This option is insecure except in controlled environments where the static
 # environment's contents are known to be safe.
 PRESERVE_EARLY_KENV	opt_global.h
diff --git a/sys/contrib/ngatm/FREEBSD-Xlist b/sys/contrib/ngatm/FREEBSD-Xlist
deleted file mode 100644
index 0ead0cc6a5ce..000000000000
--- a/sys/contrib/ngatm/FREEBSD-Xlist
+++ /dev/null
@@ -1,15 +0,0 @@
-#$FreeBSD$
-*/README
-*/VERSION
-*/Makefile.in
-*/Makefile.pre
-*/Makefile.post
-*/aclocal.m4
-*/config
-*/configure
-*/configure.ac
-*/libngatm
-*/man
-*/snmp_atm
-*/snmp_ilmid
-*/sscop
diff --git a/sys/contrib/ngatm/FREEBSD-upgrade b/sys/contrib/ngatm/FREEBSD-upgrade
deleted file mode 100644
index cb167acca87d..000000000000
--- a/sys/contrib/ngatm/FREEBSD-upgrade
+++ /dev/null
@@ -1,26 +0,0 @@
-$FreeBSD$
-
-This is the part of the NgATM stuff that is shared by kernel and user.
-Be careful to feed changes back to the maintainer <harti@freebsd.org>,
-because the code here is actually shared with other environments besides
-FreeBSD.
-
-Import should be done by:
-
-	1. Put the distribution into a clean directory.
-
-	2. Remove any unneeded files.
-
-	3. cvs import \
-		-m "Virgin import of NgATM shared kernel/user part X.Y" \
-		src/sys/contrib/ngatm/netnatm BEGEMOT NGATM_X_Y
-
-	4. resolve conflicts
-
-	5. check-out the imported stuff
-
-	6. Re-generate files by calling ./genfiles
-
-	7. If neccessary commit the re-generated files
-
-harti
diff --git a/sys/contrib/ngatm/netnatm/addr.h b/sys/contrib/ngatm/netnatm/addr.h
deleted file mode 100644
index c1ba20eb1c3d..000000000000
--- a/sys/contrib/ngatm/netnatm/addr.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/addr.h,v 1.3 2004/07/08 08:21:45 brandt Exp $
- */
-#ifndef _NETNATM_ADDR_H_
-#define _NETNATM_ADDR_H_
-
-int uni_str2nsap(u_char *, const char *);
-void uni_nsap2str(char *, const u_char *, int);
-
-void uni_prefix2str(char *, const u_char *, u_int, int);
-
-int uni_e1642nsap(u_char *, const char *);
-int uni_nsap2e164(char *, const u_char *, int);
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/api/atmapi.h b/sys/contrib/ngatm/netnatm/api/atmapi.h
deleted file mode 100644
index 887f548598ed..000000000000
--- a/sys/contrib/ngatm/netnatm/api/atmapi.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright (c) 2003-2004
- *	Hartmut Brandt
- *	All rights reserved.
- *
- * Copyright (c) 2001-2002
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation must retain the above
- *    copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE AUTHORS
- * AND ITS CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHORS OR ITS CONTRIBUTORS  BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Begemot: libunimsg/netnatm/api/atmapi.h,v 1.1 2004/07/08 08:21:48 brandt Exp $
- *
- * ATM API as defined per af-saa-0108
- */
-#ifndef _NETNATM_API_ATMAPI_H_
-#define _NETNATM_API_ATMAPI_H_
-
-#include <sys/types.h>
-
-/* size of an endpointlen including trailing \0 */
-#define	ATM_EPNAMSIZ	65
-
-enum atmstate {
-	ATM_A0,		/* non existent */
-	ATM_A1,		/* initial */
-	ATM_A2,		/* outgoing call preparation */
-	ATM_A3,		/* outgoing call requested */
-	ATM_A4,		/* incoming call preparation */
-	ATM_A5,		/* wait incoming call */
-	ATM_A6,		/* incoming call present */
-	ATM_A7,		/* incoming call requested */
-	ATM_A8,		/* p2p data transfer */
-	ATM_A9,		/* p2mp root data transfer */
-	ATM_A10,	/* p2mp leaf data transfer */
-	ATM_A11,	/* terminated */
-};
-
-enum atmop {
-	ATMOP_RESP,				/* 0 */
-	ATMOP_ABORT_CONNECTION,
-	ATMOP_ACCEPT_INCOMING_CALL,
-	ATMOP_ADD_PARTY,
-	ATMOP_ADD_PARTY_REJECT,
-	ATMOP_ADD_PARTY_SUCCESS,		/* 5 */
-	ATMOP_ARRIVAL_OF_INCOMING_CALL,
-	ATMOP_CALL_RELEASE,
-	ATMOP_CONNECT_OUTGOING_CALL,
-	ATMOP_DROP_PARTY,
-	ATMOP_GET_LOCAL_PORT_INFO,		/* 10 */
-	ATMOP_P2MP_CALL_ACTIVE,
-	ATMOP_P2P_CALL_ACTIVE,
-	ATMOP_PREPARE_INCOMING_CALL,
-	ATMOP_PREPARE_OUTGOING_CALL,
-	ATMOP_QUERY_CONNECTION_ATTRIBUTES,	/* 15 */
-	ATMOP_REJECT_INCOMING_CALL,
-	ATMOP_SET_CONNECTION_ATTRIBUTES,
-	ATMOP_WAIT_ON_INCOMING_CALL,
-	ATMOP_SET_CONNECTION_ATTRIBUTES_X,
-	ATMOP_QUERY_CONNECTION_ATTRIBUTES_X,	/* 20 */
-	ATMOP_QUERY_STATE,
-};
-
-#define ATM_DEFINE_ERRORS						\
-   DEF(ATMERR_OK,		 0, "OK")				\
-   DEF(ATMERR_SYS,		-1, "syscall error")			\
-   DEF(ATMERR_BAD_OP,		-2, "bad operation")			\
-   DEF(ATMERR_BAD_ARGS,		-3, "bad arguments for operation")	\
-   DEF(ATMERR_BAD_STATE,	-4, "operation in bad state")		\
-   DEF(ATMERR_BAD_ATTR,		-5, "unknown attribute")		\
-   DEF(ATMERR_BAD_VALUE,	-6, "bad attribute value")		\
-   DEF(ATMERR_BUSY,		-7, "busy")				\
-   DEF(ATMERR_RDONLY,		-8, "read-only attribute")		\
-   DEF(ATMERR_BAD_SAP,		-9, "bad SAP")				\
-   DEF(ATMERR_OVERLAP,		-10,"overlaping SAP")			\
-   DEF(ATMERR_BAD_ENDPOINT,	-11,"bad ATM endpoint")			\
-   DEF(ATMERR_PREVIOUSLY_ABORTED,-12,"previously aborted")		\
-   DEF(ATMERR_NO_CALL,		-13,"no incoming call")			\
-   DEF(ATMERR_BAD_LEAF_IDENT,	-14,"bad leaf identifier")		\
-   DEF(ATMERR_BAD_PORT,		-15,"unknown port")			\
-   DEF(ATMERR_BAD_SIGNAL,	-29-UNIAPI_ERROR_BAD_SIGNAL, "bad signal")\
-   DEF(ATMERR_BADCU,		-29-UNIAPI_ERROR_BADCU, "bad coordinator state")\
-   DEF(ATMERR_BAD_CALLSTATE,	-29-UNIAPI_ERROR_BAD_CALLSTATE, "bad call state")\
-   DEF(ATMERR_BAD_EPSTATE,	-29-UNIAPI_ERROR_BAD_EPSTATE, "bad party state")\
-   DEF(ATMERR_BAD_UNIARG,	-29-UNIAPI_ERROR_BAD_ARG, "bad uni argument")\
-   DEF(ATMERR_BAD_CALL,		-29-UNIAPI_ERROR_BAD_CALL, "unknown call")\
-   DEF(ATMERR_BAD_PARTY,	-29-UNIAPI_ERROR_BAD_PARTY, "unknown party")\
-   DEF(ATMERR_BAD_CTYPE,	-29-UNIAPI_ERROR_BAD_CTYPE, "wrong call type")\
-   DEF(ATMERR_BAD_IE,		-29-UNIAPI_ERROR_BAD_IE, "bad information element")\
-   DEF(ATMERR_EPREF_INUSE,	-29-UNIAPI_ERROR_EPREF_INUSE, "endpoint reference in use")\
-   DEF(ATMERR_MISSING_IE,	-29-UNIAPI_ERROR_MISSING_IE, "missing information element")\
-   DEF(ATMERR_ENCODING,		-29-UNIAPI_ERROR_ENCODING, "encoding error")\
-   DEF(ATMERR_NOMEM,		-29-UNIAPI_ERROR_NOMEM, "no memory")\
-   DEF(ATMERR_UNIBUSY,		-29-UNIAPI_ERROR_BUSY, "uni process busy")
-
-#define ATM_MKUNIERR(E)	(-29 - (E))
-
-enum atm_error {
-#define DEF(NAME,VAL,STR)	NAME = (VAL),
-ATM_DEFINE_ERRORS
-#undef DEF
-};
-
-enum atm_attribute {
-	ATM_ATTR_NONE = 0,
-	ATM_ATTR_BLLI_SELECTOR,
-	ATM_ATTR_BLLI,
-	ATM_ATTR_BEARER,
-	ATM_ATTR_TRAFFIC,
-	ATM_ATTR_QOS,
-	ATM_ATTR_EXQOS,
-	ATM_ATTR_CALLED,
-	ATM_ATTR_CALLEDSUB,
-	ATM_ATTR_CALLING,
-	ATM_ATTR_CALLINGSUB,
-	ATM_ATTR_AAL,
-	ATM_ATTR_EPREF,
-	ATM_ATTR_CONNED,
-	ATM_ATTR_CONNEDSUB,
-	ATM_ATTR_EETD,
-	ATM_ATTR_ABRSETUP,
-	ATM_ATTR_ABRADD,
-	ATM_ATTR_CONNID,
-	ATM_ATTR_MDCR,
-};
-
-struct atm_resp {
-	int32_t		resp;
-	uint32_t	data;		/* type of attached data */
-};
-enum {
-	ATMRESP_NONE,			/* no data */
-	ATMRESP_ATTRS,			/* attribute(s) */
-	ATMRESP_PORTS,			/* port info */
-	ATMRESP_STATE,			/* endpoint state */
-	ATMRESP_EXSTAT,			/* extended status */
-};
-
-struct atm_abort_connection {
-	struct uni_ie_cause cause;
-};
-
-struct atm_query_connection_attributes {
-	uint32_t	attr;
-};
-struct atm_set_connection_attributes {
-	uint32_t	attr;
-};
-struct atm_query_connection_attributes_x {
-	uint32_t	count;
-#if defined(__GNUC__) && __GNUC__ < 3
-	uint32_t	attr[0];
-#else
-	uint32_t	attr[];
-#endif
-};
-struct atm_set_connection_attributes_x {
-	uint32_t	count;
-#if defined(__GNUC__) && __GNUC__ < 3
-	uint32_t	attr[0];
-#else
-	uint32_t	attr[];
-#endif
-};
-struct atm_prepare_incoming_call {
-	struct uni_sap	sap;
-	uint32_t	queue_size;
-};
-struct atm_connect_outgoing_call {
-	struct uni_ie_called	called;
-};
-struct atm_call_release {
-	struct uni_ie_cause	cause[2];
-};
-struct atm_p2p_call_active {
-	struct uni_ie_connid	connid;
-};
-struct atm_p2mp_call_active {
-	struct uni_ie_connid	connid;
-};
-struct atm_accept_incoming_call {
-	char	newep[ATM_EPNAMSIZ];
-};
-struct atm_reject_incoming_call {
-	struct uni_ie_cause	cause;
-};
-struct atm_add_party {
-	uint16_t		leaf_ident;
-	struct uni_ie_called	called;
-};
-struct atm_add_party_success {
-	uint16_t		leaf_ident;
-};
-struct atm_add_party_reject {
-	uint16_t		leaf_ident;
-	struct uni_ie_cause	cause;
-};
-struct atm_drop_party {
-	uint16_t		leaf_ident;
-	struct uni_ie_cause	cause;
-};
-
-/*
- * Get local port info. If port is 0, information on all ports is returned,
- * otherwise only on the named port.
- * The response consists of a header with two counters, a list of ports
- * (struct atm_port_info) and a list of addresses (struct uni_addr).
- * The port to which an address belongs is implicit in the num_addrs field
- * of the port.
- */
-struct atm_get_local_port_info {
-	uint32_t	port;
-};
-
-struct atm_port_list {
-	uint32_t	num_ports;	/* number of ports */
-	uint32_t	num_addrs;	/* total number of addresses */
-};
-
-struct atm_port_info {
-	uint32_t	port;
-	uint32_t	pcr;
-	uint32_t	max_vpi_bits;
-	uint32_t	max_vci_bits;
-	uint32_t	max_svpc_vpi;
-	uint32_t	max_svcc_vpi;
-	uint32_t	min_svcc_vci;
-	u_char		esi[6];
-	uint32_t	num_addrs;	/* number of addresses on this port */
-};
-
-/*
- * Endpoint state info
- */
-struct atm_epstate {
-	char	name[ATM_EPNAMSIZ];
-	uint8_t	state;
-};
-
-/*
- * Extended status information.
- */
-struct atm_exstatus {
-	uint32_t	neps;		/* endpoints */
-	uint32_t	nports;		/* ports */
-	uint32_t	nconns;		/* connections */
-	uint32_t	nparties;	/* number of parties */
-};
-struct atm_exstatus_ep {
-	char		name[ATM_EPNAMSIZ];
-	uint8_t		state;		/* Ux */
-};
-struct atm_exstatus_port {
-	uint32_t	portno;
-	uint8_t		state;
-};
-struct atm_exstatus_conn {
-	uint32_t	id;
-	uint32_t	cref;		/* (flag << 23) | cref */
-	uint32_t	port;
-	char		ep[ATM_EPNAMSIZ];	/* \0 - none */
-	uint8_t		state;		/* Cx */
-};
-struct atm_exstatus_party {
-	uint32_t	connid;
-	uint16_t	epref;
-	uint8_t		state;		/* Px */
-};
-#endif
diff --git a/sys/contrib/ngatm/netnatm/api/cc_conn.c b/sys/contrib/ngatm/netnatm/api/cc_conn.c
deleted file mode 100644
index 3350e2cb3806..000000000000
--- a/sys/contrib/ngatm/netnatm/api/cc_conn.c
+++ /dev/null
@@ -1,2096 +0,0 @@
-/*
- * Copyright (c) 2003-2007
- *	Hartmut Brandt
- *	All rights reserved.
- *
- * Copyright (c) 2001-2002
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation must retain the above
- *    copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE AUTHOR
- * AND ITS CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR OR ITS CONTRIBUTORS  BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id: cc_conn.c 1291 2007-07-10 10:35:38Z brandt_h $
- *
- * ATM API as defined per af-saa-0108
- *
- * Lower half - connection handling
- */
-#include <netnatm/unimsg.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#include <netnatm/api/unisap.h>
-#include <netnatm/sig/unidef.h>
-#include <netnatm/api/atmapi.h>
-#include <netnatm/api/ccatm.h>
-#include <netnatm/api/ccpriv.h>
-
-static const char *stab[] = {
-#define DEF(N) [N] = #N,
-	CONN_STATES
-#undef DEF
-};
-
-static const char *ptab[] = {
-#define DEF(N) [PARTY_##N] = #N,
-	PARTY_STATES
-#undef DEF
-};
-
-const char *
-cc_conn_state2str(u_int s)
-{
-	if (s >= sizeof(stab) / sizeof(stab[0]) || stab[s] == NULL)
-		return ("?");
-	return (stab[s]);
-}
-
-void
-cc_conn_set_state(struct ccconn *conn, enum conn_state ns)
-{
-	if (conn->state != ns) {
-		if (conn->cc->log & CCLOG_CONN_STATE)
-			cc_conn_log(conn, "%s -> %s",
-			    stab[conn->state], stab[ns]);
-		conn->state = ns;
-	}
-}
-
-const char *
-cc_party_state2str(u_int s)
-{
-	if (s >= sizeof(ptab) / sizeof(ptab[0]) || ptab[s] == NULL)
-		return ("?");
-	return (ptab[s]);
-}
-
-void
-cc_party_set_state(struct ccparty *party, enum party_state ns)
-{
-
-	if (party->state != ns) {
-		if (party->conn->cc->log & CCLOG_PARTY_STATE)
-			cc_party_log(party, "%s -> %s",
-			    ptab[party->state], ptab[ns]);
-		party->state = ns;
-	}
-}
-
-/*
- * Remove connection from its user's queue
- */
-void
-cc_disconnect_from_user(struct ccconn *conn)
-{
-
-	if (conn->user == NULL)
-		cc_conn_log(conn, "no %s", "user");
-	else {
-		TAILQ_REMOVE(&conn->user->connq, conn, connq_link);
-		conn->user->queue_act--;
-		conn->user = NULL;
-	}
-}
-
-/*
- * Put connection on user queue
- */
-void
-cc_connect_to_user(struct ccconn *conn, struct ccuser *user)
-{
-
-	if (conn->user != NULL)
-		cc_conn_log(conn, "still connected to %p", conn->user);
-	conn->user = user;
-	TAILQ_INSERT_TAIL(&user->connq, conn, connq_link);
-	conn->user->queue_act++;
-}
-
-/*
- * Send a signal to the UNI stack for this connection
- */
-static void
-cc_send_uni(struct ccconn *conn, u_int op, struct uni_msg *msg)
-{
-	struct ccreq *r;
-
-	r = CCZALLOC(sizeof(*r));
-	if (r == NULL) {
-		if (msg != NULL)
-			uni_msg_destroy(msg);
-		cc_conn_log(conn, "no memory for cookie op=%u", op);
-		return;
-	}
-
-	if ((r->cookie = ++conn->port->cc->cookie) == 0)
-		r->cookie = ++conn->port->cc->cookie;
-	r->req = op;
-	r->conn = conn;
-
-	TAILQ_INSERT_TAIL(&conn->port->cookies, r, link);
-
-	conn->port->cc->funcs->send_uni(conn, conn->port->uarg, op,
-	    r->cookie, msg);
-}
-
-/*
- * Send a RELEASE.request for this connection.
- */
-static void
-do_release_request(struct ccconn *conn, const struct uni_ie_cause cause[2])
-{
-	struct uni_msg *u;
-	struct uniapi_release_request *req;
-
-	if ((u = uni_msg_alloc(sizeof(*req))) == NULL)
-		return;
-	req = uni_msg_wptr(u, struct uniapi_release_request *);
-	memset(req, 0, sizeof(*req));
-	u->b_wptr += sizeof(struct uniapi_release_request);
-
-	req->release.hdr.cref = conn->cref;
-	req->release.hdr.act = UNI_MSGACT_DEFAULT;
-
-	if (cause == NULL) {
-		IE_SETPRESENT(req->release.cause[0]);
-		req->release.cause[0].h.act = UNI_IEACT_DEFAULT;
-		req->release.cause[0].loc = UNI_CAUSE_LOC_USER;
-		req->release.cause[0].cause = UNI_CAUSE_UNSPEC;
-	} else {
-		req->release.cause[0] = cause[0];
-		req->release.cause[1] = cause[1];
-	}
-
-	cc_send_uni(conn, UNIAPI_RELEASE_request, u);
-}
-
-/*
- * Make a RELEASE.response for this connection
- */
-static void
-do_release_response(struct ccconn *conn, uint8_t cause, struct uni_ie_cause *ie)
-{
-	struct uni_msg *u;
-	struct uniapi_release_response *resp;
-
-	if ((u = uni_msg_alloc(sizeof(*resp))) == NULL)
-		return;
-	resp = uni_msg_wptr(u, struct uniapi_release_response *);
-	memset(resp, 0, sizeof(*resp));
-	u->b_wptr += sizeof(struct uniapi_release_response);
-
-	resp->release_compl.hdr.cref = conn->cref;
-	resp->release_compl.hdr.act = UNI_MSGACT_DEFAULT;
-
-	if (ie != NULL)
-		resp->release_compl.cause[0] = *ie;
-
-	if (cause != 0) {
-		IE_SETPRESENT(resp->release_compl.cause[0]);
-		resp->release_compl.cause[0].h.act = UNI_IEACT_DEFAULT;
-		resp->release_compl.cause[0].loc = UNI_CAUSE_LOC_USER;
-		resp->release_compl.cause[0].cause = cause;
-	}
-
-	cc_send_uni(conn, UNIAPI_RELEASE_response, u);
-}
-
-/**********************************************************************
- *
- * INSTANCE handling
- */
-struct ccconn *
-cc_conn_create(struct ccdata *cc)
-{
-	struct ccconn *conn;
-
-	conn = CCZALLOC(sizeof(*conn));
-	if (conn == NULL)
-		return (NULL);
-
-	conn->state = CONN_NULL;
-	conn->port = NULL;
-	conn->cc = cc;
-	LIST_INIT(&conn->parties);
-
-	LIST_INSERT_HEAD(&cc->orphaned_conns, conn, port_link);
-
-	if (conn->cc->log & CCLOG_CONN_INST)
-		cc_conn_log(conn, "created %s", "orphaned");
-
-	return (conn);
-}
-
-/*
- * assign to port
- */
-void
-cc_conn_ins_port(struct ccconn *conn, struct ccport *port)
-{
-
-	if (conn->port != NULL) {
-		cc_conn_log(conn, "conn is already on port %u",
-		    conn->port->param.port);
-		cc_conn_rem_port(conn);
-	}
-	LIST_REMOVE(conn, port_link);
-
-	conn->port = port;
-	LIST_INSERT_HEAD(&port->conn_list, conn, port_link);
-
-}
-
-/*
- * remove from port
- */
-void
-cc_conn_rem_port(struct ccconn *conn)
-{
-
-	if (conn->port == NULL) {
-		cc_conn_log(conn, "conn not on any %s", "port");
-		return;
-	}
-	LIST_REMOVE(conn, port_link);
-	conn->port = NULL;
-	LIST_INSERT_HEAD(&conn->cc->orphaned_conns, conn, port_link);
-}
-
-static void
-cc_conn_flush_cookies(struct ccconn *conn)
-{
-	struct ccreq *r, *r1;
-
-	if (conn->port == NULL)
-		return;
-	TAILQ_FOREACH_SAFE(r, &conn->port->cookies, link, r1) {
-		if (r->conn == conn) {
-			TAILQ_REMOVE(&conn->port->cookies, r, link);
-			CCFREE(r);
-		}
-	}
-}
-
-void
-cc_conn_reset_acceptor(struct ccconn *conn)
-{
-	if (conn->acceptor != NULL) {
-		conn->acceptor->accepted = NULL;
-		conn->acceptor = NULL;
-	}
-}
-
-/*
- * Destroy a connection
- */
-void
-cc_conn_destroy(struct ccconn *conn)
-{
-	struct ccparty *p;
-
-	if (conn->cc->log & CCLOG_CONN_INST)
-		cc_conn_log(conn, "destroy%s", "");
-
-	if (conn->user != NULL) {
-		cc_conn_log(conn, "still connected to user %p\n", conn->user);
-		conn->user->queue_act--;
-		TAILQ_REMOVE(&conn->user->connq, conn, connq_link);
-	}
-
-	if (conn->acceptor != NULL)
-		conn->acceptor->accepted = NULL;
-
-	cc_conn_flush_cookies(conn);
-	cc_conn_sig_flush(conn);
-
-	LIST_REMOVE(conn, port_link);
-	while ((p = LIST_FIRST(&conn->parties)) != NULL) {
-		LIST_REMOVE(p, link);
-		CCFREE(p);
-	}
-
-	CCFREE(conn);
-}
-
-struct ccparty *
-cc_party_create(struct ccconn *conn, u_int ident, u_int flag)
-{
-	struct ccparty *party;
-
-	party = CCZALLOC(sizeof(*party));
-	if (party == NULL)
-		return (NULL);
-
-	party->conn = conn;
-	party->state = PARTY_NULL;
-	IE_SETPRESENT(party->epref);
-	party->epref.flag = flag;
-	party->epref.epref = ident;
-	LIST_INSERT_HEAD(&conn->parties, party, link);
-
-	if (party->conn->cc->log & CCLOG_PARTY_INST)
-		cc_party_log(party, "created %u.%u", flag, ident);
-
-	return (party);
-}
-
-static void
-cc_party_destroy(struct ccparty *party)
-{
-
-	if (party->conn->cc->log & CCLOG_PARTY_INST)
-		cc_party_log(party, "destroyed %u.%u", party->epref.flag,
-		    party->epref.epref);
-
-	LIST_REMOVE(party, link);
-	CCFREE(party);
-}
-
-static struct ccparty *
-cc_party_find(struct ccconn *conn, u_int ident)
-{
-	struct ccparty *party;
-
-	LIST_FOREACH(party, &conn->parties, link)
-		if (party->epref.epref == ident)
-			return (party);
-	return (NULL);
-}
-/*
- * Abort connection from down stream (because of the UNI hook beeing
- * disconnected). This is called from two places:
- *  1) the shutdown code.
- *	In this case the connections should be already dissociated from
- *	users and be only in states waiting for the UNI stack.
- *  2) from the disconnect code.
- */
-void
-cc_conn_abort(struct ccconn *conn, int shutdown)
-{
-	struct ccuser *u = conn->user;
-	struct ccparty *p, *p1;
-
-	if (shutdown) {
-		CCASSERT(u == NULL, ("still in use"));
-		CCASSERT(conn->acceptor == NULL, ("still in use"));
-		cc_conn_destroy(conn);
-		return;
-	}
-
-	/*
-	 * Look whether any parties are blocked waiting for a response
-	 * from the stack. We don't use extra party states to handle
-	 * user aborts, so check that there is a user before using it.
-	 */
-	if (u == NULL) {
-		while ((p = LIST_FIRST(&conn->parties)) != NULL)
-			cc_party_destroy(p);
-	} else {
-		LIST_FOREACH_SAFE(p, &conn->parties, link, p1) {
-			switch (p->state) {
-
-			  case PARTY_NULL:		/* P0 */
-				/* should not happen */
-				goto dpty;
-
-			  case PARTY_ACTIVE:		/* P1 */
-				/* don't send a drop - user'll get a rel */
-				goto dpty;
-
-			  case PARTY_ADD_WAIT_CREATE:	/* P2 */
-			  case PARTY_ADD_WAIT_OK:	/* P3 */
-				/* we're adding - synthesise an error */
-				cc_user_sig(u, USER_SIG_ADD_PARTY_ERR,
-				    NULL, ATMERR_BAD_PORT);
-				goto dpty;
-
-			  case PARTY_ADD_WAIT_ACK:	/* P4 */
-				/* don't send a drop - user'll get a rel */
-				goto dpty;
-
-			  case PARTY_DROP_WAIT_OK:	/* P5 */
-			  case PARTY_DROP_WAIT_ACK:	/* P6 */
-			  case PARTY_ADD_DROP_WAIT_OK:	/* P11 */
-				/* we're dropping - synthesis an ok */
-				cc_user_sig(u, USER_SIG_DROP_PARTY_OK,
-				    NULL, p->epref.epref);
-				goto dpty;
-
-			  case PARTY_WAIT_DESTROY:	/* P7 */
-				goto dpty;
-
-			  case PARTY_WAIT_SETUP_COMPL:	/* P8 */
-			  case PARTY_WAIT_SETUP_CONF:	/* P10 */
-				/* first party - nothing to do */
-				goto dpty;
-
-			  case PARTY_WAIT_DROP_ACK_OK:	/* P9 */
-			  case PARTY_ADD_DROPACK_WAIT_OK:/* P12 */
-				/* we're dropping - nothing to do */
-				goto dpty;
-			}
-			cc_party_log(p, "bad uabort for party in state %s",
-			    ptab[p->state]);
-    dpty:
-			cc_party_destroy(p);
-		}
-	}
-
-	/*
-	 * Now do what the connection needs
-	 */
-	switch (conn->state) {
-
-	  case CONN_NULL:		/* 0 */
-	  case CONN_OUT_PREPARING: 	/* 1 */
-		/* may not happen because we're not associated with
-		 * aport yet */
-		break;
-
-	  case CONN_OUT_WAIT_CREATE: 	/* 2 */
-	  case CONN_OUT_WAIT_OK:	/* 3 */
-	  case CONN_OUT_WAIT_DESTROY:	/* 37 */
-		/* return an error to the user, go back to C1/U1
-		 * reset cref (for C37, C3) and cookie */
-		conn->cref.flag = 0;
-		conn->cref.cref = 0;
-		cc_conn_flush_cookies(conn);
-		cc_conn_set_state(conn, CONN_OUT_PREPARING);
-		cc_conn_rem_port(conn);
-		cc_user_sig(u, USER_SIG_CONNECT_OUTGOING_ERR,
-		    NULL, ATMERR_BAD_PORT);
-		return;
-
-	  case CONN_OUT_WAIT_CONF:	/* 4 */
-	  case CONN_ACTIVE:		/* 5 */
-	  case CONN_IN_WAIT_COMPL:	/* 13 */
-		/* emulate a RELEASE.confirm */
-		memset(&u->cause, 0, sizeof(u->cause));
-		cc_user_sig(u, USER_SIG_RELEASE_CONFIRM, NULL, 0);
-		cc_disconnect_from_user(conn);
-		cc_conn_destroy(conn);
-		return;
-
-	  case CONN_IN_PREPARING:	/* 10 */
-	  case CONN_AB_WAIT_REQ_OK:	/* 33 */
-	  case CONN_AB_WAIT_RESP_OK:	/* 34 */
-	  case CONN_AB_FLUSH_IND:	/* 35 */
-		/* no user - destroy */
-		cc_conn_destroy(conn);
-		return;
-
-	  case CONN_IN_ARRIVED:		/* 11 */
-		u->aborted = 1;
-		cc_disconnect_from_user(conn);
-		cc_conn_destroy(conn);
-		return;
-
-	  case CONN_IN_WAIT_ACCEPT_OK:	/* 12 */
-		/* return ACCEPT error */
-		cc_disconnect_from_user(conn);
-		cc_conn_reset_acceptor(conn);
-		cc_user_sig(u, USER_SIG_ACCEPT_ERR,
-		    u, ATMERR_PREVIOUSLY_ABORTED);
-		cc_conn_destroy(conn);
-		return;
-
-	  case CONN_REJ_WAIT_OK:	/* 14 */
-		/* return REJECT ok */
-		cc_disconnect_from_user(conn);
-		cc_conn_destroy(conn);
-		cc_user_sig(u, USER_SIG_REJECT_OK, NULL, 0);
-		return;
-
-	  case CONN_REL_IN_WAIT_OK:	/* 15 */
-	  case CONN_REL_WAIT_OK:	/* 20 */
-		/* confirm destroy */
-		if (u != NULL) {
-			/* connection not aborted */
-			memset(&u->cause, 0, sizeof(u->cause));
-			cc_user_sig(u, USER_SIG_RELEASE_CONFIRM, NULL, 0);
-			cc_disconnect_from_user(conn);
-		}
-		cc_conn_destroy(conn);
-		return;
-
-	  case CONN_IN_WAITING:		/* 21 */
-		/* user has not seen the connection - destroy */
-		cc_disconnect_from_user(conn);
-		cc_conn_destroy(conn);
-		return;
-	}
-	cc_conn_log(conn, "bad state %s", stab[conn->state]);
-}
-
-#ifdef DEBUG_MATCH
-static void
-print_sap(const struct uni_sap *sap)
-{
-	static const char *const tags[] = {
-		[UNISVE_ABSENT] "absent",
-		[UNISVE_PRESENT]"present",
-		[UNISVE_ANY]	"any",
-	};
-	u_int i;
-
-	printf("addr={%s", tags[sap->addr.tag]);
-	if (sap->addr.tag == UNISVE_PRESENT) {
-		printf(",%d-%d", sap->addr.type, sap->addr.plan);
-		for (i = 0; i < sap->addr.len; i++)
-			printf("%c%02x", ",:"[i!=0], sap->addr.addr[i]);
-	}
-	printf("}\n");
-
-	printf("selector={%s", tags[sap->selector.tag]);
-	if (sap->selector.tag == UNISVE_PRESENT)
-		printf(",%02x", sap->selector.selector);
-	printf("}\n");
-
-	printf("blli_id2={%s", tags[sap->blli_id2.tag]);
-	if (sap->blli_id2.tag == UNISVE_PRESENT)
-		printf(",%02x,%02x", sap->blli_id2.proto, sap->blli_id2.user);
-	printf("}\n");
-
-	printf("blli_id3={%s", tags[sap->blli_id3.tag]);
-	if (sap->blli_id3.tag == UNISVE_PRESENT)
-		printf(",%02x,%02x,%02x,%06x,%04x,%d",
-		    sap->blli_id3.proto, sap->blli_id3.user,
-		    sap->blli_id3.ipi, sap->blli_id3.oui,
-		    sap->blli_id3.pid, sap->blli_id3.noipi);
-	printf("}\n");
-
-	printf("bhli={%s", tags[sap->bhli.tag]);
-	if (sap->bhli.tag == UNISVE_PRESENT) {
-		printf(",%d", sap->bhli.type);
-		for (i = 0; i < sap->bhli.len; i++)
-			printf("%c%02x", ",:"[i!=0], sap->bhli.info[i]);
-	}
-	printf("}\n");
-}
-#endif
-
-/*********************************************************************
- *
- * DISPATCH incoming call
- */
-void
-cc_conn_dispatch(struct ccconn *conn)
-{
-	struct ccdata *priv = conn->port->cc;
-	struct ccuser *user;
-	u_int blli_index;
-
-#ifdef DEBUG_MATCH
-	static char buf[1000];
-	static struct unicx cx;
-	static int init = 1;
-
-	if (init) {
-		uni_initcx(&cx);
-		init = 0;
-	}
-#endif
-
-	/*
-	 * Do call dispatching according to 4.6
-	 */
-#ifdef DEBUG_MATCH
-	printf("+++++ DISPATCH++++++\n");
-#endif
-	for (blli_index = 0; blli_index < UNI_NUM_IE_BLLI; blli_index++) {
-		if (blli_index > 0 && !IE_ISGOOD(conn->blli[blli_index]))
-			break;
-#ifdef DEBUG_MATCH
-		if (IE_ISPRESENT(conn->called)) {
-			uni_print_ie(buf, sizeof(buf), UNI_IE_CALLED,
-			    (union uni_ieall *)&conn->called, &cx);
-			printf("called=%s\n", buf);
-		}
-		if (IE_ISPRESENT(conn->bhli)) {
-			uni_print_ie(buf, sizeof(buf), UNI_IE_BHLI,
-			    (union uni_ieall *)&conn->bhli, &cx);
-			printf("bhli=%s\n", buf);
-		}
-		if (IE_ISPRESENT(conn->blli[blli_index])) {
-			uni_print_ie(buf, sizeof(buf), UNI_IE_BLLI,
-			    (union uni_ieall *)&conn->blli[blli_index], &cx);
-			printf("%s\n", buf);
-		}
-#endif
-		LIST_FOREACH(user, &priv->user_list, node_link) {
-			if ((user->state == USER_IN_WAITING ||
-			    user->state == USER_IN_ARRIVED ||
-			    user->state == USER_IN_WAIT_ACC ||
-			    user->state == USER_IN_WAIT_REJ) &&
-			    !unisve_is_catchall(user->sap)) {
-#ifdef DEBUG_MATCH
-				printf("TRYING user=%p\n", user);
-				print_sap(user->sap);
-#endif
-				if (unisve_match(user->sap, &conn->called,
-				    &conn->blli[blli_index], &conn->bhli))
-					goto found;
-			}
-		}
-	}
-#ifdef DEBUG_MATCH
-	printf("TRYING CATCHALL\n");
-#endif
-	blli_index = 0;
-	LIST_FOREACH(user, &priv->user_list, node_link) {
-		if ((user->state == USER_IN_WAITING ||
-		    user->state == USER_IN_ARRIVED ||
-		    user->state == USER_IN_WAIT_ACC ||
-		    user->state == USER_IN_WAIT_REJ) &&
-		    unisve_is_catchall(user->sap))
-			goto found;
-	}
-#ifdef DEBUG_MATCH
-	printf("SORRY\n");
-#endif
-
-	/*
-	 * No application found - reject call.
-	 */
-	do_release_response(conn, UNI_CAUSE_INCOMP, NULL);
-	cc_conn_set_state(conn, CONN_AB_WAIT_RESP_OK);
-	return;
-
-  found:
-#ifdef DEBUG_MATCH
-	printf("MATCH\n");
-#endif
-	if (user->queue_max == user->queue_act) {
-		do_release_response(conn, UNI_CAUSE_BUSY, NULL);
-		cc_conn_set_state(conn, CONN_AB_WAIT_RESP_OK);
-		return;
-	}
-
-	if (blli_index == 0 && !IE_ISGOOD(conn->blli[blli_index]))
-		conn->blli_selector = 0;
-	else
-		conn->blli_selector = blli_index + 1;
-
-	cc_conn_set_state(conn, CONN_IN_WAITING);
-	cc_connect_to_user(conn, user);
-
-	cc_user_sig(user, USER_SIG_SETUP_IND, NULL, 0);
-}
-
-static void
-cc_party_setup_conf(struct ccconn *conn)
-{
-	struct ccparty *party;
-
-	party = cc_party_find(conn, conn->epref.epref);
-	if (party == NULL) {
-		cc_party_log(party, "no party for %s",
-		    cc_conn_sigtab[CONN_SIG_SETUP_CONFIRM]);
-		return;
-	}
-	if (party->state != PARTY_WAIT_SETUP_CONF) {
-		cc_party_log(party, "bad state=%s for signal=%s",
-		    ptab[party->state], cc_conn_sigtab[CONN_SIG_SETUP_CONFIRM]);
-		return;
-	}
-	cc_party_set_state(party, PARTY_ACTIVE);
-}
-
-static void
-cc_party_add_ack_ind(struct ccconn *conn, const struct uni_ie_epref *epref)
-{
-	struct ccparty *party;
-
-	party = cc_party_find(conn, epref->epref);
-	if (party == NULL) {
-		cc_party_log(party, "no party for %s",
-		    cc_conn_sigtab[CONN_SIG_PARTY_ADD_ACK_IND]);
-	}
-	if (party->state != PARTY_ADD_WAIT_ACK) {
-		cc_party_log(party, "bad state=%s for signal=%s",
-		    ptab[party->state],
-		    cc_conn_sigtab[CONN_SIG_PARTY_ADD_ACK_IND]);
-		return;
-	}
-	cc_party_set_state(party, PARTY_ACTIVE);
-	cc_user_sig(conn->user, USER_SIG_ADD_PARTY_ACK,
-	    NULL, epref->epref);
-}
-
-static void
-cc_party_add_rej_ind(struct ccconn *conn, const struct uni_ie_epref *epref)
-{
-	struct ccparty *party;
-
-	party = cc_party_find(conn, epref->epref);
-	if (party == NULL) {
-		cc_party_log(party, "no party for %s",
-		    cc_conn_sigtab[CONN_SIG_PARTY_ADD_REJ_IND]);
-		return;
-	}
-	if (party->state != PARTY_ADD_WAIT_ACK) {
-		cc_party_log(party, "bad state=%s for signal=%s",
-		    ptab[party->state],
-		    cc_conn_sigtab[CONN_SIG_PARTY_ADD_REJ_IND]);
-		return;
-	}
-	cc_party_set_state(party, PARTY_WAIT_DESTROY);
-	cc_user_sig(conn->user, USER_SIG_ADD_PARTY_REJ, NULL, epref->epref);
-}
-
-static void
-cc_party_drop_ack_ind(struct ccconn *conn,
-    const struct uni_drop_party *drop)
-{
-	struct ccparty *party;
-
-	party = cc_party_find(conn, drop->epref.epref);
-	if (party == NULL) {
-		cc_party_log(party, "no party for %s",
-		    cc_conn_sigtab[CONN_SIG_DROP_PARTY_ACK_IND]);
-		return;
-	}
-	switch (party->state) {
-
-	  case PARTY_ACTIVE:			/* P1 */
-		memset(&conn->user->cause[1], 0, sizeof(conn->user->cause[1]));
-		conn->user->cause[0] = drop->cause;
-		cc_party_set_state(party, PARTY_WAIT_DESTROY);
-		cc_user_sig(conn->user, USER_SIG_DROP_PARTY_IND,
-		    NULL, party->epref.epref);
-		break;
-
-	  case PARTY_ADD_WAIT_ACK:		/* P4 */
-		memset(&conn->user->cause[1], 0, sizeof(conn->user->cause[1]));
-		conn->user->cause[0] = drop->cause;
-		cc_party_set_state(party, PARTY_WAIT_DESTROY);
-		cc_user_sig(conn->user, USER_SIG_ADD_PARTY_REJ,
-		    NULL, party->epref.epref);
-		break;
-
-	  case PARTY_DROP_WAIT_ACK:		/* P6 */
-		cc_party_set_state(party, PARTY_WAIT_DESTROY);
-		cc_user_sig(conn->user, USER_SIG_DROP_PARTY_OK, NULL, 0);
-		break;
-
-	  case PARTY_WAIT_SETUP_COMPL:		/* P8 */
-	  case PARTY_WAIT_SETUP_CONF:		/* P10 */
-		cc_party_set_state(party, PARTY_WAIT_DESTROY);
-		break;
-
-	  default:
-		cc_party_log(party, "bad state=%s for signal=%s",
-		    ptab[party->state],
-		    cc_conn_sigtab[CONN_SIG_DROP_PARTY_ACK_IND]);
-		break;
-	}
-}
-
-/*
- * Handle a signal to this connection
- */
-void
-cc_conn_sig_handle(struct ccconn *conn, enum conn_sig sig,
-    void *arg, u_int iarg)
-{
-	struct ccparty *party;
-
-	if (conn->cc->log & CCLOG_CONN_SIG)
-		cc_conn_log(conn, "signal %s in state %s", cc_conn_sigtab[sig],
-		    stab[conn->state]);
-
-	switch (sig) {
-
-	  case CONN_SIG_CONNECT_OUTGOING:
-		/* Do SETUP */
-	    {
-		struct uni_msg *u;
-		struct uniapi_setup_request *setup;
-
-		if (conn->state != CONN_OUT_PREPARING)
-			goto bad_state;
-
-		if (IE_ISGOOD(conn->bearer) &&
-		    conn->bearer.cfg == UNI_BEARER_MP) {
-			IE_SETPRESENT(conn->epref);
-			conn->epref.flag = 0;
-			conn->epref.epref = 0;
-		}
-
-		/*
-		 * Construct message to UNI.
-		 */
-		u = uni_msg_alloc(sizeof(struct uniapi_setup_request));
-		if (u == NULL) {
-			cc_user_sig(conn->user, USER_SIG_CONNECT_OUTGOING_ERR,
-			    NULL, ATMERR_NOMEM);
-			return;
-		}
-		setup = uni_msg_wptr(u, struct uniapi_setup_request *);
-		memset(setup, 0, sizeof(*setup));
-		u->b_wptr += sizeof(struct uniapi_setup_request);
-
-		setup->setup.hdr.act = UNI_MSGACT_DEFAULT;
-		memcpy(setup->setup.blli, conn->blli, sizeof(conn->blli));
-		setup->setup.bearer = conn->bearer;
-		setup->setup.traffic = conn->traffic;
-		setup->setup.qos = conn->qos;
-		setup->setup.exqos = conn->exqos;
-		setup->setup.called = conn->called;
-		setup->setup.calledsub[0] = conn->calledsub;
-		setup->setup.aal = conn->aal;
-		setup->setup.epref = conn->epref;
-		setup->setup.eetd = conn->eetd;
-		setup->setup.abrsetup = conn->abrsetup;
-		setup->setup.abradd = conn->abradd;
-		setup->setup.calling = conn->calling;
-		setup->setup.callingsub[0] = conn->callingsub;
-		setup->setup.connid = conn->connid;
-		memcpy(setup->setup.tns, conn->tns, sizeof(conn->tns));
-		setup->setup.atraffic = conn->atraffic;
-		setup->setup.mintraffic = conn->mintraffic;
-		setup->setup.cscope = conn->cscope;
-		setup->setup.bhli = conn->bhli;
-		setup->setup.mdcr = conn->mdcr;
-
-		cc_conn_set_state(conn, CONN_OUT_WAIT_CREATE);
-		cc_send_uni(conn, UNIAPI_SETUP_request, u);
-
-		break;
-	    }
-
-
-	  case CONN_SIG_ARRIVAL:
-		/* user informed of arrival of this call */
-		if (conn->state != CONN_IN_WAITING)
-			goto bad_state;
-		cc_conn_set_state(conn, CONN_IN_ARRIVED);
-		break;
-
-
-	  case CONN_SIG_RELEASE:
-	    {
-		/* Release this call */
-		struct uni_msg *u;
-		struct uniapi_release_request *req;
-
-		if (conn->state != CONN_ACTIVE &&
-		    conn->state != CONN_IN_WAIT_COMPL)
-			goto bad_state;
-
-		if ((u = uni_msg_alloc(sizeof(*req))) == NULL)
-			return;
-
-		req = uni_msg_wptr(u, struct uniapi_release_request *);
-		memset(req, 0, sizeof(*req));
-		u->b_wptr += sizeof(struct uniapi_release_request);
-
-		req->release.hdr.cref = conn->cref;
-		req->release.hdr.act = UNI_MSGACT_DEFAULT;
-
-		req->release.cause[0] = conn->cause[0];
-		req->release.cause[1] = conn->cause[1];
-
-		if (conn->state == CONN_ACTIVE)
-			cc_conn_set_state(conn, CONN_REL_WAIT_OK);
-		else
-			cc_conn_set_state(conn, CONN_REL_IN_WAIT_OK);
-
-		cc_send_uni(conn, UNIAPI_RELEASE_request, u);
-		break;
-	    }
-
-	  case CONN_SIG_REJECT:
-	    {
-		/* reject from user */
-		struct ccuser *user = conn->user;
-
-		if (conn->state != CONN_IN_ARRIVED) {
-			cc_user_sig(user, USER_SIG_REJECT_ERR,
-			    NULL, ATMERR_BAD_STATE);
-			break;
-		}
-		cc_conn_set_state(conn, CONN_REJ_WAIT_OK);
-		do_release_response(conn, 0, conn->cause);
-		break;
-	    }
-
-
-	  case CONN_SIG_ACCEPT:
-	    {
-		 /* User accepts. */
-    		struct ccuser *newep = arg;
-		struct uni_msg *u;
-		struct uniapi_setup_response *resp;
-		struct ccuser *user = conn->user;
-
-		if (conn->state != CONN_IN_ARRIVED) {
-			cc_user_sig(user, USER_SIG_ACCEPT_ERR,
-			    NULL, ATMERR_PREVIOUSLY_ABORTED);
-			break;
-		}
-
-		u = uni_msg_alloc(sizeof(struct uniapi_setup_response));
-		if (u == NULL) {
-			cc_user_sig(user, USER_SIG_ACCEPT_ERR,
-			    NULL, ATMERR_NOMEM);
-			return;
-		}
-
-		/*
-		 * Link to the new endpoint
-		 */
-		conn->acceptor = newep;
-		newep->accepted = conn;
-
-		/*
-		 * Construct connect message
-		 */
-		resp = uni_msg_wptr(u, struct uniapi_setup_response *);
-		memset(resp, 0, sizeof(*resp));
-		u->b_wptr += sizeof(*resp);
-
-		resp->connect.hdr.act = UNI_MSGACT_DEFAULT;
-		resp->connect.hdr.cref = conn->cref;
-
-		/*
-		 * attributes
-		 */
-		if (conn->dirty_attr & CCDIRTY_AAL)
-			resp->connect.aal = conn->aal;
-		if (conn->dirty_attr & CCDIRTY_BLLI)
-			resp->connect.blli =
-			    conn->blli[conn->blli_selector - 1];
-		if (conn->dirty_attr & CCDIRTY_CONNID)
-			resp->connect.connid = conn->connid;
-		/* XXX NOTIFY */
-		if (conn->dirty_attr & CCDIRTY_EETD)
-			resp->connect.eetd = conn->eetd;
-		/* XXX GIT */
-		/* XXX UU */
-		if (conn->dirty_attr & CCDIRTY_TRAFFIC)
-			resp->connect.traffic = conn->traffic;
-		if (conn->dirty_attr & CCDIRTY_EXQOS)
-			resp->connect.exqos = conn->exqos;
-		if (conn->dirty_attr & CCDIRTY_ABRSETUP)
-			resp->connect.abrsetup = conn->abrsetup;
-		if (conn->dirty_attr & CCDIRTY_ABRADD)
-			resp->connect.abradd = conn->abradd;
-
-		/*
-		 * If the SETUP had an endpoint reference - echo it back
-		 */
-		if (IE_ISPRESENT(conn->epref)) {
-			resp->connect.epref = conn->epref;
-			resp->connect.epref.flag = !resp->connect.epref.flag;
-		}
-
-		cc_conn_set_state(conn, CONN_IN_WAIT_ACCEPT_OK);
-		cc_send_uni(conn, UNIAPI_SETUP_response, u);
-		break;
-	    }
-
-
-	  case CONN_SIG_ADD_PARTY:
-	    {
-		/* request to add party from user */
-		struct uni_msg *u;
-		struct uniapi_add_party_request *req;
-
-		if (conn->state != CONN_ACTIVE)
-			goto bad_state;
-
-		/* create the party */
-		party = cc_party_create(conn, (u_int)(uintptr_t)arg, 0);
-		if (party == NULL) {
-			cc_user_sig(conn->user, USER_SIG_ADD_PARTY_ERR,
-			    NULL, ATMERR_NOMEM);
-			return;
-		}
-		party->called = conn->called;
-
-		/* Construct message to UNI. */
-		u = uni_msg_alloc(sizeof(struct uniapi_setup_request));
-		if (u == NULL) {
-			cc_party_destroy(party);
-			cc_user_sig(conn->user, USER_SIG_ADD_PARTY_ERR,
-			    NULL, ATMERR_NOMEM);
-			return;
-		}
-
-		req = uni_msg_wptr(u, struct uniapi_add_party_request *);
-		memset(req, 0, sizeof(*req));
-		u->b_wptr += sizeof(struct uniapi_add_party_request);
-
-		req->add.hdr.act = UNI_MSGACT_DEFAULT;
-		req->add.hdr.cref = conn->cref;
-		req->add.epref = party->epref;
-		req->add.called = party->called;
-
-		cc_party_set_state(party, PARTY_ADD_WAIT_CREATE);
-		cc_send_uni(conn, UNIAPI_ADD_PARTY_request, u);
-		break;
-	    }
-
-
-	  case CONN_SIG_DROP_PARTY:
-	    {
-		/* user request to drop a party */
-		struct uni_msg *u;
-		struct uniapi_drop_party_request *req;
-
-		if (conn->state != CONN_ACTIVE)
-			goto bad_state;
-
-		party = cc_party_find(conn, (u_int)(uintptr_t)arg);
-		if (party == NULL) {
-			cc_user_sig(conn->user, USER_SIG_DROP_PARTY_ERR,
-			    NULL, ATMERR_BAD_PARTY);
-			return;
-		}
-
-		switch (party->state) {
-
-		  case PARTY_ACTIVE:
-		  case PARTY_ADD_WAIT_ACK:
-			break;
-
-		  default:
-			cc_user_sig(conn->user, USER_SIG_DROP_PARTY_ERR,
-			    NULL, ATMERR_BAD_STATE);
-			return;
-
-		}
-		/*
-		 * Construct message to UNI.
-		 */
-		u = uni_msg_alloc(sizeof(*req));
-		if (u == NULL) {
-			cc_user_sig(conn->user, USER_SIG_DROP_PARTY_ERR,
-			    NULL, ATMERR_NOMEM);
-			return;
-		}
-
-		req = uni_msg_wptr(u, struct uniapi_drop_party_request *);
-		memset(req, 0, sizeof(*req));
-		u->b_wptr += sizeof(struct uniapi_drop_party_request);
-
-		req->drop.hdr.act = UNI_MSGACT_DEFAULT;
-		req->drop.hdr.cref = conn->cref;
-		req->drop.epref = party->epref;
-		req->drop.cause = conn->cause[0];
-
-		if (party->state == PARTY_ACTIVE)
-			cc_party_set_state(party, PARTY_DROP_WAIT_OK);
-		else
-			cc_party_set_state(party, PARTY_ADD_DROP_WAIT_OK);
-		cc_send_uni(conn, UNIAPI_DROP_PARTY_request, u);
-		break;
-	    }
-
-	  case CONN_SIG_DROP_PARTY_ACK_IND:
-	    {
-		struct uni_msg *msg = arg;
-		struct uniapi_drop_party_ack_indication *ind = uni_msg_rptr(msg,
-		    struct uniapi_drop_party_ack_indication *);
-
-		cc_party_drop_ack_ind(conn, &ind->drop);
-		break;
-	    }
-
-
-	  case CONN_SIG_USER_ABORT:
-		/*
-		 * Aborting a connection. This is callable in all states.
-		 * The connection is already disconnected from the user.
-		 * The cause is in cause[].
-		 */
-		switch (conn->state) {
-
-		  case CONN_NULL:		/* C0 */
-		  case CONN_OUT_PREPARING:	/* C1 */
-			cc_conn_destroy(conn);
-			break;
-
-		  case CONN_OUT_WAIT_CONF:	/* C4 */
-		  case CONN_ACTIVE:		/* C5 */
-			do_release_request(conn, conn->cause);
-			cc_conn_set_state(conn, CONN_AB_WAIT_REQ_OK);
-			break;
-
-		  case CONN_IN_WAITING:		/* C21 */
-			/* that should not happen */
-			goto bad_state;
-			break;
-
-		  case CONN_IN_ARRIVED:		/* C11 */
-			/*
-			 * This is called only for the first connection
-			 * of the user - the others are re-dispatched.
-			 */
-			do_release_response(conn, 0, conn->cause);
-			cc_conn_set_state(conn, CONN_AB_WAIT_RESP_OK);
-			break;
-
-		  case CONN_IN_WAIT_COMPL:	/* C13 */
-			do_release_request(conn, conn->cause);
-			cc_conn_set_state(conn, CONN_AB_WAIT_REQ_OK);
-			break;
-
-		  case CONN_OUT_WAIT_DESTROY:	/* C20 */
-			cc_conn_set_state(conn, CONN_AB_FLUSH_IND);
-			break;
-
-		  case CONN_IN_WAIT_ACCEPT_OK:	/* C12 */
-		  case CONN_AB_WAIT_REQ_OK:	/* C33 */
-		  case CONN_AB_WAIT_RESP_OK:	/* C34 */
-		  case CONN_AB_FLUSH_IND:	/* C35 */
-			/* just ignore */
-			break;
-
-		/*
-		 * The following states may not happen, because
-		 * we're waiting for a response from the UNI stack.
-		 * As soon as the response comes the ABORT is undefered
-		 * and will hit us (but in another state).
-		 */
-		  case CONN_OUT_WAIT_CREATE:	/* C2 */
-		  case CONN_OUT_WAIT_OK:	/* C3 */
-		  case CONN_IN_PREPARING:	/* C10 */
-		  case CONN_REJ_WAIT_OK:	/* C14 */
-		  case CONN_REL_IN_WAIT_OK:	/* C15 */
-		  case CONN_REL_WAIT_OK:	/* C20 */
-			goto bad_state;
-		}
-		break;
-
-
-	  case CONN_SIG_CREATED:
-	    {
-		/*
-		 * CALL_CREATED message from UNI. This can happen for either
-		 * incoming or outgoing connections.
-		 */
-		struct uni_msg *msg = arg;
-		struct uniapi_call_created *cr = uni_msg_rptr(msg,
-		    struct uniapi_call_created *);
-
-		switch (conn->state) {
-
-		  case CONN_OUT_WAIT_CREATE:
-			conn->cref = cr->cref;
-			cc_conn_set_state(conn, CONN_OUT_WAIT_OK);
-			break;
-
-		  case CONN_NULL:
-			conn->cref = cr->cref;
-			cc_conn_set_state(conn, CONN_IN_PREPARING);
-			break;
-
-		  default:
-			goto bad_state;
-		}
-		break;
-	    }
-
-	  case CONN_SIG_DESTROYED:
-		/*
-		 * CALL_DESTROYED message from UNI.
-		 */
-		switch (conn->state) {
-
-		  case CONN_OUT_WAIT_DESTROY:
-			cc_conn_rem_port(conn);
-			cc_conn_set_state(conn, CONN_OUT_PREPARING);
-			if (conn->user != NULL)
-				cc_user_sig(conn->user,
-				    USER_SIG_CONNECT_OUTGOING_ERR,
-				    NULL, ATM_MKUNIERR(conn->reason));
-			break;
-
-		  case CONN_AB_FLUSH_IND:
-			cc_conn_destroy(conn);
-			break;
-
-		  case CONN_IN_PREPARING:
-			cc_conn_destroy(conn);
-			break;
-
-		  default:
-			goto bad_state;
-		}
-		break;
-
-
-	  case CONN_SIG_SETUP_CONFIRM:
-		/* Setup confirm from the UNI. */
-	    {
-		struct uni_msg *msg = arg;
-		struct uniapi_setup_confirm *conf = uni_msg_rptr(msg,
-		    struct uniapi_setup_confirm *);
-
-		switch (conn->state) {
-
-		  case CONN_OUT_WAIT_CONF:
-			/*
-			 * Shuffle attributes and inform the user.
-			 * Negotiable attributes are condititionally shuffled,
-			 * because not returning it means accepting it
-			 * (in case of blli the first instance of it).
-			 * All others are shuffled unconditionally.
-			 * Here we should also open the VCI in the driver. (XXX)
-			 */
-#define SHUFFLE(ATTR)	conn->ATTR = conf->connect.ATTR
-#define COND_SHUFFLE(ATTR) if (IE_ISPRESENT(conf->connect.ATTR)) SHUFFLE(ATTR)
-
-			COND_SHUFFLE(aal);
-			(void)memset(conn->blli + 1, 0,
-			    sizeof(conn->blli) - sizeof(conn->blli[0]));
-			if (IE_ISPRESENT(conf->connect.blli))
-				conn->blli[0] = conf->connect.blli;
-			conn->blli_selector = 1;
-			COND_SHUFFLE(epref);
-			SHUFFLE(conned);
-			SHUFFLE(connedsub);
-			SHUFFLE(eetd);
-			COND_SHUFFLE(traffic);
-			COND_SHUFFLE(exqos);
-			COND_SHUFFLE(abrsetup);
-			COND_SHUFFLE(abradd);
-			COND_SHUFFLE(connid);
-#undef SHUFFLE
-#undef COND_SHUFFLE
-			if (IE_ISGOOD(conn->epref))
-				cc_party_setup_conf(conn);
-
-			cc_conn_set_state(conn, CONN_ACTIVE);
-			cc_user_sig(conn->user, USER_SIG_SETUP_CONFIRM,
-			    NULL, 0);
-			break;
-
-		  case CONN_AB_FLUSH_IND:
-		  case CONN_AB_WAIT_RESP_OK:
-			break;
-
-		  default:
-			goto bad_state;
-		}
-		break;
-	    }
-
-	  case CONN_SIG_SETUP_IND:
-	    {
-		/* SETUP indication */
-		struct uni_msg *msg = arg;
-		struct uniapi_setup_indication *ind = uni_msg_rptr(msg,
-		    struct uniapi_setup_indication *);
-		u_int i;
-
-		if (conn->state != CONN_IN_PREPARING)
-			goto bad_state;
-
-		/*
-		 * Shuffle information elements.
-		 */
-		for (i = 0; i < UNI_NUM_IE_BLLI; i++)
-			conn->blli[i] = ind->setup.blli[i];
-		conn->bearer = ind->setup.bearer;
-		conn->traffic = ind->setup.traffic;
-		conn->qos = ind->setup.qos;
-		conn->exqos = ind->setup.exqos;
-		conn->called = ind->setup.called;
-		conn->calledsub = ind->setup.calledsub[0];
-		conn->aal = ind->setup.aal;
-		conn->epref = ind->setup.epref;
-		conn->eetd = ind->setup.eetd;
-		conn->abrsetup = ind->setup.abrsetup;
-		conn->abradd = ind->setup.abradd;
-		conn->calling = ind->setup.calling;
-		conn->callingsub = ind->setup.callingsub[0];
-		conn->connid = ind->setup.connid;
-		for (i = 0; i < UNI_NUM_IE_TNS; i++)
-			conn->tns[i] = ind->setup.tns[i];
-		conn->atraffic = ind->setup.atraffic;
-		conn->mintraffic = ind->setup.mintraffic;
-		conn->cscope = ind->setup.cscope;
-		conn->bhli = ind->setup.bhli;
-		conn->mdcr = ind->setup.mdcr;
-
-		cc_conn_dispatch(conn);
-		break;
-	    }
-
-
-	  case CONN_SIG_SETUP_COMPL:
-	    {
-		struct uni_msg *msg = arg;
-		struct uniapi_setup_indication *ind __unused =
-		    uni_msg_rptr(msg, struct uniapi_setup_indication *);
-
-		/* SETUP_COMPLETE.indication from UNI */
-		if (conn->state == CONN_AB_FLUSH_IND ||
-		    conn->state == CONN_AB_WAIT_RESP_OK)
-			break;
-
-		if (conn->state != CONN_IN_WAIT_COMPL)
-			goto bad_state;
-
-		cc_conn_set_state(conn, CONN_ACTIVE);
-
-		LIST_FOREACH(party, &conn->parties, link) {
-			if (party->state == PARTY_WAIT_SETUP_COMPL)
-				cc_party_set_state(party, PARTY_ACTIVE);
-			else
-				cc_party_log(party, "bad state=%s for sig=%s",
-				    ptab[party->state],
-				    cc_conn_sigtab[CONN_SIG_SETUP_COMPL]);
-		}
-
-		cc_user_sig(conn->user, USER_SIG_SETUP_COMPL, NULL, 0);
-		break;
-	    }
-
-
-	  case CONN_SIG_PROC_IND:
-	    {
-		/*
-		 * ALERTING.indication and PROCEEDING.indication are entirly
-		 * ignored by the specification. We need to at least save the
-		 * connid information element.
-		 */
-		struct uni_msg *msg = arg;
-		struct uniapi_proceeding_indication *ind = uni_msg_rptr(msg,
-		    struct uniapi_proceeding_indication *);
-
-		switch (conn->state) {
-
-		  case CONN_OUT_WAIT_CONF:
-			if (IE_ISGOOD(ind->call_proc.connid))
-				conn->connid = ind->call_proc.connid;
-			break;
-
-		  case CONN_AB_FLUSH_IND:
-		  case CONN_AB_WAIT_RESP_OK:
-			break;
-
-		  default:
-			goto bad_state;
-		}
-		break;
-	    }
-
-	  case CONN_SIG_ALERTING_IND:
-	    {
-		struct uni_msg *msg = arg;
-		struct uniapi_alerting_indication *ind = uni_msg_rptr(msg,
-		    struct uniapi_alerting_indication *);
-
-		switch (conn->state) {
-
-		  case CONN_OUT_WAIT_CONF:
-			if (IE_ISGOOD(ind->alerting.connid))
-				conn->connid = ind->alerting.connid;
-			break;
-
-		  case CONN_AB_FLUSH_IND:
-		  case CONN_AB_WAIT_RESP_OK:
-			break;
-
-		  default:
-			goto bad_state;
-		}
-		break;
-	  }
-
-	  case CONN_SIG_REL_CONF:
-	    {
-		/* RELEASE.confirm from UNI */
-		struct uni_msg *msg = arg;
-		struct uniapi_release_confirm *conf = uni_msg_rptr(msg,
-		    struct uniapi_release_confirm *);
-
-		switch (conn->state) {
-
-		  case CONN_OUT_WAIT_CONF:
-		  case CONN_ACTIVE:
-			cc_conn_set_state(conn, CONN_AB_FLUSH_IND);
-			memcpy(conn->user->cause, conf->release.cause,
-			    sizeof(conn->user->cause));
-			/*
-			 * If any party is in P6, ok the user
-			 */
-			LIST_FOREACH(party, &conn->parties, link) {
-				if (party->state == PARTY_DROP_WAIT_ACK) {
-					cc_party_set_state(party,
-					    PARTY_WAIT_DESTROY);
-					cc_user_sig(conn->user,
-					    USER_SIG_DROP_PARTY_OK,
-					    NULL, party->epref.epref);
-				}
-			}
-			cc_user_sig(conn->user, USER_SIG_RELEASE_CONFIRM,
-			    NULL, 0);
-			cc_disconnect_from_user(conn);
-			break;
-
-		  case CONN_AB_FLUSH_IND:
-		  case CONN_AB_WAIT_RESP_OK:
-			break;
-
-		  case CONN_IN_WAITING:
-			cc_disconnect_from_user(conn);
-			cc_conn_set_state(conn, CONN_AB_FLUSH_IND);
-			break;
-
-		  case CONN_IN_ARRIVED:
-			conn->user->aborted = 1;
-			memcpy(conn->user->cause, conf->release.cause,
-			    sizeof(conn->user->cause));
-			cc_conn_set_state(conn, CONN_AB_FLUSH_IND);
-			cc_disconnect_from_user(conn);
-			break;
-
-		  case CONN_IN_WAIT_COMPL:
-			cc_conn_set_state(conn, CONN_AB_FLUSH_IND);
-			memcpy(conn->user->cause, conf->release.cause,
-			    sizeof(conn->user->cause));
-			cc_user_sig(conn->user, USER_SIG_RELEASE_CONFIRM,
-			    NULL, 0);
-			cc_disconnect_from_user(conn);
-			break;
-			
-		  default:
-			goto bad_state;
-		}
-		break;
-	    }
-
-	  case CONN_SIG_REL_IND:
-	    {
-		/* RELEASE.ind from UNI */
-		struct uni_msg *msg = arg;
-		struct uniapi_release_indication *conf = uni_msg_rptr(msg,
-		    struct uniapi_release_indication *);
-
-		switch (conn->state) {
-
-		  case CONN_OUT_WAIT_CONF:
-		  case CONN_ACTIVE:
-			do_release_response(conn, 0, NULL);
-			cc_conn_set_state(conn, CONN_AB_WAIT_RESP_OK);
-			memcpy(conn->user->cause, conf->release.cause,
-			    sizeof(conn->user->cause));
-			/*
-			 * If any party is in P6, ok the user
-			 */
-			LIST_FOREACH(party, &conn->parties, link) {
-				if (party->state == PARTY_DROP_WAIT_ACK) {
-					cc_party_set_state(party,
-					    PARTY_WAIT_DESTROY);
-					cc_user_sig(conn->user,
-					    USER_SIG_DROP_PARTY_OK,
-					    NULL, party->epref.epref);
-				}
-			}
-			cc_user_sig(conn->user, USER_SIG_RELEASE_CONFIRM,
-			    NULL, 0);
-			cc_disconnect_from_user(conn);
-			break;
-
-		  case CONN_AB_FLUSH_IND:
-		  case CONN_AB_WAIT_RESP_OK:
-			break;
-
-		  case CONN_IN_WAITING:
-			cc_disconnect_from_user(conn);
-			do_release_response(conn, 0, NULL);
-			cc_conn_set_state(conn, CONN_AB_WAIT_RESP_OK);
-			break;
-
-		  case CONN_IN_ARRIVED:
-			conn->user->aborted = 1;
-			cc_disconnect_from_user(conn);
-			do_release_response(conn, 0, NULL);
-			cc_conn_set_state(conn, CONN_AB_WAIT_RESP_OK);
-			break;
-
-		  case CONN_IN_WAIT_COMPL:
-			do_release_response(conn, 0, NULL);
-			cc_conn_set_state(conn, CONN_AB_WAIT_RESP_OK);
-			memcpy(conn->user->cause, conf->release.cause,
-			    sizeof(conn->user->cause));
-			cc_user_sig(conn->user, USER_SIG_RELEASE_CONFIRM,
-			    NULL, 0);
-			cc_disconnect_from_user(conn);
-			break;
-		  default:
-			goto bad_state;
-			break;
-		}
-		break;
-	    }
-
-	  case CONN_SIG_PARTY_ALERTING_IND:
-		/* party alerting from UNI */
-		if (conn->state == CONN_AB_FLUSH_IND)
-			break;
-		if (conn->state != CONN_ACTIVE)
-			goto bad_state;
-		/* ignore */
-		break;
-
-	  case CONN_SIG_PARTY_ADD_ACK_IND:
-	    {
-		/* ADD PARTY ACKNOWLEDGE from UNI */
-		struct uni_msg *msg = arg;
-		struct uniapi_add_party_ack_indication *ind = uni_msg_rptr(msg,
-		    struct uniapi_add_party_ack_indication *);
-
-		if (conn->state == CONN_AB_FLUSH_IND)
-			break;
-		if (conn->state != CONN_ACTIVE)
-			goto bad_state;
-
-		cc_party_add_ack_ind(conn, &ind->ack.epref);
-		break;
-	    }
-
-
-	 case CONN_SIG_PARTY_ADD_REJ_IND:
-	    {
-		/* ADD PARTY REJECT indication */
-		struct uni_msg *msg = arg;
-		struct uniapi_add_party_rej_indication *ind = uni_msg_rptr(msg,
-		    struct uniapi_add_party_rej_indication *);
-
-		if (conn->state == CONN_AB_FLUSH_IND)
-			break;
-		if (conn->state != CONN_ACTIVE)
-			goto bad_state;
-
-		memset(&conn->user->cause[1], 0, sizeof(conn->user->cause[1]));
-		conn->user->cause[0] = ind->rej.cause;
-
-		cc_party_add_rej_ind(conn, &ind->rej.epref);
-		break;
-	    }
-
-
-	  case CONN_SIG_DROP_PARTY_IND:
-	    {
-		/* DROP_PARTY.indication from UNI */
-		struct uni_msg *msg = arg;
-		struct uniapi_drop_party_indication *ind = uni_msg_rptr(msg,
-		    struct uniapi_drop_party_indication *);
-		struct uniapi_drop_party_ack_request *req;
-		struct uni_msg *u;
-
-		if (conn->state == CONN_AB_FLUSH_IND)
-			break;
-		if (conn->state != CONN_ACTIVE)
-			goto bad_state;
-
-		party = cc_party_find(conn, ind->drop.epref.epref);
-		if (party == NULL) {
-			cc_party_log(party, "no party for %s",
-			    cc_conn_sigtab[sig]);
-			break;
-		}
-
-		u = uni_msg_alloc(sizeof(*req));
-		if (u == NULL)
-			return;
-
-		memset(&conn->user->cause[1], 0, sizeof(conn->user->cause[1]));
-		conn->user->cause[0] = ind->drop.cause;
-
-		switch (party->state) {
-
-		  default:
-			cc_party_log(party, "bad state %s for DROP.ind",
-			    ptab[party->state]);
-			/* FALLTHRU */
-
-		  case PARTY_ACTIVE:		/* P1 -> P9 */
-			cc_party_set_state(party, PARTY_WAIT_DROP_ACK_OK);
-			break;
-
-		  case PARTY_ADD_WAIT_ACK:	/* P4 -> P12 */
-			cc_party_set_state(party, PARTY_ADD_DROPACK_WAIT_OK);
-			break;
-		}
-
-		/*
-		 * Construct message to UNI.
-		 */
-		req = uni_msg_wptr(u, struct uniapi_drop_party_ack_request *);
-		memset(req, 0, sizeof(*req));
-		u->b_wptr += sizeof(*req);
-
-		IE_SETPRESENT(req->ack.epref);
-		req->ack.hdr.act = UNI_MSGACT_DEFAULT;
-		req->ack.hdr.cref = conn->cref;
-
-		req->ack.epref.flag = 0;
-		req->ack.epref.epref = ind->drop.epref.epref;
-
-		cc_send_uni(conn, UNIAPI_DROP_PARTY_ACK_request, u);
-		break;
-	    }
-
-	  case CONN_SIG_OK:
-	    {
- 		/* OK response from UNI */
-		struct ccuser *user = conn->user;
-
-		switch (conn->state) {
-
-		  case CONN_OUT_WAIT_OK:		/* C3 */
-			cc_conn_set_state(conn, CONN_OUT_WAIT_CONF);
-			if (conn->user != NULL)
-				cc_user_sig(conn->user,
-				    USER_SIG_CONNECT_OUTGOING_OK, NULL, 0);
-			break;
-
-		  case CONN_AB_WAIT_RESP_OK:		/* C33 */
-		  case CONN_AB_WAIT_REQ_OK:		/* C34 */
-			cc_conn_set_state(conn, CONN_AB_FLUSH_IND);
-			break;
-
-		  case CONN_REL_WAIT_OK:		/* C20 */
-		  case CONN_REL_IN_WAIT_OK:		/* C15 */
-			cc_conn_set_state(conn, CONN_AB_FLUSH_IND);
-			if (conn->user != NULL) {
-				/* connection has not been aborted */
-				memset(&conn->user->cause, 0,
-				    sizeof(conn->user->cause));
-				cc_user_sig(conn->user,
-				    USER_SIG_RELEASE_CONFIRM, NULL, 0);
-				cc_disconnect_from_user(conn);
-			}
-			break;
-
-		  case CONN_IN_WAIT_ACCEPT_OK:		/* C12 */
-			if (user == NULL) {
-				/* has been aborted */
-				do_release_request(conn, NULL);
-				cc_conn_set_state(conn, CONN_AB_WAIT_REQ_OK);
-				break;
-			}
-			cc_conn_set_state(conn, CONN_IN_WAIT_COMPL);
-			cc_disconnect_from_user(conn);
-			cc_user_sig(user, USER_SIG_ACCEPT_OK, NULL, 0);
-			if (conn->acceptor == NULL) {
-				do_release_request(conn, NULL);
-				cc_conn_set_state(conn, CONN_AB_WAIT_REQ_OK);
-				break;
-			}
-			cc_connect_to_user(conn, conn->acceptor);
-			cc_conn_reset_acceptor(conn);
-			cc_user_sig(conn->user, USER_SIG_ACCEPTING, NULL, 0);
-			break;
-
-		  case CONN_REJ_WAIT_OK:		/* C14 */
-			cc_conn_set_state(conn, CONN_AB_FLUSH_IND);
-			if (user != NULL) {
-				cc_disconnect_from_user(conn);
-				cc_user_sig(user, USER_SIG_REJECT_OK, NULL, 0);
-			}
-			break;
-
-		  default:
-			/* maybe it's for a party */
-			LIST_FOREACH(party, &conn->parties, link) {
-				switch (party->state) {
-
-				  case PARTY_ADD_WAIT_OK:	/* P3 */
-					if (user != NULL)
-						cc_user_sig(user,
-						    USER_SIG_ADD_PARTY_OK,
-						    NULL, 0);
-					cc_party_set_state(party,
-					    PARTY_ADD_WAIT_ACK);
-					goto ex_party_ok;
-
-				  case PARTY_DROP_WAIT_OK:	/* P5 */
-					cc_party_set_state(party,
-					    PARTY_DROP_WAIT_ACK);
-					goto ex_party_ok;
-
-				  case PARTY_WAIT_DROP_ACK_OK:	/* P9 */
-				  case PARTY_ADD_DROPACK_WAIT_OK:/* P12 */
-				     {
-					struct ccparty *p1;
-
-					cc_party_set_state(party,
-					    PARTY_WAIT_DESTROY);
-					/* signal to user only if there are any other parties */
-					LIST_FOREACH(p1, &conn->parties, link)
-						if (p1 != party)
-							break;
-					if (p1 != NULL && user != NULL)
-						cc_user_sig(user,
-						    USER_SIG_DROP_PARTY_IND,
-						    NULL,
-						    party->epref.epref);
-
-					goto ex_party_ok;
-				    }
-
-				  case PARTY_ADD_DROP_WAIT_OK:	/* P11 */
-					cc_party_set_state(party,
-					    PARTY_DROP_WAIT_ACK);
-					goto ex_party_ok;
-
-				  default:
-					break;
-				}
-			}
-			goto bad_state;
-		    ex_party_ok:
-			break;
-		}
-		break;
-	    }
-
-	  case CONN_SIG_ERROR:
-	    {
-		/* error response from UNI */
-		u_int reason = (iarg >> 16) & 0xffff;
-		u_int state = iarg & 0xffff;
-		struct ccuser *user = conn->user;
-
-		switch (conn->state) {
-
-		  case CONN_OUT_WAIT_CREATE:		/* C2 */
-			cc_conn_rem_port(conn);
-			cc_conn_set_state(conn, CONN_OUT_PREPARING);
-			if (conn->user != NULL)
-				cc_user_sig(conn->user,
-				    USER_SIG_CONNECT_OUTGOING_ERR,
-				    NULL, ATM_MKUNIERR(reason));
-			break;
-
-		  case CONN_OUT_WAIT_OK:		/* C3 */
-			cc_conn_set_state(conn, CONN_OUT_WAIT_DESTROY);
-			conn->reason = reason;
-			break;
-
-		  case CONN_AB_WAIT_REQ_OK:		/* C33 */
-			if (state == UNI_CALLSTATE_U12) {
-				do_release_response(conn, 0, conn->cause);
-				cc_conn_set_state(conn, CONN_AB_WAIT_RESP_OK);
-				break;
-			}
-			cc_conn_set_state(conn, CONN_AB_FLUSH_IND);
-			break;
-
-		  case CONN_AB_WAIT_RESP_OK:		/* C34 */
-			cc_conn_set_state(conn, CONN_AB_FLUSH_IND);
-			break;
-
-		  case CONN_REL_WAIT_OK:		/* C20 */
-			if (user == NULL) {
-				/* connection has been aborted. */
-				if (state == UNI_CALLSTATE_U10) {
-					/* do what we can */
-					do_release_request(conn, conn->cause);
-					cc_conn_set_state(conn,
-					    CONN_AB_WAIT_REQ_OK);
-				} else if (state == UNI_CALLSTATE_U12) {
-					do_release_response(conn, 0, NULL);
-					cc_conn_set_state(conn,
-					    CONN_AB_WAIT_RESP_OK);
-				} else {
-					cc_conn_set_state(conn,
-					    CONN_AB_FLUSH_IND);
-				}
-				break;
-			}
-			if (state == UNI_CALLSTATE_U10) {
-				cc_conn_set_state(conn, CONN_ACTIVE);
-				cc_user_sig(conn->user, USER_SIG_RELEASE_ERR,
-				    NULL, reason);
-			} else if (state == UNI_CALLSTATE_U12) {
-				do_release_response(conn, 0, NULL);
-				cc_conn_set_state(conn, CONN_AB_WAIT_RESP_OK);
-				memset(&conn->user->cause, 0,
-				    sizeof(conn->user->cause));
-				cc_user_sig(conn->user,
-				    USER_SIG_RELEASE_CONFIRM, NULL, 0);
-				cc_disconnect_from_user(conn);
-			} else {
-				cc_conn_set_state(conn, CONN_AB_FLUSH_IND);
-				memset(&conn->user->cause, 0,
-				    sizeof(conn->user->cause));
-				cc_user_sig(conn->user,
-				    USER_SIG_RELEASE_CONFIRM, NULL, 0);
-				cc_disconnect_from_user(conn);
-			}
-			break;
-
-		  case CONN_IN_WAIT_ACCEPT_OK:		/* C12 */
-			if (user == NULL) {
-				/* connection was aborted */
-				if (state == UNI_CALLSTATE_U6 ||
-				    state == UNI_CALLSTATE_U7 ||
-				    state == UNI_CALLSTATE_U9 ||
-				    state == UNI_CALLSTATE_U12) {
-					do_release_response(conn, 0, NULL);
-					cc_conn_set_state(conn,
-					    CONN_AB_WAIT_RESP_OK);
-				} else {
-					cc_conn_set_state(conn,
-					    CONN_AB_FLUSH_IND);
-				}
-				break;
-			}
-			cc_conn_reset_acceptor(conn);
-			if (state == UNI_CALLSTATE_U6 ||
-			    state == UNI_CALLSTATE_U9 ||
-			    state == UNI_CALLSTATE_U7) {
-				cc_user_sig(user, USER_SIG_ACCEPT_ERR,
-				    NULL, ATM_MKUNIERR(reason));
-				cc_conn_set_state(conn, CONN_IN_ARRIVED);
-			} else if (state == UNI_CALLSTATE_U12) {
-				do_release_response(conn, 0, NULL);
-				cc_disconnect_from_user(conn);
-				cc_user_sig(user, USER_SIG_ACCEPT_ERR,
-				    user, ATMERR_PREVIOUSLY_ABORTED);
-				cc_conn_set_state(conn, CONN_AB_WAIT_RESP_OK);
-			} else {
-				cc_disconnect_from_user(conn);
-				cc_user_sig(user, USER_SIG_ACCEPT_ERR,
-				    user, ATMERR_PREVIOUSLY_ABORTED);
-				cc_conn_set_state(conn, CONN_AB_FLUSH_IND);
-			}
-			break;
-
-		  case CONN_REJ_WAIT_OK:		/* C14 */
-			if (user == NULL) {
-				/* connection has been aborted. */
-				if (state == UNI_CALLSTATE_U6 ||
-				    state == UNI_CALLSTATE_U7 ||
-				    state == UNI_CALLSTATE_U9 ||
-				    state == UNI_CALLSTATE_U12) {
-					/* do what we can */
-					do_release_response(conn, 0, NULL);
-					cc_conn_set_state(conn,
-					    CONN_AB_WAIT_RESP_OK);
-				} else {
-					cc_conn_set_state(conn,
-					    CONN_AB_FLUSH_IND);
-				}
-				break;
-			}
-			if (state == UNI_CALLSTATE_U6 ||
-			    state == UNI_CALLSTATE_U9 ||
-			    state == UNI_CALLSTATE_U7) {
-				cc_user_sig(user, USER_SIG_REJECT_ERR,
-				    NULL, ATM_MKUNIERR(reason));
-				cc_conn_set_state(conn, CONN_IN_ARRIVED);
-			} else {
-				cc_disconnect_from_user(conn);
-				cc_user_sig(user, USER_SIG_REJECT_OK, NULL, 0);
-				cc_conn_set_state(conn, CONN_AB_FLUSH_IND);
-			}
-			break;
-
-		  case CONN_REL_IN_WAIT_OK:		/* C15 */
-			if (user == NULL) {
-				/* connection has been aborted. */
-				if (state == UNI_CALLSTATE_U8) {
-					/* do what we can */
-					do_release_request(conn, conn->cause);
-					cc_conn_set_state(conn,
-					    CONN_AB_WAIT_REQ_OK);
-				} else if (state == UNI_CALLSTATE_U12) {
-					do_release_response(conn, 0, NULL);
-					cc_conn_set_state(conn,
-					    CONN_AB_WAIT_RESP_OK);
-				} else {
-					cc_conn_set_state(conn,
-					    CONN_AB_FLUSH_IND);
-				}
-				break;
-			}
-			if (state == UNI_CALLSTATE_U8) {
-				cc_conn_set_state(conn, CONN_IN_WAIT_COMPL);
-				cc_user_sig(conn->user, USER_SIG_RELEASE_ERR,
-				    NULL, reason);
-			} else if (state == UNI_CALLSTATE_U12) {
-				do_release_response(conn, 0, NULL);
-				cc_conn_set_state(conn, CONN_AB_WAIT_RESP_OK);
-				memset(&conn->user->cause, 0,
-				    sizeof(conn->user->cause));
-				cc_user_sig(conn->user,
-				    USER_SIG_RELEASE_CONFIRM, NULL, 0);
-				cc_disconnect_from_user(conn);
-			} else {
-				cc_conn_set_state(conn, CONN_AB_FLUSH_IND);
-				memset(&conn->user->cause, 0,
-				    sizeof(conn->user->cause));
-				cc_user_sig(conn->user,
-				    USER_SIG_RELEASE_CONFIRM, NULL, 0);
-				cc_disconnect_from_user(conn);
-			}
-			break;
-
-		  default:
-			/* maybe it's for a party */
-			LIST_FOREACH(party, &conn->parties, link) {
-				switch (party->state) {
-
-				  case PARTY_ADD_WAIT_CREATE:	/* P2 */
-					cc_party_destroy(party);
-					if (user != NULL)
-						cc_user_sig(user,
-						    USER_SIG_ADD_PARTY_ERR,
-						    NULL, ATM_MKUNIERR(reason));
-					goto ex_party_err;
-
-				  case PARTY_ADD_WAIT_OK:	/* P3 */
-					cc_party_set_state(party,
-					    PARTY_WAIT_DESTROY);
-					if (user != NULL)
-						cc_user_sig(user,
-						    USER_SIG_ADD_PARTY_ERR,
-						    NULL, ATM_MKUNIERR(reason));
-					goto ex_party_err;
-
-				  case PARTY_DROP_WAIT_OK:	/* P5 */
-					cc_party_set_state(party,
-					    PARTY_ACTIVE);
-					if (user != NULL)
-						cc_user_sig(user,
-						    USER_SIG_DROP_PARTY_ERR,
-						    NULL, ATM_MKUNIERR(reason));
-					goto ex_party_err;
-
-				  case PARTY_WAIT_DROP_ACK_OK:	/* P9 */
-					cc_party_set_state(party,
-					    PARTY_ACTIVE);
-					goto ex_party_err;
-
-				  case PARTY_ADD_DROP_WAIT_OK:	/* P11 */
-					cc_party_set_state(party,
-					    PARTY_ADD_WAIT_ACK);
-					if (user != NULL)
-						cc_user_sig(user,
-						    USER_SIG_DROP_PARTY_ERR,
-						    NULL, ATM_MKUNIERR(reason));
-					goto ex_party_err;
-
-				  case PARTY_ADD_DROPACK_WAIT_OK:/* P12 */
-					cc_party_set_state(party,
-					    PARTY_ADD_WAIT_ACK);
-					goto ex_party_err;
-
-				  default:
-					break;
-				}
-			}
-			cc_conn_log(conn, "unexpected reason=%u ustate=%u "
-			    "state=%s\n", reason, state, stab[conn->state]);
-		  ex_party_err:
-			break;
-		}
-		break;
-	    }
-
-	  case CONN_SIG_PARTY_CREATED:
-	    {
-		struct uni_msg *msg = arg;
-		struct uniapi_party_created *pcr = uni_msg_rptr(msg,
-		    struct uniapi_party_created *);
-
-		party = cc_party_find(conn, pcr->epref.epref);
-		if (party == NULL) {
-			/* for incoming connections we see the party-created
-			 * immediately after the call-create so that we
-			 * must be in C10 */
-			switch (conn->state) {
-
-			  case CONN_IN_PREPARING:
-				party = cc_party_create(conn,
-				    pcr->epref.epref, 1);
-				if (party == NULL)
-					break;
-				cc_party_set_state(party,
-				    PARTY_WAIT_SETUP_COMPL);
-				break;
-
-			  case CONN_OUT_WAIT_OK:
-				party = cc_party_create(conn,
-				    pcr->epref.epref, 0);
-				if (party == NULL)
-					break;
-				cc_party_set_state(party,
-				    PARTY_WAIT_SETUP_CONF);
-				break;
-
-			  default:
-				goto bad_state;
-			}
-			break;
-		}
-		/* this is for an ADD-PARTY */
-		if (conn->state != CONN_ACTIVE)
-			goto bad_state;
-		if (party->state != PARTY_ADD_WAIT_CREATE)
-			goto bad_party_state;
-		cc_party_set_state(party, PARTY_ADD_WAIT_OK);
-		break;
-	    }
-
-	  case CONN_SIG_PARTY_DESTROYED:
-	    {
-		struct uni_msg *msg = arg;
-		struct uniapi_party_destroyed *pcr = uni_msg_rptr(msg,
-		    struct uniapi_party_destroyed *);
-
-		party = cc_party_find(conn, pcr->epref.epref);
-		if (party == NULL) {
-			cc_conn_log(conn, "no party to destroy %u/%u",
-			    pcr->epref.flag, pcr->epref.epref);
-			break;
-		}
-		cc_party_destroy(party);
-		break;
-	    }
-
-	}
-
-	return;
-
-  bad_state:
-	cc_conn_log(conn, "bad state=%s for signal=%s",
-	    stab[conn->state], cc_conn_sigtab[sig]);
-	return;
-
-  bad_party_state:
-	cc_conn_log(conn, "bad party state=%s for signal=%s",
-	    ptab[party->state], cc_conn_sigtab[sig]);
-	return;
-}
diff --git a/sys/contrib/ngatm/netnatm/api/cc_data.c b/sys/contrib/ngatm/netnatm/api/cc_data.c
deleted file mode 100644
index bf607de1e45b..000000000000
--- a/sys/contrib/ngatm/netnatm/api/cc_data.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
-* Copyright (c) 2004
-*	Hartmut Brandt
-*	All rights reserved.
-*
-* Author: Harti Brandt <harti@freebsd.org>
-*
-* Redistribution of this software and documentation 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 or documentation must retain the above
-*    copyright notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE AUTHOR
-* AND ITS CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-* THE AUTHOR OR ITS CONTRIBUTORS  BE LIABLE FOR ANY DIRECT, INDIRECT,
-* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-* $Begemot: libunimsg/netnatm/api/cc_data.c,v 1.1 2004/07/08 08:21:50 brandt Exp $
-*
-* ATM API as defined per af-saa-0108
-*/
-#include <netnatm/unimsg.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#include <netnatm/api/unisap.h>
-#include <netnatm/sig/unidef.h>
-#include <netnatm/api/atmapi.h>
-#include <netnatm/api/ccatm.h>
-#include <netnatm/api/ccpriv.h>
-
-/*
- * Create a new call control instance
- */
-struct ccdata *
-cc_create(const struct cc_funcs *vtab)
-{
-	struct ccdata *cc;
-
-	cc = CCMALLOC(sizeof(*cc));
-	if (cc == NULL)
-		return (NULL);
-
-	LIST_INIT(&cc->user_list);
-	TAILQ_INIT(&cc->port_list);
-	LIST_INIT(&cc->orphaned_conns);
-	TAILQ_INIT(&cc->sigs);
-	TAILQ_INIT(&cc->def_sigs);
-	TAILQ_INIT(&cc->free_sigs);
-	cc->funcs = vtab;
-	cc->cookie = 0;
-
-	return (cc);
-}
-
-/*
- * Reset everything the hard way by just freeing the data
- */
-void
-cc_reset(struct ccdata *cc)
-{
-
-	while (!LIST_EMPTY(&cc->user_list))
-		cc_user_destroy(LIST_FIRST(&cc->user_list));
-
-	while (!TAILQ_EMPTY(&cc->port_list))
-		cc_port_destroy(TAILQ_FIRST(&cc->port_list), 1);
-
-	while (!LIST_EMPTY(&cc->orphaned_conns))
-		cc_conn_destroy(LIST_FIRST(&cc->orphaned_conns));
-
-	CCASSERT(LIST_EMPTY(&cc->user_list),
-	    ("user list not empty"));
-	CCASSERT(LIST_EMPTY(&cc->orphaned_conns),
-	    ("still orphaned conns"));
-
-	cc_sig_flush_all(cc);
-
-	cc->cookie = 0;
-}
-
-/*
- * Destroy a call control instance and free all data
- */
-void
-cc_destroy(struct ccdata *cc)
-{
-
-	cc_reset(cc);
-	CCFREE(cc);
-}
-
-/*
- * set/get logging flags
- */
-void
-cc_set_log(struct ccdata *cc, u_int flags)
-{
-	cc->log = flags;
-}
-u_int
-cc_get_log(const struct ccdata *cc)
-{
-	return (cc->log);
-}
-
-/* get extended status */
-int
-cc_get_extended_status(const struct ccdata *cc, struct atm_exstatus *status,
-    struct atm_exstatus_ep **pep, struct atm_exstatus_port **pport,
-    struct atm_exstatus_conn **pconn, struct atm_exstatus_party **pparty)
-{
-	const struct ccuser *user;
-	const struct ccport *port;
-	const struct ccconn *conn;
-	const struct ccparty *party;
-	struct atm_exstatus_ep *eep;
-	struct atm_exstatus_port *eport;
-	struct atm_exstatus_conn *econn;
-	struct atm_exstatus_party *eparty;
-
-	/* count and allocate */
-	status->neps = 0;
-	LIST_FOREACH(user, &cc->user_list, node_link)
-		status->neps++;
-
-	status->nports = 0;
-	status->nconns = 0;
-	status->nparties = 0;
-	LIST_FOREACH(conn, &cc->orphaned_conns, port_link) {
-		status->nconns++;
-		LIST_FOREACH(party, &conn->parties, link)
-			status->nparties++;
-	}
-	TAILQ_FOREACH(port, &cc->port_list, node_link) {
-		status->nports++;
-		LIST_FOREACH(conn, &port->conn_list, port_link) {
-			status->nconns++;
-			LIST_FOREACH(party, &conn->parties, link)
-				status->nparties++;
-		}
-	}
-
-	*pep = CCMALLOC(sizeof(**pep) * status->neps);
-	*pport = CCMALLOC(sizeof(**pport) * status->nports);
-	*pconn = CCMALLOC(sizeof(**pconn) * status->nconns);
-	*pparty = CCMALLOC(sizeof(**pparty) * status->nparties);
-
-	if (*pep == NULL || *pport == NULL ||
-	    *pconn == NULL || *pparty == NULL) {
-		CCFREE(*pep);
-		CCFREE(*pport);
-		CCFREE(*pconn);
-		CCFREE(*pparty);
-		return (ENOMEM);
-	}
-
-	eep = *pep;
-	eport = *pport;
-	econn = *pconn;
-	eparty = *pparty;
-
-	/* collect information */
-	LIST_FOREACH(user, &cc->user_list, node_link) {
-		strcpy(eep->name, user->name);
-		eep->state = user->state;
-		eep++;
-	}
-
-	LIST_FOREACH(conn, &cc->orphaned_conns, port_link) {
-		econn->id = econn - *pconn;
-		econn->port = 0;
-		if (conn->user != NULL)
-			strcpy(econn->ep, conn->user->name);
-		else
-			econn->ep[0] = '\0';
-		econn->state = conn->state;
-		econn->cref = conn->cref.cref;
-		if (conn->cref.flag)
-			econn->cref |= (1 << 23);
-		LIST_FOREACH(party, &conn->parties, link) {
-			eparty->connid = econn - *pconn;
-			eparty->epref = party->epref.epref;
-			eparty->state = party->state;
-			eparty++;
-		}
-		econn++;
-	}
-
-	TAILQ_FOREACH(port, &cc->port_list, node_link) {
-		eport->portno = port->param.port;
-		eport->state = port->admin;
-		LIST_FOREACH(conn, &port->conn_list, port_link) {
-			econn->id = econn - *pconn;
-			econn->port = port->param.port;
-			if (conn->user != NULL)
-				strcpy(econn->ep, conn->user->name);
-			else
-				econn->ep[0] = '\0';
-			econn->state = conn->state;
-			econn->cref = conn->cref.cref;
-			if (conn->cref.flag)
-				econn->cref |= (1 << 23);
-			LIST_FOREACH(party, &conn->parties, link) {
-				eparty->connid = econn - *pconn;
-				eparty->epref = party->epref.epref;
-				eparty->state = party->state;
-				eparty++;
-			}
-			econn++;
-		}
-		eport++;
-	}
-	return (0);
-}
diff --git a/sys/contrib/ngatm/netnatm/api/cc_dump.c b/sys/contrib/ngatm/netnatm/api/cc_dump.c
deleted file mode 100644
index 245f8b7b5f04..000000000000
--- a/sys/contrib/ngatm/netnatm/api/cc_dump.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * Copyright (c) 2003-2004
- *	Hartmut Brandt
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation must retain the above
- *    copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE AUTHOR
- * AND ITS CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR OR ITS CONTRIBUTORS  BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Begemot: libunimsg/netnatm/api/cc_dump.c,v 1.3 2004/08/05 07:10:56 brandt Exp $
- *
- * ATM API as defined per af-saa-0108
- */
-
-#include <netnatm/unimsg.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#include <netnatm/api/unisap.h>
-#include <netnatm/sig/unidef.h>
-#include <netnatm/api/atmapi.h>
-#include <netnatm/api/ccatm.h>
-#include <netnatm/api/ccpriv.h>
-
-#ifdef _KERNEL
-#ifdef __FreeBSD__
-#include <machine/stdarg.h>
-#endif
-#else	/* !_KERNEL */
-#include <stdarg.h>
-#endif
-
-/*
- * local structure to reduce number of arguments to functions
- */
-struct dump {
-	struct ccdata	*cc;	/* what to dump */
-	size_t		maxsiz;	/* size of user buffer */
-	cc_dump_f	func;	/* user function */
-	void		*uarg;	/* user supplied argument */
-	char		*buf;	/* user buffer */
-	size_t		len;	/* current string length */
-	int		ret;	/* return code */
-};
-
-static void cc_dumpf(struct dump *, const char *, ...) __printflike(2, 3);
-
-static void
-cc_dumpf(struct dump *d, const char *fmt, ...)
-{
-	va_list ap;
-	int n;
-
-	if (d->ret != 0)
-		return;
-	if (d->len >= d->maxsiz - 1) {
-		d->ret = d->func(d->cc, d->uarg, d->buf);
-		if (d->ret != 0)
-			return;
-		d->buf[0] = '\0';
-		d->len = 0;
-	}
-	va_start(ap, fmt);
-	n = vsnprintf(d->buf + d->len, d->maxsiz - d->len, fmt, ap);
-	va_end(ap);
-
-	if (n < 0) {
-		d->ret = CCGETERRNO();
-		return;
-	}
-	if ((size_t)n < d->maxsiz - d->len) {
-		d->len += n;
-		return;
-	}
-
-	/* undo the vsnprintf() and flush */
-	d->buf[d->len] = '\0';
-	d->ret = d->func(d->cc, d->uarg, d->buf);
-	if (d->ret != 0)
-		return;
-	d->buf[0] = '\0';
-	d->len = 0;
-
-	va_start(ap, fmt);
-	n = vsnprintf(d->buf, d->maxsiz, fmt, ap);
-	va_end(ap);
-
-	if (n < 0) {
-		d->ret = CCGETERRNO();
-		return;
-	}
-	if ((size_t)n >= d->maxsiz) {
-		/* ok, truncate */
-		d->len = d->maxsiz - 1;
-		return;
-	}
-	d->len = n;
-}
-
-/*
- * Dump a SAP
- */
-static void
-cc_dump_sap(struct dump *d, const struct uni_sap *sap)
-{
-	static const char *const tagtab[] = {
-		[UNISVE_ABSENT] =	"absent",
-		[UNISVE_ANY] =		"any",
-		[UNISVE_PRESENT] =	"present"
-	};
-	static const char *const plantab[] = {
-		[UNI_ADDR_E164] =	"E164",
-		[UNI_ADDR_ATME] =	"ATME",
-	};
-	static const char *const hlitab[] = {
-		[UNI_BHLI_ISO] =	"ISO",
-		[UNI_BHLI_VENDOR] =	"VENDOR",
-		[UNI_BHLI_USER] =	"USER"
-	};
-	u_int i;
-
-	cc_dumpf(d, "  sap(%p):\n", sap);
-	cc_dumpf(d, "    addr=%s", tagtab[sap->addr.tag]);
-	if (sap->addr.tag == UNISVE_PRESENT) {
-		cc_dumpf(d, " %s %u ", plantab[sap->addr.plan], sap->addr.len);
-		if (sap->addr.plan == UNI_ADDR_E164)
-			for (i = 0; i < sap->addr.len; i++)
-				cc_dumpf(d, "%c", sap->addr.addr[i]);
-		else
-			for (i = 0; i < sap->addr.len; i++)
-				cc_dumpf(d, "%02x", sap->addr.addr[i]);
-	}
-	cc_dumpf(d, "\n");
-
-	cc_dumpf(d, "    selector=%s", tagtab[sap->selector.tag]);
-	if (sap->selector.tag == UNISVE_PRESENT)
-		cc_dumpf(d, " %02x", sap->selector.selector);
-	cc_dumpf(d, "\n");
-
-	cc_dumpf(d, "    blli_id2=%s", tagtab[sap->blli_id2.tag]);
-	if (sap->blli_id2.tag == UNISVE_PRESENT)
-		cc_dumpf(d, " %02x %02x", sap->blli_id2.proto,
-		    sap->blli_id2.user);
-	cc_dumpf(d, "\n");
-
-	cc_dumpf(d, "    blli_id3=%s", tagtab[sap->blli_id3.tag]);
-	if (sap->blli_id3.tag == UNISVE_PRESENT)
-		cc_dumpf(d, " %02x,%02x, %02x(%d),%03x,%02x",
-		    sap->blli_id3.proto, sap->blli_id3.user,
-		    sap->blli_id3.ipi, sap->blli_id3.noipi,
-		    sap->blli_id3.oui, sap->blli_id3.pid);
-	cc_dumpf(d, "\n");
-
-	cc_dumpf(d, "    bhli=%s", tagtab[sap->bhli.tag]);
-	if (sap->bhli.tag == UNISVE_PRESENT) {
-		cc_dumpf(d, " %s ", hlitab[sap->bhli.type]);
-		for (i = 0; i < sap->bhli.len; i++)
-			cc_dumpf(d, "%02x", sap->bhli.info[i]);
-	}
-	cc_dumpf(d, "\n");
-}
-
-/*
- * Dump a user.
- */
-static void
-cc_dump_user(struct dump *d, const struct ccuser *user)
-{
-	struct ccconn *conn;
-
-	cc_dumpf(d, "user(%p): %s '%s' %s\n", user,
-	    cc_user_state2str(user->state), user->name,
-	    (user->config == USER_P2P) ? "p2p" :
-	    (user->config == USER_ROOT) ? "root" :
-	    (user->config == USER_LEAF) ? "leaf" : "?");
-	if (user->sap)
-		cc_dump_sap(d, user->sap);
-
-	cc_dumpf(d, "  queue=%u/%u accepted=%p aborted=%u\n", user->queue_max,
-	    user->queue_act, user->accepted, user->aborted);
-
-	cc_dumpf(d, "  connq:");
-	TAILQ_FOREACH(conn, &user->connq, connq_link)
-		cc_dumpf(d, "%p", conn);
-	cc_dumpf(d, "\n");
-}
-
-/*
- * Dump a party
- */
-static void
-cc_dump_party(struct dump *d, const struct ccparty *party, const char *pfx)
-{
-
-	cc_dumpf(d, "%s  party(%p): %u.%u %s\n", pfx, party,
-	    party->epref.flag, party->epref.epref,
-	    cc_party_state2str(party->state));
-}
-
-/*
- * Dump a connection
- */
-static void
-cc_dump_conn(struct dump *d, const struct ccconn *conn, const char *pfx)
-{
-	const struct ccparty *party;
-
-	cc_dumpf(d, "%sconn(%p): %s\n", pfx, conn,
-	    cc_conn_state2str(conn->state));
-	cc_dumpf(d, "%s  user=%p cref=%u.%u acceptor=%p\n", pfx,
-	    conn->user, conn->cref.cref, conn->cref.flag,
-	    conn->acceptor);
-
-	cc_dumpf(d, "%s  blli_sel=%u\n", pfx, conn->blli_selector);
-
-	LIST_FOREACH(party, &conn->parties, link)
-		cc_dump_party(d, party, pfx);
-}
-
-/*
- * Dump a port
- */
-static void
-cc_dump_port(struct dump *d, const struct ccport *p)
-{
-	u_int i;
-	const struct ccaddr *a;
-	const struct ccconn *c;
-	const struct ccreq *r;
-
-	static const char *const ttab[] = {
-		[UNI_ADDR_UNKNOWN] =		"unknown",
-		[UNI_ADDR_INTERNATIONAL] =	"international",
-		[UNI_ADDR_NATIONAL] =		"national",
-		[UNI_ADDR_NETWORK] =		"network",
-		[UNI_ADDR_SUBSCR] =		"subscr",
-		[UNI_ADDR_ABBR] =		"abbr",
-	};
-	static const char *const ptab[] = {
-		[UNI_ADDR_UNKNOWN] =	"unknown",
-		[UNI_ADDR_E164] =	"e164",
-		[UNI_ADDR_ATME] =	"atme",
-		[UNI_ADDR_DATA] =	"data",
-		[UNI_ADDR_PRIVATE] =	"private",
-	};
-
-	cc_dumpf(d, "port(%p) %u: %s\n", p, p->param.port,
-	    (p->admin == CCPORT_STOPPED) ? "STOPPED" :
-	    (p->admin == CCPORT_RUNNING) ? "RUNNING" : "????");
-	cc_dumpf(d, "  pcr=%u bits=%u.%u ids=%u/%u/%u esi=%02x:%02x:"
-	    "%02x:%02x:%02x:%02x naddrs=%u\n", p->param.pcr,
-	    p->param.max_vpi_bits, p->param.max_vci_bits, p->param.max_svpc_vpi,
-	    p->param.max_svcc_vpi, p->param.min_svcc_vci, p->param.esi[0],
-	    p->param.esi[1], p->param.esi[2], p->param.esi[3], p->param.esi[4],
-	    p->param.esi[5], p->param.num_addrs);
-
-	cc_dumpf(d, "  cookies:");
-	TAILQ_FOREACH(r, &p->cookies, link)
-		cc_dumpf(d, " %u(%p,%u)", r->cookie, r->conn, r->req);
-	cc_dumpf(d, "\n");
-
-	TAILQ_FOREACH(a, &p->addr_list, port_link) {
-		cc_dumpf(d, "  addr(%p): %s %s %u ", a,
-		    (a->addr.type < sizeof(ttab) / sizeof(ttab[0]) &&
-		    ttab[a->addr.type] != NULL) ? ttab[a->addr.type] : "?", 
-		    (a->addr.plan < sizeof(ptab) / sizeof(ptab[0]) &&
-		    ptab[a->addr.plan] != NULL) ? ptab[a->addr.plan] : "?", 
-		    a->addr.len);
-		for (i = 0; i < a->addr.len; i++)
-			cc_dumpf(d, "%02x", a->addr.addr[i]);
-		cc_dumpf(d, "\n");
-	}
-	LIST_FOREACH(c, &p->conn_list, port_link)
-		cc_dump_conn(d, c, "  ");
-}
-
-/*
- * Produce a textual dump of the state
- */
-int
-cc_dump(struct ccdata *cc, size_t maxsiz, cc_dump_f func, void *uarg)
-{
-	struct dump d;
-	struct ccuser *user;
-	struct ccconn *conn;
-	struct ccport *port;
-
-	d.ret = 0;
-	d.uarg = uarg;
-	d.maxsiz = maxsiz;
-	d.cc = cc;
-	d.func = func;
-	d.buf = CCMALLOC(maxsiz);
-	if (d.buf == NULL)
-		return (ENOMEM);
-	d.len = 0;
-
-	cc_dumpf(&d, "dump of node %p\n", cc);
-
-	TAILQ_FOREACH(port, &cc->port_list, node_link)
-		cc_dump_port(&d, port);
-
-	LIST_FOREACH(user, &cc->user_list, node_link)
-		cc_dump_user(&d, user);
-
-	cc_dumpf(&d, "orphaned conns:\n");
-	LIST_FOREACH(conn, &cc->orphaned_conns, port_link)
-		cc_dump_conn(&d, conn, "");
-
-	if (d.len > 0 && d.ret == 0)
-		d.ret = d.func(d.cc, d.uarg, d.buf);
-
-	CCFREE(d.buf);
-	return (d.ret);
-}
diff --git a/sys/contrib/ngatm/netnatm/api/cc_port.c b/sys/contrib/ngatm/netnatm/api/cc_port.c
deleted file mode 100644
index f01a723260b2..000000000000
--- a/sys/contrib/ngatm/netnatm/api/cc_port.c
+++ /dev/null
@@ -1,923 +0,0 @@
-/*
- * Copyright (c) 2003-2004
- *	Hartmut Brandt
- *	All rights reserved.
- *
- * Copyright (c) 2001-2002
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation must retain the above
- *    copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE AUTHOR
- * AND ITS CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR OR ITS CONTRIBUTORS  BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Begemot: libunimsg/netnatm/api/cc_port.c,v 1.1 2004/07/08 08:21:53 brandt Exp $
- *
- * ATM API as defined per af-saa-0108
- *
- * Port-global stuff (ILMI and Co.)
- */
-#include <netnatm/unimsg.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/api/unisap.h>
-#include <netnatm/sig/unidef.h>
-#include <netnatm/api/atmapi.h>
-#include <netnatm/api/ccatm.h>
-#include <netnatm/api/ccpriv.h>
-
-/*
- * Find a port with a given number
- */
-static struct ccport *
-find_port(struct ccdata *cc, u_int portno)
-{
-	struct ccport *port;
-
-	TAILQ_FOREACH(port, &cc->port_list, node_link)
-		if (port->param.port == portno)
-			return (port);
-	return (NULL);
-}
-
-/*
- * Create a new port structure, initialize it and link it to the node.
- * Returns 0 on success, an errno otherwise.
- */
-struct ccport *
-cc_port_create(struct ccdata *cc, void *uarg, u_int portno)
-{
-	struct ccport *port, *p1;
-
-	if (portno == 0 || portno > 0xffffffff)
-		return (NULL);
-
-	TAILQ_FOREACH(port, &cc->port_list, node_link)
-		if (port->param.port == portno)
-			return (NULL);
-
-	port = CCZALLOC(sizeof(*port));
-	if (port == NULL)
-		return (NULL);
-
-	port->uarg = uarg;
-	port->cc = cc;
-	port->admin = CCPORT_STOPPED;
-	LIST_INIT(&port->conn_list);
-	TAILQ_INIT(&port->addr_list);
-	port->param.port = portno;
-	port->param.pcr = 350053;
-	port->param.max_vpi_bits = 0;
-	port->param.max_vci_bits = 8;
-	port->param.max_svpc_vpi = 0;
-	port->param.max_svcc_vpi = 0;
-	port->param.min_svcc_vci = 32;
-	port->param.num_addrs = 0;
-	TAILQ_INIT(&port->cookies);
-
-	TAILQ_FOREACH(p1, &cc->port_list, node_link)
-		if (p1->param.port > portno) {
-			TAILQ_INSERT_BEFORE(p1, port, node_link);
-			break;
-		}
-	if (p1 == NULL)
-		TAILQ_INSERT_TAIL(&cc->port_list, port, node_link);
-
-	return (port);
-}
-
-/*
- * Destroy a port. This closes all connections and aborts all the users of
- * these connections.
- * This should be called only after work has returned so that no signals
- * are pending.
- */
-void
-cc_port_destroy(struct ccport *port, int shutdown)
-{
-	struct ccaddr *addr;
-	struct ccreq *r;
-
-	TAILQ_REMOVE(&port->cc->port_list, port, node_link);
-
-	while ((r = TAILQ_FIRST(&port->cookies)) != NULL) {
-		TAILQ_REMOVE(&port->cookies, r, link);
-		CCFREE(r);
-	}
-
-	/*
-	 * Abort all connections.
-	 */
-	while (!LIST_EMPTY(&port->conn_list))
-		cc_conn_abort(LIST_FIRST(&port->conn_list), shutdown);
-
-	/*
-	 * Free addresses.
-	 */
-	while ((addr = TAILQ_FIRST(&port->addr_list)) != NULL) {
-		TAILQ_REMOVE(&port->addr_list, addr, port_link);
-		CCFREE(addr);
-	}
-
-	CCFREE(port);
-}
-
-/*
- * Management is given up on this node. Remove all addresses from the port.
- */
-void
-cc_unmanage(struct ccdata *cc)
-{
-	struct ccport *port;
-	struct ccaddr *addr;
-
-	TAILQ_FOREACH(port, &cc->port_list, node_link) {
-		while ((addr = TAILQ_FIRST(&port->addr_list)) != NULL) {
-			TAILQ_REMOVE(&port->addr_list, addr, port_link);
-			CCFREE(addr);
-		}
-	}
-}
-
-/*
- * Compare two addresses
- */
-static __inline int
-addr_eq(const struct uni_addr *a1, const struct uni_addr *a2)
-{
-	return (a1->type == a2->type && a1->plan == a2->plan &&
-	    a1->len == a2->len && memcmp(a1->addr, a2->addr, a1->len) == 0);
-}
-
-
-/*
- * retrieve addresses
- */
-int
-cc_get_addrs(struct ccdata *cc, u_int portno,
-    struct uni_addr **pa, u_int **ports, u_int *count)
-{
-	struct ccport *port = NULL;
-	struct ccaddr *addr;
-	struct uni_addr *buf, *ptr;
-	u_int *pports;
-
-	/*
-	 * If a port number is specified and the port does not exist,
-	 * return an error.
-	 */
-	if (portno != 0)
-		if ((port = find_port(cc, portno)) == NULL)
-			return (ENOENT);
-
-	/*
-	 * Count the addresses
-	 */
-	*count = 0;
-	if (portno != 0) {
-		TAILQ_FOREACH(addr, &port->addr_list, port_link)
-			(*count)++;
-	} else {
-		TAILQ_FOREACH(port, &cc->port_list, node_link)
-			TAILQ_FOREACH(addr, &port->addr_list, port_link)
-				(*count)++;
-	}
-
-	buf = CCMALLOC(*count * sizeof(struct uni_addr));
-	if (buf == NULL)
-		return (ENOMEM);
-	ptr = buf;
-
-	*ports = CCMALLOC(*count * sizeof(u_int));
-	if (*ports == NULL) {
-		CCFREE(buf);
-		return (ENOMEM);
-	}
-	pports = *ports;
-
-	if (portno != 0) {
-		TAILQ_FOREACH(addr, &port->addr_list, port_link) {
-			*ptr++ = addr->addr;
-			*pports++ = portno;
-		}
-	} else {
-		TAILQ_FOREACH(port, &cc->port_list, node_link)
-			TAILQ_FOREACH(addr, &port->addr_list, port_link) {
-				*ptr++ = addr->addr;
-				*pports++ = port->param.port;
-			}
-	}
-
-	*pa = buf;
-	return (0);
-}
-
-/*
- * return port number
- */
-u_int
-cc_port_no(struct ccport *port)
-{
-	return (port->param.port);
-}
-
-/*
- * Address unregisterd.
- */
-int
-cc_addr_unregister(struct ccdata *cc, u_int portno, const struct uni_addr *arg)
-{
-	struct ccport *port;
-	struct ccaddr *a;
-
-	if ((port = find_port(cc, portno)) == NULL)
-		return (ENOENT);
-
-	/* Find the address */
-	TAILQ_FOREACH(a, &port->addr_list, port_link)
-		if (addr_eq(arg, &a->addr)) {
-			TAILQ_REMOVE(&port->addr_list, a, port_link);
-			CCFREE(a);
-			return (0);
-		}
-
-	return (ENOENT);
-}
-
-/*
- * Address registerd.
- */
-int
-cc_addr_register(struct ccdata *cc, u_int portno, const struct uni_addr *arg)
-{
-	struct ccport *port, *p1;
-	struct ccaddr *a;
-
-	if ((port = find_port(cc, portno)) == NULL)
-		return (ENOENT);
-
-	/* maybe we know it already? */
-	TAILQ_FOREACH(p1, &port->cc->port_list, node_link)
-		TAILQ_FOREACH(a, &p1->addr_list, port_link)
-			if (addr_eq(arg, &a->addr))
-				return (EISCONN);
-
-	a = CCZALLOC(sizeof(*a));
-	if (a == NULL)
-		return (ENOMEM);
-	a->addr = *arg;
-
-	TAILQ_INSERT_TAIL(&port->addr_list, a, port_link);
-
-	return (0);
-}
-
-/*
- * Set/get port parameters.
- */
-int
-cc_port_get_param(struct ccdata *cc, u_int portno,
-    struct atm_port_info *param)
-{
-	struct ccport *port;
-
-	if ((port = find_port(cc, portno)) == NULL)
-		return (ENOENT);
-
-	*param = port->param;
-	return (0);
-}
-
-/* XXX maybe allow only in stopped. */
-int
-cc_port_set_param(struct ccdata *cc, const struct atm_port_info *param)
-{
-	struct ccport *port;
-	struct ccaddr *addr;
-
-	if ((port = find_port(cc, param->port)) == NULL)
-		return (ENOENT);
-
-	port->param = *param;
-
-	port->param.num_addrs = 0;
-	TAILQ_FOREACH(addr, &port->addr_list, port_link)
-		port->param.num_addrs++;
-
-	return (0);
-}
-
-/*
- * get port list
- */
-int
-cc_port_getlist(struct ccdata *cc, u_int *cnt, u_int **ports)
-{
-	struct ccport *p;
-	u_int n;
-
-	n = 0;
-	TAILQ_FOREACH(p, &cc->port_list, node_link)
-		n++;
-
-	*ports = CCMALLOC(n * sizeof(u_int));
-	if (*ports == NULL)
-		return (ENOMEM);
-
-	n = 0;
-	TAILQ_FOREACH(p, &cc->port_list, node_link)
-		(*ports)[n++] = p->param.port;
-	*cnt = n;
-
-	return (0);
-}
-
-/*
- * START and STOP signalling
- */
-int
-cc_port_start(struct ccdata *cc, u_int portno)
-{
-	struct ccport *port;
-
-	if ((port = find_port(cc, portno)) == NULL)
-		return (ENOENT);
-	if (port->admin != CCPORT_STOPPED)
-		return (EISCONN);
-
-	cc->funcs->send_uni_glob(port, port->uarg,
-	    UNIAPI_LINK_ESTABLISH_request, 0, NULL);
-	port->admin = CCPORT_RUNNING;
-
-	return (0);
-}
-
-int
-cc_port_stop(struct ccdata *cc, u_int portno)
-{
-	struct ccport *port;
-
-	if ((port = find_port(cc, portno)) == NULL)
-		return (ENOENT);
-	if (port->admin != CCPORT_RUNNING)
-		return (ENOTCONN);
-
-	port->admin = CCPORT_STOPPED;
-
-	/*
-	 * Abort all connections.
-	 */
-	while (!LIST_EMPTY(&port->conn_list))
-		cc_conn_destroy(LIST_FIRST(&port->conn_list));
-
-	return (0);
-}
-
-/*
- * is port running?
- */
-int
-cc_port_isrunning(struct ccdata *cc, u_int portno, int *state)
-{
-	struct ccport *port;
-
-	if ((port = find_port(cc, portno)) == NULL)
-		return (ENOENT);
-	if (port->admin == CCPORT_RUNNING)
-		*state = 1;
-	else
-		*state = 0;
-	return (0);
-}
-
-/*
- * Clear address and prefix information from the named port.
- */
-int
-cc_port_clear(struct ccdata *cc, u_int portno)
-{
-	struct ccaddr *addr;
-	struct ccport *port;
-
-	if ((port = find_port(cc, portno)) == NULL)
-		return (ENOENT);
-
-	while ((addr = TAILQ_FIRST(&port->addr_list)) != NULL) {
-		TAILQ_REMOVE(&port->addr_list, addr, port_link);
-		CCFREE(addr);
-	}
-	return (0);
-}
-
-/*
- * retrieve info on local ports
- */
-struct atm_port_list *
-cc_get_local_port_info(struct ccdata *cc, u_int portno, size_t *lenp)
-{
-	struct atm_port_list *list;
-	struct atm_port_info *pp;
-	struct uni_addr *aa;
-	struct ccaddr *addr;
-	struct ccport *port;
-	u_int nports, naddrs;
-
-	/*
-	 * Count ports and addresses.
-	 */
-	nports = 0;
-	naddrs = 0;
-	TAILQ_FOREACH(port, &cc->port_list, node_link) {
-		if (portno == 0 || port->param.port == portno) {
-			nports++;
-			TAILQ_FOREACH(addr, &port->addr_list, port_link)
-				naddrs++;
-		}
-	}
-
-	/*
-	 * Size and allocate message
-	 */
-	*lenp = sizeof(*list) + nports * sizeof(*pp) + naddrs * sizeof(*aa);
-
-	list = CCZALLOC(*lenp);
-	if (list == NULL)
-		return (NULL);
-
-	/*
-	 * Fill the message.
-	 */
-	list->num_ports = nports;
-	list->num_addrs = naddrs;
-
-	pp = (void *)((u_char *)list + sizeof(*list));
-	aa = (void *)((u_char *)list + sizeof(*list) + nports * sizeof(*pp));
-
-	TAILQ_FOREACH(port, &cc->port_list, node_link) {
-		if (portno == 0 || port->param.port == portno) {
-			*pp = port->param;
-			pp->num_addrs = 0;
-			TAILQ_FOREACH(addr, &port->addr_list, port_link) {
-				*aa++ = addr->addr;
-				pp->num_addrs++;
-			}
-			pp++;
-		}
-	}
-
-	return (list);
-}
-
-static struct ccreq *
-find_cookie(struct ccport *port, u_int cookie)
-{
-	struct ccreq *r;
-
-	TAILQ_FOREACH(r, &port->cookies, link)
-		if (r->cookie == cookie)
-			return (r);
-	return (NULL);
-}
-
-/*
- * input a response from the UNI layer to CC
- */
-int
-cc_uni_response(struct ccport *port, u_int cookie, u_int reason, u_int state)
-{
-	struct ccconn *conn;
-	struct ccreq *req;
-
-	if (cookie == 0)
-		return (EINVAL);
-
-	if (port->admin != CCPORT_RUNNING)
-		return (ENOTCONN);
-
-	if ((req = find_cookie(port, cookie)) == NULL) {
-		cc_port_log(port, "UNI response for unknown cookie %u", cookie);
-		return (EINVAL);
-	}
-	conn = req->conn;
-
-	TAILQ_REMOVE(&port->cookies, req, link);
-	CCFREE(req);
-
-	if (reason == UNIAPI_OK)
-		return (cc_conn_resp(conn, CONN_SIG_OK,
-		    cookie, reason, state));
-	else
-		return (cc_conn_resp(conn, CONN_SIG_ERROR,
-		    cookie, reason, state));
-}
-
-static struct ccconn *
-find_cref(const struct ccport *port, const struct uni_cref *cref)
-{
-	struct ccconn *conn;
-
-	LIST_FOREACH(conn, &port->conn_list, port_link)
-		if (conn->cref.cref == cref->cref &&
-		    conn->cref.flag == cref->flag)
-			return (conn);
-	return (NULL);
-}
-
-/*
- * Signal from UNI on this port
- */
-int
-cc_uni_signal(struct ccport *port, u_int cookie, u_int sig, struct uni_msg *msg)
-{
-	int error = 0;
-	size_t len, ilen = 0;
-	struct uni_cref *cref;
-	struct ccconn *conn;
-
-	if (port->admin != CCPORT_RUNNING) {
-		error = ENOTCONN;
-		goto out;
-	}
-	len = (msg != NULL) ? uni_msg_len(msg) : 0;
-
-	switch ((enum uni_sig)sig) {
-
-	  case UNIAPI_ERROR:
-		/* handled above */
-		cc_port_log(port, "bad UNIAPI_ERROR cookie=%u", cookie);
-		error = EINVAL;
-		break;
-
-	  case UNIAPI_CALL_CREATED:
-		ilen = sizeof(struct uniapi_call_created);
-		if (len != ilen)
-			goto bad_len;
-
-		if (cookie != 0) {
-			/* outgoing call */
-			struct ccreq *req;
-
-			if ((req = find_cookie(port, cookie)) == NULL) {
-				cc_port_log(port, "bad cookie %u in CREATE",
-				    cookie);
-				error = EINVAL;
-				goto out;
-			}
-			conn = req->conn;
-
-		} else {
-			if ((conn = cc_conn_create(port->cc)) == NULL) {
-				error = ENOMEM;
-				goto out;
-			}
-			cc_conn_ins_port(conn, port);
-		}
-
-		cc_conn_sig_msg_nodef(conn, CONN_SIG_CREATED, msg);
-		msg = NULL;
-		goto out;
-
-	  case UNIAPI_CALL_DESTROYED:
-		ilen = sizeof(struct uniapi_call_destroyed);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg, struct uniapi_call_destroyed *)->cref;
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig(conn, CONN_SIG_DESTROYED, NULL);
-		goto out;
-
-	  case UNIAPI_LINK_ESTABLISH_confirm:
-		goto out;
-
-	  case UNIAPI_LINK_RELEASE_confirm:
-		/* Ups. If we administratively up, restart the link */
-		if (port->admin == CCPORT_RUNNING)
-			port->cc->funcs->send_uni_glob(port, port->uarg,
-			    UNIAPI_LINK_ESTABLISH_request, 0, NULL);
-		goto out;
-
-	  case UNIAPI_PARTY_CREATED:
-		ilen = sizeof(struct uniapi_party_created);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg, struct uniapi_party_created *)->cref;
-
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig_msg_nodef(conn,
-		     CONN_SIG_PARTY_CREATED, msg);
-		msg = NULL;
-		goto out;
-
-	  case UNIAPI_PARTY_DESTROYED:
-		ilen = sizeof(struct uniapi_party_destroyed);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg,
-		    struct uniapi_party_destroyed *)->cref;
-
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig_msg(conn, CONN_SIG_PARTY_DESTROYED, msg);
-		msg = NULL;
-		goto out;
-
-	  case UNIAPI_DROP_PARTY_ACK_indication:	/* UNI -> API */
-		ilen = sizeof(struct uniapi_drop_party_ack_indication);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg,
-		    struct uniapi_drop_party_ack_indication *)->drop.hdr.cref;
-
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig_msg(conn, CONN_SIG_DROP_PARTY_ACK_IND, msg);
-		msg = NULL;
-		goto out;
-
-	  case UNIAPI_RESET_indication:			/* UNI -> API */
-	    {
-		/*
-		 * XXX - do the right thing
-		 */
-		struct uniapi_reset_indication *ind = uni_msg_rptr(msg,
-		    struct uniapi_reset_indication *);
-		struct uniapi_reset_response *resp;
-		struct uni_msg *u;
-		
-		/*
-		 * Construct message to UNI.
-		 */
-		if ((u = uni_msg_alloc(sizeof(*resp))) == NULL)
-			return (ENOMEM);
-
-		resp = uni_msg_wptr(u, struct uniapi_reset_response *);
-		memset(resp, 0, sizeof(*resp));
-		u->b_wptr += sizeof(*resp);
-
-		resp->restart = ind->restart;
-		resp->connid = ind->connid;
-
-		port->cc->funcs->send_uni_glob(port, port->uarg,
-		    UNIAPI_RESET_response, 0, u);
-
-		goto out;
-	    }
-
-	  case UNIAPI_RELEASE_indication:		/* UNI -> API */
-		ilen = sizeof(struct uniapi_release_indication);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg, struct uniapi_release_indication *)
-		    ->release.hdr.cref;
-
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig_msg(conn, CONN_SIG_REL_IND, msg);
-		msg = NULL;
-		goto out;
-
-	  case UNIAPI_RELEASE_confirm:			/* UNI -> API */
-		ilen = sizeof(struct uniapi_release_confirm);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg, struct uniapi_release_confirm *)
-		    ->release.hdr.cref;
-
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig_msg(conn, CONN_SIG_REL_CONF, msg);
-		msg = NULL;
-		goto out;
-
-	  case UNIAPI_SETUP_confirm:			/* UNI -> API */
-		ilen = sizeof(struct uniapi_setup_confirm);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg, struct uniapi_setup_confirm *)
-		    ->connect.hdr.cref;
-
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig_msg(conn, CONN_SIG_SETUP_CONFIRM, msg);
-		msg = NULL;
-		goto out;
-
-
-	  case UNIAPI_ALERTING_indication:		/* UNI -> API */
-		ilen = sizeof(struct uniapi_alerting_indication);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg, struct uniapi_alerting_indication *)
-		    ->alerting.hdr.cref;
-
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig_msg(conn, CONN_SIG_ALERTING_IND, msg);
-		msg = NULL;
-		goto out;
-
-
-	  case UNIAPI_PROCEEDING_indication:		/* UNI -> API */
-		ilen = sizeof(struct uniapi_proceeding_indication);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg, struct uniapi_proceeding_indication *)
-		    ->call_proc.hdr.cref;
-
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig_msg(conn, CONN_SIG_PROC_IND, msg);
-		msg = NULL;
-		goto out;
-
-
-	  case UNIAPI_SETUP_indication:			/* UNI -> API */
-		ilen = sizeof(struct uniapi_setup_indication);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg, struct uniapi_setup_indication *)
-		    ->setup.hdr.cref;
-
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig_msg(conn, CONN_SIG_SETUP_IND, msg);
-		msg = NULL;
-		goto out;
-
-	  case UNIAPI_SETUP_COMPLETE_indication:	/* UNI -> API */
-		ilen = sizeof(struct uniapi_setup_complete_indication);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg,
-		    struct uniapi_setup_complete_indication *)
-		    ->connect_ack.hdr.cref;
-
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig_msg(conn, CONN_SIG_SETUP_COMPL, msg);
-		msg = NULL;
-		goto out;
-
-	  case UNIAPI_PARTY_ALERTING_indication:	/* UNI -> API */
-		ilen = sizeof(struct uniapi_party_alerting_indication);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg,
-		    struct uniapi_party_alerting_indication *)->alert.hdr.cref;
-
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig_msg(conn, CONN_SIG_PARTY_ALERTING_IND, msg);
-		msg = NULL;
-		goto out;
-
-	  case UNIAPI_ADD_PARTY_ACK_indication:		/* UNI -> API */
-		ilen = sizeof(struct uniapi_add_party_ack_indication);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg,
-		    struct uniapi_add_party_ack_indication *)->ack.hdr.cref;
-
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig_msg(conn, CONN_SIG_PARTY_ADD_ACK_IND, msg);
-		msg = NULL;
-		goto out;
-
-	  case UNIAPI_ADD_PARTY_REJ_indication:		/* UNI -> API */
-		ilen = sizeof(struct uniapi_add_party_rej_indication);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg,
-		    struct uniapi_add_party_rej_indication *)->rej.hdr.cref;
-
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig_msg(conn, CONN_SIG_PARTY_ADD_REJ_IND, msg);
-		msg = NULL;
-		goto out;
-
-	  case UNIAPI_DROP_PARTY_indication:		/* UNI -> API */
-		ilen = sizeof(struct uniapi_drop_party_indication);
-		if (len != ilen)
-			goto bad_len;
-
-		cref = &uni_msg_rptr(msg, struct uniapi_drop_party_indication *)
-		    ->drop.hdr.cref;
-
-		if ((conn = find_cref(port, cref)) == NULL)
-			goto unk_call;
-
-		error = cc_conn_sig_msg(conn, CONN_SIG_DROP_PARTY_IND, msg);
-		msg = NULL;
-		goto out;
-
-	  case UNIAPI_RESET_confirm:			/* UNI -> API */
-	  case UNIAPI_RESET_ERROR_indication:		/* UNI -> API */
-	  case UNIAPI_RESET_STATUS_indication:		/* UNI -> API */
-		/* XXX */
-		goto out;
-
-	  case UNIAPI_NOTIFY_indication:		/* UNI -> API */
-	  case UNIAPI_STATUS_indication:		/* UNI -> API */
-		break;
-
-	  case UNIAPI_ADD_PARTY_indication:		/* UNI -> API */
-		/* not supported by the API */
-		break;
-
-	/*
-	 * All these are illegal in this direction
-	 */
-	  case UNIAPI_LINK_ESTABLISH_request:		/* API -> UNI */
-	  case UNIAPI_LINK_RELEASE_request:		/* API -> UNI */
-	  case UNIAPI_RESET_request:			/* API -> UNI */
-	  case UNIAPI_RESET_response:			/* API -> UNI */
-	  case UNIAPI_RESET_ERROR_response:		/* API -> UNI */
-	  case UNIAPI_SETUP_request:			/* API -> UNI */
-	  case UNIAPI_SETUP_response:			/* API -> UNI */
-	  case UNIAPI_ALERTING_request:			/* API -> UNI */
-	  case UNIAPI_PROCEEDING_request:		/* API -> UNI */
-	  case UNIAPI_RELEASE_request:			/* API -> UNI */
-	  case UNIAPI_RELEASE_response:			/* API -> UNI */
-	  case UNIAPI_NOTIFY_request:			/* API -> UNI */
-	  case UNIAPI_STATUS_ENQUIRY_request:		/* API -> UNI */
-	  case UNIAPI_ADD_PARTY_request:		/* API -> UNI */
-	  case UNIAPI_PARTY_ALERTING_request:		/* API -> UNI */
-	  case UNIAPI_ADD_PARTY_ACK_request:		/* API -> UNI */
-	  case UNIAPI_ADD_PARTY_REJ_request:		/* API -> UNI */
-	  case UNIAPI_DROP_PARTY_request:		/* API -> UNI */
-	  case UNIAPI_DROP_PARTY_ACK_request:		/* API -> UNI */
-	  case UNIAPI_ABORT_CALL_request:		/* API -> UNI */
-	  case UNIAPI_SETUP_COMPLETE_request:		/* API -> UNI */
-	  case UNIAPI_MAXSIG:
-		break;
-	}
-	cc_port_log(port, "bad signal %u", sig);
-	error = EINVAL;
-	goto out;
-
-  bad_len:
-	cc_port_log(port, "signal %u bad length: %zu, need %zu", len, ilen);
-	error = EINVAL;
-	goto out;
-
-  unk_call:
-	cc_port_log(port, "unknown call %u/%u", cref->cref, cref->flag);
-	error = EINVAL;
-
-  out:
-	if (msg != NULL)
-		uni_msg_destroy(msg);
-	return (error);
-}
-
diff --git a/sys/contrib/ngatm/netnatm/api/cc_sig.c b/sys/contrib/ngatm/netnatm/api/cc_sig.c
deleted file mode 100644
index ae6fcce51229..000000000000
--- a/sys/contrib/ngatm/netnatm/api/cc_sig.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/*
-* Copyright (c) 2004
-*	Hartmut Brandt
-*	All rights reserved.
-*
-* Author: Harti Brandt <harti@freebsd.org>
-*
-* Redistribution of this software and documentation 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 or documentation must retain the above
-*    copyright notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE AUTHOR
-* AND ITS CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-* THE AUTHOR OR ITS CONTRIBUTORS  BE LIABLE FOR ANY DIRECT, INDIRECT,
-* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-* $Begemot: libunimsg/netnatm/api/cc_sig.c,v 1.1 2004/07/08 08:21:54 brandt Exp $
-*
-* ATM API as defined per af-saa-0108
-*
-* Generic signal handling
-*/
-#include <netnatm/unimsg.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#include <netnatm/api/unisap.h>
-#include <netnatm/sig/unidef.h>
-#include <netnatm/api/atmapi.h>
-#include <netnatm/api/ccatm.h>
-#include <netnatm/api/ccpriv.h>
-
-enum {
-	SIG_USER,
-	SIG_CONN,
-};
-
-struct ccsig {
-	u_char	type;		/* type of target */
-	u_char	has_msg;	/* arg1 is a message */
-	void	*target;	/* target instance */
-	u_int	sig;		/* signal */
-	void	*arg1;		/* argument */
-	u_int	arg2;		/* argument */
-	TAILQ_ENTRY(ccsig) link;
-};
-
-#if defined(__GNUC__) && __GNUC__ < 3
-#define	cc_sig_log(CC, FMT, ARGS...) do {				\
-	if ((CC)->log & CCLOG_SIGS)					\
-		(CC)->funcs->log("%s: " FMT, __FUNCTION__ , ## ARGS);	\
-    } while (0)
-#else
-#define	cc_sig_log(CC, FMT, ...) do {					\
-	if ((CC)->log & CCLOG_SIGS)					\
-		(CC)->funcs->log("%s: " FMT, __func__, __VA_ARGS__);	\
-    } while (0)
-#endif
-
-
-const char *const cc_user_sigtab[] = {
-#define	DEF(N) [USER_SIG_##N] = #N,
-USER_SIGS
-#undef DEF
-};
-
-const char *const cc_conn_sigtab[] = {
-#define	DEF(N) [CONN_SIG_##N] = #N,
-CONN_SIGS
-#undef DEF
-};
-
-
-/*
- * Allocate and populate a signal
- */
-static /* __inline */ struct ccsig *
-sig_alloc(struct ccdata *cc, u_int type, void *target, u_int has_msg,
-    u_int sig, void *arg1, u_int arg2)
-{
-	struct ccsig *s;
-
-	if ((s = TAILQ_FIRST(&cc->free_sigs)) == NULL) {
-		s = CCZALLOC(sizeof(struct ccsig));
-		if (s == NULL) {
-			cc_log(cc, "signal %u/%u lost - ENOMEM", type, sig);
-			return (NULL);
-		}
-	} else
-		TAILQ_REMOVE(&cc->free_sigs, s, link);
-
-	s->type = type;
-	s->has_msg = has_msg;
-	s->target = target;
-	s->sig = sig;
-	s->arg1 = arg1;
-	s->arg2 = arg2;
-
-	return (s);
-}
-
-/*
- * Queue a signal to this user
- */
-int
-cc_user_sig(struct ccuser *user, enum user_sig sig, void *arg1, u_int arg2)
-{
-	struct ccsig *s;
-
-	s = sig_alloc(user->cc, SIG_USER, user, 0, sig, arg1, arg2);
-	if (s == NULL)
-		return (ENOMEM);
-	TAILQ_INSERT_TAIL(&user->cc->sigs, s, link);
-	cc_sig_log(user->cc, "queuing sig %s to user %p", cc_user_sigtab[sig],
-	    user);
-	return (0);
-}
-
-/* Queue a signal with message to this user */
-int
-cc_user_sig_msg(struct ccuser *user, enum user_sig sig, struct uni_msg *msg)
-{
-	struct ccsig *s;
-
-	s = sig_alloc(user->cc, SIG_USER, user, msg != NULL, sig, msg, 0);
-	if (s == NULL)
-		return (ENOMEM);
-	TAILQ_INSERT_TAIL(&user->cc->sigs, s, link);
-	cc_sig_log(user->cc, "queuing sig %s to user %p", cc_user_sigtab[sig],
-	    user);
-	return (0);
-}
-
-/*
- * Signal to connection
- */
-static int
-sig_conn(struct ccconn *conn, enum conn_sig sig, u_int has_msg, void *arg)
-{
-	struct ccsig *s;
-	const struct ccreq *r = NULL;
-
-	s = sig_alloc(conn->cc, SIG_CONN, conn, has_msg, sig, arg, 0);
-	if (s == NULL)
-		return (ENOMEM);
-
-	if (conn->port != NULL) {
-		/* argh */
-		TAILQ_FOREACH(r, &conn->port->cookies, link)
-			if (r->conn == conn)
-				break;
-	}
-	if (r == NULL) {
-		TAILQ_INSERT_TAIL(&conn->cc->sigs, s, link);
-		cc_sig_log(conn->cc, "queuing sig %s to conn %p",
-		    cc_conn_sigtab[sig], conn);
-	} else {
-		TAILQ_INSERT_TAIL(&conn->cc->def_sigs, s, link);
-		cc_sig_log(conn->cc, "queuing defered sig %s to conn %p",
-		    cc_conn_sigtab[sig], conn);
-	}
-	return (0);
-}
-
-/*
- * Queue a signal to a connection.
- */
-int
-cc_conn_sig(struct ccconn *conn, enum conn_sig sig, void *arg1)
-{
-
-	return (sig_conn(conn, sig, 0, arg1));
-}
-
-/*
- * signal with message to connection
- */
-int
-cc_conn_sig_msg(struct ccconn *conn, enum conn_sig sig, struct uni_msg *msg)
-{
-
-	return (sig_conn(conn, sig, (msg != NULL), msg));
-}
-int
-cc_conn_sig_msg_nodef(struct ccconn *conn, enum conn_sig sig,
-    struct uni_msg *msg)
-{
-	struct ccsig *s;
-
-	s = sig_alloc(conn->cc, SIG_CONN, conn, (msg != NULL), sig, msg, 0);
-	if (s == NULL)
-		return (ENOMEM);
-
-	TAILQ_INSERT_TAIL(&conn->cc->sigs, s, link);
-	cc_sig_log(conn->cc, "queuing sig %s to conn %p",
-	    cc_conn_sigtab[sig], conn);
-
-	return (0);
-}
-
-/*
- * Queue a response signal to a connection.
- */
-int
-cc_conn_resp(struct ccconn *conn, enum conn_sig sig, u_int cookie __unused,
-    u_int reason, u_int state)
-{
-	struct ccsig *s, *s1, *s2;
-
-	s = sig_alloc(conn->cc, SIG_CONN, conn, 0, sig, NULL,
-	     ((reason & 0xffff) << 16) | (state & 0xffff));
-	if (s == NULL)
-		return (ENOMEM);
-
-	TAILQ_INSERT_TAIL(&conn->cc->sigs, s, link);
-
-	cc_sig_log(conn->cc, "queuing response %s to conn %p",
-	    cc_conn_sigtab[sig], conn);
-
-	s1 = TAILQ_FIRST(&conn->cc->def_sigs);
-	while (s1 != NULL) {
-		s2 = TAILQ_NEXT(s1, link);
-		if (s1->type == SIG_CONN && s1->target == conn) {
-			TAILQ_REMOVE(&conn->cc->def_sigs, s1, link);
-			TAILQ_INSERT_AFTER(&conn->cc->sigs, s, s1, link);
-			cc_sig_log(conn->cc, "undefering sig %s to conn %p",
-			    cc_conn_sigtab[s1->sig], conn);
-			s = s1;
-		}
-		s1 = s2;
-	}
-
-	return (0);
-}
-
-/*
- * Flush all signals to a given target from both queues
- */
-static /* __inline */ void
-sig_flush(struct ccdata *cc, u_int type, void *target)
-{
-	struct ccsig *s, *s1;
-
-	s = TAILQ_FIRST(&cc->sigs);
-	while (s != NULL) {
-		s1 = TAILQ_NEXT(s, link);
-		if (s->type == type && s->target == target) {
-			if (s->has_msg)
-				uni_msg_destroy((struct uni_msg *)s->arg1);
-			TAILQ_REMOVE(&cc->sigs, s, link);
-			TAILQ_INSERT_HEAD(&cc->free_sigs, s, link);
-		}
-		s = s1;
-	}
-
-	s = TAILQ_FIRST(&cc->def_sigs);
-	while (s != NULL) {
-		s1 = TAILQ_NEXT(s, link);
-		if (s->type == type && s->target == target) {
-			if (s->has_msg)
-				uni_msg_destroy((struct uni_msg *)s->arg1);
-			TAILQ_REMOVE(&cc->def_sigs, s, link);
-			TAILQ_INSERT_HEAD(&cc->free_sigs, s, link);
-		}
-		s = s1;
-	}
-}
-
-/*
- * Flush all signals to this user
- */
-void
-cc_user_sig_flush(struct ccuser *user)
-{
-
-	cc_sig_log(user->cc, "flushing signals to user %p", user);
-	sig_flush(user->cc, SIG_USER, user);
-}
-
-/*
- * Flush all signals to this connection
- */
-void
-cc_conn_sig_flush(struct ccconn *conn)
-{
-
-	cc_sig_log(conn->cc, "flushing signals to conn %p", conn);
-	sig_flush(conn->cc, SIG_CONN, conn);
-}
-
-/*
- * Do the work
- */
-void
-cc_work(struct ccdata *cc)
-{
-	struct ccsig *s;
-
-	cc_sig_log(cc, "start %s", "work");
-	while ((s = TAILQ_FIRST(&cc->sigs)) != NULL) {
-		TAILQ_REMOVE(&cc->sigs, s, link);
-		if (s->type == SIG_USER)
-			cc_user_sig_handle(s->target, s->sig, s->arg1, s->arg2);
-		else {
-			cc_conn_sig_handle(s->target, s->sig, s->arg1, s->arg2);
-			if (s->has_msg)
-				uni_msg_destroy(s->arg1);
-		}
-		TAILQ_INSERT_HEAD(&cc->free_sigs, s, link);
-	}
-	cc_sig_log(cc, "end %s", "work");
-}
-
-/*
- * flush all signals
- */
-void
-cc_sig_flush_all(struct ccdata *cc)
-{
-	struct ccsig *s;
-
-	while ((s = TAILQ_FIRST(&cc->sigs)) != NULL) {
-		if (s->has_msg)
-			uni_msg_destroy((struct uni_msg *)s->arg1);
-		TAILQ_REMOVE(&cc->sigs, s, link);
-		CCFREE(s);
-	}
-	while ((s = TAILQ_FIRST(&cc->def_sigs)) != NULL) {
-		if (s->has_msg)
-			uni_msg_destroy((struct uni_msg *)s->arg1);
-		TAILQ_REMOVE(&cc->def_sigs, s, link);
-		CCFREE(s);
-	}
-	while ((s = TAILQ_FIRST(&cc->free_sigs)) != NULL) {
-		TAILQ_REMOVE(&cc->free_sigs, s, link);
-		CCFREE(s);
-	}
-}
diff --git a/sys/contrib/ngatm/netnatm/api/cc_user.c b/sys/contrib/ngatm/netnatm/api/cc_user.c
deleted file mode 100644
index 75ce91eb4e56..000000000000
--- a/sys/contrib/ngatm/netnatm/api/cc_user.c
+++ /dev/null
@@ -1,1922 +0,0 @@
-/*
- * Copyright (c) 2003-2004
- *	Hartmut Brandt
- *	All rights reserved.
- *
- * Copyright (c) 2001-2002
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation must retain the above
- *    copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE AUTHOR
- * AND ITS CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR OR ITS CONTRIBUTORS  BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Begemot: libunimsg/netnatm/api/cc_user.c,v 1.3 2004/07/16 18:46:55 brandt Exp $
- *
- * ATM API as defined per af-saa-0108
- *
- * User side (upper half)
- */
-
-#include <netnatm/unimsg.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#include <netnatm/api/unisap.h>
-#include <netnatm/sig/unidef.h>
-#include <netnatm/api/atmapi.h>
-#include <netnatm/api/ccatm.h>
-#include <netnatm/api/ccpriv.h>
-
-/*
-* This file handles messages to a USER.
-*/
-static const char *stab[] = {
-#define DEF(N) [N] = #N,
-	USER_STATES
-#undef DEF
-};
-
-const char *
-cc_user_state2str(u_int s)
-{
-	if (s >= sizeof(stab) / sizeof(stab[0]) || stab[s] == NULL)
-		return ("?");
-	return (stab[s]);
-}
-
-static __inline void
-set_state(struct ccuser *user, enum user_state ns)
-{
-	if (user->state != ns) {
-		if (user->cc->log & CCLOG_USER_STATE)
-			cc_user_log(user, "%s -> %s",
-			    stab[user->state], stab[ns]);
-		user->state = ns;
-	}
-}
-
-static __inline void
-cc_user_send(struct ccuser *user, u_int op, void *arg, size_t len)
-{
-	user->cc->funcs->send_user(user, user->uarg, op, arg, len);
-}
-
-static __inline void
-cc_user_ok(struct ccuser *user, u_int data, void *arg, size_t len)
-{
-	user->cc->funcs->respond_user(user, user->uarg,
-	    ATMERR_OK, data, arg, len);
-}
-
-static __inline void
-cc_user_err(struct ccuser *user, int err)
-{
-	user->cc->funcs->respond_user(user, user->uarg,
-	    err, ATMRESP_NONE, NULL, 0);
-}
-
-
-/**********************************************************************
-*
-* INSTANCE MANAGEMENT
-*/
-/*
-* New endpoint created
-*/
-struct ccuser *
-cc_user_create(struct ccdata *cc, void *uarg, const char *name)
-{
-	struct ccuser *user;
-
-	user = CCZALLOC(sizeof(*user));
-	if (user == NULL)
-		return (NULL);
-
-	user->cc = cc;
-	user->state = USER_NULL;
-	user->uarg = uarg;
-	strncpy(user->name, name, sizeof(user->name));
-	user->name[sizeof(user->name) - 1] = '\0';
-	TAILQ_INIT(&user->connq);
-	LIST_INSERT_HEAD(&cc->user_list, user, node_link);
-
-	if (user->cc->log & CCLOG_USER_INST)
-		cc_user_log(user, "created with name '%s'", name);
-
-	return (user);
-}
-
-/*
- * Reset a user instance
- */
-static void
-cc_user_reset(struct ccuser *user)
-{
-
-	CCASSERT(TAILQ_EMPTY(&user->connq), ("connq not empty"));
-
-	if (user->sap != NULL) {
-		CCFREE(user->sap);
-		user->sap = NULL;
-	}
-
-	if (user->accepted != NULL) {
-		user->accepted->acceptor = NULL;
-		user->accepted = NULL;
-	}
-	user->config = USER_P2P;
-	user->queue_act = 0;
-	user->queue_max = 0;
-	user->aborted = 0;
-
-	set_state(user, USER_NULL);
-
-	cc_user_sig_flush(user);
-}
-
-static void
-cc_user_abort(struct ccuser *user, const struct uni_ie_cause *cause)
-{
-	struct ccconn *conn;
-
-	/*
-	 * Although the standard state that 'all connections
-	 * associated with this endpoint are aborted' we only
-	 * have to abort the head one, because in state A6
-	 * (call present) the endpoint is only associated to the
-	 * head connection - the others are 'somewhere else' and
-	 * need to be redispatched.
-	 *
-	 * First bring user into a state that the connections
-	 * are not dispatched back to it.
-	 */
-	set_state(user, USER_NULL);
-	if (!user->aborted) {
-		if ((conn = TAILQ_FIRST(&user->connq)) != NULL) {
-			memset(conn->cause, 0, sizeof(conn->cause));
-			if (cause != NULL)
-				conn->cause[0] = *cause;
-			cc_conn_reset_acceptor(conn);
-			cc_disconnect_from_user(conn);
-			cc_conn_sig(conn, CONN_SIG_USER_ABORT, NULL);
-		}
-	}
-
-	while ((conn = TAILQ_FIRST(&user->connq)) != NULL) {
-		/* these should be in C21 */
-		cc_disconnect_from_user(conn);
-		cc_conn_dispatch(conn);
-	}
-
-	cc_user_reset(user);
-}
-
-/*
- * Application has closed this endpoint. Clean up all user resources and
- * abort all connections. This can be called in any state.
- */
-void
-cc_user_destroy(struct ccuser *user)
-{
-
-	if (user->cc->log & CCLOG_USER_INST)
-		cc_user_log(user, "destroy '%s'", user->name);
-
-	cc_user_abort(user, NULL);
-
-	if (user->sap != NULL)
-		CCFREE(user->sap);
-
-	cc_user_sig_flush(user);
-
-	LIST_REMOVE(user, node_link);
-	CCFREE(user);
-}
-
-/**********************************************************************
- *
- * OUTGOING CALLS
- */
-/*
- * Return true when the calling address of the connection matches the address.
- */
-static int
-addr_matches(const struct ccaddr *addr, const struct ccconn *conn)
-{
-
-	if (!IE_ISPRESENT(conn->calling))
-		return (0);
-
-	return (addr->addr.type == conn->calling.addr.type &&
-	    addr->addr.plan == conn->calling.addr.plan &&
-	    addr->addr.len == conn->calling.addr.len &&
-	    memcmp(addr->addr.addr, conn->calling.addr.addr,
-	    addr->addr.len) == 0);
-}
-
-/*
- * Check if the user's SAP (given he is in the right state) and
- * the given SAP overlap
- */
-static int
-check_overlap(struct ccuser *user, struct uni_sap *sap)
-{
-	return ((user->state == USER_IN_PREPARING ||
-	    user->state == USER_IN_WAITING) &&
-	    unisve_overlap_sap(user->sap, sap));
-}
-
-/*
- * Send arrival notification to user
- */
-static void
-do_arrival(struct ccuser *user)
-{
-	struct ccconn *conn;
-
-	user->aborted = 0;
-	if ((conn = TAILQ_FIRST(&user->connq)) != NULL) {
-		set_state(user, USER_IN_ARRIVED);
-		cc_user_send(user, ATMOP_ARRIVAL_OF_INCOMING_CALL, NULL, 0);
-		cc_conn_sig(conn, CONN_SIG_ARRIVAL, NULL);
-	}
-}
-
-/**********************************************************************
- *
- * ATTRIBUTES
- */
-/*
- * Query an attribute. This is possible only in some states: preparation
- * of an outgoing call, after an incoming call was offered to the application
- * and in the three active states (P2P, P2PLeaf, P2PRoot).
- */
-static struct ccconn *
-cc_query_check(struct ccuser *user)
-{
-
-	switch (user->state) {
-
-	  case USER_OUT_PREPARING:
-	  case USER_IN_ARRIVED:
-	  case USER_ACTIVE:
-		return (TAILQ_FIRST(&user->connq));
-
-	  case USER_NULL:
-		/* if we are waiting for the SETUP_confirm, we are in
-		 * the NULL state still (we are the new endpoint), but
-		 * have a connection in 'accepted' that is in the
-		 * CONN_IN_WAIT_ACCEPT_OK state.
-		 */
-		if (user->accepted != NULL &&
-		    user->accepted->state == CONN_IN_WAIT_ACCEPT_OK)
-			return (user->accepted);
-		/* FALLTHRU */
-
-	  default:
-		return (NULL);
-	}
-}
-
-/*
- * Query attributes
- */
-static void
-cc_attr_query(struct ccuser *user, struct ccconn *conn,
-    uint32_t *attr, u_int count)
-{
-	void *val, *ptr;
-	size_t total, len;
-	u_int i;
-	uint32_t *atab;
-
-	/* determine the length of the total attribute buffer */
-	total = sizeof(uint32_t) + count * sizeof(uint32_t);
-	for (i = 0; i < count; i++) {
-		len = 0;
-		switch ((enum atm_attribute)attr[i]) {
-
-		  case ATM_ATTR_NONE:
-			break;
-
-		  case ATM_ATTR_BLLI_SELECTOR:
-			len = sizeof(uint32_t);
-			break;
-
-		  case ATM_ATTR_BLLI:
-			len = sizeof(struct uni_ie_blli);
-			break;
-
-		  case ATM_ATTR_BEARER:
-			len = sizeof(struct uni_ie_bearer);
-			break;
-
-		  case ATM_ATTR_TRAFFIC:
-			len = sizeof(struct uni_ie_traffic);
-			break;
-
-		  case ATM_ATTR_QOS:
-			len = sizeof(struct uni_ie_qos);
-			break;
-
-		  case ATM_ATTR_EXQOS:
-			len = sizeof(struct uni_ie_exqos);
-			break;
-
-		  case ATM_ATTR_CALLED:
-			len = sizeof(struct uni_ie_called);
-			break;
-
-		  case ATM_ATTR_CALLEDSUB:
-			len = sizeof(struct uni_ie_calledsub);
-			break;
-
-		  case ATM_ATTR_CALLING:
-			len = sizeof(struct uni_ie_calling);
-			break;
-
-		  case ATM_ATTR_CALLINGSUB:
-			len = sizeof(struct uni_ie_callingsub);
-			break;
-
-		  case ATM_ATTR_AAL:
-			len = sizeof(struct uni_ie_aal);
-			break;
-
-		  case ATM_ATTR_EPREF:
-			len = sizeof(struct uni_ie_epref);
-			break;
-
-		  case ATM_ATTR_CONNED:
-			len = sizeof(struct uni_ie_conned);
-			break;
-
-		  case ATM_ATTR_CONNEDSUB:
-			len = sizeof(struct uni_ie_connedsub);
-			break;
-
-		  case ATM_ATTR_EETD:
-			len = sizeof(struct uni_ie_eetd);
-			break;
-
-		  case ATM_ATTR_ABRSETUP:
-			len = sizeof(struct uni_ie_abrsetup);
-			break;
-
-		  case ATM_ATTR_ABRADD:
-			len = sizeof(struct uni_ie_abradd);
-			break;
-
-		  case ATM_ATTR_CONNID:
-			len = sizeof(struct uni_ie_connid);
-			break;
-
-		  case ATM_ATTR_MDCR:
-			len = sizeof(struct uni_ie_mdcr);
-			break;
-		}
-		if (len == 0) {
-			cc_user_err(user, ATMERR_BAD_ATTR);
-			return;
-		}
-		total += len;
-	}
-
-	/* allocate buffer */
-	val = CCMALLOC(total);
-	if (val == NULL)
-		return;
-
-	atab = val;
-	atab[0] = count;
-
-	/* fill */
-	ptr = (u_char *)val + (sizeof(uint32_t) + count * sizeof(uint32_t));
-	for (i = 0; i < count; i++) {
-		len = 0;
-		atab[i + 1] = attr[i];
-		switch (attr[i]) {
-
-		  case ATM_ATTR_NONE:
-			break;
-
-		  case ATM_ATTR_BLLI_SELECTOR:
-			len = sizeof(uint32_t);
-			memcpy(ptr, &conn->blli_selector, len);
-			break;
-
-		  case ATM_ATTR_BLLI:
-			/* in A6 the blli_selector may be 0 when
-			 * there was no blli in the SETUP.
-			 */
-			len = sizeof(struct uni_ie_blli);
-			if (conn->blli_selector == 0)
-				memset(ptr, 0, len);
-			else
-				memcpy(ptr, &conn->blli[conn->blli_selector -
-				    1], len);
-			break;
-
-		  case ATM_ATTR_BEARER:
-			len = sizeof(struct uni_ie_bearer);
-			memcpy(ptr, &conn->bearer, len);
-			break;
-
-		  case ATM_ATTR_TRAFFIC:
-			len = sizeof(struct uni_ie_traffic);
-			memcpy(ptr, &conn->traffic, len);
-			break;
-
-		  case ATM_ATTR_QOS:
-			len = sizeof(struct uni_ie_qos);
-			memcpy(ptr, &conn->qos, len);
-			break;
-
-		  case ATM_ATTR_EXQOS:
-			len = sizeof(struct uni_ie_exqos);
-			memcpy(ptr, &conn->exqos, len);
-			break;
-
-		  case ATM_ATTR_CALLED:
-			len = sizeof(struct uni_ie_called);
-			memcpy(ptr, &conn->called, len);
-			break;
-
-		  case ATM_ATTR_CALLEDSUB:
-			len = sizeof(struct uni_ie_calledsub);
-			memcpy(ptr, &conn->calledsub, len);
-			break;
-
-		  case ATM_ATTR_CALLING:
-			len = sizeof(struct uni_ie_calling);
-			memcpy(ptr, &conn->calling, len);
-			break;
-
-		  case ATM_ATTR_CALLINGSUB:
-			len = sizeof(struct uni_ie_callingsub);
-			memcpy(ptr, &conn->callingsub, len);
-			break;
-
-		  case ATM_ATTR_AAL:
-			len = sizeof(struct uni_ie_aal);
-			memcpy(ptr, &conn->aal, len);
-			break;
-
-		  case ATM_ATTR_EPREF:
-			len = sizeof(struct uni_ie_epref);
-			memcpy(ptr, &conn->epref, len);
-			break;
-
-		  case ATM_ATTR_CONNED:
-			len = sizeof(struct uni_ie_conned);
-			memcpy(ptr, &conn->conned, len);
-			break;
-
-		  case ATM_ATTR_CONNEDSUB:
-			len = sizeof(struct uni_ie_connedsub);
-			memcpy(ptr, &conn->connedsub, len);
-			break;
-
-		  case ATM_ATTR_EETD:
-			len = sizeof(struct uni_ie_eetd);
-			memcpy(ptr, &conn->eetd, len);
-			break;
-
-		  case ATM_ATTR_ABRSETUP:
-			len = sizeof(struct uni_ie_abrsetup);
-			memcpy(ptr, &conn->abrsetup, len);
-			break;
-
-		  case ATM_ATTR_ABRADD:
-			len = sizeof(struct uni_ie_abradd);
-			memcpy(ptr, &conn->abradd, len);
-			break;
-
-		  case ATM_ATTR_CONNID:
-			len = sizeof(struct uni_ie_connid);
-			memcpy(ptr, &conn->connid, len);
-			break;
-
-		  case ATM_ATTR_MDCR:
-			len = sizeof(struct uni_ie_mdcr);
-			memcpy(ptr, &conn->mdcr, len);
-			break;
-		}
-		ptr = (u_char *)ptr + len;
-	}
-
-	cc_user_ok(user, ATMRESP_ATTRS, val, total);
-
-	CCFREE(val);
-}
-
-/*
- * Check whether the state is ok and return the connection
- */
-static struct ccconn *
-cc_set_check(struct ccuser *user)
-{
-	switch(user->state) {
-
-	  case USER_OUT_PREPARING:
-	  case USER_IN_ARRIVED:
-		return (TAILQ_FIRST(&user->connq));
-
-	  default:
-		return (NULL);
-	}
-}
-
-/*
- * Set connection attribute(s)
- */
-static void
-cc_attr_set(struct ccuser *user, struct ccconn *conn, uint32_t *attr,
-    u_int count, u_char *val, size_t vallen)
-{
-	size_t total, len;
-	u_int i;
-	u_char *ptr;
-
-	/* determine the length of the total attribute buffer */
-	total = 0;
-	ptr = val;
-	for (i = 0; i < count; i++) {
-		len = 0;
-		switch ((enum atm_attribute)attr[i]) {
-
-		  case ATM_ATTR_NONE:
-			break;
-
-		  case ATM_ATTR_BLLI_SELECTOR:
-		    {
-			uint32_t sel;
-
-			if (conn->state != CONN_OUT_PREPARING)
-				goto rdonly;
-			memcpy(&sel, ptr, sizeof(sel));
-			if (sel == 0 || sel > UNI_NUM_IE_BLLI)
-				goto bad_val;
-			len = sizeof(uint32_t);
-			break;
-		    }
-
-		  case ATM_ATTR_BLLI:
-			len = sizeof(struct uni_ie_blli);
-			break;
-
-		  case ATM_ATTR_BEARER:
-			if (conn->state != CONN_OUT_PREPARING)
-				goto rdonly;
-			len = sizeof(struct uni_ie_bearer);
-			break;
-
-		  case ATM_ATTR_TRAFFIC:
-			len = sizeof(struct uni_ie_traffic);
-			break;
-
-		  case ATM_ATTR_QOS:
-			if (conn->state != CONN_OUT_PREPARING)
-				goto rdonly;
-			len = sizeof(struct uni_ie_qos);
-			break;
-
-		  case ATM_ATTR_EXQOS:
-			len = sizeof(struct uni_ie_exqos);
-			break;
-
-		  case ATM_ATTR_CALLED:
-			goto rdonly;
-
-		  case ATM_ATTR_CALLEDSUB:
-			if (conn->state != CONN_OUT_PREPARING)
-				goto rdonly;
-			len = sizeof(struct uni_ie_calledsub);
-			break;
-
-		  case ATM_ATTR_CALLING:
-			if (conn->state != CONN_OUT_PREPARING)
-				goto rdonly;
-			len = sizeof(struct uni_ie_calling);
-			break;
-
-		  case ATM_ATTR_CALLINGSUB:
-			if (conn->state != CONN_OUT_PREPARING)
-				goto rdonly;
-			len = sizeof(struct uni_ie_callingsub);
-			break;
-
-		  case ATM_ATTR_AAL:
-			len = sizeof(struct uni_ie_aal);
-			break;
-
-		  case ATM_ATTR_EPREF:
-			goto rdonly;
-
-		  case ATM_ATTR_CONNED:
-			goto rdonly;
-
-		  case ATM_ATTR_CONNEDSUB:
-			goto rdonly;
-
-		  case ATM_ATTR_EETD:
-			len = sizeof(struct uni_ie_eetd);
-			break;
-
-		  case ATM_ATTR_ABRSETUP:
-			len = sizeof(struct uni_ie_abrsetup);
-			break;
-
-		  case ATM_ATTR_ABRADD:
-			len = sizeof(struct uni_ie_abradd);
-			break;
-
-		  case ATM_ATTR_CONNID:
-			len = sizeof(struct uni_ie_connid);
-			break;
-
-		  case ATM_ATTR_MDCR:
-			if (conn->state != CONN_OUT_PREPARING)
-				goto rdonly;
-			len = sizeof(struct uni_ie_mdcr);
-			break;
-		}
-		if (len == 0) {
-			cc_user_err(user, ATMERR_BAD_ATTR);
-			return;
-		}
-		total += len;
-		ptr += len;
-	}
-
-	/* check the length */
-	if (vallen != total) {
-		cc_user_err(user, ATMERR_BAD_ARGS);
-		return;
-	}
-
-	ptr = val;
-	for (i = 0; i < count; i++) {
-		len = 0;
-		switch ((enum atm_attribute)attr[i]) {
-
-		  case ATM_ATTR_NONE:
-			break;
-
-		  case ATM_ATTR_BLLI_SELECTOR:
-		    {
-			uint32_t sel;
-
-			memcpy(&sel, ptr, sizeof(sel));
-			conn->blli_selector = sel;
-			len = sizeof(uint32_t);
-			break;
-		    }
-
-		  case ATM_ATTR_BLLI:
-			len = sizeof(struct uni_ie_blli);
-			memcpy(&conn->blli[conn->blli_selector - 1], ptr, len);
-			conn->dirty_attr |= CCDIRTY_BLLI;
-			break;
-
-		  case ATM_ATTR_BEARER:
-			len = sizeof(struct uni_ie_bearer);
-			memcpy(&conn->bearer, ptr, len);
-			break;
-
-		  case ATM_ATTR_TRAFFIC:
-			len = sizeof(struct uni_ie_traffic);
-			memcpy(&conn->traffic, ptr, len);
-			conn->dirty_attr |= CCDIRTY_TRAFFIC;
-			break;
-
-		  case ATM_ATTR_QOS:
-			len = sizeof(struct uni_ie_qos);
-			memcpy(&conn->qos, ptr, len);
-			break;
-
-		  case ATM_ATTR_EXQOS:
-			len = sizeof(struct uni_ie_exqos);
-			memcpy(&conn->exqos, ptr, len);
-			conn->dirty_attr |= CCDIRTY_EXQOS;
-			break;
-
-		  case ATM_ATTR_CALLED:
-			len = sizeof(struct uni_ie_called);
-			break;
-
-		  case ATM_ATTR_CALLEDSUB:
-			len = sizeof(struct uni_ie_calledsub);
-			memcpy(&conn->calledsub, ptr, len);
-			break;
-
-		  case ATM_ATTR_CALLING:
-			len = sizeof(struct uni_ie_calling);
-			memcpy(&conn->calling, ptr, len);
-			break;
-
-		  case ATM_ATTR_CALLINGSUB:
-			len = sizeof(struct uni_ie_callingsub);
-			memcpy(&conn->callingsub, ptr, len);
-			break;
-
-		  case ATM_ATTR_AAL:
-			len = sizeof(struct uni_ie_aal);
-			memcpy(&conn->aal, ptr, len);
-			conn->dirty_attr |= CCDIRTY_AAL;
-			break;
-
-		  case ATM_ATTR_EPREF:
-			len = sizeof(struct uni_ie_epref);
-			break;
-
-		  case ATM_ATTR_CONNED:
-			len = sizeof(struct uni_ie_conned);
-			break;
-
-		  case ATM_ATTR_CONNEDSUB:
-			len = sizeof(struct uni_ie_connedsub);
-			break;
-
-		  case ATM_ATTR_EETD:
-			len = sizeof(struct uni_ie_eetd);
-			memcpy(&conn->eetd, ptr, len);
-			conn->dirty_attr |= CCDIRTY_EETD;
-			break;
-
-		  case ATM_ATTR_ABRSETUP:
-			len = sizeof(struct uni_ie_abrsetup);
-			memcpy(&conn->abrsetup, ptr, len);
-			conn->dirty_attr |= CCDIRTY_ABRSETUP;
-			break;
-
-		  case ATM_ATTR_ABRADD:
-			len = sizeof(struct uni_ie_abradd);
-			memcpy(&conn->abradd, ptr, len);
-			conn->dirty_attr |= CCDIRTY_ABRADD;
-			break;
-
-		  case ATM_ATTR_CONNID:
-			len = sizeof(struct uni_ie_connid);
-			memcpy(&conn->connid, ptr, len);
-			conn->dirty_attr |= CCDIRTY_CONNID;
-			break;
-
-		  case ATM_ATTR_MDCR:
-			len = sizeof(struct uni_ie_mdcr);
-			memcpy(&conn->mdcr, ptr, len);
-			break;
-		}
-		ptr += len;
-	}
-
-	cc_user_ok(user, ATMRESP_NONE, NULL, 0);
-	return;
-
-  bad_val:
-	cc_user_err(user, ATMERR_BAD_VALUE);
-	return;
-
-  rdonly:
-	cc_user_err(user, ATMERR_RDONLY);
-	return;
-}
-
-#ifdef CCATM_DEBUG
-static const char *op_names[] = {
-#define	S(OP)	[ATMOP_##OP] = #OP
-	S(RESP),
-	S(ABORT_CONNECTION),
-	S(ACCEPT_INCOMING_CALL),
-	S(ADD_PARTY),
-	S(ADD_PARTY_REJECT),
-	S(ADD_PARTY_SUCCESS),
-	S(ARRIVAL_OF_INCOMING_CALL),
-	S(CALL_RELEASE),
-	S(CONNECT_OUTGOING_CALL),
-	S(DROP_PARTY),
-	S(GET_LOCAL_PORT_INFO),
-	S(P2MP_CALL_ACTIVE),
-	S(P2P_CALL_ACTIVE),
-	S(PREPARE_INCOMING_CALL),
-	S(PREPARE_OUTGOING_CALL),
-	S(QUERY_CONNECTION_ATTRIBUTES),
-	S(REJECT_INCOMING_CALL),
-	S(SET_CONNECTION_ATTRIBUTES),
-	S(WAIT_ON_INCOMING_CALL),
-	S(SET_CONNECTION_ATTRIBUTES_X),
-	S(QUERY_CONNECTION_ATTRIBUTES_X),
-	S(QUERY_STATE),
-#undef S
-};
-#endif
-
-/*
- * Signal from user - map this to our internal signals and queue
- * the mapped signal.
- */
-int
-cc_user_signal(struct ccuser *user, enum atmop sig, struct uni_msg *msg)
-{
-	size_t len = uni_msg_len(msg);
-	int err = EINVAL;
-
-	if (user->cc->log & CCLOG_USER_SIG)
-		cc_user_log(user, "signal %s to user", op_names[sig]);
-
-	if ((u_int)sig > ATMOP_QUERY_STATE)
-		goto bad_signal;
-
-	switch (sig) {
-
-	  case ATMOP_ABORT_CONNECTION:
-		if (len != sizeof(struct atm_abort_connection))
-			goto bad_len;
-		err = cc_user_sig_msg(user, USER_SIG_ABORT_CONNECTION, msg);
-		break;
-
-	  case ATMOP_ACCEPT_INCOMING_CALL:
-		if (len != sizeof(struct atm_accept_incoming_call))
-			goto bad_len;
-		err = cc_user_sig_msg(user, USER_SIG_ACCEPT_INCOMING, msg);
-		break;
-
-	  case ATMOP_ADD_PARTY:
-		if (len != sizeof(struct atm_add_party))
-			goto bad_len;
-		err = cc_user_sig_msg(user, USER_SIG_ADD_PARTY, msg);
-		break;
-
-	  case ATMOP_CALL_RELEASE:
-		if (len != sizeof(struct atm_call_release))
-			goto bad_len;
-		err = cc_user_sig_msg(user, USER_SIG_CALL_RELEASE, msg);
-		break;
-
-	  case ATMOP_CONNECT_OUTGOING_CALL:
-		if (len != sizeof(struct atm_connect_outgoing_call))
-			goto bad_len;
-		err = cc_user_sig_msg(user, USER_SIG_CONNECT_OUTGOING, msg);
-		break;
-
-	  case ATMOP_DROP_PARTY:
-		if (len != sizeof(struct atm_drop_party))
-			goto bad_len;
-		err = cc_user_sig_msg(user, USER_SIG_DROP_PARTY, msg);
-		break;
-
-	  case ATMOP_GET_LOCAL_PORT_INFO:
-		if (len != sizeof(struct atm_get_local_port_info))
-			goto bad_len;
-		err = cc_user_sig_msg(user, USER_SIG_GET_LOCAL_PORT_INFO, msg);
-		break;
-
-	  case ATMOP_PREPARE_INCOMING_CALL:
-		if (len != sizeof(struct atm_prepare_incoming_call))
-			goto bad_len;
-		err = cc_user_sig_msg(user, USER_SIG_PREPARE_INCOMING, msg);
-		break;
-
-	  case ATMOP_PREPARE_OUTGOING_CALL:
-		if (len != 0)
-			goto bad_len;
-		uni_msg_destroy(msg);
-		err = cc_user_sig(user, USER_SIG_PREPARE_OUTGOING, NULL, 0);
-		break;
-
-	  case ATMOP_QUERY_CONNECTION_ATTRIBUTES:
-		if (len != sizeof(struct atm_query_connection_attributes))
-			goto bad_len;
-		err = cc_user_sig_msg(user, USER_SIG_QUERY_ATTR, msg);
-		break;
-
-	  case ATMOP_REJECT_INCOMING_CALL:
-		if (len != sizeof(struct atm_reject_incoming_call))
-			goto bad_len;
-		err = cc_user_sig_msg(user, USER_SIG_REJECT_INCOMING, msg);
-		break;
-
-	  case ATMOP_SET_CONNECTION_ATTRIBUTES:
-		if (len < sizeof(struct atm_set_connection_attributes))
-			goto bad_len;
-		err = cc_user_sig_msg(user, USER_SIG_SET_ATTR, msg);
-		break;
-
-	  case ATMOP_WAIT_ON_INCOMING_CALL:
-		if (len != 0)
-			goto bad_len;
-		uni_msg_destroy(msg);
-		err = cc_user_sig(user, USER_SIG_WAIT_ON_INCOMING, NULL, 0);
-		break;
-
-	  case ATMOP_QUERY_CONNECTION_ATTRIBUTES_X:
-		if (len < sizeof(struct atm_set_connection_attributes_x) ||
-		    len != offsetof(struct atm_set_connection_attributes_x,
-		    attr) + uni_msg_rptr(msg,
-		    struct atm_set_connection_attributes_x *)->count *
-		    sizeof(uint32_t))
-			goto bad_len;
-		err = cc_user_sig_msg(user, USER_SIG_QUERY_ATTR_X, msg);
-		break;
-
-	  case ATMOP_SET_CONNECTION_ATTRIBUTES_X:
-		if (len < sizeof(struct atm_set_connection_attributes_x))
-			goto bad_len;
-		err = cc_user_sig_msg(user, USER_SIG_SET_ATTR_X, msg);
-		break;
-
-	  case ATMOP_QUERY_STATE:
-		if (len != 0)
-			goto bad_len;
-		uni_msg_destroy(msg);
-		err = cc_user_sig(user, USER_SIG_QUERY_STATE, NULL, 0);
-		break;
-
-	  case ATMOP_RESP:
-	  case ATMOP_ADD_PARTY_REJECT:
-	  case ATMOP_ADD_PARTY_SUCCESS:
-	  case ATMOP_ARRIVAL_OF_INCOMING_CALL:
-	  case ATMOP_P2MP_CALL_ACTIVE:
-	  case ATMOP_P2P_CALL_ACTIVE:
-	  bad_signal:
-		/* bad signal */
-		if (user->cc->log & CCLOG_USER_SIG)
-			cc_user_log(user, "bad signal %u", sig);
-		cc_user_err(user, ATMERR_BAD_OP);
-		uni_msg_destroy(msg);
-		break;
-	}
-	return (err);
-
-  bad_len:
-	/* bad argument length */
-	if (user->cc->log & CCLOG_USER_SIG)
-		cc_user_log(user, "signal %s had bad len=%zu",
-		    op_names[sig], len);
-	cc_user_err(user, ATMERR_BAD_ARGS);
-	uni_msg_destroy(msg);
-	return (EINVAL);
-}
-
-/*
- * Send active signal to user
- */
-static void
-cc_user_active(struct ccuser *user)
-{
-	struct ccconn *conn = TAILQ_FIRST(&user->connq);
-
-	set_state(user, USER_ACTIVE);
-	if (conn->bearer.cfg == UNI_BEARER_P2P) {
-		struct atm_p2p_call_active *act;
-
-		user->config = USER_P2P;
-		act = CCZALLOC(sizeof(*act));
-		if (act == NULL)
-			return;
-		act->connid = conn->connid;
-		cc_user_send(user, ATMOP_P2P_CALL_ACTIVE, act, sizeof(*act));
-		CCFREE(act);
-	} else {
-		struct atm_p2mp_call_active *act;
-
-		user->config = USER_ROOT;
-		act = CCZALLOC(sizeof(*act));
-		if (act == NULL)
-			return;
-		act->connid = conn->connid;
-		cc_user_send(user, ATMOP_P2MP_CALL_ACTIVE, act, sizeof(*act));
-		CCFREE(act);
-	}
-}
-
-/*
-* Handle a signal to this user
-*/
-void
-cc_user_sig_handle(struct ccuser *user, enum user_sig sig,
-    void *arg, u_int arg2)
-{
-
-	if (user->cc->log & CCLOG_USER_SIG)
-		cc_user_log(user, "signal %s to user state %s",
-		    cc_user_sigtab[sig], stab[user->state]);
-
-	switch (sig) {
-
-
-	  case USER_SIG_PREPARE_OUTGOING:
-	    {
-		/*
-		 * Here we create a connection for the call we soon will make.
-		 * We put this call on the list of orphaned connections,
-		 * because we don't know yet, which port will get the
-		 * connection. It is assigned, when the user issues the call
-		 * to connect.
-		 */
-		struct ccconn *conn;
-
-		if (user->state != USER_NULL) {
-			cc_user_err(user, ATMERR_BAD_STATE);
-			goto bad_state;
-		}
-		conn = cc_conn_create(user->cc);
-		if (conn == NULL) {
-			cc_user_err(user, ATMERR_NOMEM);
-			return;
-		}
-		set_state(user, USER_OUT_PREPARING);
-		cc_conn_set_state(conn, CONN_OUT_PREPARING);
-		conn->blli_selector = 1;
-		cc_connect_to_user(conn, user);
-
-		cc_user_ok(user, ATMRESP_NONE, NULL, 0);
-		return;
-	    }
-
-
-	  case USER_SIG_CONNECT_OUTGOING:
-	    {
-		/*
-		 * Request to connect that call
-		 *
-		 * Here we assign the connection to a port.
-		 */
-		struct uni_msg *msg = arg;
-		struct atm_connect_outgoing_call *req = uni_msg_rptr(msg,
-		    struct atm_connect_outgoing_call *);
-		struct ccdata *priv = user->cc;
-		struct ccport *port;
-		struct ccaddr *addr;
-		struct ccconn *conn = TAILQ_FIRST(&user->connq);
-
-		if (user->state != USER_OUT_PREPARING) {
-			uni_msg_destroy(msg);
-			cc_user_err(user, ATMERR_BAD_STATE);
-			goto bad_state;
-		}
-		if (!IE_ISPRESENT(req->called)) {
-			uni_msg_destroy(msg);
-			cc_user_err(user, ATMERR_BAD_ARGS);
-			return;
-		}
-		CCASSERT(conn->port == NULL, ("connection still on port"));
-
-		if (TAILQ_EMPTY(&priv->port_list)) {
-			/*
-			 * We have no ports - reject
-			 */
-			uni_msg_destroy(msg);
-			cc_user_err(user, ATMERR_BAD_PORT);
-			return;
-		}
-
-		/*
-		 * Find the correct port
-		 * Routing of outgoing calls goes to the lowest numbered port
-		 * with a matching address or, if no address match is found to
-		 * the lowest numbered port.
-		 */
-		TAILQ_FOREACH(port, &priv->port_list, node_link)
-			TAILQ_FOREACH(addr, &port->addr_list, port_link)
-				if (addr_matches(addr, conn))
-					break;
-
-		if (port == NULL)
-			port = TAILQ_FIRST(&priv->port_list);
-
-		cc_conn_ins_port(conn, port);
-		conn->called = req->called;
-		uni_msg_destroy(msg);
-
-		/*
-		 * Now move the state
-		 */
-		set_state(user, USER_OUT_WAIT_OK);
-		cc_conn_sig(conn, CONN_SIG_CONNECT_OUTGOING, NULL);
-
-		return;
-	    }
-
-
-	  case USER_SIG_CONNECT_OUTGOING_ERR:
-		switch (user->state) {
-
-		  case USER_OUT_WAIT_OK:
-			set_state(user, USER_OUT_PREPARING);
-			cc_user_err(user, arg2);
-			break;
-
-		  case USER_REL_WAIT_CONN:
-		    {
-			struct ccconn *conn;
-
-			conn = TAILQ_FIRST(&user->connq);
-			if (conn != NULL) {
-				cc_disconnect_from_user(conn);
-				cc_conn_destroy(conn);
-			}
-
-			cc_user_reset(user);
-			cc_user_ok(user, ATMRESP_NONE, NULL, 0);
-			break;
-		    }
-
-		  default:
-			goto bad_state;
-		}
-		return;
-
-
-	  case USER_SIG_CONNECT_OUTGOING_OK:
-		switch (user->state) {
-
-		  case USER_OUT_WAIT_OK:
-			set_state(user, USER_OUT_WAIT_CONF);
-			cc_user_ok(user, ATMRESP_NONE, NULL, 0);
-			break;
-
-		  case USER_REL_WAIT_CONN:
-			set_state(user, USER_REL_WAIT_SCONF);
-			break;
-
-		  default:
-			goto bad_state;
-		}
-		return;
-
-
-	  case USER_SIG_SETUP_CONFIRM:
-		/*
-		 * SETUP.confirm from UNI stack.
-		 */
-		switch (user->state) {
-
-		  case USER_OUT_WAIT_CONF:
-			cc_user_active(user);
-			break;
-
-		  case USER_REL_WAIT_SCONF:
-			/* now try to release */
-			set_state(user, USER_REL_WAIT_CONF);
-			cc_conn_sig(TAILQ_FIRST(&user->connq),
-			    CONN_SIG_RELEASE, NULL);
-			break;
-
-		  default:
-			goto bad_state;
-		}
-		return;
-
-
-	  case USER_SIG_PREPARE_INCOMING:
-	    {
-		struct uni_msg *msg = arg;
-		struct ccuser *ptr;
-		struct atm_prepare_incoming_call *prep = uni_msg_rptr(msg,
-		    struct atm_prepare_incoming_call *);
-
-		if (user->state != USER_NULL) {
-			uni_msg_destroy(msg);
-			cc_user_err(user, ATMERR_BAD_STATE);
-			goto bad_state;
-		}
-
-		/*
-		 * Check the SAP
-		 */
-		if (unisve_check_sap(&prep->sap) != UNISVE_OK) {
-			uni_msg_destroy(msg);
-			cc_user_err(user, ATMERR_BAD_SAP);
-			return;
-		}
-
-		/*
-		 * Loop through all incoming calls and check whether there
-		 * is an overlap in SAP space.
-		 */
-		LIST_FOREACH(ptr, &user->cc->user_list, node_link) {
-			if (check_overlap(ptr, &prep->sap)) {
-				uni_msg_destroy(msg);
-				cc_user_err(user, ATMERR_OVERLAP);
-				return;
-			}
-		}
-
-		/*
-		 * Save info and set state
-		 */
-		user->sap = CCZALLOC(sizeof(struct uni_sap));
-		if (user->sap == NULL) {
-			uni_msg_destroy(msg);
-			cc_user_err(user, ATMERR_NOMEM);
-			return;
-		}
-		*user->sap = prep->sap;
-		user->queue_max = prep->queue_size;
-		user->queue_act = 0;
-		uni_msg_destroy(msg);
-
-		set_state(user, USER_IN_PREPARING);
-		cc_user_ok(user, ATMRESP_NONE, NULL, 0);
-
-		return;
-	    }
-
-
-	  case USER_SIG_WAIT_ON_INCOMING:
-		if (user->state != USER_IN_PREPARING) {
-			cc_user_err(user, ATMERR_BAD_STATE);
-			goto bad_state;
-		}
-
-		set_state(user, USER_IN_WAITING);
-		cc_user_ok(user, ATMRESP_NONE, NULL, 0);
-		return;
-
-
-	  case USER_SIG_SETUP_IND:
-		/*
-		 * New connection queued up in the queue. If this is the
-		 * first one, inform the application of the arrival.
-		 */
-		switch (user->state) {
-
-		  case USER_IN_WAITING:
-			do_arrival(user);
-			break;
-
-		  case USER_IN_ARRIVED:
-		  case USER_IN_WAIT_REJ:
-		  case USER_IN_WAIT_ACC:
-			break;
-
-		  default:
-			goto bad_state;
-		}
-		return;
-
-
-	  case USER_SIG_REJECT_INCOMING:
-	     {
-		/*
-		 * User rejects call. This is done on the OLD user
-		 * (i.e. the one sending the arrival).
-		 */
-		struct uni_msg *msg = arg;
-		struct atm_reject_incoming_call *rej = uni_msg_rptr(msg,
-		    struct atm_reject_incoming_call *);
-		struct ccconn *conn = TAILQ_FIRST(&user->connq);
-
-		if (user->state != USER_IN_ARRIVED) {
-			uni_msg_destroy(msg);
-			cc_user_err(user, ATMERR_BAD_STATE);
-			goto bad_state;
-		}
-		if (user->aborted) {
-			/* connection has disappeared. Send an ok
-			 * to the user and lock whether there is another
-			 * connection at this endpoint */
-			uni_msg_destroy(msg);
-			cc_user_ok(user, ATMRESP_NONE, NULL, 0);
-
-			set_state(user, USER_IN_WAITING);
-			do_arrival(user);
-			return;
-		}
-		conn->cause[0] = rej->cause;
-		memset(&conn->cause[1], 0, sizeof(conn->cause[1]));
-		uni_msg_destroy(msg);
-
-		set_state(user, USER_IN_WAIT_REJ);
-		cc_conn_sig(conn, CONN_SIG_REJECT, NULL);
-
-		return;
-	    }
-
-
-	  case USER_SIG_REJECT_OK:
-		if (user->state != USER_IN_WAIT_REJ)
-			goto bad_state;
-		cc_user_ok(user, ATMRESP_NONE, NULL, 0);
-
-		set_state(user, USER_IN_WAITING);
-		do_arrival(user);
-		return;
-
-
-	  case USER_SIG_REJECT_ERR:
-		if (user->state != USER_IN_WAIT_REJ)
-			goto bad_state;
-		cc_user_err(user, arg2);
-
-		if (arg == NULL)
-			set_state(user, USER_IN_ARRIVED);
-		else {
-			set_state(user, USER_IN_WAITING);
-			do_arrival(user);
-		}
-		return;
-
-
-	  case USER_SIG_ACCEPT_INCOMING:
-	    {
-		/*
-		 * User accepts call. This is done on the OLD user (i.e. the one
-		 * sending the arrival), the message contains a pointer to the
-		 * new endpoint.
-		 */
-		struct uni_msg *msg = arg;
-		struct atm_accept_incoming_call *acc =
-		    uni_msg_rptr(msg, struct atm_accept_incoming_call *);
-		struct ccuser *newep;
-
-		if (user->state != USER_IN_ARRIVED) {
-			uni_msg_destroy(msg);
-			cc_user_err(user, ATMERR_BAD_STATE);
-			return;
-		}
-		if (user->aborted) {
-			/* connection has disappeared. Send an error
-			 * to the user and lock whether there is another
-			 * connection at this endpoint */
-			uni_msg_destroy(msg);
-			cc_user_err(user, ATMERR_PREVIOUSLY_ABORTED);
-
-			set_state(user, USER_IN_WAITING);
-			do_arrival(user);
-			return;
-		}
-		acc->newep[sizeof(acc->newep) - 1] = '\0';
-
-		LIST_FOREACH(newep, &user->cc->user_list, node_link)
-			if (strcmp(acc->newep, newep->name) == 0)
-				break;
-		uni_msg_destroy(msg);
-
-		if (newep == NULL) {
-			cc_user_err(user, ATMERR_BAD_ENDPOINT);
-			return;
-		}
-
-		if (newep->state != USER_NULL || newep->accepted != NULL) {
-			cc_user_err(user, ATMERR_BAD_STATE);
-			return;
-		}
-
-		set_state(user, USER_IN_WAIT_ACC);
-		cc_conn_sig(TAILQ_FIRST(&user->connq), CONN_SIG_ACCEPT, newep);
-
-		return;
-	    }
-
-
-	  case USER_SIG_ACCEPT_OK:
-		if (user->state != USER_IN_WAIT_ACC)
-			goto bad_state;
-		cc_user_ok(user, ATMRESP_NONE, NULL, 0);
-
-		set_state(user, USER_IN_WAITING);
-		do_arrival(user);
-		return;
-
-
-	  case USER_SIG_ACCEPT_ERR:
-		if (user->state != USER_IN_WAIT_ACC)
-			goto bad_state;
-		cc_user_err(user, arg2);
-
-		if (arg == NULL) {
-			/* arg used as flag! */
-			set_state(user, USER_IN_ARRIVED);
-		} else {
-			set_state(user, USER_IN_WAITING);
-			do_arrival(user);
-		}
-		return;
-
-
-	  case USER_SIG_ACCEPTING:
-		if (user->state != USER_NULL)
-			goto bad_state;
-		set_state(user, USER_IN_ACCEPTING);
-		return;
-
-
-	  case USER_SIG_SETUP_COMPL:
-	    {
-		struct ccconn *conn = TAILQ_FIRST(&user->connq);
-
-		if (user->state != USER_IN_ACCEPTING)
-			goto bad_state;
-
-		user->state = USER_ACTIVE;
-		if (conn->bearer.cfg == UNI_BEARER_P2P) {
-			struct atm_p2p_call_active *act;
-
-			user->config = USER_P2P;
-			act = CCZALLOC(sizeof(*act));
-			if (act == NULL)
-				return;
-			act->connid = conn->connid;
-			cc_user_send(user, ATMOP_P2P_CALL_ACTIVE,
-			    act, sizeof(*act));
-			CCFREE(act);
-		} else {
-			struct atm_p2mp_call_active *act;
-
-			user->config = USER_LEAF;
-			act = CCZALLOC(sizeof(*act));
-			if (act == NULL)
-				return;
-			act->connid = conn->connid;
-			cc_user_send(user, ATMOP_P2MP_CALL_ACTIVE,
-			    act, sizeof(*act));
-			CCFREE(act);
-		}
-		return;
-	    }
-
-
-	  case USER_SIG_CALL_RELEASE:
-	    {
-		struct uni_msg *msg = arg;
-		struct atm_call_release *api = uni_msg_rptr(msg,
-		    struct atm_call_release *);
-		struct ccconn *conn;
-
-		conn = TAILQ_FIRST(&user->connq);
-		switch (user->state) {
-
-		  case USER_OUT_WAIT_OK:	/* U2/A3 */
-			/* wait for CONN_OK first */
-			conn->cause[0] = api->cause[0];
-			conn->cause[1] = api->cause[1];
-			set_state(user, USER_REL_WAIT_CONN);
-			break;
-
-		  case USER_OUT_WAIT_CONF:	/* U3/A3 */
-			/* wait for SETUP.confirm first */
-			conn->cause[0] = api->cause[0];
-			conn->cause[1] = api->cause[1];
-			set_state(user, USER_REL_WAIT_SCONF);
-			break;
-
-		  case USER_IN_ACCEPTING:	/* U11/A7 */
-			conn->cause[0] = api->cause[0];
-			conn->cause[1] = api->cause[1];
-			set_state(user, USER_REL_WAIT_SCOMP);
-			cc_conn_sig(conn, CONN_SIG_RELEASE, NULL);
-			break;
-
-		  case USER_ACTIVE:		/* U4/A8,A9,A10 */
-			conn->cause[0] = api->cause[0];
-			conn->cause[1] = api->cause[1];
-			set_state(user, USER_REL_WAIT);
-			cc_conn_sig(conn, CONN_SIG_RELEASE, NULL);
-			break;
-
-		  default:
-			uni_msg_destroy(msg);
-			cc_user_err(user, ATMERR_BAD_STATE);
-			goto bad_state;
-		}
-		uni_msg_destroy(msg);
-		return;
-	    }
-
-
-	  case USER_SIG_RELEASE_CONFIRM:
-	    {
-		struct atm_call_release *ind;
-
-		switch (user->state) {
-
-		  case USER_OUT_WAIT_CONF:	/* U3/A3 */
-		  case USER_ACTIVE:		/* U4/A8,A9,A10 */
-			cc_user_reset(user);
-			break;
-
-		  case USER_REL_WAIT:		/* U5 /A8,A9,A10 */
-		  case USER_REL_WAIT_SCOMP:	/* U12/A7 */
-		  case USER_REL_WAIT_SCONF:	/* U13/A3 */
-		  case USER_REL_WAIT_CONF:	/* U14/A3 */
-			cc_user_reset(user);
-			cc_user_ok(user, ATMRESP_NONE, NULL, 0);
-			return;
-
-		  case USER_IN_ACCEPTING:	/* U11/A7 */
-			cc_user_reset(user);
-			break;
-
-		  default:
-			goto bad_state;
-		}
-
-		ind = CCZALLOC(sizeof(*ind));
-		if (ind == NULL)
-			return;
-		memcpy(ind->cause, user->cause, sizeof(ind->cause));
-		cc_user_send(user, ATMOP_CALL_RELEASE, ind, sizeof(*ind));
-		CCFREE(ind);
-		return;
-	    }
-
-
-	  case USER_SIG_RELEASE_ERR:
-		switch (user->state) {
-
-		  case USER_REL_WAIT:		/* U5/A8,A9,A10 */
-			set_state(user, USER_ACTIVE);
-			cc_user_err(user, ATM_MKUNIERR(arg2));
-			break;
-
-		  case USER_REL_WAIT_CONF:	/* U14/A3 */
-			cc_user_err(user, ATM_MKUNIERR(arg2));
-			cc_user_active(user);
-			break;
-
-		  case USER_REL_WAIT_SCOMP:	/* U12/A7 */
-			set_state(user, USER_IN_ACCEPTING);
-			cc_user_err(user, ATM_MKUNIERR(arg2));
-			break;
-
-		  default:
-			goto bad_state;
-		}
-		return;
-
-
-	  case USER_SIG_ADD_PARTY:
-	    {
-		struct uni_msg *msg = arg;
-		struct atm_add_party *add = uni_msg_rptr(msg,
-		    struct atm_add_party *);
-		struct ccconn *conn;
-
-		if (user->state != USER_ACTIVE || user->config != USER_ROOT) {
-			uni_msg_destroy(msg);
-			cc_user_err(user, ATMERR_BAD_STATE);
-			return;
-		}
-
-		if (add->leaf_ident == 0 || add->leaf_ident >= 32786) {
-			uni_msg_destroy(msg);
-			cc_user_err(user, ATMERR_BAD_LEAF_IDENT);
-			return;
-		}
-
-		conn = TAILQ_FIRST(&user->connq);
-		conn->called = add->called;
-
-		cc_conn_sig(conn, CONN_SIG_ADD_PARTY,
-		    (void *)(uintptr_t)add->leaf_ident);
-
-		uni_msg_destroy(msg);
-		return;
-	    }
-
-
-	  case USER_SIG_ADD_PARTY_ERR:
-		if (user->state != USER_ACTIVE)
-			goto bad_state;
-		cc_user_err(user, arg2);
-		return;
-
-
-	  case USER_SIG_ADD_PARTY_OK:
-		if (user->state != USER_ACTIVE)
-			goto bad_state;
-		cc_user_ok(user, ATMRESP_NONE, NULL, 0);
-		return;
-
-
-	  case USER_SIG_ADD_PARTY_ACK:
-	    {
-		u_int leaf_ident = arg2;
-		struct atm_add_party_success *succ;
-
-		if (user->state != USER_ACTIVE)
-			goto bad_state;
-
-		succ = CCZALLOC(sizeof(*succ));
-		if (succ == NULL)
-			return;
-
-		succ->leaf_ident = leaf_ident;
-		cc_user_send(user, ATMOP_ADD_PARTY_SUCCESS,
-		    succ, sizeof(*succ));
-
-		CCFREE(succ);
-		return;
-	    }
-
-
-	  case USER_SIG_ADD_PARTY_REJ:
-	    {
-		u_int leaf_ident = arg2;
-		struct atm_add_party_reject *reject;
-
-		if (user->state != USER_ACTIVE)
-			goto bad_state;
-
-		reject = CCZALLOC(sizeof(*reject));
-		if (reject == NULL)
-			return;
-
-		reject->leaf_ident = leaf_ident;
-		reject->cause = user->cause[0];
-		cc_user_send(user, ATMOP_ADD_PARTY_REJECT,
-		    reject, sizeof(*reject));
-
-		CCFREE(reject);
-		return;
-	    }
-
-
-	  case USER_SIG_DROP_PARTY:
-	    {
-		struct uni_msg *msg = arg;
-		struct atm_drop_party *drop = uni_msg_rptr(msg,
-		    struct atm_drop_party *);
-		struct ccconn *conn;
-
-		if (user->state != USER_ACTIVE || user->config != USER_ROOT) {
-			uni_msg_destroy(msg);
-			cc_user_err(user, ATMERR_BAD_STATE);
-			return;
-		}
-
-		if (drop->leaf_ident >= 32786) {
-			uni_msg_destroy(msg);
-			cc_user_err(user, ATMERR_BAD_LEAF_IDENT);
-			return;
-		}
-
-		conn = TAILQ_FIRST(&user->connq);
-		conn->cause[0] = drop->cause;
-		memset(&conn->cause[1], 0, sizeof(conn->cause[1]));
-
-		cc_conn_sig(conn, CONN_SIG_DROP_PARTY,
-		    (void *)(uintptr_t)drop->leaf_ident);
-
-		uni_msg_destroy(msg);
-		return;
-	    }
-
-
-	  case USER_SIG_DROP_PARTY_ERR:
-		if (user->state != USER_ACTIVE)
-			goto bad_state;
-		cc_user_err(user, arg2);
-		return;
-
-
-	  case USER_SIG_DROP_PARTY_OK:
-		if (user->state != USER_ACTIVE)
-			goto bad_state;
-		cc_user_ok(user, ATMRESP_NONE, NULL, 0);
-		return;
-
-
-	  case USER_SIG_DROP_PARTY_IND:
-	    {
-		u_int leaf_ident = arg2;
-		struct atm_drop_party *drop;
-
-		if (user->state != USER_ACTIVE)
-			goto bad_state;
-
-		drop = CCZALLOC(sizeof(*drop));
-		if (drop == NULL)
-			return;
-
-		drop->leaf_ident = leaf_ident;
-		drop->cause = user->cause[0];
-		cc_user_send(user, ATMOP_DROP_PARTY, drop, sizeof(*drop));
-
-		CCFREE(drop);
-		return;
-	    }
-
-
-	  case USER_SIG_QUERY_ATTR:
-	    {
-		struct uni_msg *msg = arg;
-		struct atm_query_connection_attributes *req;
-		struct ccconn *conn;
-
-		if (user->aborted) {
-			cc_user_err(user, ATMERR_PREVIOUSLY_ABORTED);
-			uni_msg_destroy(msg);
-			return;
-		}
-		conn = cc_query_check(user);
-		if (conn == NULL) {
-			cc_user_err(user, ATMERR_BAD_STATE);
-			uni_msg_destroy(msg);
-			return;
-		}
-		req = uni_msg_rptr(msg,
-		    struct atm_query_connection_attributes *);
-		cc_attr_query(user, conn, &req->attr, 1);
-		uni_msg_destroy(msg);
-		return;
-	    }
-
-	  case USER_SIG_QUERY_ATTR_X:
-	    {
-		struct uni_msg *msg = arg;
-		struct atm_query_connection_attributes_x *req;
-		struct ccconn *conn;
-
-		conn = cc_query_check(user);
-		if (conn == NULL) {
-			cc_user_err(user, ATMERR_BAD_STATE);
-			uni_msg_destroy(msg);
-			return;
-		}
-		req = uni_msg_rptr(msg,
-		    struct atm_query_connection_attributes_x *);
-		cc_attr_query(user, conn, req->attr, req->count);
-		uni_msg_destroy(msg);
-		return;
-	    }
-
-	  case USER_SIG_SET_ATTR:
-	    {
-		struct uni_msg *msg = arg;
-		struct atm_set_connection_attributes *req;
-		struct ccconn *conn;
-
-		if (user->aborted) {
-			cc_user_err(user, ATMERR_PREVIOUSLY_ABORTED);
-			uni_msg_destroy(msg);
-			return;
-		}
-		conn = cc_set_check(user);
-		if (conn == NULL) {
-			cc_user_err(user, ATMERR_BAD_STATE);
-			uni_msg_destroy(msg);
-			return;
-		}
-		req = uni_msg_rptr(msg, struct atm_set_connection_attributes *);
-		cc_attr_set(user, conn, &req->attr, 1, (u_char *)(req + 1),
-		    uni_msg_len(msg) - sizeof(*req));
-		uni_msg_destroy(msg);
-		return;
-	    }
-
-	  case USER_SIG_SET_ATTR_X:
-	    {
-		struct uni_msg *msg = arg;
-		struct atm_set_connection_attributes_x *req;
-		struct ccconn *conn;
-
-		conn = cc_set_check(user);
-		if (conn == NULL) {
-			cc_user_err(user, ATMERR_BAD_STATE);
-			uni_msg_destroy(msg);
-			return;
-		}
-		req = uni_msg_rptr(msg,
-		    struct atm_set_connection_attributes_x *);
-		cc_attr_set(user, conn, req->attr, req->count,
-		    (u_char *)req->attr + req->count * sizeof(req->attr[0]),
-		    uni_msg_len(msg) -
-		    offsetof(struct atm_set_connection_attributes_x, attr) -
-		    req->count * sizeof(req->attr[0]));
-		uni_msg_destroy(msg);
-		return;
-	    }
-
-	  case USER_SIG_QUERY_STATE:
-	    {
-		struct atm_epstate state;
-
-		strcpy(state.name, user->name);
-		switch (user->state) {
-
-		  case USER_NULL:
-			if (user->accepted != NULL)
-				state.state = ATM_A7;
-			else
-				state.state = ATM_A1;
-			break;
-
-		  case USER_OUT_PREPARING:
-			state.state = ATM_A2;
-			break;
-
-		  case USER_OUT_WAIT_OK:
-		  case USER_OUT_WAIT_CONF:
-		  case USER_REL_WAIT_SCONF:
-		  case USER_REL_WAIT_CONF:
-		  case USER_REL_WAIT_CONN:
-			state.state = ATM_A3;
-			break;
-
-		  case USER_ACTIVE:
-		  case USER_REL_WAIT:
-			switch (user->config) {
-
-			  case USER_P2P:
-				state.state = ATM_A8;
-				break;
-
-			  case USER_ROOT:
-				state.state = ATM_A9;
-				break;
-
-			  case USER_LEAF:
-				state.state = ATM_A10;
-				break;
-			}
-			break;
-
-		  case USER_IN_PREPARING:
-			state.state = ATM_A4;
-			break;
-
-		  case USER_IN_WAITING:
-			state.state = ATM_A5;
-			break;
-
-		  case USER_IN_ARRIVED:
-		  case USER_IN_WAIT_REJ:
-		  case USER_IN_WAIT_ACC:
-			state.state = ATM_A6;
-			break;
-
-		  case USER_IN_ACCEPTING:
-		  case USER_REL_WAIT_SCOMP:
-			state.state = ATM_A7;
-			break;
-		}
-		cc_user_ok(user, ATMRESP_STATE, &state, sizeof(state));
-		return;
-	    }
-
-	  case USER_SIG_GET_LOCAL_PORT_INFO:
-	    {
-		struct uni_msg *msg = arg;
-		struct atm_port_list *list;
-		size_t list_len;
-
-		list = cc_get_local_port_info(user->cc,
-		    uni_msg_rptr(msg, struct atm_get_local_port_info *)->port,
-		    &list_len);
-		uni_msg_destroy(msg);
-		if (list == NULL) {
-			cc_user_err(user, ATMERR_NOMEM);
-			return;
-		}
-		cc_user_ok(user, ATMRESP_PORTS, list, list_len);
-		CCFREE(list);
-		return;
-	    }
-
-	  case USER_SIG_ABORT_CONNECTION:
-	    {
-		struct uni_msg *msg = arg;
-		struct atm_abort_connection *abo = uni_msg_rptr(msg,
-		    struct atm_abort_connection *);
-
-		cc_user_abort(user, &abo->cause);
-		uni_msg_destroy(msg);
-		cc_user_ok(user, ATMRESP_NONE, NULL, 0);
-		return;
-	    }
-
-	}
-	if (user->cc->log & CCLOG_USER_SIG)
-		cc_user_log(user, "bad signal=%u in state=%u",
-		    sig, user->state);
-	return;
-
-  bad_state:
-	if (user->cc->log & CCLOG_USER_SIG)
-		cc_user_log(user, "bad state=%u for signal=%u",
-		    user->state, sig);
-	return;
-}
diff --git a/sys/contrib/ngatm/netnatm/api/ccatm.h b/sys/contrib/ngatm/netnatm/api/ccatm.h
deleted file mode 100644
index 1b4a179a3348..000000000000
--- a/sys/contrib/ngatm/netnatm/api/ccatm.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2003-2004
- *	Hartmut Brandt
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation must retain the above
- *    copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE AUTHOR
- * AND ITS CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR OR ITS CONTRIBUTORS  BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Begemot: libunimsg/netnatm/api/ccatm.h,v 1.1 2004/07/08 08:21:58 brandt Exp $
- *
- * ATM API as defined per af-saa-0108
- *
- * Interface to the supporting code.
- */
-
-#ifndef _API_CCATM_H_
-#define _API_CCATM_H_
-
-struct ccuser;
-struct ccconn;
-struct ccport;
-struct ccdata;
-
-struct cc_funcs {
-	/* send signal to API user */
-	void	(*send_user)(struct ccuser *, void *, u_int, void *, size_t);
-
-	/* respond API user */
-	void	(*respond_user)(struct ccuser *, void *, int, u_int,
-		    void *, size_t);
-
-	/* send signal to uni for connection */
-	void	(*send_uni)(struct ccconn *, void *, u_int, u_int,
-		    struct uni_msg *);
-
-	/* send global signal to uni */
-	void	(*send_uni_glob)(struct ccport *, void *, u_int, u_int,
-		    struct uni_msg *);
-
-	/* log a message */
-	void	(*log)(const char *, ...);
-};
-
-enum {
-	CCLOG_USER_STATE	= 0x00000001,
-	CCLOG_USER_INST		= 0x00000002,
-	CCLOG_USER_SIG		= 0x00000004,
-	CCLOG_CONN_STATE	= 0x00000010,
-	CCLOG_CONN_INST		= 0x00000020,
-	CCLOG_CONN_SIG		= 0x00000040,
-	CCLOG_PARTY_STATE	= 0x00000100,
-	CCLOG_PARTY_INST	= 0x00000200,
-	CCLOG_PARTY_SIG		= 0x00000400,
-	CCLOG_SIGS		= 0x00001000,
-};
-
-/* instance handling */
-struct ccdata *cc_create(const struct cc_funcs *);
-void cc_destroy(struct ccdata *);
-void cc_reset(struct ccdata *);
-
-/* input a response from the UNI layer to CC */
-int cc_uni_response(struct ccport *, u_int cookie, u_int reason, u_int state);
-
-/* Signal from UNI on this port */
-int cc_uni_signal(struct ccport *, u_int cookie, u_int sig, struct uni_msg *);
-
-/* retrieve addresses */
-int cc_get_addrs(struct ccdata *, u_int, struct uni_addr **, u_int **, u_int *);
-
-/* dump state */
-typedef int (*cc_dump_f)(struct ccdata *, void *, const char *);
-int cc_dump(struct ccdata *, size_t, cc_dump_f, void *);
-
-/* start/stop port */
-int cc_port_stop(struct ccdata *, u_int);
-int cc_port_start(struct ccdata *, u_int);
-
-/* is port running? */
-int cc_port_isrunning(struct ccdata *, u_int, int *);
-
-/* return port number */
-u_int cc_port_no(struct ccport *);
-
-/* Clear address and prefix information from the named port. */
-int cc_port_clear(struct ccdata *, u_int);
-
-/* Address registered.  */
-int cc_addr_register(struct ccdata *, u_int, const struct uni_addr *);
-
-/* Address unregistered. */
-int cc_addr_unregister(struct ccdata *, u_int, const struct uni_addr *);
-
-/* get port info */
-int cc_port_get_param(struct ccdata *, u_int, struct atm_port_info *);
-
-/* set port info */
-int cc_port_set_param(struct ccdata *, const struct atm_port_info *);
-
-/* get port list */
-int cc_port_getlist(struct ccdata *, u_int *, u_int **);
-
-/* create a port */
-struct ccport *cc_port_create(struct ccdata *, void *, u_int);
-
-/* destroy a port */
-void cc_port_destroy(struct ccport *, int);
-
-/* New endpoint created */
-struct ccuser *cc_user_create(struct ccdata *, void *, const char *);
-
-/* destroy user endpoint */
-void cc_user_destroy(struct ccuser *);
-
-/* signal from user */
-int cc_user_signal(struct ccuser *, u_int, struct uni_msg *);
-
-/* Management is given up on this node. */
-void cc_unmanage(struct ccdata *);
-
-/* handle all queued signals */
-void cc_work(struct ccdata *);
-
-/* set/get logging flags */
-void cc_set_log(struct ccdata *, u_int);
-u_int cc_get_log(const struct ccdata *);
-
-/* get extended status */
-int cc_get_extended_status(const struct ccdata *, struct atm_exstatus *,
-    struct atm_exstatus_ep **, struct atm_exstatus_port **,
-    struct atm_exstatus_conn **, struct atm_exstatus_party **);
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/api/ccpriv.h b/sys/contrib/ngatm/netnatm/api/ccpriv.h
deleted file mode 100644
index c0f30750fc10..000000000000
--- a/sys/contrib/ngatm/netnatm/api/ccpriv.h
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
- * Copyright (c) 2003-2004
- *	Hartmut Brandt
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation must retain the above
- *    copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE AUTHOR
- * AND ITS CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR OR ITS CONTRIBUTORS  BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Begemot: libunimsg/netnatm/api/ccpriv.h,v 1.2 2005/05/23 11:49:17 brandt_h Exp $
- *
- * ATM API as defined per af-saa-0108
- *
- * Private declarations.
- */
-#ifdef _KERNEL
-#ifdef __FreeBSD__
-#include <netgraph/atm/ccatm/ng_ccatm_cust.h>
-#endif
-#else	/* !_KERNEL */
-#include "cccust.h"
-#endif
-
-struct ccuser;
-struct ccconn;
-struct ccaddr;
-struct ccport;
-struct ccdata;
-struct ccsig;
-struct ccparty;
-
-LIST_HEAD(ccuser_list, ccuser);
-LIST_HEAD(ccconn_list, ccconn);
-TAILQ_HEAD(ccaddr_list, ccaddr);
-TAILQ_HEAD(ccport_list, ccport);
-TAILQ_HEAD(ccsig_list, ccsig);
-LIST_HEAD(ccparty_list, ccparty);
-
-/*
- * Private node data.
- */
-struct ccdata {
-	struct ccuser_list	user_list;	/* instance list */
-	struct ccport_list	port_list;	/* list of ports */
-	struct ccconn_list	orphaned_conns;	/* list of connections */
-	struct ccsig_list	sigs;		/* current signals */
-	struct ccsig_list	def_sigs;	/* deferred signals */
-	struct ccsig_list	free_sigs;	/* free signals */
-
-	const struct cc_funcs	*funcs;
-	uint32_t		cookie;		/* cookie generator */
-	u_int			log;		/* logging flags */
-};
-
-/* retrieve info on local ports */
-struct atm_port_list *cc_get_local_port_info(struct ccdata *,
-    u_int, size_t *);
-
-/* log */
-#ifdef CCATM_DEBUG
-#if defined(__GNUC__) && __GNUC__ < 3
-#define	cc_log(CC, FMT, ARGS...) do {					\
-	(CC)->funcs->log("%s (data=%p): " FMT, __FUNCTION__,		\
-	    (CC) , ## ARGS);						\
-    } while (0)
-#else
-#define	cc_log(CC, FMT, ...) do {					\
-	(CC)->funcs->log("%s (data=%p): " FMT, __func__,		\
-	    (CC), __VA_ARGS__);						\
-    } while (0)
-#endif
-#else
-#if defined(__GNUC__) && __GNUC__ < 3
-#define	cc_log(CC, FMT, ARGS...) do { } while (0)
-#else
-#define	cc_log(CC, FMT, ...) do { } while (0)
-#endif
-#endif
-
-/*
- * structure to remember cookies for outstanding requests
- * we also remember the request itself but don't use it.
- */
-struct ccreq {
-	TAILQ_ENTRY(ccreq)	link;
-	uint32_t		cookie;
-	uint32_t		req;
-	struct ccconn		*conn;
-};
-TAILQ_HEAD(ccreq_list, ccreq);
-
-/*
- * Port data. Each port has one UNI stack below.
- * The port number is in param.port. The number is assigned when the
- * hook to the uni is connected. This hook has the name 'uni<port>'.
- */
-struct ccport {
-	void		*uarg;		/* hook to UNI protocol */
-	struct ccdata 	*cc;		/* back pointer to node */
-	enum {
-		CCPORT_STOPPED,		/* halted */
-		CCPORT_RUNNING,		/* ok */
-	}		admin;		/* admin status */
-	struct ccconn_list conn_list;	/* list of connections */
-	struct ccaddr_list addr_list;	/* list of network addresses */
-	struct atm_port_info param;	/* parameters */
-
-	/* list of outstanding requests */
-	struct ccreq_list	cookies;
-
-	TAILQ_ENTRY(ccport) node_link;
-};
-
-#ifdef CCATM_DEBUG
-#if defined(__GNUC__) && __GNUC__ < 3
-#define	cc_port_log(P, FMT, ARGS...) do {				\
-	(P)->cc->funcs->log("%s (port=%p/%u): " FMT, __FUNCTION__,	\
-	    (P), (P)->param.port , ## ARGS);				\
-    } while (0)
-#else
-#define	cc_port_log(P, FMT, ...) do {					\
-	(P)->cc->funcs->log("%s (port=%p/%u): " FMT, __func__,		\
-	    (P), (P)->param.port, __VA_ARGS__);				\
-    } while (0)
-#endif
-#else
-#if defined(__GNUC__) && __GNUC__ < 3
-#define	cc_port_log(P, FMT, ARGS...) do { } while (0)
-#else
-#define	cc_port_log(P, FMT, ...) do { } while (0)
-#endif
-#endif
-
-#define CONN_STATES					\
-	DEF(CONN_NULL)			/*  C0 */	\
-	DEF(CONN_OUT_PREPARING)		/*  C1 */	\
-	DEF(CONN_OUT_WAIT_CREATE)	/*  C2 */	\
-	DEF(CONN_OUT_WAIT_OK)		/*  C3 */	\
-	DEF(CONN_OUT_WAIT_CONF)		/*  C4 */	\
-							\
-	DEF(CONN_ACTIVE)		/*  C5 */	\
-							\
-	DEF(CONN_IN_PREPARING)		/* C10 */	\
-	DEF(CONN_IN_WAITING)		/* C21 */	\
-	DEF(CONN_IN_ARRIVED)		/* C11 */	\
-	DEF(CONN_IN_WAIT_ACCEPT_OK)	/* C12 */	\
-	DEF(CONN_IN_WAIT_COMPL)		/* C13 */	\
-							\
-	DEF(CONN_REJ_WAIT_OK)		/* C14 */	\
-	DEF(CONN_REL_IN_WAIT_OK)	/* C15 */	\
-	DEF(CONN_REL_WAIT_OK)		/* C20 */	\
-							\
-	DEF(CONN_AB_WAIT_REQ_OK)	/* C33 */	\
-	DEF(CONN_AB_WAIT_RESP_OK)	/* C34 */	\
-	DEF(CONN_AB_FLUSH_IND)		/* C35 */	\
-	DEF(CONN_OUT_WAIT_DESTROY)	/* C37 */
-
-enum conn_state {
-#define DEF(N) N,
-	CONN_STATES
-#undef DEF
-};
-
-#define	CONN_SIGS							\
-	DEF(CONNECT_OUTGOING)	/* U */					\
-	DEF(ARRIVAL)		/* U */					\
-	DEF(RELEASE)		/* U */					\
-	DEF(REJECT)		/* U */					\
-	DEF(ACCEPT)		/* U newuser */				\
-	DEF(ADD_PARTY)		/* U ident */				\
-	DEF(DROP_PARTY)		/* U ident */				\
-	DEF(USER_ABORT)		/* U */					\
-									\
-	DEF(CREATED)		/* P msg */				\
-	DEF(DESTROYED)		/* P */					\
-	DEF(SETUP_CONFIRM)	/* P msg */				\
-	DEF(SETUP_IND)		/* P msg */				\
-	DEF(SETUP_COMPL)	/* P msg */				\
-	DEF(PROC_IND)		/* P msg */				\
-	DEF(ALERTING_IND)	/* P msg */				\
-	DEF(REL_CONF)		/* P msg */				\
-	DEF(REL_IND)		/* P msg */				\
-	DEF(PARTY_CREATED)	/* P msg */				\
-	DEF(PARTY_DESTROYED)	/* P msg */				\
-	DEF(PARTY_ALERTING_IND)	/* P msg */				\
-	DEF(PARTY_ADD_ACK_IND)	/* P msg */				\
-	DEF(PARTY_ADD_REJ_IND)	/* P msg */				\
-	DEF(DROP_PARTY_IND)	/* P msg */				\
-	DEF(DROP_PARTY_ACK_IND)	/* P msg */				\
-									\
-	DEF(OK)			/* P msg */				\
-	DEF(ERROR)		/* P msg */
-
-enum conn_sig {
-#define DEF(NAME) CONN_SIG_##NAME,
-CONN_SIGS
-#undef DEF
-};
-extern const char *const cc_conn_sigtab[];
-
-/*
- * This describes a connection and must be in sync with the UNI
- * stack.
- */
-struct ccconn {
-	enum conn_state		state;	/* API state of the connection */
-	struct ccdata		*cc;	/* owner node */
-	struct ccport		*port;	/* the port we belong to */
-	struct ccuser		*user;	/* user instance we belong to */
-    	TAILQ_ENTRY(ccconn)	connq_link;	/* queue of the owner */
-	LIST_ENTRY(ccconn) 	port_link;	/* link in list of port */
-	struct uni_cref		cref;
-	uint8_t			reason;
-	struct ccuser		*acceptor;
-
-	/* attributes */
-	uint32_t		blli_selector;
-	struct uni_ie_blli	blli[UNI_NUM_IE_BLLI];
-
-	struct uni_ie_bearer	bearer;
-	struct uni_ie_traffic	traffic;
-	struct uni_ie_qos	qos;
-	struct uni_ie_exqos	exqos;
-	struct uni_ie_called	called;
-	struct uni_ie_calledsub	calledsub;
-	struct uni_ie_aal	aal;
-	struct uni_ie_epref	epref;
-	struct uni_ie_conned	conned;
-	struct uni_ie_connedsub	connedsub;
-	struct uni_ie_eetd	eetd;
-	struct uni_ie_abrsetup	abrsetup;
-	struct uni_ie_abradd	abradd;
-	struct uni_ie_mdcr	mdcr;
-
-	struct uni_ie_calling	calling;
-	struct uni_ie_callingsub callingsub;
-	struct uni_ie_connid	connid;
-	struct uni_ie_tns	tns[UNI_NUM_IE_TNS];
-	struct uni_ie_atraffic	atraffic;
-	struct uni_ie_mintraffic mintraffic;
-	struct uni_ie_cscope	cscope;
-	struct uni_ie_bhli	bhli;
-
-	/* bit mask of written attributes in A6 */
-	u_int			dirty_attr;
-
-	struct uni_ie_cause	cause[2];
-
-	struct ccparty_list	parties;
-};
-
-/* dirty attribute mask values */
-enum {
-	CCDIRTY_AAL		= 0x0001,
-	CCDIRTY_BLLI		= 0x0002,
-	CCDIRTY_CONNID		= 0x0004,
-	CCDIRTY_NOTIFY		= 0x0008,	/* XXX */
-	CCDIRTY_EETD		= 0x0010,
-	CCDIRTY_GIT		= 0x0020,	/* XXX */
-	CCDIRTY_UU		= 0x0040,	/* XXX */
-	CCDIRTY_TRAFFIC		= 0x0080,
-	CCDIRTY_EXQOS		= 0x0100,
-	CCDIRTY_ABRSETUP	= 0x0200,
-	CCDIRTY_ABRADD		= 0x0400,
-};
-
-/* set conn to new state */
-void cc_conn_set_state(struct ccconn *, enum conn_state);
-
-/* return string for state */
-const char *cc_conn_state2str(u_int);
-
-/* connect connection to user */
-void cc_connect_to_user(struct ccconn *, struct ccuser *);
-
-/* disconnect from the user */
-void cc_disconnect_from_user(struct ccconn *);
-
-/* abort the connection */
-void cc_conn_abort(struct ccconn *, int);
-
-/* destroy a connection */
-void cc_conn_destroy(struct ccconn *);
-
-/* create a connection */
-struct ccconn *cc_conn_create(struct ccdata *);
-
-/* assign to port */
-void cc_conn_ins_port(struct ccconn *, struct ccport *);
-
-/* remove from port */
-void cc_conn_rem_port(struct ccconn *);
-
-/* dispatch a connection to a user or reject it */
-void cc_conn_dispatch(struct ccconn *);
-
-/* disconnect from acceptor */
-void cc_conn_reset_acceptor(struct ccconn *);
-
-/* log on a connection */
-#ifdef CCATM_DEBUG
-#if defined(__GNUC__) && __GNUC__ < 3
-#define	cc_conn_log(C, FMT, ARGS...) do {				\
-	(C)->cc->funcs->log("%s (conn=%p): " FMT, __FUNCTION__,		\
-	    (C) , ## ARGS);						\
-    } while (0)
-#else
-#define	cc_conn_log(C, FMT, ...) do {					\
-	(C)->cc->funcs->log("%s (conn=%p): " FMT, __func__,		\
-	    (C), __VA_ARGS__);						\
-    } while (0)
-#endif
-#else
-#if defined(__GNUC__) && __GNUC__ < 3
-#define	cc_conn_log(C, FMT, ARGS...) do { } while (0)
-#else
-#define	cc_conn_log(C, FMT, ...) do { } while (0)
-#endif
-#endif
-
-/* handle signal to connection */
-void cc_conn_sig_handle(struct ccconn *, enum conn_sig, void *arg, u_int iarg);
-
-/*
- * Mp connection parties
- */
-#define	PARTY_STATES							\
-	DEF(NULL)		/* 0 created */				\
-	DEF(ACTIVE)		/* 1 active */				\
-	DEF(ADD_WAIT_CREATE)	/* 2 wait for PARTY_CREATE */		\
-	DEF(ADD_WAIT_OK)	/* 3 wait for OK for ADD.request */	\
-	DEF(ADD_WAIT_ACK)	/* 4 wait for ADD.ack/rej */		\
-	DEF(DROP_WAIT_OK)	/* 5 wait for OK for DROP.request */	\
-	DEF(DROP_WAIT_ACK)	/* 6 wait for DROP.ack */		\
-	DEF(WAIT_DESTROY)	/* 7 wait for destroy */		\
-	DEF(WAIT_SETUP_COMPL)	/* 8 wait for setup.complete */		\
-	DEF(WAIT_DROP_ACK_OK)	/* 9 wait for OK for DROP_ACK.request */\
-	DEF(WAIT_SETUP_CONF)	/* 10 wait for setup.confirm */		\
-	DEF(ADD_DROP_WAIT_OK)	/* 11 wait for ok to DROP.request */	\
-	DEF(ADD_DROPACK_WAIT_OK)/* 12 wait for ok to DROP_ACK.req */
-
-enum party_state {
-#define	DEF(N)	PARTY_##N,
-PARTY_STATES
-#undef DEF
-};
-
-struct ccparty {
-	struct ccconn		*conn;	/* owner */
-	LIST_ENTRY(ccparty)	link;
-	enum party_state	state;
-	struct uni_ie_called	called;
-	struct uni_ie_epref	epref;
-};
-
-/* set party to new state */
-void cc_party_set_state(struct ccparty *, enum party_state);
-
-/* return string for state */
-const char *cc_party_state2str(u_int);
-
-/* create new party */
-struct ccparty *cc_party_create(struct ccconn *, u_int ident, u_int flag);
-
-/* log on a party */
-#ifdef CCATM_DEBUG
-#if defined(__GNUC__) && __GNUC__ < 3
-#define	cc_party_log(P, FMT, ARGS...) do {				\
-	(P)->conn->cc->funcs->log("%s (conn=%p, party=%p): " FMT,	\
-	    __FUNCTION__, (P)->conn, (P) , ## ARGS);			\
-    } while (0)
-#else
-#define	cc_party_log(P, FMT, ...) do {					\
-	(P)->conn->cc->funcs->log("%s (conn=%p, party=%p): " FMT,	\
-	__func__, (P)->conn, (P), __VA_ARGS__);				\
-    } while (0)
-#endif
-#else
-#if defined(__GNUC__) && __GNUC__ < 3
-#define	cc_party_log(P, FMT, ARGS...) do { } while (0)
-#else
-#define	cc_party_log(P, FMT, ...) do { } while (0)
-#endif
-#endif
-
-/*
- * This is kind of a user socket, i.e. the entity managed towards the
- * upper layer.
- */
-#define USER_STATES							\
-	DEF(USER_NULL)		/* U0 none */				\
-	DEF(USER_OUT_PREPARING)	/* U1 process set/query requests */	\
-	DEF(USER_OUT_WAIT_OK)	/* U2 wait for OK to setup */		\
-	DEF(USER_OUT_WAIT_CONF)	/* U3 wait for SETUP.confirm */		\
-	DEF(USER_ACTIVE)	/* U4 A8-9-10/U10 */			\
-	DEF(USER_REL_WAIT)	/* U5 wait for release to compl */	\
-	DEF(USER_IN_PREPARING)	/* U6 set SAP */			\
-	DEF(USER_IN_WAITING)	/* U7 wait and dispatch */		\
-	DEF(USER_IN_ARRIVED)	/* U8 waiting for rej/acc */		\
-	DEF(USER_IN_WAIT_REJ)	/* U9 wait for rejecting */		\
-	DEF(USER_IN_WAIT_ACC)	/* U10 wait for accepting */		\
-	DEF(USER_IN_ACCEPTING)	/* U11 wait for SETUP_complete */	\
-	DEF(USER_REL_WAIT_SCOMP)/* U12 wait for SETUP_complete */	\
-	DEF(USER_REL_WAIT_SCONF)/* U13 wait for SETUP.confirm */	\
-	DEF(USER_REL_WAIT_CONF)	/* U14 wait for confirm */		\
-	DEF(USER_REL_WAIT_CONN)	/* U15 wait for CONN_OK */
-
-enum user_state {
-#define	DEF(N) N,
-USER_STATES
-#undef DEF
-};
-
-#define	USER_SIGS						\
-	DEF(PREPARE_OUTGOING)		/* U */			\
-	DEF(CONNECT_OUTGOING)		/* U msg */		\
-	DEF(PREPARE_INCOMING)		/* U msg */		\
-	DEF(WAIT_ON_INCOMING)		/* U msg */		\
-	DEF(REJECT_INCOMING)		/* U msg */		\
-	DEF(ACCEPT_INCOMING)		/* U msg */		\
-	DEF(CALL_RELEASE)		/* U msg */		\
-	DEF(ADD_PARTY)			/* U msg */		\
-	DEF(DROP_PARTY)			/* U msg */		\
-	DEF(QUERY_ATTR)			/* U msg */		\
-	DEF(QUERY_ATTR_X)		/* U msg */		\
-	DEF(SET_ATTR)			/* U msg */		\
-	DEF(SET_ATTR_X)			/* U msg */		\
-	DEF(QUERY_STATE)		/* U */			\
-	DEF(GET_LOCAL_PORT_INFO)	/* U msg */		\
-	DEF(ABORT_CONNECTION)		/* U msg */		\
-								\
-	DEF(CONNECT_OUTGOING_OK)	/* */			\
-	DEF(CONNECT_OUTGOING_ERR)	/* reason */		\
-	DEF(SETUP_CONFIRM)		/* */			\
-	DEF(SETUP_IND)			/* */			\
-	DEF(REJECT_OK)			/* */			\
-	DEF(REJECT_ERR)			/* reason */		\
-	DEF(ACCEPT_OK)			/* */			\
-	DEF(ACCEPT_ERR)			/* reason */		\
-	DEF(ACCEPTING)			/* */			\
-	DEF(SETUP_COMPL)		/* */			\
-	DEF(RELEASE_CONFIRM)		/* */			\
-	DEF(RELEASE_ERR)		/* reason */		\
-	DEF(ADD_PARTY_ERR)		/* reason */		\
-	DEF(ADD_PARTY_OK)		/* */			\
-	DEF(ADD_PARTY_ACK)		/* leaf-ident */	\
-	DEF(ADD_PARTY_REJ)		/* leaf-ident */	\
-	DEF(DROP_PARTY_ERR)		/* reason */		\
-	DEF(DROP_PARTY_OK)		/* */			\
-	DEF(DROP_PARTY_IND)		/* leaf-ident */	\
-
-
-enum user_sig {
-#define	DEF(NAME)	USER_SIG_##NAME,
-USER_SIGS
-#undef DEF
-};
-extern const char *const cc_user_sigtab[];
-
-struct ccuser {
-	LIST_ENTRY(ccuser) 	node_link;	/* link in list of node */
-	enum user_state		state;		/* type of this instance */
-	struct ccdata		*cc;		/* the node */
-	void			*uarg;		/* the hook (if any) */
-	char			name[ATM_EPNAMSIZ];
-	enum {
-		USER_P2P,
-		USER_ROOT,
-		USER_LEAF
-	}			config;		/* configuration */
-
-	struct uni_sap		*sap;		/* listening SAP */
-	u_int			queue_max;	/* maximum queue size */
-	u_int			queue_act;	/* actual queue size */
-	TAILQ_HEAD(,ccconn)	connq;		/* pending connections */
-	struct ccconn		*accepted;
-	struct uni_ie_cause	cause[2];	/* cause from connection */
-	u_int			aborted;
-};
-
-/* set user to new state */
-void cc_user_set_state(struct ccuser *, enum user_state);
-
-/* return string for state */
-const char *cc_user_state2str(u_int);
-
-/* log on a user */
-#ifdef CCATM_DEBUG
-#if defined(__GNUC__) && __GNUC__ < 3
-#define	cc_user_log(U, FMT, ARGS...) do {				\
-	(U)->cc->funcs->log("%s (user=%p): " FMT, __FUNCTION__,		\
-	    (U) , ## ARGS);						\
-    } while (0)
-#else
-#define	cc_user_log(U, FMT, ...) do {					\
-	(U)->cc->funcs->log("%s (user=%p): " FMT, __func__,		\
-	    (U), __VA_ARGS__);						\
-    } while (0)
-#endif
-#else
-#if defined(__GNUC__) && __GNUC__ < 3
-#define	cc_user_log(U, FMT, ARGS...) do { } while (0)
-#else
-#define	cc_user_log(U, FMT, ...) do { } while (0)
-#endif
-#endif
-
-/* Handle a signal to this user */
-void cc_user_sig_handle(struct ccuser *, enum user_sig, void *, u_int);
-
-/*
- * Addresses
- */
-struct ccaddr {
-	TAILQ_ENTRY(ccaddr) port_link;
-	struct uni_addr	addr;
-};
-
-/* signal to connection */
-int cc_conn_sig(struct ccconn *, enum conn_sig, void *arg);
-
-/* signal with message to connection */
-int cc_conn_sig_msg(struct ccconn *, enum conn_sig, struct uni_msg *);
-int cc_conn_sig_msg_nodef(struct ccconn *, enum conn_sig, struct uni_msg *);
-
-/* response signal to connection */
-int cc_conn_resp(struct ccconn *, enum conn_sig, u_int, u_int, u_int);
-
-/* flush all signals to a given connection */
-void cc_conn_sig_flush(struct ccconn *);
-
-/* Queue a signal to this user */
-int cc_user_sig(struct ccuser *, enum user_sig, void *, u_int);
-
-/* Queue a signal with message to this user */
-int cc_user_sig_msg(struct ccuser *, enum user_sig, struct uni_msg *);
-
-/* Flush all signals to a given user */
-void cc_user_sig_flush(struct ccuser *);
-
-/* flush all signals */
-void cc_sig_flush_all(struct ccdata *);
diff --git a/sys/contrib/ngatm/netnatm/api/unisap.c b/sys/contrib/ngatm/netnatm/api/unisap.c
deleted file mode 100644
index d96f39ec1b1c..000000000000
--- a/sys/contrib/ngatm/netnatm/api/unisap.c
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- * Copyright (c) 2004
- *	Hartmut Brandt
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Begemot: libunimsg/netnatm/api/unisap.c,v 1.4 2004/07/08 08:22:01 brandt Exp $
- */
-
-#include <sys/types.h>
-#ifdef _KERNEL
-#include <sys/ctype.h>
-#include <sys/libkern.h>
-#else
-#include <ctype.h>
-#include <string.h>
-#endif
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/api/unisap.h>
-
-int
-unisve_check_addr(const struct unisve_addr *sve)
-{
-	if (sve->tag == UNISVE_ABSENT)
-		return (UNISVE_OK);
-	if (sve->tag == UNISVE_ANY)
-		return (UNISVE_OK);
-	if (sve->tag != UNISVE_PRESENT)
-		return (UNISVE_ERROR_BAD_TAG);
-
-	if (sve->type == UNI_ADDR_INTERNATIONAL) {
-		if (sve->plan != UNI_ADDR_E164)
-			return (UNISVE_ERROR_TYPE_PLAN_CONFLICT);
-		if (sve->len == 0 || sve->len > 15)
-			return (UNISVE_ERROR_ADDR_LEN);
-
-	} else if (sve->type == UNI_ADDR_UNKNOWN) {
-		if (sve->plan != UNI_ADDR_ATME)
-			return (UNISVE_ERROR_TYPE_PLAN_CONFLICT);
-		if (sve->len != 19)
-			return (UNISVE_ERROR_ADDR_LEN);
-	} else
-		return (UNISVE_ERROR_BAD_ADDR_TYPE);
-
-	return (UNISVE_OK);
-}
-
-int
-unisve_check_selector(const struct unisve_selector *sve)
-{
-	if (sve->tag != UNISVE_PRESENT &&
-	    sve->tag != UNISVE_ABSENT &&
-	    sve->tag != UNISVE_ANY)
-		return (UNISVE_ERROR_BAD_TAG);
-	return (UNISVE_OK);
-}
-
-/*
- * We don't want to check the protocol values here.
- */
-int
-unisve_check_blli_id2(const struct unisve_blli_id2 *sve)
-{
-	if (sve->tag != UNISVE_PRESENT &&
-	    sve->tag != UNISVE_ABSENT &&
-	    sve->tag != UNISVE_ANY)
-		return (UNISVE_ERROR_BAD_TAG);
-	return (UNISVE_OK);
-}
-
-/*
- * We don't want to check the protocol values here.
- */
-int
-unisve_check_blli_id3(const struct unisve_blli_id3 *sve)
-{
-	if (sve->tag != UNISVE_PRESENT &&
-	    sve->tag != UNISVE_ABSENT &&
-	    sve->tag != UNISVE_ANY)
-		return (UNISVE_ERROR_BAD_TAG);
-	return (UNISVE_OK);
-}
-
-int
-unisve_check_bhli(const struct unisve_bhli *sve)
-{
-	if (sve->tag == UNISVE_ABSENT)
-		return (UNISVE_OK);
-	if (sve->tag == UNISVE_ANY)
-		return (UNISVE_OK);
-
-	if (sve->tag != UNISVE_PRESENT)
-		return (UNISVE_ERROR_BAD_TAG);
-
-	if (sve->type != UNI_BHLI_ISO &&
-	    sve->type != UNI_BHLI_USER &&
-	    sve->type != UNI_BHLI_VENDOR)
-		return (UNISVE_ERROR_BAD_BHLI_TYPE);
-
-	if (sve->len > sizeof(sve->info))
-		return (UNISVE_ERROR_BAD_BHLI_LEN);
-
-	return (UNISVE_OK);
-}
-
-int
-unisve_check_sap(const struct uni_sap *sap)
-{
-	int err;
-
-	if ((err = unisve_check_addr(&sap->addr)) != 0 ||
-	    (err = unisve_check_selector(&sap->selector)) != 0 ||
-	    (err = unisve_check_blli_id2(&sap->blli_id2)) != 0 ||
-	    (err = unisve_check_blli_id3(&sap->blli_id3)) != 0 ||
-	    (err = unisve_check_bhli(&sap->bhli)) != 0)
-		return (err);
-
-	if (sap->addr.plan == UNI_ADDR_E164) {
-		if (sap->selector.tag == UNISVE_PRESENT)
-			return (UNISVE_ERROR_ADDR_SEL_CONFLICT);
-	} else if (sap->addr.plan == UNI_ADDR_ATME) {
-		if (sap->selector.tag == UNISVE_ABSENT)
-			return (UNISVE_ERROR_ADDR_SEL_CONFLICT);
-	}
-	return (0);
-}
-
-#define COMMON_OVERLAP(A1,A2)						\
-	if ((A1->tag == UNISVE_ABSENT && A2->tag == UNISVE_ABSENT) ||	\
-	    A1->tag == UNISVE_ANY || A2->tag == UNISVE_ANY)		\
-		return (1);						\
-	if ((A1->tag == UNISVE_ABSENT && A2->tag == UNISVE_PRESENT) ||	\
-	    (A2->tag == UNISVE_ABSENT && A1->tag == UNISVE_PRESENT))	\
-		return (0);
-
-int
-unisve_overlap_addr(const struct unisve_addr *s1, const struct unisve_addr *s2)
-{
-	COMMON_OVERLAP(s1, s2);
-
-	return (s1->type == s2->type && s1->plan == s2->plan &&
-	    s1->len == s2->len && memcmp(s1->addr, s2->addr, s1->len) == 0);
-}
-
-int
-unisve_overlap_selector(const struct unisve_selector *s1,
-    const struct unisve_selector *s2)
-{
-	COMMON_OVERLAP(s1, s2);
-
-	return (s1->selector == s2->selector);
-}
-
-int
-unisve_overlap_blli_id2(const struct unisve_blli_id2 *s1,
-    const struct unisve_blli_id2 *s2)
-{
-	COMMON_OVERLAP(s1, s2);
-
-	return (s1->proto == s2->proto &&
-	    (s1->proto != UNI_BLLI_L2_USER || s1->user == s2->user));
-}
-
-int
-unisve_overlap_blli_id3(const struct unisve_blli_id3 *s1,
-    const struct unisve_blli_id3 *s2)
-{
-	COMMON_OVERLAP(s1, s2);
-
-	if (s1->proto != s2->proto)
-		return (0);
-	if (s1->proto == UNI_BLLI_L3_USER)
-		return (s1->user == s2->user);
-	if (s1->proto == UNI_BLLI_L3_TR9577) {
-		if (s1->noipi && s2->noipi)
-			return (1);
-		if (!s1->noipi && !s2->noipi) {
-			if (s1->ipi == s2->ipi) {
-				if (s1->ipi != UNI_BLLI_L3_SNAP)
-					return (1);
-				if (s1->oui == s2->oui && s1->pid == s2->pid)
-					return (1);
-			}
-		}
-		return (0);
-	}
-	return (1);
-}
-
-int
-unisve_overlap_bhli(const struct unisve_bhli *s1, const struct unisve_bhli *s2)
-{
-	COMMON_OVERLAP(s1, s2);
-
-	return (s1->type == s2->type && s1->len == s2->len &&
-	    memcmp(s1->info, s2->info, s1->len) == 0);
-}
-
-int
-unisve_overlap_sap(const struct uni_sap *s1, const struct uni_sap *s2)
-{
-	int any1, any2;
-
-	/*
-	 * Two catch-all's SAP's are not allowed. A catch-all does never
-	 * overlap with a non-catch all SAP.
-	 */
-	any1 = unisve_is_catchall(s1);
-	any2 = unisve_is_catchall(s2);
-
-	if (any1 && any2)
-		return (1);
-	 if(any1 || any2)
-		return (0);
-
-	return (unisve_overlap_addr(&s1->addr, &s2->addr) &&
-	    unisve_overlap_selector(&s1->selector, &s2->selector) &&
-	    unisve_overlap_blli_id2(&s1->blli_id2, &s2->blli_id2) &&
-	    unisve_overlap_blli_id3(&s1->blli_id3, &s2->blli_id3) &&
-	    unisve_overlap_bhli(&s1->bhli, &s2->bhli));
-}
-
-int
-unisve_is_catchall(const struct uni_sap *sap)
-{
-	return (sap->addr.tag == UNISVE_ANY &&
-	    sap->selector.tag == UNISVE_ANY &&
-	    sap->blli_id2.tag == UNISVE_ANY &&
-	    sap->blli_id3.tag == UNISVE_ANY &&
-	    sap->bhli.tag == UNISVE_ANY);
-}
-
-int
-unisve_match(const struct uni_sap *sap, const struct uni_ie_called *called,
-	const struct uni_ie_blli *blli, const struct uni_ie_bhli *bhli)
-{
-	switch (sap->addr.tag) {
-	  case UNISVE_ABSENT:
-		if (IE_ISGOOD(*called))
-			return (0);
-		break;
-
-	  case UNISVE_ANY:
-		break;
-
-	  case UNISVE_PRESENT:
-		if (!IE_ISGOOD(*called))
-			return (0);
-		if (called->addr.type != sap->addr.type ||
-		    called->addr.plan != sap->addr.plan)
-			return (0);
-		if (called->addr.plan == UNI_ADDR_E164) {
-			if (called->addr.len != sap->addr.len ||
-			    memcmp(called->addr.addr, sap->addr.addr,
-			    called->addr.len) != 0)
-				return (0);
-		} else if (called->addr.plan == UNI_ADDR_ATME) {
-			if (called->addr.len != 20 ||
-			    memcmp(called->addr.addr, sap->addr.addr, 19) != 0)
-				return (0);
-		}
-		break;
-
-	  default:
-		return (0);
-	}
-
-	switch (sap->selector.tag) {
-
-	  case UNISVE_ABSENT:
-		if (IE_ISGOOD(*called) && called->addr.plan == UNI_ADDR_ATME)
-			return (0);
-		break;
-
-	  case UNISVE_ANY:
-		break;
-
-	  case UNISVE_PRESENT:
-		if (!IE_ISGOOD(*called))
-			return (0);
-		if (called->addr.plan != UNI_ADDR_ATME)
-			return (0);
-		if (called->addr.addr[19] != sap->selector.selector)
-			return (0);
-		break;
-
-	  default:
-		return (0);
-	}
-
-	switch (sap->blli_id2.tag) {
-
-	  case UNISVE_ABSENT:
-		if (IE_ISGOOD(*blli) && (blli->h.present & UNI_BLLI_L2_P))
-			return (0);
-		break;
-
-	  case UNISVE_ANY:
-		break;
-
-	  case UNISVE_PRESENT:
-		if (!IE_ISGOOD(*blli) || (blli->h.present & UNI_BLLI_L2_P) == 0)
-			return (0);
-		if (blli->l2 != sap->blli_id2.proto)
-			return (0);
-		if (blli->l2 == UNI_BLLI_L2_USER) {
-			if ((blli->h.present & UNI_BLLI_L2_USER_P) == 0)
-				return (0);
-			if (blli->l2_user != sap->blli_id2.user)
-				return (0);
-		}
-		break;
-
-	  default:
-		return (0);
-	}
-
-	switch (sap->blli_id3.tag) {
-
-	  case UNISVE_ABSENT:
-		if (IE_ISGOOD(*blli) && (blli->h.present & UNI_BLLI_L3_P))
-			return (0);
-		break;
-
-	  case UNISVE_ANY:
-		break;
-
-	  case UNISVE_PRESENT:
-		if (!IE_ISGOOD(*blli) || (blli->h.present & UNI_BLLI_L3_P) == 0)
-			return (0);
-		if (blli->l3 != sap->blli_id3.proto)
-			return (0);
-		if (blli->l3 == UNI_BLLI_L3_USER) {
-			if ((blli->h.present & UNI_BLLI_L3_USER_P) == 0)
-				return (0);
-			if (blli->l3_user != sap->blli_id3.user)
-				return (0);
-			break;
-		}
-		if (blli->l3 == UNI_BLLI_L3_TR9577) {
-			if (sap->blli_id3.noipi) {
-				if (blli->h.present & UNI_BLLI_L3_IPI_P)
-					return (0);
-			} else {
-				if (!(blli->h.present & UNI_BLLI_L3_IPI_P))
-					return (0);
-				if (blli->l3_ipi != sap->blli_id3.ipi)
-					return (0);
-				if (blli->l3_ipi == UNI_BLLI_L3_SNAP) {
-					if (!(blli->h.present &
-					    UNI_BLLI_L3_SNAP_P))
-						return (0);
-					if (blli->oui != sap->blli_id3.oui ||
-					    blli->pid != sap->blli_id3.pid)
-						return (0);
-				}
-			}
-		}
-		break;
-
-	  default:
-		return (0);
-	}
-
-	switch (sap->bhli.tag) {
-
-	  case UNISVE_ABSENT:
-		if (IE_ISGOOD(*bhli))
-			return (0);
-		break;
-
-	  case UNISVE_ANY:
-		break;
-
-	  case UNISVE_PRESENT:
-		if (!IE_ISGOOD(*bhli))
-			return (0);
-		if (sap->bhli.type != bhli->type)
-			return (0);
-		if (sap->bhli.len != bhli->len)
-			return (0);
-		if (memcmp(sap->bhli.info, bhli->info, bhli->len) != 0)
-			return (0);
-		break;
-
-	  default:
-		return (0);
-	}
-	/* Uff */
-	return (1);
-}
diff --git a/sys/contrib/ngatm/netnatm/api/unisap.h b/sys/contrib/ngatm/netnatm/api/unisap.h
deleted file mode 100644
index ffbfc9fa42e8..000000000000
--- a/sys/contrib/ngatm/netnatm/api/unisap.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Begemot: libunimsg/netnatm/api/unisap.h,v 1.6 2005/05/23 11:49:17 brandt_h Exp $
- */
-#ifndef _NETNATM_API_UNISAP_H_
-#define _NETNATM_API_UNISAP_H_
-
-#include <netnatm/msg/uni_config.h>
-
-enum unisve_tag {
-	UNISVE_ABSENT,		/* Element is absent */
-	UNISVE_PRESENT,		/* Element is present with specific value */
-	UNISVE_ANY		/* Any values is acceptable */
-};
-
-struct unisve_addr {
-	enum unisve_tag		tag;
-	enum uni_addr_type	type;	/* type of address */
-	enum uni_addr_plan	plan;	/* addressing plan */
-	uint32_t		len;	/* length of address */
-	u_char			addr[UNI_ADDR_MAXLEN];
-};
-
-struct unisve_selector {
-	enum unisve_tag	tag;
-	uint8_t		selector;
-};
-
-struct unisve_blli_id2 {
-	enum unisve_tag	tag;
-	u_int		proto:5;	/* the protocol */
-	u_int		user:7;		/* user specific protocol */
-};
-
-struct unisve_blli_id3 {
-	enum unisve_tag	tag;
-	u_int		proto:5;	/* L3 protocol */
-	u_int		user:7;		/* user specific protocol */
-	u_int		ipi:8;		/* ISO/IEC TR 9557 IPI */
-	u_int		oui:24;		/* IEEE 802.1 OUI */
-	u_int		pid:16;		/* IEEE 802.1 PID */
-	uint32_t	noipi;		/* ISO/IEC TR 9557 per frame */
-};
-
-struct unisve_bhli {
-	enum unisve_tag	tag;
-	enum uni_bhli	type;		/* type of info */
-	uint32_t	len;		/* length of info */
-	uint8_t		info[8];	/* info itself */
-};
-
-struct uni_sap {
-	struct unisve_addr	addr;
-	struct unisve_selector	selector;
-	struct unisve_blli_id2	blli_id2;
-	struct unisve_blli_id3	blli_id3;
-	struct unisve_bhli	bhli;
-};
-
-int unisve_check_addr(const struct unisve_addr *);
-int unisve_check_selector(const struct unisve_selector *);
-int unisve_check_blli_id2(const struct unisve_blli_id2 *);
-int unisve_check_blli_id3(const struct unisve_blli_id3 *);
-int unisve_check_bhli(const struct unisve_bhli *);
-
-int unisve_check_sap(const struct uni_sap *);
-
-int unisve_overlap_addr(const struct unisve_addr *, const struct unisve_addr *);
-int unisve_overlap_selector(const struct unisve_selector *,
-    const struct unisve_selector *);
-int unisve_overlap_blli_id2(const struct unisve_blli_id2 *,
-    const struct unisve_blli_id2 *);
-int unisve_overlap_blli_id3(const struct unisve_blli_id3 *,
-    const struct unisve_blli_id3 *);
-int unisve_overlap_bhli(const struct unisve_bhli *,
-    const struct unisve_bhli *);
-int unisve_overlap_sap(const struct uni_sap *, const struct uni_sap *);
-
-int unisve_is_catchall(const struct uni_sap *);
-int unisve_match(const struct uni_sap *, const struct uni_ie_called *,
-	const struct uni_ie_blli *, const struct uni_ie_bhli *);
-
-enum {
-	UNISVE_OK = 0,
-	UNISVE_ERROR_BAD_TAG,
-	UNISVE_ERROR_TYPE_PLAN_CONFLICT,
-	UNISVE_ERROR_ADDR_SEL_CONFLICT,
-	UNISVE_ERROR_ADDR_LEN,
-	UNISVE_ERROR_BAD_ADDR_TYPE,
-	UNISVE_ERROR_BAD_BHLI_TYPE,
-	UNISVE_ERROR_BAD_BHLI_LEN,
-};
-
-#define UNISVE_ERRSTR					\
-	"no error",					\
-	"bad SVE tag",					\
-	"bad address type/plan combination",		\
-	"bad address plan/selector tag combination",	\
-	"bad address length in SVE",			\
-	"unknown address type in SVE",			\
-	"bad BHLI type in SVE",				\
-	"BHLI info too long in SVE",
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/genfiles b/sys/contrib/ngatm/netnatm/genfiles
deleted file mode 100644
index 70fb5e880463..000000000000
--- a/sys/contrib/ngatm/netnatm/genfiles
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2003
-#	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-#	All rights reserved.
-#
-# Author: Harti Brandt <harti@freebsd.org>
-#
-# $Begemot: libunimsg/netnatm/genfiles,v 1.4 2004/07/08 08:21:45 brandt Exp $
-#
-awk -f ${SRC}msg/parseie.awk -f ${SRC}msg/geniec.awk ${SRC}msg/ie.def >${DST}msg/uni_ietab.h
-awk -f ${SRC}msg/parseie.awk -f ${SRC}msg/genieh.awk ${SRC}msg/ie.def >${DST}msg/uni_ie.h
-awk -f ${SRC}msg/parsemsg.awk -f ${SRC}msg/genmsgc.awk ${SRC}msg/msg.def >${DST}msg/uni_msg.c
-awk -f ${SRC}msg/parsemsg.awk -f ${SRC}msg/genmsgh.awk ${SRC}msg/msg.def >${DST}msg/uni_msg.h
-awk -f ${SRC}msg/parsemsg.awk -f ${SRC}sig/genmsgcpyh.awk ${SRC}msg/msg.def >${DST}sig/unimsgcpy.h
-awk -f ${SRC}msg/parsemsg.awk -f ${SRC}sig/genmsgcpyc.awk ${SRC}msg/msg.def >${DST}sig/sig_unimsgcpy.c
diff --git a/sys/contrib/ngatm/netnatm/misc/straddr.c b/sys/contrib/ngatm/netnatm/misc/straddr.c
deleted file mode 100644
index 7d21b8f74206..000000000000
--- a/sys/contrib/ngatm/netnatm/misc/straddr.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Begemot: libunimsg/netnatm/misc/straddr.c,v 1.4 2004/07/08 08:22:02 brandt Exp $
- */
-
-#include <sys/types.h>
-#ifdef _KERNEL
-#include <sys/ctype.h>
-#include <sys/libkern.h>
-#else
-#include <ctype.h>
-#include <string.h>
-#endif
-#include <netnatm/addr.h>
-
-/*
- * Convert an NSAP address from the ASCII format to the binary.
- * ASCII format means each byte formatted as a 2-byte hex number
- * with dots freely interspersed between the bytes.
- * If the conversion is succesful, the function returns 0, -1
- * on conversion errors.
- */
-int
-uni_str2nsap(u_char *out, const char *in)
-{
-	int i;
-	int c;
-
-	for(i = 0; i < 20; i++) {
-		while((c = *in++) == '.')
-			;
-		if(!isascii(c) || !isxdigit(c))
-			return -1;
-		out[i] = isdigit(c) ? (c - '0')
-			: islower(c) ? (c - 'a' + 10)
-			: (c - 'A' + 10);
-		out[i] <<= 4;
-		c = *in++;
-		if(!isascii(c) || !isxdigit(c))
-			return -1;
-		out[i] |= isdigit(c) ? (c - '0')
-			: islower(c) ? (c - 'a' + 10)
-			: (c - 'A' + 10);
-	}
-	return *in != '\0';
-}
-
-/*
- * Parse an emebedded E.164 NSAP address.
- * If check is 0, the contents of the last 11 bytes are ignored
- * If check is 1, the contents of all of these but the selector byte
- * are checked to be zero. If check is 2 all 11 bytes must be 0.
- */
-int
-uni_nsap2e164(char *e164, const u_char *nsap, int check)
-{
-	char *p = e164;
-	u_int d;
-	int i;
-
-	if(nsap[0] != 0x45)
-		return -1;
-	if((nsap[8] & 0xf) != 0xf)
-		return -1;
-	for(i = 1; i <= 7; i++) {
-		d = (nsap[i] >> 4) & 0xf;
-		if(d == 0x00 && p == e164)
-			continue;
-		if(d >= 0xa)
-			return -1;
-		*p++ = d + '0';
-
-		d = nsap[i] & 0xf;
-		if(d == 0x00 && p == e164)
-			continue;
-		if(d >= 0xa)
-			return -1;
-		*p++ = d + '0';
-	}
-	d = (nsap[i] >> 4) & 0xf;
-	if(d != 0x00 || p == e164) {
-		if(d >= 0xa)
-			return -1;
-		*p++ = d + '0';
-	}
-	if(p == e164)
-		return -1;
-	*p++ = 0;
-
-	if(check == 0)
-		return 0;
-	while(i < ((check == 1) ? 19 : 20)) {
-		if(nsap[i] != 0x00)
-			return -1;
-		i++;
-	}
-
-	return 0;
-}
-
-/*
- * Convert a binary representation to ASCII. The standard formats are
- * recognized and dotted. Non-standard formats get no dots altogether.
- */
-void
-uni_prefix2str(char *out, const u_char *in, u_int len, int dotit)
-{
-	static char hex[16] = "0123456789abcdef";
-	static int fmt[3][6] = {
-		{ 1, 2, 10, 6, 1, 0 },
-		{ 1, 2, 10, 6, 1, 0 },
-		{ 1, 8,  4, 6, 1, 0 },
-	};
-	int f, b;
-	u_int i;
-
-	if (len > 20)
-		len = 20;
-
-	if(dotit) {
-		switch(*in) {
-
-		  case 0x39:	/* DCC */
-			i = 0;
-  fmt:
-			for(f = 0; fmt[i][f]; f++) {
-				if (len == 0)
-					goto done;
-				if(f != 0)
-					*out++ = '.';
-				for(b = 0; b < fmt[i][f]; b++) {
-					if (len-- == 0)
-						goto done;
-					*out++ = hex[(*in >> 4) & 0xf];
-					*out++ = hex[*in & 0xf];
-					in++;
-				}
-			}
-  done:
-			*out = '\0';
-			return;
-
-		  case 0x47:	/* ICD */
-			i = 1;
-			goto fmt;
-
-		  case 0x45:	/* E.164 */
-			i = 2;
-			goto fmt;
-		}
-	}
-
-	/* undotted */
-	for(i = 0; i < len; i++) {
-		*out++ = hex[(*in >> 4) & 0xf];
-		*out++ = hex[*in & 0xf];
-		in++;
-	}
-	*out = '\0';
-}
-
-void
-uni_nsap2str(char *out, const u_char *in, int dotit)
-{
-	uni_prefix2str(out, in, 20, dotit);
-}
-
-/*
- * Make an embedded E.164 NSAP address from a NSAP address.
- * The E.164 address is a string of digits, at least one digit and
- * not more than 15 digits long. The NSAP address will start with
- * byte 0x45 and then a 8 byte field, which contains the right
- * justified E.164 address in BCD coding, filled with a 0xf to the
- * right. The rest of the address is zero.
- * The function returns 0 if everything is ok, -1 in case of a wrong
- * E.164 address.
- */
-int
-uni_e1642nsap(u_char *nsap, const char *e164)
-{
-	size_t len;
-	int fill;
-	u_int i;
-
-	if((len = strlen(e164)) > 15 || len == 0)
-		return -1;
-	for(i = 0; i < len; i++)
-		if(!isdigit(e164[i]))
-			return -1;
-
-	*nsap++ = 0x45;
-	fill = (15 - len) / 2;
-	while(fill--)
-		*nsap++ = 0x00;
-	if((len & 1) == 0) {
-		*nsap++ = *e164++ - '0';
-		len--;
-	}
-	while(len > 1) {
-		len -= 2;
-		*nsap = (*e164++ - '0') << 4;
-		*nsap++ |= *e164 - '0';
-	}
-	*nsap++ = ((*e164++ - '0') << 4) | 0xf;
-	for(fill = 0; fill < 11; fill++)
-		*nsap++ = 0;
-
-	return 0;
-}
diff --git a/sys/contrib/ngatm/netnatm/misc/unimsg_common.c b/sys/contrib/ngatm/netnatm/misc/unimsg_common.c
deleted file mode 100644
index 033213aef781..000000000000
--- a/sys/contrib/ngatm/netnatm/misc/unimsg_common.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2003-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Begemot: libunimsg/netnatm/misc/unimsg_common.c,v 1.3 2004/07/08 08:22:03 brandt Exp $
- */
-
-#include <netnatm/unimsg.h>
-
-/*
- * Make sure there is enough space in front of the data for
- * len bytes, and update the read pointer.
- */
-int
-uni_msg_prepend(struct uni_msg *msg, size_t len)
-{
-	size_t need;
-
-	if (uni_msg_leading(msg) >= len) {
-		msg->b_rptr -= len;
-		return (0);
-	}
-	need = len - uni_msg_leading(msg);
-	if (uni_msg_ensure(msg, need))
-		return (-1);
-	memcpy(msg->b_rptr + need, msg->b_rptr, uni_msg_len(msg));
-	msg->b_rptr += need - len;
-	msg->b_wptr += need;
-	return (0);
-}
diff --git a/sys/contrib/ngatm/netnatm/msg/geniec.awk b/sys/contrib/ngatm/netnatm/msg/geniec.awk
deleted file mode 100644
index d0620825178f..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/geniec.awk
+++ /dev/null
@@ -1,110 +0,0 @@
-#
-# Copyright (c) 2001-2003
-# Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-# 	All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# Author: Hartmut Brandt <harti@freebsd.org>
-#
-# $Begemot: libunimsg/netnatm/msg/geniec.awk,v 1.4 2003/10/10 14:50:05 hbb Exp $
-#
-# Generate table for IE parsing.
-#
-# This function is called before the first line
-#
-function begin() {
-	for(i = 0; i < 256; i++) {
-		for(j = 0; j < 4; j++) {
-			decl[i,j] = ""
-		}
-	}
-}
-
-#
-# This function is called after the last line.
-#
-function end() {
-	print ""
-	print "const struct iedecl *uni_ietable[256][4] = {"
-	for(i = 0; i < 256; i++) {
-		printf "\t{"
-		for(j = 0; j < 4; j++) {
-			if(decl[i,j] == "") {
-				printf " NULL,"
-			} else {
-				printf " &%s,", decl[i,j]
-			}
-		}
-		printf " }, /* 0x%02x */\n", i
-	}
-	print "};"
-}
-
-#
-# This function is called just when the first information element was found
-#
-function first_element() {
-	print "/* This file was created automatically"
-	print " * Source file: " id
-	print " */"
-	print ""
-}
-
-#
-# This is called, when the information element is defaulted (there is
-# only the name and the coding scheme
-#
-function element_default() {
-	print ""
-	print "static const struct iedecl decl_" coding "_" ie " = {"
-	print "\tUNIFL_DEFAULT,"
-	print "\t0,"
-	print "\t(uni_print_f)NULL,"
-	print "\t(uni_check_f)NULL,"
-	print "\t(uni_encode_f)NULL,"
-	print "\t(uni_decode_f)NULL"
-	print "};"
-	decl[number,ncoding] = "decl_" coding "_" ie
-}
-
-#
-# This is found for a real, non-default IE
-#
-function element() {
-	print ""
-	print "static void uni_ie_print_" coding "_" ie "(struct uni_ie_" ie " *, struct unicx *);"
-	print "static int uni_ie_check_" coding "_" ie "(struct uni_ie_" ie " *, struct unicx *);"
-	print "static int uni_ie_encode_" coding "_" ie "(struct uni_msg *, struct uni_ie_" ie " *, struct unicx *);"
-	print "static int uni_ie_decode_" coding "_" ie "(struct uni_ie_" ie " *, struct uni_msg *, u_int, struct unicx *);"
-	print ""
-	print "static struct iedecl decl_" coding "_" ie " = {"
-	if(access)	print "\tUNIFL_ACCESS,"
-	else		print "\t0,"
-	print "\t" len ","
-	print "\t(uni_print_f)uni_ie_print_" coding "_" ie ","
-	print "\t(uni_check_f)uni_ie_check_" coding "_" ie ","
-	print "\t(uni_encode_f)uni_ie_encode_" coding "_" ie ","
-	print "\t(uni_decode_f)uni_ie_decode_" coding "_" ie ""
-	print "};"
-	decl[number,ncoding] = "decl_" coding "_" ie
-}
diff --git a/sys/contrib/ngatm/netnatm/msg/genieh.awk b/sys/contrib/ngatm/netnatm/msg/genieh.awk
deleted file mode 100644
index 7120d7b9a020..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/genieh.awk
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Copyright (c) 2001-2003
-# Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-# 	All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# Author: Hartmut Brandt <harti@freebsd.org>
-#
-# $Begemot: libunimsg/netnatm/msg/genieh.awk,v 1.4 2004/07/08 08:22:03 brandt Exp $
-#
-# Generate IE header file
-#
-function begin() {
-}
-
-function first_element() {
-	print "/* This file was created automatically"
-	print " * Source file: " id
-	print " */"
-	print ""
-	print "#ifndef _NETNATM_MSG_UNI_IE_H_"
-	print "#define _NETNATM_MSG_UNI_IE_H_"
-	print ""
-	print "union uni_ieall {"
-	print "	struct uni_iehdr h;"
-}
-
-function end() {
-	print "};"
-	print ""
-	print "#endif"
-}
-
-function element_default() {
-}
-
-function element() {
-	if(ie in u) return
-	u[ie] = 1
-	print "	struct uni_ie_" ie " " ie ";"
-}
diff --git a/sys/contrib/ngatm/netnatm/msg/genmsgc.awk b/sys/contrib/ngatm/netnatm/msg/genmsgc.awk
deleted file mode 100644
index ffd69ac5fc69..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/genmsgc.awk
+++ /dev/null
@@ -1,274 +0,0 @@
-#
-# Copyright (c) 2001-2003
-# Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-# 	All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# Author: Hartmut Brandt <harti@freebsd.org>
-#
-# $Begemot: libunimsg/netnatm/msg/genmsgc.awk,v 1.6 2004/07/08 08:22:04 brandt Exp $
-#
-# Generate message functions.
-#
-function begin() {
-}
-
-function first_entry() {
-	print "/* This file was created automatically"
-	print " * Source file: " id
-	print " */"
-	print ""
-	print "#include <sys/types.h>"
-	print "#include <sys/param.h>"
-	print ""
-	print "#ifdef _KERNEL"
-	print "#include <sys/libkern.h>"
-	print "#else"
-	print "#include <string.h>"
-	print "#endif"
-	print "#include <netnatm/unimsg.h>"
-	print "#include <netnatm/msg/unistruct.h>"
-	print "#include <netnatm/msg/unimsglib.h>"
-	print "#include <netnatm/msg/priv.h>"
-	print "#include <netnatm/msg/privmsg.c>"
-}
-
-function end() {
-	print ""
-	print "const struct msgdecl *uni_msgtable[256] = {"
-	for(i = 0; i < 256; i++) {
-		if(decl[i] == "") {
-			printf "\t&decl_unknown,"
-		} else {
-			printf "\t&%s,", decl[i]
-		}
-		printf "\t/* 0x%02x */\n", i
-	}
-	print "};"
-}
-
-function start_message() {
-}
-
-function end_message() {
-		gen_print()
-		gen_check()
-		gen_encode()
-		gen_decode()
-		gen_reg()
-}
-
-function gen_print() {
-	print ""
-	print "static void"
-	print "print_" msg "(struct uni_" msg " *msg, struct unicx *cx)"
-	print "{"
-	if(msgrep) {
-		print "\tu_int i;"
-		print ""
-	}
-	for(i = 0; i < cnt; i++) {
-		ie = iename[i]
-		uie = toupper(iename[i])
-		if(ierep[i]) {
-			print "\tif(msg->" ie "_repeat.h.present & UNI_IE_PRESENT)"
-			print "\t\tuni_print_ie_internal(UNI_IE_REPEAT, (union uni_ieall *)&msg->" ie "_repeat, cx);"
-		}
-		if(ienum[i] == "-") {
-			print "\tif(msg->" ie ".h.present & UNI_IE_PRESENT)"
-			print "\t\tuni_print_ie_internal(UNI_IE_" uie ", (union uni_ieall *)&msg->" ie ", cx);"
-		} else {
-			print "\tfor(i = 0; i < " ienum[i] "; i++)"
-			print "\t\tif(msg->" ie "[i].h.present & UNI_IE_PRESENT)"
-			print "\t\t\tuni_print_ie_internal(UNI_IE_" uie ", (union uni_ieall *)&msg->" ie "[i], cx);"
-		}
-	}
-	print "}"
-}
-
-function gen_check() {
-	print ""
-	print "static int"
-	print "check_" msg "(struct uni_" msg " *m, struct unicx *cx)"
-	print "{"
-	print "\tint ret = 0;"
-	if(msgrep) {
-		print "\tu_int i;"
-	}
-	print ""
-	for(i = 0; i < cnt; i++) {
-		ie = iename[i]
-		if(ierep[i]) {
-			if(iecond[i] == "1") {
-				print "\tret |= uni_check_ie(UNI_IE_REPEAT, (union uni_ieall *)&m->" ie "_repeat, cx);"
-			} else {
-				print "\tif(!(" iecond[i] "))"
-				print "\t\tret |= IE_ISPRESENT(m->" ie "_repeat);"
-				print "\telse"
-				print "\t\tret |= uni_check_ie(UNI_IE_REPEAT, (union uni_ieall *)&m->" ie "_repeat, cx);"
-			}
-		}
-		if(ienum[i] == "-") {
-			if(iecond[i] == "1") {
-				print "\tret |= uni_check_ie(UNI_IE_" toupper(ie) ", (union uni_ieall *)&m->" ie ", cx);"
-			} else {
-				print "\tif(!(" iecond[i] "))"
-				print "\t\tret |= IE_ISPRESENT(m->" ie ");"
-				print "\telse"
-				print "\t\tret |= uni_check_ie(UNI_IE_" toupper(ie) ", (union uni_ieall *)&m->" ie ", cx);"
-			}
-		} else {
-	    		print "\tfor(i = 0; i < " ienum[i]" ; i++) {"
-			if(iecond[i] == "1") {
-				print "\t\tret |= uni_check_ie(UNI_IE_" toupper(ie) ", (union uni_ieall *)&m->" ie "[i], cx);"
-			} else {
-				print "\t\tif(!(" iecond[i] "))"
-				print "\t\t\tret |= IE_ISPRESENT(m->" ie "[i]);"
-				print "\t\telse"
-				print "\t\t\tret |= uni_check_ie(UNI_IE_" toupper(ie) ", (union uni_ieall *)&m->" ie "[i], cx);"
-			}
-			print "\t}"
-		}
-	}
-	print ""
-	print "\treturn ret;"
-	print "}"
-}
-
-function gen_encode() {
-	print ""
-	print "static int"
-	print "encode_" msg "(struct uni_msg *msg, struct uni_" msg " *p, struct unicx *cx)"
-	print "{"
-	print "\tu_int mlen;"
-	if(msgrep) {
-		print "\tu_int i;"
-	}
-	print ""
-	print "\tif(uni_encode_msg_hdr(msg, &p->hdr, UNI_" toupper(msg) ", cx, &mlen))"
-	print "\t\treturn (-2);"
-	print ""
-	for(i = 0; i < cnt; i++) {
-		ie = iename[i]
-		if(ierep[i]) {
-			print "\tif((p->" ie "_repeat.h.present & UNI_IE_PRESENT) &&"
-	   		print "\t   uni_encode_ie(UNI_IE_" toupper(ie) ", msg, (union uni_ieall *)&p->" ie "_repeat, cx))"
-			print "\t\treturn (0x10000000 + UNI_IE_" toupper(ie) ");"
-		}
-		if(ienum[i] == "-") {
-			print "\tif((p->" ie ".h.present & UNI_IE_PRESENT) &&"
-	   		print "\t   uni_encode_ie(UNI_IE_" toupper(ie) ", msg, (union uni_ieall *)&p->" ie ", cx))"
-			print "\t\treturn (UNI_IE_" toupper(ie) ");"
-		} else {
-			print "\tfor(i = 0; i < " ienum[i] "; i++)"
-			print "\t\tif((p->" ie "[i].h.present & UNI_IE_PRESENT) &&"
-	   		print "\t\t   uni_encode_ie(UNI_IE_" toupper(ie) ", msg, (union uni_ieall *)&p->" ie "[i], cx))"
-			print "\t\treturn ((i << 16) + UNI_IE_" toupper(ie) ");"
-		}
-	}
-	print ""
-	print "\tmsg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;"
-	print "\tmsg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;"
- 	print ""
-	print "\treturn (0);"
-	print "}"
-}
-
-function gen_decode() {
-	print ""
-	print "static int"
-	print "decode_" msg "(struct uni_" msg " *out, struct uni_msg *msg,"
-	print "    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,"
-	print "    struct unicx *cx)"
-	print "{"
-	if (msgrep) {
-		print "	u_int i;"
-		print ""
-	}
-	print "	switch (ie) {"
-
-	rep=0
-	for (i = 0; i < cnt; i++) {
-		ie = iename[i]
-		print ""
-	  	print "	  case UNI_IE_" toupper(ie) ":"
-		if (iecond[i] != "1") {
-			print "		if (!(" iecond[i] "))"
-			print "			return (DEC_ILL);"
-		}
-		if (ierep[i]) {
-			rep=1
-			print "		if (IE_ISPRESENT(cx->repeat))"
-			print "			out->" ie "_repeat = cx->repeat;"
-		}
-		if (ienum[i] == "-") {
-			print "		out->" ie ".h = *hdr;"
-			print "		if (hdr->present & UNI_IE_ERROR)"
-			print "			return (DEC_ERR);"
-			print "		if(uni_decode_ie_body(UNI_IE_"toupper(ie)", (union uni_ieall *)&out->"ie", msg, ielen, cx))"
-			print "			return (DEC_ERR);"
-
-		} else {
-			print "		for(i = 0; i < " ienum[i] "; i++)"
-			print "			if (!IE_ISPRESENT(out->" ie "[i])) {"
-			print "				out->" ie "[i].h = *hdr;"
-			print "				if (hdr->present & UNI_IE_ERROR)"
-			print "					return (DEC_ERR);"
-			print "				if(uni_decode_ie_body(UNI_IE_"toupper(ie)", (union uni_ieall *)&out->"ie"[i], msg, ielen, cx))"
-			print "					return (DEC_ERR);"
-			print "				break;"
-			print "			}"
-		}
-		print "		break;"
-	}
-	if(rep) {
-		print ""
-		print "	  case UNI_IE_REPEAT:"
-		print "		cx->repeat.h = *hdr;"
-		print "		if (hdr->present & UNI_IE_ERROR)"
-		print "			return (DEC_ERR);"
-		print "		if (uni_decode_ie_body(UNI_IE_REPEAT, (union uni_ieall *)&cx->repeat, msg, ielen, cx))"
-		print "			return (DEC_ERR);"
-		print "		break;"
-	}
-
-	print ""
-	print "	  default:"
-	print "		return (DEC_ILL);"
-	print "	}"
-	print "	return (DEC_OK);"
-	print "}"
-}
-
-function gen_reg() {
-	print ""
-	print "static const struct msgdecl decl_" msg " = {"
-	print "\t0,"
-	print "\t\"" msg "\","
-	print "\t(uni_msg_print_f)print_" msg ","
-	print "\t(uni_msg_check_f)check_" msg ","
-	print "\t(uni_msg_encode_f)encode_" msg ","
-	print "\t(uni_msg_decode_f)decode_" msg
-	print "};"
-	decl[code] = "decl_" msg
-}
diff --git a/sys/contrib/ngatm/netnatm/msg/genmsgh.awk b/sys/contrib/ngatm/netnatm/msg/genmsgh.awk
deleted file mode 100644
index 8705b31e1e30..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/genmsgh.awk
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (c) 2001-2003
-# Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-# 	All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# Author: Hartmut Brandt <harti@freebsd.org>
-#
-# $Begemot: libunimsg/netnatm/msg/genmsgh.awk,v 1.4 2004/07/08 08:22:04 brandt Exp $
-#
-# Generate message header
-#
-function begin() {
-}
-
-function first_entry() {
-	print "/* This file was created automatically"
-	print " * Source file: " id
-	print " */"
-	print ""
-	print "#ifndef _NETNATM_MSG_UNI_MSG_H_"
-	print "#define _NETNATM_MSG_UNI_MSG_H_"
-}
-
-function end() {
-	print ""
-	print "union uni_msgall {"
-	print "\tstruct uni_msghdr\thdr;"
-	for(i = 0; i < mcnt; i++) {
-		m = messages[i]
-		if(msgcond[i] == "") {
-			print "\tstruct uni_" m "\t" m ";"
-		} else {
-			print "\tstruct uni_" m "\t" m ";\t/* " msgcond[i] " */"
-		}
-	}
-	print "};"
-	print ""
-	print "#endif"
-}
-
-function start_message() {
-}
-
-function end_message() {
-	print ""
-	print "struct uni_" msg " {"
-	print "\tstruct uni_msghdr\thdr;"
-	for(i = 0; i < cnt; i++) {
-		if(ierep[i]) {
-			print "\tstruct uni_ie_repeat\t" iename[i] "_repeat;"
-		}
-		if(ienum[i] != "-") {
-			print "\tstruct uni_ie_" iename[i] "\t" iename[i] "[" ienum[i] "];"
-		} else {
-			print "\tstruct uni_ie_" iename[i] "\t" iename[i] ";"
-		}
-	}
-	print "};"
-}
diff --git a/sys/contrib/ngatm/netnatm/msg/ie.def b/sys/contrib/ngatm/netnatm/msg/ie.def
deleted file mode 100644
index fbeabe87a84c..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/ie.def
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Copyright (c) 2001-2003
-# Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-# 	All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# Author: Hartmut Brandt <harti@freebsd.org>
-#
-# $Begemot: libunimsg/netnatm/msg/ie.def,v 1.4 2003/09/29 10:47:18 hbb Exp $
-#
-# Define information elements --- no content definition
-#
-#########################################################################
-element cause		0x08 itu 34
-element cause		0x08 net 34
-element callstate	0x14 itu  5
-element facility	0x1c itu UNI_FACILITY_MAXAPDU+1+4	q2932
-element notify		0x27 itu UNI_NOTIFY_MAXLEN+4
-element eetd		0x42 itu 11
-element eetd		0x42 net 13
-element conned		0x4c itu 25 file=addr
-element connedsub	0x4d itu 25 access file=addr
-element epref		0x54 itu  7
-element epstate		0x55 itu  5
-element aal		0x58 itu 21 access
-element traffic		0x59 itu 30
-element traffic		0x59 net
-element connid		0x5a itu  9
-element qos		0x5c itu  6
-element qos		0x5c net  6
-element bhli		0x5d itu 13 access
-element bearer		0x5e itu  7
-element blli		0x5f itu 17 access
-element lshift		0x60 itu  5 0 file=shift
-element nlshift		0x61 itu  5 0 file=shift
-element scompl		0x62 itu  5 !pnni
-element repeat		0x63 itu  5
-element calling		0x6c itu 26 file=addr
-element callingsub	0x6d itu 25 access file=addr
-element called		0x70 itu 25 file=addr
-element calledsub	0x71 itu 25 access file=addr
-element tns		0x78 itu  9
-element tns		0x78 net
-element restart		0x79 itu  5
-element uu		0x7e itu UNI_UU_MAXLEN+4		access !pnni
-element git		0x7f net 33
-element mintraffic	0x81 itu 20 file=traffic
-element mintraffic	0x81 net
-element atraffic	0x82 itu 30 file=traffic
-element atraffic	0x82 net
-element abrsetup	0x84 net 36 file=abr
-element report		0x89 itu  5
-element called_soft	0xe0 net 11 file=soft			pnni
-element crankback	0xe1 net 72				pnni
-element dtl		0xe2 net UNI_DTL_LOGNP_SIZE*UNI_DTL_MAXNUM+6 pnni
-element calling_soft	0xe3 net 10 file=soft			pnni
-element abradd		0xe4 net 14 file=abr
-element lij_callid	0xe8 net  9 file=lij			!pnni
-element lij_param	0xe9 net  5 file=lij			!pnni
-element lij_seqno	0xea net  8 file=lij			!pnni
-element cscope		0xeb net  6
-element exqos		0xec net 25
-element mdcr		0xf0 net 13 file=traffic
-element unrec		0xfe itu 128
diff --git a/sys/contrib/ngatm/netnatm/msg/msg.def b/sys/contrib/ngatm/netnatm/msg/msg.def
deleted file mode 100644
index 41453ec6a5c4..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/msg.def
+++ /dev/null
@@ -1,582 +0,0 @@
-#
-# Copyright (c) 2001-2003
-# Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-# 	All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# Author: Hartmut Brandt <harti@freebsd.org>
-#
-# $Begemot: libunimsg/netnatm/msg/msg.def,v 1.4 2003/09/29 10:47:18 hbb Exp $
-#
-# Define message contents
-#
-#########################################################################
-# 
-#  ALERTING message
-# 
-#  References:
-# 	Q.2931	8, 17*
-#	...A4	4, 11*
-# 	Q.2957	3
-# 	Q.2971	6
-# 	UNI4.0	5
-# 	PNNI1.0 177...178, 184*
-# 
-#  Notes:
-# 	N-ISDN compatiblity not implemented.
-# 
-start alerting 0x01
-	connid		-		!pnni
-	epref
-	notify
-	git		UNI_NUM_IE_GIT
-	uu		-		!pnni
-	report		-		!pnni
-	unrec
-end
-
-#########################################################################
-#
-#  CALL PROCEEDING message
-# 
-#  References:
-# 	Q.2931	9, 18*
-# 	Q.2971	6
-# 	UNI4.0	5
-# 	PNNI1.0 178
-# 
-#  Notes:
-# 	N-ISDN compatiblity not implemented.
-# 
-start call_proc 0x02
-	connid
-	epref
-	notify		-		!pnni
-	unrec
-end
-
-#########################################################################
-#
-# CONNECT message
-#
-# References:
-#	Q.2931	 p. 10, 19*
-#	...A4	6, 12*
-#	Q.2932.1 p. 17
-#	Q.2951   p. 30
-#	Q.2957   p. 4
-#	Q.2962   p. 3
-#	Q.2971   p. 7
-#	UNI4.0   p. 5-6, 61, 68, 77
-#	PNNI1.0  pp. 178...179, 184...185*
-#
-# Notes:
-#	N-ISDN compatiblity not implemented.
-#
-start connect 0x07
-	aal
-	blli
-	connid		-		!pnni
-	epref
-	notify
-	conned
-	connedsub
-	eetd
-	git		UNI_NUM_IE_GIT
-	uu		-		!pnni
-	traffic
-	exqos
-	facility	-		q2932
-	abrsetup
-	abradd
-	called_soft	-		pnni
-	report		-		!pnni
-	unrec
-end
-
-#########################################################################
-#
-# CONNECT ACKNOWLEDGE message
-#
-# References:
-#	Q.2931	11
-#
-start connect_ack 0x0f !pnni
-	notify
-	unrec
-end
-
-#########################################################################
-#
-#  RELEASE message
-# 
-#  References:
-# 	Q.2931	 p. 11, 22*
-# 	Q.2932.1 p. 18
-# 	Q.2957   p. 4
-# 	Q.2962   p. 3
-# 	UNI4.0   p. 6
-# 	PNNI1.0	 pp. 179...180, 185...186*
-# 
-#  Notes:
-# 	N-ISDN compatiblity not implemented.
-# 
-start release 0x4d
-	cause		2
-	notify
-	git		UNI_NUM_IE_GIT
-	uu		-		!pnni
-	facility	-		q2932
-	crankback	-		pnni
-	unrec
-end
-
-#########################################################################
-#
-#  RELEASE COMPLETE message
-# 
-#  References:
-# 	Q.2931	 p. 12
-# 	UNI4.0   p. 6
-# 	PNNI1.0  p. 180
-# 
-start release_compl 0x5a
-	cause		2
-	git		UNI_NUM_IE_GIT		!pnni
-	uu		-			!pnni
-	crankback	-			pnni
-	unrec
-end
-
-#########################################################################
-#
-#  SETUP message
-# 
-#  References:
-# 	Q.2931	13-14, 23-24*
-#	...A4	7-9, 13-16*
-# 	Q.2957	5
-# 	Q.2962	3
-# 	Q.2971	7
-# 	UNI4.0	6-7, 43, 57*, 60-61, 68-69, 78
-# 	PNNI1.0 180...182, 186*
-#	af-cs-0147.000
-# 
-#  Notes:
-# 
-start setup 0x05
-	aal
-	traffic
-	bearer
-	bhli
-	blli		UNI_NUM_IE_BLLI/R
-	called
-	calledsub	UNI_NUM_IE_CALLEDSUB
-	calling
-	callingsub	UNI_NUM_IE_CALLINGSUB
-	connid
-	qos
-	eetd
-	notify
-	scompl		-		!pnni
-	tns		UNI_NUM_IE_TNS
-	epref
-	atraffic
-	mintraffic
-	uu		-		!pnni
-	git		UNI_NUM_IE_GIT
-	lij_callid	-		!pnni
-	lij_param	-		!pnni
-	lij_seqno	-		!pnni
-	exqos
-	abrsetup
-	abradd
-	cscope
-	calling_soft	-		pnni
-	called_soft	-		pnni
-	dtl		UNI_NUM_IE_DTL/R pnni
-	report		-		!pnni
-	mdcr
-	unrec
-end
-
-#########################################################################
-#
-#  STATUS message
-# 
-#  References:
-# 	Q.2931	 p. 14
-# 	Q.2971   p. 8
-# 	PNNI1.0  p. 182
-# 
-start status 0x7d
-	callstate
-	cause
-	epref
-	epstate
-	unrec
-end
-
-#########################################################################
-#
-#  STATUS ENQUIRY message
-# 
-#  References:
-# 	Q.2931	 p. 15
-# 	Q.2971   p. 8
-# 	PNNI1.0  pp. 182...183
-# 
-start status_enq 0x75
-	epref
-	unrec
-end
-
-#########################################################################
-#
-#  NOTIFY message
-# 
-#  References:
-# 	Q.2931	 p. 15
-# 	Q.2971   p. 8
-# 	PNNI1.0  p. 183
-#
-start notify 0x6e
-	notify
-	epref
-	unrec
-end
-
-#########################################################################
-#
-#  RESTART message
-# 
-#  References:
-# 	Q.2931	 p. 26
-# 	UNI4.0	 p. 7
-# 	PNNI1.0  pp. 186...187
-#
-start restart 0x46
-	connid
-	restart
-	unrec
-end
-
-#########################################################################
-#
-#  RESTART ACKNOWLEDGE message
-# 
-#  References:
-# 	Q.2931	 p. 26
-# 	UNI4.0	 p. 7
-# 	PNNI1.0  p. 187
-#
-start restart_ack 0x4e
-	connid
-	restart
-	unrec
-end
-
-#########################################################################
-#
-#  ADD PARTY message
-# 
-#  References:
-# 	Q.2971	10, 47
-# 	UNI4.0	39, 43-44
-# 	PNNI1.0 188...189
-# 
-#  Notes:
-# 
-start add_party 0x80
-	aal
-	bhli
-	blli
-	called
-	calledsub	UNI_NUM_IE_CALLEDSUB
-	calling
-	callingsub	UNI_NUM_IE_CALLINGSUB
-	scompl		-		!pnni
-	tns		UNI_NUM_IE_TNS
-	epref
-	notify
-	eetd
-	uu		-		!pnni
-	git		UNI_NUM_IE_GIT
-	lij_seqno	-		!pnni
-	calling_soft	-		pnni
-	called_soft	-		pnni
-	dtl		UNI_NUM_IE_DTL/R pnni
-	unrec
-end
-
-#########################################################################
-#
-#  ADD PARTY ACKNOWLEDGE message
-# 
-#  References:
-# 	Q.2971	10, 42, 47
-# 	UNI4.0	39
-# 	PNNI1.0 189
-# 
-#  Notes:
-# 
-start add_party_ack 0x81
-	epref
-	aal
-	blli
-	notify
-	eetd
-	conned
-	connedsub
-	uu		-		!pnni
-	git		UNI_NUM_IE_GIT
-	called_soft	-		pnni
-	unrec
-end
-
-#########################################################################
-#
-#  PARTY ALERTING message
-# 
-#  References:
-# 	Q.2971	12, 49
-# 	UNI4.0	39
-# 	PNNI1.0 189...190
-# 
-#  Notes:
-# 
-start party_alerting 0x85
-	epref
-	notify
-	uu		-		!pnni
-	git		UNI_NUM_IE_GIT
-	unrec
-end
-
-#########################################################################
-#
-#  ADD PARTY REJECT message
-# 
-#  References:
-# 	Q.2971	12, 48
-# 	UNI4.0	40
-# 	PNNI1.0 190
-# 
-#  Notes:
-# 
-start add_party_rej 0x82
-	cause
-	epref
-	uu		-		!pnni
-	git		UNI_NUM_IE_GIT
-	crankback	-		pnni
-	unrec
-end
-
-#########################################################################
-#
-#  DROP PARTY message
-# 
-#  References:
-# 	Q.2971	13, 48
-# 	UNI4.0	40
-# 	PNNI1.0 191
-# 
-#  Notes:
-# 
-start drop_party 0x83
-	cause
-	epref
-	notify
-	uu		-		!pnni
-	git		UNI_NUM_IE_GIT
-	unrec
-end
-
-#########################################################################
-#
-#  DROP PARTY ACKNOWLEDGE message
-# 
-#  References:
-# 	Q.2971	13, 49
-# 	UNI4.0	40
-# 	PNNI1.0	191
-# 
-#  Notes:
-# 
-start drop_party_ack 0x84
-	epref
-	cause
-	uu		-		!pnni
-	git		UNI_NUM_IE_GIT
-	unrec
-end
-
-#########################################################################
-#
-#  LEAF SETUP REQUEST message
-# 
-#  References:
-# 	UNI4.0	45...46
-# 
-#  Notes:
-# 
-start leaf_setup_req 0x91 !pnni
-	tns		UNI_NUM_IE_TNS
-	calling
-	callingsub	UNI_NUM_IE_CALLINGSUB
-	called
-	calledsub	UNI_NUM_IE_CALLEDSUB
-	lij_callid
-	lij_seqno
-	unrec
-end
-
-#########################################################################
-#
-#  LEAF SETUP FAIL message
-# 
-#  References:
-# 	UNI4.0	45...46
-# 
-#  Notes:
-# 
-start leaf_setup_fail 0x90 !pnni
-	cause
-	called
-	calledsub
-	lij_seqno
-	tns		UNI_NUM_IE_TNS
-	unrec
-end
-
-#########################################################################
-#
-#  CO-BI SETUP message
-# 
-#  References:
-#  Q.2932.1	16
-# 
-#  Notes:
-# 
-start cobisetup 0x15 !pnni&&q2932
-	facility
-	called
-	calledsub
-	calling
-	notify
-	unrec
-end
-
-#########################################################################
-#
-#  FACILITY message
-# 
-#  References:
-# 	Q.2932.1	14...15
-# 
-#  Notes:
-# 
-start facility 0x62 !pnni&&q2932
-	facility
-	called
-	calledsub
-	calling
-	notify
-	unrec
-end
-
-#########################################################################
-#
-#   MODIFY REQUEST message
-# 
-#  References:
-# 	Q.2963.1	p. 6
-# 	Q.2963.4	p. 4
-# 	UNI4.0-MFY	p. 3
-# 
-start modify_req 0x88 !pnni
-	traffic
-	atraffic
-	mintraffic
-	notify
-	git		UNI_NUM_IE_GIT
-	unrec
-end
-
-#########################################################################
-#
-#   MODIFY ACKNOWLEDGE message
-# 
-#  References:
-# 	Q.2963.1	p.6
-# 	Q.2963.3	p.5
-# 	UNI4.0-MFY	p.3
-# 
-start modify_ack 0x89 !pnni
-	report
-	traffic
-	notify
-	git		UNI_NUM_IE_GIT
-	unrec
-end
-
-#########################################################################
-#
-#   MODIFY REJECT message
-# 
-#  References:
-# 	Q.2963		p.6
-# 	UNI4.0-MFY	p.3
-# 
-start modify_rej 0x8a !pnni
-	cause
-	notify
-	git		UNI_NUM_IE_GIT
-	unrec
-end
-
-#########################################################################
-#
-#  CONNECTION AVAILABLE message
-# 
-#  References:
-#	Q.2931A4	9...10
-# 	Q.2963		p.6
-# 	UNI4.0-MFY	p.3
-# 
-start conn_avail 0x8b !pnni
-	notify
-	git		UNI_NUM_IE_GIT
-	report
-	unrec
-end
-
-#########################################################################
-#
-#  UNKNOWN message
-#
-start unknown 0x100
-	epref
-	unrec
-end
diff --git a/sys/contrib/ngatm/netnatm/msg/parseie.awk b/sys/contrib/ngatm/netnatm/msg/parseie.awk
deleted file mode 100644
index 14bd0f876978..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/parseie.awk
+++ /dev/null
@@ -1,150 +0,0 @@
-#
-# Copyright (c) 2001-2003
-# Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-# 	All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# Author: Hartmut Brandt <harti@freebsd.org>
-#
-# $Begemot: libunimsg/netnatm/msg/parseie.awk,v 1.3 2003/09/19 11:58:15 hbb Exp $
-#
-# Parse the IE definition file
-#
-match($0, "Begemot:")!=0 {
-	gsub("^[^$]*", "")
-	gsub("[^$]*$", "")
-	id = $0
-	next
-}
-
-/^#/ {
-	next
-}
-NF == 0 {
-	next
-}
-
-BEGIN {
-	iecnt = 0
-	id = " * ???"
-	begin()
-}
-
-END {
-	end()
-}
-
-#
-# Syntax is:
-# element <name> <code> <coding> [<maxlen> [<options>*]]
-#
-$1=="element" {
-	if(iecnt == 0) first_element()
-	if(NF < 4) {
-		error("Bad number of args: " $0)
-	}
-	ie = $2
-	file = $2
-	number = parse_hex($3)
-	coding = $4
-	if(coding == "itu") {
-		ncoding = 0
-	} else if(coding == "net") {
-		ncoding = 3
-	} else {
-		error("bad coding " coding)
-	}
-	if(NF == 4) {
-		element_default()
-		file=""
-	} else {
-		len = $5
-		parse_options()
-		element()
-	}
-	ies[iecnt] = ie
-	codings[iecnt] = coding
-	files[iecnt] = file
-	iecnt++
-	next
-}
-
-{
-	error("Bad line: " $0)
-}
-
-function parse_options() {
-	access = 0
-	cond = ""
-	for(i = 6; i <= NF; i++) {
-		if($i == "access") {
-			access = 1
-		} else if($i == "-") {
-		} else if(index($i, "file=") == 1) {
-			file=substr($i, 6)
-		} else {
-			if(cond != "") {
-				error("Too many conditions: "$0)
-			}
-			cond = $i
-		}
-	}
-}
-
-function parse_hex(str,		n)
-{
-	n = 0
-	if(substr(str,1,2) != "0x") {
-		error("bad hex number" str)
-	}
-	for(i = 3; i <= length(str); i++) {
-		c = substr(str,i,1)
-		if(match(c,"[0-9]") != 0) {
-			n = 16 * n + c
-		} else if(match(c,"[a-f]")) {
-			if(c == "a") n = 16 * n + 10
-			if(c == "b") n = 16 * n + 11
-			if(c == "c") n = 16 * n + 12
-			if(c == "d") n = 16 * n + 13
-			if(c == "e") n = 16 * n + 14
-			if(c == "f") n = 16 * n + 15
-		} else if(match(c,"[A-F]")) {
-			if(c == "A") n = 16 * n + 10
-			if(c == "B") n = 16 * n + 11
-			if(c == "C") n = 16 * n + 12
-			if(c == "D") n = 16 * n + 13
-			if(c == "E") n = 16 * n + 14
-			if(c == "F") n = 16 * n + 15
-		} else {
-			error("bad hex digit '" c "'")
-		}
-	}
-	return n
-}
-
-# function error(str)
-# {
-# 	print "error:" str >"/dev/stderr"
-# 	exit 1
-# }
-
diff --git a/sys/contrib/ngatm/netnatm/msg/parsemsg.awk b/sys/contrib/ngatm/netnatm/msg/parsemsg.awk
deleted file mode 100644
index ff13874d4509..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/parsemsg.awk
+++ /dev/null
@@ -1,138 +0,0 @@
-#
-# Copyright (c) 2001-2003
-# Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-# 	All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# Author: Hartmut Brandt <harti@freebsd.org>
-#
-# $Begemot: libunimsg/netnatm/msg/parsemsg.awk,v 1.3 2003/09/19 11:58:15 hbb Exp $
-#
-# Parse the message definition file
-#
-match($0, "Begemot:")!=0 {
-	gsub("^[^$]*", "")
-	gsub("[^$]*$", "")
-	id = $0
-	next
-}
-
-/^#/ {
-	next
-}
-NF == 0 {
-	next
-}
-BEGIN {
-	state=0
-	id = " * ???"
-	mcnt=0
-	begin()
-}
-END {
-	end()
-}
-
-state==0 && $1=="start" {
-	if(NF < 3) error("bad number of fields in message start "$0)
-	state = 1
-	msg = $2
-	code = parse_hex($3)
-	messages[mcnt] = msg
-	msgcond[mcnt] = $4
-	msgrep = 0
-	msgrepie = 0
-	cnt = 0
-	if(mcnt == 0) first_entry()
-	start_message()
-	next
-}
-
-state==1 && $1=="end" {
-	state=0
-	mcnt++
-	end_message()
-	next
-}
-state==1 {
-	iename[cnt]=$1
-	if($2 == "") $2="-"
-	if(match($2, "[A-Za-z][A-Za-z0-9_]*/R") == 1) {
-		ienum[cnt]=substr($2, 1, length($2)-2)
-		ierep[cnt]=1
-		msgrepie=1
-	} else {
-		ierep[cnt]=0
-		ienum[cnt]=$2
-	}
-	if(ienum[cnt] != "-") msgrep = 1
-	if($3 == "" || $3 == "-") {
-		$3 = "1"
-	} else {
-		gsub("[a-zA-Z][a-zA-Z0-9]*", "cx->&", $3)
-	}
-	iecond[cnt] = $3
-	cnt++
-	next
-}
-
-{
-	error("bad line: "$0)
-}
-
-function parse_hex(str,		n)
-{
-	n = 0
-	if(substr(str,1,2) != "0x") {
-		error("bad hex number" str)
-	}
-	for(i = 3; i <= length(str); i++) {
-		c = substr(str,i,1)
-		if(match(c,"[0-9]") != 0) {
-			n = 16 * n + c
-		} else if(match(c,"[a-f]")) {
-			if(c == "a") n = 16 * n + 10
-			if(c == "b") n = 16 * n + 11
-			if(c == "c") n = 16 * n + 12
-			if(c == "d") n = 16 * n + 13
-			if(c == "e") n = 16 * n + 14
-			if(c == "f") n = 16 * n + 15
-		} else if(match(c,"[A-F]")) {
-			if(c == "A") n = 16 * n + 10
-			if(c == "B") n = 16 * n + 11
-			if(c == "C") n = 16 * n + 12
-			if(c == "D") n = 16 * n + 13
-			if(c == "E") n = 16 * n + 14
-			if(c == "F") n = 16 * n + 15
-		} else {
-			error("bad hex digit '" c "'")
-		}
-	}
-	return n
-}
-
-function error(str)
-{
-	print "error:" str >"/dev/stderr"
-	exit 1
-}
diff --git a/sys/contrib/ngatm/netnatm/msg/priv.h b/sys/contrib/ngatm/netnatm/msg/priv.h
deleted file mode 100644
index aa13fc467d46..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/priv.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/msg/priv.h,v 1.4 2003/10/10 14:50:05 hbb Exp $
- *
- * Private definitions for the IE code file.
- */
-#ifndef unimsg_priv_h
-#define unimsg_priv_h
-
-#ifdef _KERNEL
-#include <sys/systm.h>
-#include <machine/stdarg.h>
-#define PANIC(X) panic X
-#else
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#define PANIC(X) abort()
-#endif
-
-/*
- * Define a structure for the declaration of information elements.
- * For each coding scheme a quadrupel of check, print, encode and
- * decode functions must be defined. A structure of the same format
- * is used for messages.
- */
-typedef void (*uni_print_f)(const union uni_ieall *, struct unicx *);
-typedef int (*uni_check_f)(union uni_ieall *, struct unicx *);
-typedef int (*uni_encode_f)(struct uni_msg *, union uni_ieall *,
-    struct unicx *);
-typedef int (*uni_decode_f)(union uni_ieall *, struct uni_msg *, u_int,
-    struct unicx *);
-
-typedef void (*uni_msg_print_f)(const union uni_msgall *, struct unicx *);
-typedef int (*uni_msg_check_f)(struct uni_all *, struct unicx *);
-typedef int (*uni_msg_encode_f)(struct uni_msg *, union uni_msgall *,
-    struct unicx *);
-typedef int (*uni_msg_decode_f)(union uni_msgall *, struct uni_msg *,
-    enum uni_ietype, struct uni_iehdr *, u_int, struct unicx *);
-
-struct iedecl {
-	u_int		flags;		/* information element flags */
-	u_int		maxlen;		/* maximum size */
-	uni_print_f	print;
-	uni_check_f	check;
-	uni_encode_f	encode;
-	uni_decode_f	decode;
-};
-
-struct msgdecl {
-	u_int		flags;
-	const char	*name;
-	uni_msg_print_f	print;
-	uni_msg_check_f	check;
-	uni_msg_encode_f encode;
-	uni_msg_decode_f decode;
-};
-
-enum {
-	UNIFL_DEFAULT	= 0x0001,
-	UNIFL_ACCESS	= 0x0002,
-};
-
-extern const struct iedecl *uni_ietable[256][4];
-extern const struct msgdecl *uni_msgtable[256];
-
-/*
- * Need to check range here because declaring a variable as a enum does not
- * guarantee that the values will be legal.
- */
-#define GET_IEDECL(IE, CODING) 						\
-({									\
-	const struct iedecl *_decl = NULL;				\
-									\
-	if((CODING) <= 3 && (IE) <= 255)				\
-	    if((_decl = uni_ietable[IE][CODING]) != NULL)		\
-		if((_decl->flags & UNIFL_DEFAULT) != 0)			\
-		    if((_decl = uni_ietable[IE][0]) == NULL)		\
-			PANIC(("IE %02x,%02x -- no default", CODING,IE));\
-	_decl;								\
-})
-
-
-enum {
-	DEC_OK,
-	DEC_ILL,
-	DEC_ERR,
-};
-
-void uni_print_ie_internal(enum uni_ietype, const union uni_ieall *,
-    struct unicx *);
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/msg/privmsg.c b/sys/contrib/ngatm/netnatm/msg/privmsg.c
deleted file mode 100644
index 73e3944c06e6..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/privmsg.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/msg/privmsg.c,v 1.8 2003/10/10 14:50:05 hbb Exp $
- *
- * Private definitions for the MSG code file.
- *
- * This file is included at the begin of the automatically generated 
- * uni_msg.c.
- */
-
-/*
- * Decode a UNI message header.
- * Return values:
- *   0 - ok
- *  -1 - ignore message (proto, length, CR error)
- */
-int
-uni_decode_head(struct uni_msg *msg, struct uni_all *out,
-    struct unicx *cx __unused)
-{
-#if 0
-	u_int mlen;
-#endif
-
-	cx->errcnt = 0;
-	(void)memset(out, 0, sizeof(struct uni_all));
-
-	if(uni_msg_len(msg) < 9)
-		return -1;			/* Q.2931 5.6.2 */
-	if(cx->pnni) {
-		if(*msg->b_rptr++ != PNNI_PROTO)
-			return -1;			/* Q.2931 5.6.1 */
-	} else {
-		if(*msg->b_rptr++ != UNI_PROTO)
-			return -1;			/* Q.2931 5.6.1 */
-	}
-	if(*msg->b_rptr++ != 3)
-		return -1;			/* Q.2931 5.6.3.1 */
-
-	out->u.hdr.cref.flag = (*msg->b_rptr & 0x80) ? 1 : 0;
-	out->u.hdr.cref.cref = (*msg->b_rptr++ & 0x7f) << 16;
-	out->u.hdr.cref.cref |= *msg->b_rptr++ << 8;
-	out->u.hdr.cref.cref |= *msg->b_rptr++;
-
-	out->mtype = *msg->b_rptr++;
-
-	/*
-	 * Be not too piggy about this byte
-	 */
-	switch(*msg->b_rptr & 0x13) {
-
-	  case 0x00: case 0x01: case 0x02: case 0x03:
-		out->u.hdr.act = UNI_MSGACT_DEFAULT;
-		break;
-
-	  case 0x10: case 0x11: case 0x12:
-		out->u.hdr.act = *msg->b_rptr & 0x3;
-		break;
-
-	  case 0x13:			/* Q.2931 5.7.1 */
-		out->u.hdr.act = UNI_MSGACT_REPORT;
-		break;
-	}
-	if(cx->pnni && (*msg->b_rptr & 0x08))
-		out->u.hdr.pass = 1;
-	else
-		out->u.hdr.pass = 0;
-	
-	msg->b_rptr++;
-
-#if 0
-	mlen = *msg->b_rptr++ << 8;
-	mlen |= *msg->b_rptr++;
-
-	/*
-	 * If the message is longer than the indicated length
-	 * shorten it. If it is shorter, probably one of the IE
-	 * decoders will break, but we should proceed. 5.5.6.5
-	 */
-	if(uni_msg_len(msg) > mlen)
-		msg->b_wptr = msg->b_rptr + mlen;
-#endif
-
-	return 0;
-}
-
-static int
-uni_decode_body_internal(enum uni_msgtype mtype, struct uni_msg *msg,
-    union uni_msgall *out, struct unicx *cx)
-{
-	enum uni_ietype ietype;
-	struct uni_iehdr hdr;
-	u_int ielen;
-	const struct iedecl *iedecl;
-	int err = 0, ret;
-	u_char *end;
-
-	cx->ielast = (enum uni_ietype)0;
-	cx->repeat.h.present = 0;
-
-	while (uni_msg_len(msg) != 0) {
-		if (uni_decode_ie_hdr(&ietype, &hdr, msg, cx, &ielen)) {
-			/*
-			 * Short header. Set the ielen to an impossible size.
-			 * Then we should bump out in the error handling below.
-			 * We should have at least an IE type here.
-			 */
-			ielen = 0xffffffff;
-		}
-#ifdef DTRACE
-		printf("IE %x\n", ietype);
-#endif
-
-		if ((iedecl = GET_IEDECL(ietype, hdr.coding)) == NULL ||
-		    ietype == UNI_IE_UNREC) {
-			/*
-			 * entirly unknown IE. Check the length and skip it.
-			 * Q.2931 5.6.8.1
-			 */
-			if (ielen > uni_msg_len(msg))
-				msg->b_rptr = msg->b_wptr;
-			else
-				msg->b_rptr += ielen;
-			(void)UNI_SAVE_IERR(cx, ietype, hdr.act, UNI_IERR_UNK);
-			err = -1;
-			continue;
-		}
-#ifdef DTRACE
-		printf("IE %x known\n", ietype);
-#endif
-		if (ielen > iedecl->maxlen - 4 || ielen > uni_msg_len(msg)) {
-			/*
-			 * Information element too long -> content error.
-			 * Let the decoding routine set the error flag and
-			 * return DEC_ERR.
-			 * Q.2931 5.6.8.2
-			 */
-#if 0
-			/*
-			 * It is not clear how to best handle this error.
-			 */
-			if (ielen > iedecl->maxlen - 4)
-				ielen = iedecl->maxlen - 4;
-#endif
-
-			if (ielen > uni_msg_len(msg))
-				ielen = uni_msg_len(msg);
-
-			hdr.present |= UNI_IE_ERROR;
-
-#ifdef DTRACE
-			printf("IE %x length too large\n", ietype);
-#endif
-		}
-
-#ifdef DTRACE
-		else
-			printf("IE %x length ok\n", ietype);
-#endif
-		end = msg->b_rptr + ielen;
-		ret = uni_msgtable[mtype]->decode(out, msg, ietype,
-		    &hdr, ielen, cx);
-		msg->b_rptr = end;
-
-#ifdef DTRACE
-		printf("IE %x ret %d\n", ietype, ret);
-#endif
-
-		switch (ret) {
-
-		  case DEC_OK:	/* ok */
-			break;
-
-		  case DEC_ILL:	/* illegal IE */
-			/*
-			 * Unexpected but recognized.
-			 * Q.2931 5.6.8.3
-			 */
-			(void)UNI_SAVE_IERR(cx, ietype, hdr.act, UNI_IERR_UNK);
-			err = -1;
-			break;
-
-		  case DEC_ERR:	/* bad IE */
-			if (iedecl->flags & UNIFL_ACCESS)
-				/* this may be wrong: 5.6.8.2 */
-				(void)UNI_SAVE_IERR(cx, ietype, hdr.act, UNI_IERR_ACC);
-			else
-				(void)UNI_SAVE_IERR(cx, ietype, hdr.act, UNI_IERR_BAD);
-			err = -1;
-			break;
-
-		  default:
-			PANIC(("bad decode return"));
-		}
-	    	cx->ielast = ietype;
-	    	if (ietype != UNI_IE_REPEAT)
-			cx->repeat.h.present = 0;
-	}
-	return err;
-}
-
-/*
- * Decode the body of a message. The header is assumed to be decoded
- * already and out->hdr is filled in. Only information elements remain.
- */
-int
-uni_decode_body(struct uni_msg *msg, struct uni_all *out, struct unicx *cx)
-{
-	cx->errcnt = 0;
-	if (out->mtype >= 256)
-		return (-1);
-	if (uni_msgtable[out->mtype] == NULL)
-		return (-1);
-	return (uni_decode_body_internal(out->mtype, msg, &out->u, cx));
-}
-
-
-/*
- * Decode a uni message
- */
-int
-uni_decode(struct uni_msg *msg, struct uni_all *out, struct unicx *cx)
-{
-	cx->errcnt = 0;
-	if (uni_decode_head(msg, out, cx))
-		return (-1);
-	if (uni_decode_body(msg, out, cx))
-		return (-2);
-	return (0);
-}
-
-int
-uni_encode(struct uni_msg *msg, struct uni_all *in, struct unicx *cx)
-{
-	if (in->mtype >= 256)
-		return (-1);
-	if (uni_msgtable[in->mtype] == NULL)
-		return (-3);
-
-	return ((uni_msgtable[in->mtype]->encode)(msg, &in->u, cx));
-}
-
-/*
- * Doesn't belong here
- */
-void
-uni_initcx(struct unicx *cx)
-{
-	memset(cx, 0, sizeof(struct unicx));
-	cx->tabsiz = 4;
-}
diff --git a/sys/contrib/ngatm/netnatm/msg/traffic.c b/sys/contrib/ngatm/netnatm/msg/traffic.c
deleted file mode 100644
index acaffdbbe7d4..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/traffic.c
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/msg/traffic.c,v 1.4 2004/07/08 08:22:05 brandt Exp $
- *
- * Traffic classification
- */
-
-#include <netnatm/unimsg.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#ifdef _KERNEL
-#include <sys/systm.h>
-#else
-#include <stdio.h>
-#endif
-
-/*
- * Try to set the parameters for the CPCS from the parameters of the
- * connection.
- */
-enum {
-	T_CBR23 = 100, T_nrtVBR2_6_UBR12, T_rtVBR236, T_rtVBR2_6
-};
-
-static const u_int fmask = UNI_TRAFFIC_FPCR0_P | UNI_TRAFFIC_FPCR1_P |
-    UNI_TRAFFIC_FSCR0_P | UNI_TRAFFIC_FSCR1_P | UNI_TRAFFIC_FMBS0_P |
-    UNI_TRAFFIC_FMBS1_P | UNI_TRAFFIC_FABR1_P;
-static const u_int bmask = UNI_TRAFFIC_BPCR0_P | UNI_TRAFFIC_BPCR1_P |
-    UNI_TRAFFIC_BSCR0_P | UNI_TRAFFIC_BSCR1_P | UNI_TRAFFIC_BMBS0_P |
-    UNI_TRAFFIC_BMBS1_P | UNI_TRAFFIC_BABR1_P;
-
-static const u_int fcbr3 = UNI_TRAFFIC_FPCR0_P | UNI_TRAFFIC_FPCR1_P;
-static const u_int bcbr3 = UNI_TRAFFIC_BPCR0_P | UNI_TRAFFIC_BPCR1_P;
-static const u_int fvbr16 = UNI_TRAFFIC_FPCR1_P | UNI_TRAFFIC_FSCR1_P |
-    UNI_TRAFFIC_FMBS1_P;
-static const u_int bvbr16 = UNI_TRAFFIC_BPCR1_P | UNI_TRAFFIC_BSCR1_P |
-    UNI_TRAFFIC_BMBS1_P;
-static const u_int fvbr23 = UNI_TRAFFIC_FPCR1_P | UNI_TRAFFIC_FSCR0_P |
-    UNI_TRAFFIC_FMBS0_P;
-static const u_int bvbr23 = UNI_TRAFFIC_BPCR1_P | UNI_TRAFFIC_BSCR0_P |
-    UNI_TRAFFIC_BMBS0_P;
-static const u_int fvbr4 = UNI_TRAFFIC_FPCR0_P | UNI_TRAFFIC_FPCR1_P;
-static const u_int bvbr4 = UNI_TRAFFIC_BPCR0_P | UNI_TRAFFIC_BPCR1_P;
-
-int
-uni_classify_traffic(const struct uni_ie_bearer *bearer,
-    const struct uni_ie_traffic *traffic,
-    enum uni_traffic_class *fclass, enum uni_traffic_class *bclass,
-    char *ebuf, size_t ebufsiz)
-{
-	u_int tclass;
-	u_int ft, bt, be, ftag, btag;
-
-	/* classify */
-	switch (bearer->bclass) {
-
-	  case UNI_BEARER_A:
-		if (!(bearer->h.present & UNI_BEARER_ATC_P)) {
-			tclass = T_CBR23;
-			break;
-		}
-		switch (bearer->atc) {
-
-		  case UNI_BEARER_ATC_CBR1:
-			tclass = UNI_TRAFFIC_CBR1;
-			break;
-
-		  default:
-			snprintf(ebuf, ebufsiz, "bad ATC=%#02x for BCOB-A",
-			    bearer->atc);
-			return (-1);
-		}
-		break;
-
-	  case UNI_BEARER_C:
-		if (!(bearer->h.present & UNI_BEARER_ATC_P)) {
-			tclass = T_nrtVBR2_6_UBR12;
-			break;
-		}
-		switch (bearer->atc) {
-
-		  case UNI_BEARER_ATC_VBR1:
-			tclass = UNI_TRAFFIC_rtVBR1;
-			break;
-
-		  case UNI_BEARER_ATC_VBR:
-			tclass = T_rtVBR236;
-			break;
-
-		  case UNI_BEARER_ATC_NVBR1:
-			tclass = UNI_TRAFFIC_nrtVBR1;
-			break;
-
-		  case UNI_BEARER_ATC_ABR:
-			tclass = UNI_TRAFFIC_ABR;
-			break;
-
-		  default:
-			snprintf(ebuf, ebufsiz, "bad ATC=%#02x for BCOB-C",
-			    bearer->atc);
-			return (-1);
-		}
-		break;
-
-	  case UNI_BEARER_X:
-		if (!(bearer->h.present & UNI_BEARER_ATC_P)) {
-			tclass = T_nrtVBR2_6_UBR12;
-			break;
-		}
-		switch (bearer->atc) {
-
-		  case UNI_BEARER_ATC_CBR1:
-			tclass = UNI_TRAFFIC_CBR1;
-			break;
-
-		  case UNI_BEARER_ATC_CBR:
-		  case UNI_BEARER_ATCX_4:
-		  case UNI_BEARER_ATCX_6:
-			tclass = T_CBR23;
-			break;
-
-		  case UNI_BEARER_ATC_VBR1:
-			tclass = UNI_TRAFFIC_rtVBR1;
-			break;
-
-		  case UNI_BEARER_ATCX_1:
-		  case UNI_BEARER_ATC_VBR:
-			tclass = T_rtVBR2_6;
-			break;
-
-		  case UNI_BEARER_ATC_NVBR1:
-			tclass = UNI_TRAFFIC_nrtVBR1;
-			break;
-
-		  case UNI_BEARER_ATCX_0:
-		  case UNI_BEARER_ATCX_2:
-		  case UNI_BEARER_ATCX_8:
-		  case UNI_BEARER_ATC_NVBR:
-			tclass = T_nrtVBR2_6_UBR12;
-			break;
-
-		  case UNI_BEARER_ATC_ABR:
-			tclass = UNI_TRAFFIC_ABR;
-			break;
-
-		  default:
-			snprintf(ebuf, ebufsiz, "bad ATC=%#02x for BCOB-X",
-			    bearer->atc);
-			return (-1);
-		}
-		break;
-
-	  case UNI_BEARER_TVP:
-		snprintf(ebuf, ebufsiz, "unsupported bearer class tVP");
-		return (-1);
-
-	  default:
-		snprintf(ebuf, ebufsiz, "bad bearer class %#02x",
-		    bearer->bclass);
-		return (-1);
-	}
-
-	/*
-	 * Now traffic IE
-	 */
-	ft = traffic->h.present & fmask;
-	bt = traffic->h.present & bmask;
-	be = traffic->h.present & UNI_TRAFFIC_BEST_P;
-	ftag = (traffic->h.present & UNI_TRAFFIC_MOPT_P) && traffic->t.ftag;
-	btag = (traffic->h.present & UNI_TRAFFIC_MOPT_P) && traffic->t.btag;
-
-#define NOBE(C)								\
-	if (be) {							\
-		snprintf(ebuf, ebufsiz, "illegal BE for " C);		\
-		return (-1);						\
-	}
-
-#define NOFT(C)								\
-	if (ftag) {							\
-		snprintf(ebuf, ebufsiz, "illegal forward tag in " C);	\
-		return (-1);						\
-	}
-
-#define NOBT(C)								\
-	if (btag) {							\
-		snprintf(ebuf, ebufsiz, "illegal backward tag in " C);	\
-		return (-1);						\
-	}
-
-#define FBAD(C) do {							\
-	snprintf(ebuf, ebufsiz, "bad forward CRs for " C);		\
-	return (-1);							\
-    } while (0)
-
-#define BBAD(C) do {							\
-	snprintf(ebuf, ebufsiz, "bad backward CRs for " C);		\
-	return (-1);							\
-    } while (0)
-
-	switch (tclass) {
-
-	  case UNI_TRAFFIC_CBR1:
-		NOBE("CBR.1");
-		if (ft != UNI_TRAFFIC_FPCR1_P)
-			FBAD("CBR.1");
-		NOFT("CBR.1");
-		if (bt != UNI_TRAFFIC_BPCR1_P)
-			BBAD("CBR.1");
-		NOBT("CBR.1");
-		*fclass = *bclass = UNI_TRAFFIC_CBR1;
-		break;
-
-	  case T_CBR23:
-		NOBE("CBR.2/3");
-		if (ft == UNI_TRAFFIC_FPCR0_P) {
-			*fclass = UNI_TRAFFIC_CBR2;
-			NOFT("CBR.2");
-		} else if (ft == fcbr3) {
-			*fclass = UNI_TRAFFIC_CBR3;
-			if (!ftag) {
-				snprintf(ebuf, ebufsiz, "need forward tagging for CBR.3");
-				return (-1);
-			}
-		} else
-			FBAD("CBR.2/3");
-		if (bt == UNI_TRAFFIC_BPCR0_P) {
-			*bclass = UNI_TRAFFIC_CBR2;
-			NOBT("CBR.2");
-		} else if (bt == bcbr3) {
-			*bclass = UNI_TRAFFIC_CBR3;
-			if (!btag) {
-				snprintf(ebuf, ebufsiz, "need backward tagging for CBR.3");
-				return (-1);
-			}
-		} else
-			BBAD("CBR.2/3");
-		break;
-
-	  case UNI_TRAFFIC_rtVBR1:
-		NOBE("rtVBR.1");
-		if (ft != fvbr16)
-			FBAD("rtVBR.1");
-		NOFT("rtVBR.1");
-		if (bt != bvbr16)
-			BBAD("rtVBR.1");
-		NOBT("rtVBR.1");
-		*fclass = *bclass = UNI_TRAFFIC_rtVBR1;
-		break;
-
-	  case T_rtVBR236:
-		NOBE("rtVBR.2/3/6");
-		if (ft == fvbr23) {
-			if (ftag)
-				*fclass = UNI_TRAFFIC_rtVBR3;
-			else
-				*fclass = UNI_TRAFFIC_rtVBR2;
-		} else if (ft == fvbr16) {
-			*fclass = UNI_TRAFFIC_rtVBR6;
-			NOFT("rtVBR.6");
-		} else
-			FBAD("rtVBR.2/3/6");
-		if (bt == bvbr23) {
-			if (btag)
-				*bclass = UNI_TRAFFIC_rtVBR3;
-			else
-				*bclass = UNI_TRAFFIC_rtVBR2;
-		} else if (bt == bvbr16) {
-			*bclass = UNI_TRAFFIC_rtVBR6;
-			NOBT("rtVBR.6");
-		} else
-			BBAD("rtVBR.2/3/6");
-		break;
-
-	  case T_rtVBR2_6:
-		NOBE("rtVBR.2-6");
-		if (ft == fvbr23) {
-			if (ftag)
-				*fclass = UNI_TRAFFIC_rtVBR3;
-			else
-				*fclass = UNI_TRAFFIC_rtVBR2;
-		} else if (ft == fvbr4) {
-			*fclass = UNI_TRAFFIC_rtVBR4;
-		} else if (ft == UNI_TRAFFIC_FPCR1_P) {
-			*fclass = UNI_TRAFFIC_rtVBR5;
-			NOFT("rtVBR.5");
-		} else if (ft == fvbr16) {
-			*fclass = UNI_TRAFFIC_rtVBR6;
-			NOFT("rtVBR.6");
-		} else
-			FBAD("rtVBR.2-6");
-		if (bt == bvbr23) {
-			if (btag)
-				*bclass = UNI_TRAFFIC_rtVBR3;
-			else
-				*bclass = UNI_TRAFFIC_rtVBR2;
-		} else if (bt == bvbr4) {
-			*bclass = UNI_TRAFFIC_rtVBR4;
-		} else if (bt == UNI_TRAFFIC_BPCR1_P) {
-			*bclass = UNI_TRAFFIC_rtVBR5;
-			NOBT("rtVBR.5");
-		} else if (bt == bvbr16) {
-			*bclass = UNI_TRAFFIC_rtVBR6;
-			NOBT("rtVBR.6");
-		} else
-			BBAD("rtVBR.2-6");
-		break;
-
-	  case UNI_TRAFFIC_nrtVBR1:
-		NOBE("nrtVBR.1");
-		if (ft != fvbr16)
-			FBAD("nrtVBR.1");
-		NOFT("nrtVBR.1");
-		if (bt != bvbr16)
-			BBAD("nrtVBR.1");
-		NOBT("nrtVBR.1");
-		*fclass = *bclass = UNI_TRAFFIC_nrtVBR1;
-		break;
-
-	  case T_nrtVBR2_6_UBR12:
-		if (be) {
-			if (ft != UNI_TRAFFIC_FPCR1_P)
-				FBAD("UBR.1/2");
-			if (bt != UNI_TRAFFIC_BPCR1_P)
-				BBAD("UBR.1/2");
-			if (ftag)
-				*fclass = UNI_TRAFFIC_UBR2;
-			else
-				*fclass = UNI_TRAFFIC_UBR1;
-			if (btag)
-				*bclass = UNI_TRAFFIC_UBR2;
-			else
-				*bclass = UNI_TRAFFIC_UBR1;
-			break;
-		}
-		if (ft == fvbr23) {
-			if (ftag)
-				*fclass = UNI_TRAFFIC_nrtVBR3;
-			else
-				*fclass = UNI_TRAFFIC_nrtVBR2;
-		} else if (ft == fvbr4) {
-			*fclass = UNI_TRAFFIC_nrtVBR4;
-		} else if (ft == UNI_TRAFFIC_FPCR1_P) {
-			*fclass = UNI_TRAFFIC_nrtVBR5;
-			NOFT("nrtVBR.5");
-		} else if (ft == fvbr16) {
-			*fclass = UNI_TRAFFIC_nrtVBR6;
-			NOFT("nrtVBR.6");
-		} else
-			FBAD("nrtVBR.2-6");
-		if (bt == bvbr23) {
-			if (btag)
-				*bclass = UNI_TRAFFIC_nrtVBR3;
-			else
-				*bclass = UNI_TRAFFIC_nrtVBR2;
-		} else if (bt == bvbr4) {
-			*bclass = UNI_TRAFFIC_nrtVBR4;
-		} else if (bt == UNI_TRAFFIC_BPCR1_P) {
-			*bclass = UNI_TRAFFIC_nrtVBR5;
-			NOBT("nrtVBR.5");
-		} else if (bt == bvbr16) {
-			*bclass = UNI_TRAFFIC_nrtVBR6;
-			NOBT("nrtVBR.6");
-		} else
-			BBAD("nrtVBR.2-6");
-		break;
-
-	  case UNI_TRAFFIC_ABR:
-		NOBE("ABR");
-		if (ft != UNI_TRAFFIC_FPCR1_P)
-			FBAD("ABR");
-		if (bt != UNI_TRAFFIC_BPCR1_P)
-			BBAD("ABR");
-		NOFT("ABR");
-		NOBT("ABR");
-		*fclass = *bclass = UNI_TRAFFIC_ABR;
-		break;
-	}
-
-	return (0);
-}
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_config.h b/sys/contrib/ngatm/netnatm/msg/uni_config.h
deleted file mode 100644
index e53f59b8395c..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/uni_config.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/msg/uni_config.h,v 1.3 2003/09/19 11:58:15 hbb Exp $
- */
-#ifndef _uni_uni_config_h_
-#define _uni_uni_config_h_
-
-enum {
-	/* maximum number of reported error IEs */
-	UNI_MAX_ERRIE	= 50,
-
-	/* maximum number of Generic Identifier Transport IE's per message */
-	UNI_NUM_IE_GIT	= 3,
-
-	/* maximum number of BLLI's in SETUP */
-	UNI_NUM_IE_BLLI	= 3,
-
-	/* maximum number of CALLEDSUB's */
-	UNI_NUM_IE_CALLEDSUB = 2,
-
-	/* maximum number of CALLINGSUB's */
-	UNI_NUM_IE_CALLINGSUB = 2,
-
-	/* maximum number of TNS's */
-	UNI_NUM_IE_TNS = 4,
-
-	/* maximum length of TNS name */
-	UNI_TNS_MAXLEN = 4,
-
-	/* maximum info size in user-to-user signalling IE */
-	UNI_UU_MAXLEN	= 128,
-
-	/* maximum length of address */
-	UNI_ADDR_MAXLEN	= 20,
-
-	/* maximum length of subaddress */
-	UNI_SUBADDR_MAXLEN = 20,
-
-	/* maximum number of DTLs */
-	UNI_NUM_IE_DTL = 10,
-	/* maximum number of identifiers in DTL */
-	UNI_DTL_MAXNUM = 20,
-};
-#endif
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_hdr.h b/sys/contrib/ngatm/netnatm/msg/uni_hdr.h
deleted file mode 100644
index c9a30f12be5d..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/uni_hdr.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/msg/uni_hdr.h,v 1.6 2004/07/08 08:22:05 brandt Exp $
- */
-#ifndef _NETNATM_MSG_UNI_HDR_H_
-#define _NETNATM_MSG_UNI_HDR_H_
-
-#include <sys/types.h>
-#ifdef _KERNEL
-#include <sys/stdint.h>
-#else
-#include <stdint.h>
-#endif
-
-#include <netnatm/msg/uni_config.h>
-
-enum {
-	UNI_PROTO	= 0x09,		/* protocol discriminator */
-	PNNI_PROTO	= 0xf0,		/* PNNI protocol discriminator */
-};
-
-/*
- * Message types
- */
-enum uni_msgtype {
-	UNI_UNKNOWN		= 0x100,/* unknown message */
-
-	UNI_ALERTING		= 0x01,	/* alerting */
-	UNI_CALL_PROC		= 0x02, /* call proceeding */
-	UNI_SETUP		= 0x05,	/* setup */
-	UNI_CONNECT		= 0x07,	/* connect */
-	UNI_CONNECT_ACK		= 0x0f,	/* connect ack */
-
-	UNI_RESTART		= 0x46,	/* restart */
-	UNI_RELEASE		= 0x4d,	/* release */
-	UNI_RESTART_ACK		= 0x4e,	/* restart acknowledgement */
-	UNI_RELEASE_COMPL	= 0x5a,	/* release complete */
-
-	UNI_NOTIFY		= 0x6e,	/* notify user */
-	UNI_STATUS_ENQ		= 0x75,	/* status enquiry */
-	UNI_STATUS		= 0x7d,	/* status */
-
-	UNI_ADD_PARTY		= 0x80,	/* add party */
-	UNI_ADD_PARTY_ACK	= 0x81,	/* add party acknowledgement */
-	UNI_ADD_PARTY_REJ	= 0x82,	/* add party reject */
-	UNI_DROP_PARTY		= 0x83,	/* drop party */
-	UNI_DROP_PARTY_ACK	= 0x84,	/* drop party acknowledgement */
-	UNI_PARTY_ALERTING	= 0x85,	/* party alerting */
-
-	UNI_LEAF_SETUP_FAIL	= 0x90,	/* leaf setup failed */
-	UNI_LEAF_SETUP_REQ	= 0x91,	/* leaf setup request */
-
-	UNI_COBISETUP		= 0x15,	/* Q.2932 COBI-setup */
-	UNI_FACILITY		= 0x62,	/* Q.2932 facility */
-
-	UNI_MODIFY_REQ		= 0x88,	/* Q.2963 Modify request */
-	UNI_MODIFY_ACK		= 0x89,	/* Q.2963 Modify acknowledgement */
-	UNI_MODIFY_REJ		= 0x8a,	/* Q.2963 Modify reject */
-	UNI_CONN_AVAIL		= 0x8b,	/* Q.2963 Connection available */
-};
-
-/*
- * Information element types
- */
-enum uni_ietype {
-	UNI_IE_CAUSE		= 0x08,	/* cause */
-	UNI_IE_CALLSTATE	= 0x14,	/* call state */
-	UNI_IE_FACILITY		= 0x1C,	/* Q.2932 facility IE */
-	UNI_IE_NOTIFY		= 0x27,	/* UNI4.0 notify */
-	UNI_IE_EETD		= 0x42,	/* UNI4.0 end-to-end transit delay */
-	UNI_IE_CONNED		= 0x4c,	/* UNI4.0/Q.2951 connected address */
-	UNI_IE_CONNEDSUB	= 0x4d,	/* UNI4.0/Q.2951 connected subaddress */
-	UNI_IE_EPREF		= 0x54,	/* endpoint reference */
-	UNI_IE_EPSTATE		= 0x55,	/* enpoint state */
-	UNI_IE_AAL		= 0x58,	/* ATM adaptation layer parameters */
-	UNI_IE_TRAFFIC		= 0x59,	/* ATM traffic descriptor */
-	UNI_IE_CONNID		= 0x5a,	/* connection identifier */
-	UNI_IE_QOS		= 0x5c,	/* quality of service parameter */
-	UNI_IE_BHLI		= 0x5d,	/* broadband higher layer information */
-	UNI_IE_BEARER		= 0x5e,	/* broadband bearer capability */
-	UNI_IE_BLLI		= 0x5f,	/* broadband lower layer information */
-	UNI_IE_LSHIFT		= 0x60,	/* broadband locking shift */
-	UNI_IE_NLSHIFT		= 0x61,	/* broadband non-locking shift */
-	UNI_IE_SCOMPL		= 0x62,	/* broadband sending complete */
-	UNI_IE_REPEAT		= 0x63,	/* broadband repeat indicator */
-	UNI_IE_CALLING		= 0x6c,	/* calling party number */
-	UNI_IE_CALLINGSUB	= 0x6d,	/* calling party subaddress */
-	UNI_IE_CALLED		= 0x70,	/* called party number */
-	UNI_IE_CALLEDSUB	= 0x71,	/* called party subaddress */
-	UNI_IE_TNS		= 0x78,	/* transit network selection */
-	UNI_IE_RESTART		= 0x79,	/* restart indicator */
-	UNI_IE_UU		= 0x7e,	/* UNI4.0/Q.2957 user-to-user info */
-	UNI_IE_GIT		= 0x7f,	/* UNI4.0 generic identifier transport*/
-	UNI_IE_MINTRAFFIC	= 0x81,	/* Q.2962 minimum traffic desc */
-	UNI_IE_ATRAFFIC		= 0x82,	/* Q.2962 alternate traffic desc */
-	UNI_IE_ABRSETUP		= 0x84,	/* UNI4.0 ABR setup parameters */
-	UNI_IE_REPORT		= 0x89,	/* Q.2963 broadband report type */
-	UNI_IE_CALLED_SOFT	= 0xe0,	/* PNNI Calling party soft PVPC */
-	UNI_IE_CRANKBACK	= 0xe1,	/* PNNI Crankback */
-	UNI_IE_DTL		= 0xe2,	/* PNNI designated transit list */
-	UNI_IE_CALLING_SOFT	= 0xe3,	/* PNNI Called party soft PVPC */
-	UNI_IE_ABRADD		= 0xe4,	/* UNI4.0 ABR additional parameters */
-	UNI_IE_LIJ_CALLID	= 0xe8,	/* UNI4.0 LIF call identifier */
-	UNI_IE_LIJ_PARAM	= 0xe9,	/* UNI4.0 LIF parameters */
-	UNI_IE_LIJ_SEQNO	= 0xea,	/* UNI4.0 LIF sequence number */
-	UNI_IE_CSCOPE		= 0xeb,	/* UNI4.0 connection scope selection */
-	UNI_IE_EXQOS		= 0xec,	/* UNI4.0 extended QoS parameters */
-	UNI_IE_MDCR		= 0xf0,	/* UNI4.0+ Minimum desired call rate */
-	UNI_IE_UNREC		= 0xfe,
-};
-
-enum uni_coding {
-	UNI_CODING_ITU = 0x0,
-	UNI_CODING_NET = 0x3,
-};
-
-enum uni_msgact {
-	UNI_MSGACT_CLEAR	= 0x0,
-	UNI_MSGACT_IGNORE	= 0x1,
-	UNI_MSGACT_REPORT	= 0x2,
-
-	UNI_MSGACT_DEFAULT	= 0x4
-};
-
-enum uni_ieact {
-	UNI_IEACT_CLEAR		= 0x00,	/* clear call */
-	UNI_IEACT_IGNORE	= 0x01,	/* ignore IE and proceed */
-	UNI_IEACT_REPORT	= 0x02,	/* ignore IE, report and proceed */
-	UNI_IEACT_MSG_IGNORE	= 0x05,	/* ignore message */
-	UNI_IEACT_MSG_REPORT	= 0x06,	/* ignore message and report */
-
-	UNI_IEACT_DEFAULT	= 0x08
-};
-
-struct uni_cref {
-	u_int	flag;
-	u_int	cref;
-};
-
-/*
- * Message header.
- */
-struct uni_msghdr {
-	struct uni_cref	cref;
-	enum uni_msgact	act;		/* action indicator */
-	u_int		pass:1;		/* PNNI pass along request */
-};
-
-enum {
-	CREF_GLOBAL	= 0,
-	CREF_DUMMY	= 0x7fffff,
-};
-
-/*
- * General information element header.
- */
-struct uni_iehdr {
-	enum uni_coding	coding;		/* coding standard */
-	enum uni_ieact	act;		/* action indicator */
-	u_int		pass : 1;	/* PNNI pass along request */
-	u_int		present;	/* which optional elements are present */
-#define UNI_IE_EMPTY	0x80000000
-#define UNI_IE_PRESENT	0x40000000
-#define UNI_IE_ERROR	0x20000000
-#define UNI_IE_XXX	0x10000000
-#define UNI_IE_MASK	0xf0000000
-};
-
-#define IE_ISPRESENT(IE) \
-	(((IE).h.present & (UNI_IE_PRESENT|UNI_IE_EMPTY)) == UNI_IE_PRESENT)
-#define IE_SETPRESENT(IE) \
-	((IE).h.present = ((IE).h.present & ~UNI_IE_MASK) | \
-		UNI_IE_PRESENT)
-
-#define IE_ADDPRESENT(IE) \
-	((IE).h.present = ((IE).h.present & ~UNI_IE_EMPTY) | \
-		UNI_IE_PRESENT)
-
-#define IE_ISEMPTY(IE) \
-	(((IE).h.present & UNI_IE_MASK) == (UNI_IE_PRESENT | UNI_IE_EMPTY))
-#define IE_SETEMPTY(IE) \
-	((IE).h.present = ((IE).h.present & ~UNI_IE_MASK) | \
-		UNI_IE_EMPTY | UNI_IE_PRESENT)
-
-#define IE_ISERROR(IE) \
-	(((IE).h.present & UNI_IE_MASK) == (UNI_IE_PRESENT | UNI_IE_ERROR))
-#define IE_SETERROR(IE) \
-	((IE).h.present = ((IE).h.present & ~UNI_IE_MASK) | \
-		UNI_IE_ERROR | UNI_IE_PRESENT)
-
-#define IE_ISGOOD(IE) \
-	(((IE).h.present & UNI_IE_MASK) == (UNI_IE_PRESENT))
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_ie.c b/sys/contrib/ngatm/netnatm/msg/uni_ie.c
deleted file mode 100644
index 3842279c63a1..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/uni_ie.c
+++ /dev/null
@@ -1,7168 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/msg/uni_ie.c,v 1.16 2005/05/23 12:06:30 brandt_h Exp $
- *
- * Private definitions for the IE code file.
- *
- * This file includes the table generated automatically.
- */
-
-#include <sys/types.h>
-#include <sys/param.h>
-
-#ifdef _KERNEL
-#include <sys/libkern.h>
-#else
-#include <string.h>
-#endif
-#include <netnatm/unimsg.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#include <netnatm/msg/uniprint.h>
-#include <netnatm/msg/priv.h>
-
-#define UNUSED(_p) do { (void)(_p); } while (0)
-
-/*
- * Define internal functions.
- */
-#define DEF_IE_PRINT(Coding, IE) \
-	void uni_ie_print_##Coding##_##IE(struct uni_ie_##IE *ie, struct unicx *cx)
-
-#define DEF_IE_CHECK(Coding, IE) \
-	int uni_ie_check_##Coding##_##IE(struct uni_ie_##IE *ie, struct unicx *cx)
-
-#define DEF_IE_ENCODE(Coding, IE) \
-	int uni_ie_encode_##Coding##_##IE(struct uni_msg *msg, struct uni_ie_##IE *ie, struct unicx *cx)
-
-#define DEF_IE_DECODE(Coding, IE) \
-	int uni_ie_decode_##Coding##_##IE(struct uni_ie_##IE *ie, struct uni_msg *msg, u_int ielen, struct unicx *cx)
-
-/*
- * This structure is used to define value->string mappings. MKT() is used
- * to generate a table entry. EOT() to end the table.
- */
-#define MKT(V,N)	{ #N, V }
-#define EOT()		{ NULL, 0 }
-
-/* library internal functions */
-static void uni_entry(const char *, struct unicx *);
-static int  uni_print_iehdr(const char *, struct uni_iehdr *h, struct unicx *);
-static void uni_print_ieend(struct unicx *);
-static void uni_putc(int, struct unicx *);
-
-
-/*
- * Encoding
- */
-#define APP_BYTE(M, B) do {					\
-	*(M)->b_wptr++ = (B);					\
-    } while (0)
-#define APP_16BIT(M, B) do {					\
-	u_int _v = (B);						\
-	*(M)->b_wptr++ = _v >> 8; 				\
-	*(M)->b_wptr++ = _v;					\
-    } while (0)
-#define APP_24BIT(M, B) do {					\
-	u_int _v = (B);						\
-	*(M)->b_wptr++ = _v >> 16;				\
-	*(M)->b_wptr++ = _v >> 8;				\
-	*(M)->b_wptr++ = _v;					\
-    } while (0)
-#define APP_32BIT(M, B) do {					\
-	u_int _v = (B);						\
-	*(M)->b_wptr++ = _v >> 24;				\
-	*(M)->b_wptr++ = _v >> 16;				\
-	*(M)->b_wptr++ = _v >> 8;				\
-	*(M)->b_wptr++ = _v;					\
-    } while (0)
-#define APP_BUF(M, B, L) do {					\
-	(void)memcpy((M)->b_wptr, (B), (L));			\
-	(M)->b_wptr += (L);					\
-    } while (0)
-
-#define APP_SUB_BYTE(M, T, B)  do { APP_BYTE(M, T); APP_BYTE(M, B); } while (0)
-#define APP_SUB_16BIT(M, T, B) do { APP_BYTE(M, T); APP_16BIT(M, B); } while (0)
-#define APP_SUB_24BIT(M, T, B) do { APP_BYTE(M, T); APP_24BIT(M, B); } while (0)
-#define APP_SUB_32BIT(M, T, B) do { APP_BYTE(M, T); APP_32BIT(M, B); } while (0)
-
-#define APP_OPT(M, F, P, T) do {				\
-	if ((F) & (P))						\
-		APP_BYTE((M), (T));				\
-    } while (0)
-#define APP_OPT_BYTE(M, F, P, T, B) do {			\
-	if ((F) & (P))						\
-		APP_SUB_BYTE((M), (T), (B));			\
-    } while (0)
-#define APP_OPT_16BIT(M, F, P, T, B) do {			\
-	if ((F) & (P))						\
-		APP_SUB_16BIT((M), (T), (B));			\
-    } while (0)
-#define APP_OPT_24BIT(M, F, P, T, B) do {			\
-	if ((F) & (P))						\
-		APP_SUB_24BIT((M), (T), (B));			\
-    } while (0)
-
-#define START_IE(TYPE,CODE,LEN) 				\
-	u_int ielen; 						\
-								\
-	if (uni_check_ie(CODE, (union uni_ieall *)ie, cx)) 	\
-		return (-1); 					\
-	if (uni_encode_ie_hdr(msg, CODE, &ie->h, (LEN), cx))	\
-		return (0);					\
-								\
-	ielen = msg->b_wptr - msg->b_rptr - 2;
-
-#define START_IE2(TYPE,CODE,LEN,REALCODE) 			\
-	u_int ielen; 						\
-								\
-	if (uni_check_ie(CODE, (union uni_ieall *)ie, cx)) 	\
-		return (-1); 					\
-	if (uni_encode_ie_hdr(msg, REALCODE, &ie->h, (LEN), cx)) \
-		return (0);					\
-								\
-	ielen = msg->b_wptr - msg->b_rptr - 2;
-
-#define SET_IE_LEN(M) do {					\
-	(M)->b_buf[ielen + 0] =					\
-	    (((M)->b_wptr - (M)->b_rptr) - ielen - 2) >> 8;	\
-	(M)->b_buf[ielen + 1] =					\
-	    (((M)->b_wptr - (M)->b_rptr) - ielen - 2) >> 0;	\
-    } while (0)
-
-
-/***********************************************************************/
-/*
- * Decoding
- */
-#define IE_START(ERR) 							\
-	if (IE_ISPRESENT(*ie))						\
-		return (0);						\
-	if (ielen == 0) {						\
-		IE_SETEMPTY(*ie);					\
-		return (0);						\
-	}
-
-#define IE_END(IE)							\
-	IE_SETPRESENT(*ie);						\
-	if (uni_check_ie(UNI_IE_##IE, (union uni_ieall *)ie, cx) == 0) 	\
-		return (0);						\
-  rej:									\
-	ie->h.present = UNI_IE_ERROR | UNI_IE_PRESENT;			\
-	return (1);
-
-#define DEC_GETF3(ID, F, P) 						\
-		  case UNI_##ID##_ID:					\
-			if (ielen < 3)					\
-				goto rej;				\
-			ielen -= 3;					\
-		  	if (!(P & UNI_##ID##_P)) {			\
-		  		P |= UNI_##ID##_P;			\
-				ie->F  = *msg->b_rptr++ << 16;		\
-				ie->F |= *msg->b_rptr++ << 8;		\
-				ie->F |= *msg->b_rptr++;		\
-			} else						\
-				msg->b_rptr += 3;			\
-			break;
-
-#define DEC_GETF1(ID, F, P) 						\
-		  case UNI_##ID##_ID:					\
-			if (ielen < 1)					\
-				goto rej;				\
-			ielen--;					\
-		  	if (!(P & UNI_##ID##_P)) {			\
-		  		P |= UNI_##ID##_P;			\
-				ie->F = *msg->b_rptr++;			\
-			} else						\
-				msg->b_rptr++;				\
-			break;
-
-
-#define PRINT_NPREFIX (sizeof(((struct unicx *)0)->prefix) /		\
-	    sizeof(((struct unicx *)0)->prefix[0]))
-
-/*
- * This is rather here than in privmsg.c because we need the APP macros.
- */
-int
-uni_encode_msg_hdr(struct uni_msg *msg, struct uni_msghdr *h,
-    enum uni_msgtype type, struct unicx *cx, int *mlen)
-{
-	u_char byte;
-
-	if (uni_msg_ensure(msg, 9) != 0)
-		return -1;
-
-	APP_BYTE(msg, cx->pnni ? PNNI_PROTO : UNI_PROTO); 
-	APP_BYTE(msg, 3); 
-	if(h->cref.cref >= 1<<23) 
-		return -1; 
-	APP_24BIT(msg, h->cref.cref | (h->cref.flag ? 0x800000 : 0));
-	APP_BYTE(msg, type); 
-
-	byte = 0x80;
-	if(h->act != UNI_MSGACT_DEFAULT)
-		byte |= 0x10 | (h->act & 3);
-	if(cx->pnni && h->pass)
-		byte |= 0x08;
-	APP_BYTE(msg, byte); 
-
-	*mlen = msg->b_wptr - msg->b_rptr; 
-	APP_16BIT(msg, 0);
-
-	return 0;
-}
-
-/*
- * Initialize printing. This must be called by all printing routines
- * that are exported to the user.
- */
-void
-uni_print_init(char *buf, size_t bufsiz, struct unicx *cx)
-{
-	if (cx->dont_init)
-		return;
-
-	cx->indent = 0;
-	cx->nprefix = 0;
-	cx->doindent = 0;
-	if (cx->tabsiz == 0)
-		cx->tabsiz = 4;
-	cx->buf = buf;
-	cx->bufsiz = bufsiz;
-}
-
-/*
- * Append a character to the buffer if there is still space
- */
-static void
-uni_putc(int c, struct unicx *cx)
-{
-	if(cx->bufsiz > 1) {
-		*cx->buf++ = c;
-		cx->bufsiz--;
-		*cx->buf = '\0';
-	}
-}
-
-void
-uni_printf(struct unicx *cx, const char *fmt, ...)
-{
-	u_int n;
-	va_list ap;
-
-	if(cx->bufsiz > 1) {
-		va_start(ap, fmt);
-		n = vsnprintf(cx->buf, cx->bufsiz, fmt, ap);
-		va_end(ap);
-		if(n > 0) {
-			if(n < cx->bufsiz) {
-				cx->bufsiz -= n;
-				cx->buf += n;
-			} else {
-				cx->buf += cx->bufsiz - 1;
-				cx->bufsiz = 1;
-			}
-		}
-		*cx->buf = '\0';
-	}
-}
-
-/*
- * Print mode:
- *	0 - print all into one line, fully prefixed
- *	1 - print on multiple lines, full prefixed, but equal level
- *	    entries on one line
- *	2 - like 2, but only partial prefixed
- *	3 - like 1, but each entry onto a new line
- *	4 - like 2 + 3
- */
-
-/*
- * If we are in multiline mode, end the current line and set the
- * flag, that we need indentation. But prevent double new lines.
- */
-void
-uni_print_eol(struct unicx *cx)
-{
-	if (cx->multiline) {
-		if (!cx->doindent) {
-			uni_putc('\n', cx);
-			cx->doindent = 1;
-		}
-	} 
-}
-
-/*
- * New entry. Do the prefixing, indentation and spacing.
- */
-static void
-doprefix(struct unicx *cx, const char *s)
-{
-	u_int i;
-
-	if(cx->multiline == 0) {
-		uni_putc(' ', cx);
-		for(i = 0; i < cx->nprefix; i++)
-			if(cx->prefix[i])
-				uni_printf(cx, "%s.", cx->prefix[i]);
-	} else if(cx->multiline == 1) {
-		if(cx->doindent) {
-			uni_printf(cx, "%*s", cx->indent * cx->tabsiz, "");
-			cx->doindent = 0;
-		} else
-			uni_putc(' ', cx);
-		for(i = 0; i < cx->nprefix; i++)
-			if(cx->prefix[i])
-				uni_printf(cx, "%s.", cx->prefix[i]);
-	} else if(cx->multiline == 2) {
-		if(cx->doindent) {
-			uni_printf(cx, "%*s", cx->indent * cx->tabsiz, "");
-			cx->doindent = 0;
-		} else
-			uni_putc(' ', cx);
-	} else if(cx->multiline == 3) {
-		if(cx->doindent)
-			cx->doindent = 0;
-		else
-			uni_putc('\n', cx);
-		uni_printf(cx, "%*s", cx->indent * cx->tabsiz, "");
-		for(i = 0; i < cx->nprefix; i++)
-			if(cx->prefix[i])
-				uni_printf(cx, "%s.", cx->prefix[i]);
-	} else if(cx->multiline == 4) {
-		if(cx->doindent)
-			cx->doindent = 0;
-		else
-			uni_putc('\n', cx);
-		uni_printf(cx, "%*s", cx->indent * cx->tabsiz, "");
-	}
-	uni_printf(cx, "%s", s);
-}
-static void
-uni_entry(const char *s, struct unicx *cx)
-{
-	doprefix(cx, s);
-	uni_putc('=', cx);
-}
-void
-uni_print_flag(const char *s, struct unicx *cx)
-{
-	doprefix(cx, s);
-}
-
-
-/*
- * Start a deeper level of indendation. If multiline is in effect,
- * we end the current line.
- */
-void
-uni_print_push_prefix(const char *prefix, struct unicx *cx)
-{
-	if (cx->nprefix < PRINT_NPREFIX)
-		cx->prefix[cx->nprefix++] = prefix;
-}
-void
-uni_print_pop_prefix(struct unicx *cx)
-{
-	if (cx->nprefix > 0)
-		cx->nprefix--;
-}
-
-void
-uni_print_tbl(const char *entry, u_int val, const struct uni_print_tbl *tbl,
-    struct unicx *cx)
-{
-	if (entry)
-		uni_entry(entry, cx);
-	while (tbl->name) {
-		if (tbl->val == val) {
-			uni_printf(cx, "%s", tbl->name);
-			return;
-		}
-		tbl++;
-	}
-	uni_printf(cx, "ERROR(0x%x)", val);
-}
-
-void
-uni_print_entry(struct unicx *cx, const char *e, const char *fmt, ...)
-{
-	u_int n;
-	va_list ap;
-
-	uni_entry(e, cx);
-
-	if (cx->bufsiz > 1) {
-		va_start(ap, fmt);
-		n = vsnprintf(cx->buf, cx->bufsiz, fmt, ap);
-		va_end(ap);
-		if (n > 0) {
-			if (n < cx->bufsiz) {
-				cx->bufsiz -= n;
-				cx->buf += n;
-			} else {
-				cx->buf += cx->bufsiz - 1;
-				cx->bufsiz = 1;
-			}
-		}
-		*cx->buf = '\0';
-	}
-}
-
-/**********************************************************************/
-/*
- * Printing information elements.
- */
-static int
-uni_print_iehdr(const char *name, struct uni_iehdr *h, struct unicx *cx)
-{
-	static const struct uni_print_tbl act_tab[] = {
-		MKT(UNI_IEACT_CLEAR,	clear),
-		MKT(UNI_IEACT_IGNORE,	ignore),
-		MKT(UNI_IEACT_REPORT,	report),
-		MKT(UNI_IEACT_MSG_IGNORE, ignore-msg),
-		MKT(UNI_IEACT_MSG_REPORT, report-msg),
-		MKT(UNI_IEACT_DEFAULT,	default),
-		EOT()
-	};
-	static const struct uni_print_tbl cod_tab[] = {
-		MKT(UNI_CODING_ITU, itut),
-		MKT(UNI_CODING_NET, atmf),
-		EOT()
-	};
-
-	uni_print_entry(cx, name, "(");
-	uni_print_tbl(NULL, h->act, act_tab, cx);
-	uni_putc(',', cx);
-	uni_print_tbl(NULL, h->coding, cod_tab, cx);
-	if(cx->pnni && h->pass)
-		uni_printf(cx, ",pass");
-	if(IE_ISEMPTY(*(struct uni_ie_aal *)h)) {
-		uni_printf(cx, ",empty)");
-		uni_print_eol(cx);
-		return 1;
-	}
-	if(IE_ISERROR(*(struct uni_ie_aal *)h)) {
-		uni_printf(cx, ",error)");
-		uni_print_eol(cx);
-		return 1;
-	}
-
-	uni_putc(')', cx);
-
-	uni_print_push_prefix(name, cx);
-	uni_print_eol(cx);
-	cx->indent++;
-
-	return 0;
-}
-
-static void
-uni_print_ieend(struct unicx *cx)
-{
-	uni_print_pop_prefix(cx);
-	uni_print_eol(cx);
-	cx->indent--;
-}
-
-void
-uni_print_ie_internal(enum uni_ietype code, const union uni_ieall *ie,
-    struct unicx *cx)
-{
-	const struct iedecl *iedecl;
-
-	if((iedecl = GET_IEDECL(code, ie->h.coding)) != NULL)
-		(*iedecl->print)(ie, cx);
-}
-
-void
-uni_print_ie(char *buf, size_t size, enum uni_ietype code,
-    const union uni_ieall *ie, struct unicx *cx)
-{
-	uni_print_init(buf, size, cx);
-	uni_print_ie_internal(code, ie, cx);
-}
-
-int
-uni_check_ie(enum uni_ietype code, union uni_ieall *ie, struct unicx *cx)
-{
-	const struct iedecl *iedecl = GET_IEDECL(code, ie->h.coding);
-
-	if (iedecl != NULL)
-		return (iedecl->check(ie, cx));
-	else
-		return (-1);
-}
-
-/*
- * Decode a information element header.
- * Returns -1 if the message is too short.
- * Strip the header from the message.
- * The header is stripped, even if it is too short.
- */
-int
-uni_decode_ie_hdr(enum uni_ietype *ietype, struct uni_iehdr *hdr,
-    struct uni_msg *msg, struct unicx *cx, u_int *ielen)
-{
-	u_int len;
-
-	*ietype = (enum uni_ietype)0;
-	*ielen = 0;
-	hdr->present = 0;
-	hdr->coding = UNI_CODING_ITU;
-	hdr->act = UNI_IEACT_DEFAULT;
-
-	if ((len = uni_msg_len(msg)) == 0)
-		return (-1);
-
-	*ietype = *msg->b_rptr++;
-
-	if (--len == 0)
-		return (-1);
-
-	hdr->coding = (*msg->b_rptr >> 5) & 3;
-	hdr->present = 0;
-
-	switch (*msg->b_rptr & 0x17) {
-
-	  case 0x10: case 0x11: case 0x12:
-	  case 0x15: case 0x16:
-		hdr->act = *msg->b_rptr & 0x7;
-		break;
-
-	  case 0x00: case 0x01: case 0x02: case 0x03:
-	  case 0x04: case 0x05: case 0x06: case 0x07:
-		hdr->act = UNI_IEACT_DEFAULT;
-		break;
-
-	  default:
-		/* Q.2931 5.7.2 last sentence */
-		hdr->act = UNI_IEACT_REPORT;
-		break;
-	}
-	if (cx->pnni && (*msg->b_rptr & 0x08))
-		hdr->pass = 1;
-	else
-		hdr->pass = 0;
-	msg->b_rptr++;
-
-	if (--len == 0) {
-		hdr->present = UNI_IE_ERROR | UNI_IE_PRESENT;
-		return (-1);
-	}
-
-	if (len < 2) {
-		msg->b_rptr += len;
-		hdr->present = UNI_IE_ERROR | UNI_IE_PRESENT;
-		return (-1);
-	}
-
-	*ielen = *msg->b_rptr++ << 8;
-	*ielen |= *msg->b_rptr++;
-
-	return (0);
-}
-
-/*
- * Decode the body of an information element.
- */
-int
-uni_decode_ie_body(enum uni_ietype ietype, union uni_ieall *ie,
-    struct uni_msg *msg, u_int ielen, struct unicx *cx)
-{
-	const struct iedecl *iedecl;
-	u_char *end;
-	int ret;
-
-	if (ielen > uni_msg_len(msg)) {
-		/*
-		 * Information element too long -> content error.
-		 * Q.2931 5.6.8.2
-		 */
-		msg->b_rptr = msg->b_wptr;
-		ie->h.present = UNI_IE_ERROR | UNI_IE_PRESENT;
-		return (-1);
-	}
-
-	if ((iedecl = GET_IEDECL(ietype, ie->h.coding)) == NULL) {
-		/*
-		 * entirly unknown IE.
-		 * Q.2931 5.6.8.1
-		 */
-		msg->b_rptr += ielen;
-		ie->h.present = UNI_IE_ERROR | UNI_IE_PRESENT;
-		return (-1);
-	}
-
-	if (ielen > iedecl->maxlen) {
-		/*
-		 * Information element too long -> content error.
-		 * Q.2931 5.6.8.2
-		 */
-		msg->b_rptr += iedecl->maxlen;
-		ie->h.present = UNI_IE_ERROR | UNI_IE_PRESENT;
-		return (-1);
-	}
-
-	end = msg->b_rptr + ielen;
-	ret = (*iedecl->decode)(ie, msg, ielen, cx);
-	msg->b_rptr = end;
-
-	return (ret);
-}
-
-int
-uni_encode_ie(enum uni_ietype code, struct uni_msg *msg, union uni_ieall *ie,
-    struct unicx *cx)
-{
-	const struct iedecl *iedecl = GET_IEDECL(code, ie->h.coding);
-
-	if (iedecl == NULL)
-		return (-1);
-	return (iedecl->encode(msg, ie, cx));
-}
-
-int
-uni_encode_ie_hdr(struct uni_msg *msg, enum uni_ietype type,
-    struct uni_iehdr *h, u_int len, struct unicx *cx)
-{
-	u_char byte;
-
-	if (uni_msg_ensure(msg, 4 + len) != 0)
-		return -1;
-	*msg->b_wptr++ = type;
-
-	byte = 0x80 | (h->coding << 5);
-	if(h->act != UNI_IEACT_DEFAULT)
-		byte |= 0x10 | (h->act & 7);
-	if(cx->pnni)
-		byte |= h->pass << 3;
-	*msg->b_wptr++ = byte;
-
-	if(h->present & UNI_IE_EMPTY) {
-		*msg->b_wptr++ = 0;
-		*msg->b_wptr++ = 4;
-		return -1;
-	}
-	*msg->b_wptr++ = 0;
-	*msg->b_wptr++ = 0;
-
-	return 0;
-}
-
-/*
- * Printing messages.
- */
-static void
-uni_print_cref_internal(const struct uni_cref *cref, struct unicx *cx)
-{
-	uni_print_entry(cx, "cref", "%d.", cref->flag);
-	if (cref->cref == CREF_GLOBAL)
-		uni_printf(cx, "GLOBAL");
-	else if (cref->cref == CREF_DUMMY)
-		uni_printf(cx, "DUMMY");
-	else
-		uni_printf(cx, "%d", cref->cref);
-}
-void
-uni_print_cref(char *str, size_t len, const struct uni_cref *cref,
-    struct unicx *cx)
-{
-	uni_print_init(str, len, cx);
-	uni_print_cref_internal(cref, cx);
-}
-
-static void
-uni_print_msghdr_internal(const struct uni_msghdr *hdr, struct unicx *cx)
-{
-	static const struct uni_print_tbl tab[] = {
-		MKT(UNI_MSGACT_CLEAR,	clear),
-		MKT(UNI_MSGACT_IGNORE,	ignore),
-		MKT(UNI_MSGACT_REPORT,	report),
-		MKT(UNI_MSGACT_DEFAULT,	default),
-		EOT()
-	};
-
-	uni_print_cref_internal(&hdr->cref, cx);
-	uni_print_tbl("act", hdr->act, tab, cx);
-	if (cx->pnni)
-		uni_print_entry(cx, "pass", "%s", hdr->pass ? "yes" : "no");
-}
-
-void
-uni_print_msghdr(char *str, size_t len, const struct uni_msghdr *hdr,
-    struct unicx *cx)
-{
-	uni_print_init(str, len, cx);
-	uni_print_msghdr_internal(hdr, cx);
-}
-
-
-static void
-uni_print_internal(const struct uni_all *msg, struct unicx *cx)
-{
-	uni_entry("mtype", cx);
-	if(msg->mtype >= 256 || uni_msgtable[msg->mtype] == NULL) {
-		uni_printf(cx, "0x%02x(ERROR)", msg->mtype);
-	} else {
-		uni_printf(cx, "%s", uni_msgtable[msg->mtype]->name);
-		uni_print_msghdr_internal(&msg->u.hdr, cx);
-		cx->indent++;
-		uni_print_eol(cx);
-		(*uni_msgtable[msg->mtype]->print)(&msg->u, cx);
-		cx->indent--;
-	}
-
-	if(cx->multiline == 0)
-		uni_printf(cx, "\n");
-}
-
-void
-uni_print(char *buf, size_t size, const struct uni_all *all, struct unicx *cx)
-{
-	uni_print_init(buf, size, cx);
-	uni_print_internal(all, cx);
-}
-
-static void
-uni_print_msg_internal(u_int mtype, const union uni_msgall *msg,
-    struct unicx *cx)
-{
-
-	uni_entry("mtype", cx);
-	if (mtype >= 256 || uni_msgtable[mtype] == NULL) {
-		uni_printf(cx, "0x%02x(ERROR)", mtype);
-	} else {
-		uni_printf(cx, "%s", uni_msgtable[mtype]->name);
-		uni_print_msghdr_internal(&msg->hdr, cx);
-		cx->indent++;
-		uni_print_eol(cx);
-		(*uni_msgtable[mtype]->print)(msg, cx);
-		cx->indent--;
-	}
-
-	if(cx->multiline == 0)
-		uni_printf(cx, "\n");
-}
-
-void
-uni_print_msg(char *buf, size_t size, u_int mtype, const union uni_msgall *all,
-    struct unicx *cx)
-{
-	uni_print_init(buf, size, cx);
-	uni_print_msg_internal(mtype, all, cx);
-}
-
-void
-uni_print_cx(char *buf, size_t size, struct unicx *cx)
-{
-	static const char *acttab[] = {
-		"clr",	/* 0x00 */
-		"ign",	/* 0x01 */
-		"rep",	/* 0x02 */
-		"x03",	/* 0x03 */
-		"x04",	/* 0x04 */
-		"mig",	/* 0x05 */
-		"mrp",	/* 0x06 */
-		"x07",	/* 0x07 */
-		"def",	/* 0x08 */
-	};
-
-	static const char *errtab[] = {
-		[UNI_IERR_UNK] = "unk",	/* unknown IE */
-		[UNI_IERR_LEN] = "len",	/* length error */
-		[UNI_IERR_BAD] = "bad",	/* content error */
-		[UNI_IERR_ACC] = "acc",	/* access element discarded */
-		[UNI_IERR_MIS] = "mis",	/* missing IE */
-	};
-
-	u_int i;
-
-	uni_print_init(buf, size, cx);
-
-	uni_printf(cx, "q2932		%d\n", cx->q2932);
-	uni_printf(cx, "pnni		%d\n", cx->pnni);
-	uni_printf(cx, "git_hard	%d\n", cx->git_hard);
-	uni_printf(cx, "bearer_hard	%d\n", cx->bearer_hard);
-	uni_printf(cx, "cause_hard	%d\n", cx->cause_hard);
-
-	uni_printf(cx, "multiline	%d\n", cx->multiline);
-	uni_printf(cx, "tabsiz		%d\n", cx->tabsiz);
-
-	uni_printf(cx, "errcnt		%d (", cx->errcnt);
-	for(i = 0; i < cx->errcnt; i++) {
-		uni_printf(cx, "%02x[%s,%s%s]", cx->err[i].ie,
-		    errtab[cx->err[i].err], acttab[cx->err[i].act],
-		    cx->err[i].man ? ",M" : "");
-		if(i != cx->errcnt - 1)
-			uni_putc(' ', cx);
-	}
-	uni_printf(cx, ")\n");
-}
-
-#include <netnatm/msg/uni_ietab.h>
-
-/*********************************************************************
- *
- * Cause
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 69 (just a pointer to Q.2610)
- *  Q.2610        (this is a small diff to Q.850)
- *  Q.850         !!
- *  UNI4.0 pp. 15
- *  PNNI1.0 p. 198
- *
- * ITU-T and NET coding for different values.
- */
-static const struct causetab {
-	const char	*str;
-	enum uni_diag	diag;
-} itu_causes[128] = {
-
-#define D(NAME,VAL,DIAG,STD,STR) [UNI_CAUSE_##NAME] = { STR, UNI_DIAG_##DIAG },
-#define N(NAME,VAL,DIAG,STD,STR)
-
-UNI_DECLARE_CAUSE_VALUES
-
-#undef D
-#undef N
-
-}, net_causes[128] = {
-
-#define D(NAME,VAL,DIAG,STD,STR)
-#define N(NAME,VAL,DIAG,STD,STR) [UNI_CAUSE_##NAME] = { STR, UNI_DIAG_##DIAG },
-
-UNI_DECLARE_CAUSE_VALUES
-
-#undef D
-#undef N
-
-};
-
-enum uni_diag
-uni_diag(enum uni_cause cause, enum uni_coding code)
-{
-	if ((int)cause >= 128)
-		return (UNI_DIAG_NONE);
-
-	if (code == UNI_CODING_NET)
-		if (net_causes[cause].str != NULL)
-			return (net_causes[cause].diag);
-	if (itu_causes[cause].str != NULL)
-		return (itu_causes[cause].diag);
-	return (UNI_DIAG_NONE);
-}
-
-/**********************************************************************/
-
-static void
-print_cause(struct unicx *cx, struct uni_ie_cause *ie,
-    const struct causetab *tab1, const struct causetab *tab2)
-{
-	static const struct uni_print_tbl loc_tbl[] = {
-		MKT(UNI_CAUSE_LOC_USER,		user),
-		MKT(UNI_CAUSE_LOC_PRIVLOC,	priv-net:loc-user),
-		MKT(UNI_CAUSE_LOC_PUBLOC,	pub-net:loc-user),
-		MKT(UNI_CAUSE_LOC_TRANSIT,	transit-net),
-		MKT(UNI_CAUSE_LOC_PUBREM,	pub-net:rem-user),
-		MKT(UNI_CAUSE_LOC_PRIVREM,	priv-net:rem-user),
-		MKT(UNI_CAUSE_LOC_INTERNAT,	int-net),
-		MKT(UNI_CAUSE_LOC_BEYOND,	beyond),
-		EOT()
-	};
-	static const struct uni_print_tbl pu_tbl[] = {
-		MKT(UNI_CAUSE_PU_PROVIDER,	provider),
-		MKT(UNI_CAUSE_PU_USER,		user),
-		EOT()
-	};
-	static const struct uni_print_tbl na_tbl[] = {
-		MKT(UNI_CAUSE_NA_NORMAL,	normal),
-		MKT(UNI_CAUSE_NA_ABNORMAL,	abnormal),
-		EOT()
-	};
-	static const struct uni_print_tbl cond_tbl[] = {
-		MKT(UNI_CAUSE_COND_UNKNOWN,	unknown),
-		MKT(UNI_CAUSE_COND_PERM,	permanent),
-		MKT(UNI_CAUSE_COND_TRANS,	transient),
-		EOT()
-	};
-	static const struct uni_print_tbl rej_tbl[] = {
-		MKT(UNI_CAUSE_REASON_USER,	user),
-		MKT(UNI_CAUSE_REASON_IEMISS,	ie-missing),
-		MKT(UNI_CAUSE_REASON_IESUFF,	ie-not-suff),
-		EOT()
-	};
-	char buf[100], *s;
-	u_int i;
-
-	if (uni_print_iehdr("cause", &ie->h, cx))
-		return;
-
-	if ((int)ie->cause < 128 && tab1[ie->cause].str)
-		strcpy(buf, tab1[ie->cause].str);
-	else if ((int)ie->cause < 128 && tab2 != NULL && tab2[ie->cause].str != NULL)
-		strcpy(buf, tab2[ie->cause].str);
-	else {
-		sprintf(buf, "UNKNOWN-%u", ie->cause);
-	}
-
-	for (s = buf; *s != '\0'; s++)
-		if (*s == ' ')
-			*s = '_';
-	uni_print_entry(cx, "cause", "%s", buf);
-
-	uni_print_tbl("loc", ie->loc, loc_tbl, cx);
-
-	if (ie->h.present & UNI_CAUSE_COND_P) {
-		uni_print_tbl("pu", ie->u.cond.pu, pu_tbl, cx);
-		uni_print_tbl("na", ie->u.cond.na, na_tbl, cx);
-		uni_print_tbl("condition", ie->u.cond.cond, cond_tbl, cx);
-	}
-	if (ie->h.present & UNI_CAUSE_REJ_P) {
-		uni_print_tbl("reject", ie->u.rej.reason, rej_tbl, cx);
-	}
-	if (ie->h.present & UNI_CAUSE_REJ_USER_P) {
-		uni_print_entry(cx, "user", "%u", ie->u.rej.user);
-	}
-	if (ie->h.present & UNI_CAUSE_REJ_IE_P) {
-		uni_print_entry(cx, "ie", "%u", ie->u.rej.ie);
-	}
-	if (ie->h.present & UNI_CAUSE_IE_P) {
-		uni_print_entry(cx, "ie", "(");
-		for (i = 0; i < ie->u.ie.len; i++) {
-			if (i)
-				uni_putc(',', cx);
-			uni_printf(cx, "0x%02x", ie->u.ie.ie[i]);
-		}
-		uni_putc(')', cx);
-	}
-	if (ie->h.present & UNI_CAUSE_TRAFFIC_P) {
-		uni_print_entry(cx, "traffic", "(");
-		for (i = 0; i < ie->u.traffic.len; i++) {
-			if (i)
-				uni_putc(',', cx);
-			uni_printf(cx, "0x%02x", ie->u.traffic.traffic[i]);
-		}
-		uni_putc(')', cx);
-	}
-	if (ie->h.present & UNI_CAUSE_VPCI_P) {
-		uni_print_entry(cx, "vpci", "(%u,%u)", ie->u.vpci.vpci, ie->u.vpci.vci);
-	}
-	if (ie->h.present & UNI_CAUSE_MTYPE_P) {
-		uni_print_entry(cx, "mtype", "%u", ie->u.mtype);
-	}
-	if (ie->h.present & UNI_CAUSE_TIMER_P) {
-		for (i = 0, s = buf; i < 3; i++) {
-			if (ie->u.timer[i] < ' ') {
-				*s++ = '^';
-				*s++ = ie->u.timer[i] + '@';
-			} else if (ie->u.timer[i] <= '~')
-				*s++ = ie->u.timer[i];
-			else {
-				*s++ = '\\';
-				*s++ = ie->u.timer[i] / 0100 + '0';
-				*s++ = (ie->u.timer[i] % 0100) / 010 + '0';
-				*s++ = ie->u.timer[i] % 010 + '0';
-			}
-		}
-		*s++ = '\0';
-		uni_print_entry(cx, "timer", "\"%s\"", buf);
-	}
-	if (ie->h.present & UNI_CAUSE_TNS_P) {
-		uni_print_eol(cx);
-		uni_print_ie_internal(UNI_IE_TNS, (union uni_ieall *)&ie->u.tns, cx);
-	}
-	if (ie->h.present & UNI_CAUSE_NUMBER_P) {
-		uni_print_eol(cx);
-		uni_print_ie_internal(UNI_IE_CALLED, (union uni_ieall *)&ie->u.number, cx);
-	}
-	if (ie->h.present & UNI_CAUSE_ATTR_P) {
-		uni_print_entry(cx, "attr", "(");
-		for (i = 0; i < ie->u.attr.nattr; i++) {
-			uni_printf(cx, "(%u", ie->u.attr.attr[i][0]);
-			if (!(ie->u.attr.attr[i][0] & 0x80)) {
-				uni_printf(cx, ",%u", ie->u.attr.attr[i][1]);
-				if (!(ie->u.attr.attr[i][1] & 0x80))
-					uni_printf(cx, ",%u",
-					    ie->u.attr.attr[i][2]);
-			}
-			uni_putc(')', cx);
-		}
-	}
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_PRINT(itu, cause)
-{
-	print_cause(cx, ie, itu_causes, NULL);
-}
-DEF_IE_PRINT(net, cause)
-{
-	print_cause(cx, ie, net_causes, itu_causes);
-}
-
-const char *
-uni_ie_cause2str(enum uni_coding coding, u_int cause)
-{
-	if (cause < 128) {
-		if (coding == UNI_CODING_ITU)
-			return (itu_causes[cause].str);
-		if (coding == UNI_CODING_NET) {
-			if (net_causes[cause].str != NULL)
-				return (net_causes[cause].str);
-			return (itu_causes[cause].str);
-		}
-	}
-	return (NULL);
-}
-
-/**********************************************************************/
-
-static int
-check_cause(struct uni_ie_cause *ie, struct unicx *cx,
-    const struct causetab *tab1, const struct causetab *tab2)
-{
-	static const u_int mask =
-		UNI_CAUSE_COND_P | UNI_CAUSE_REJ_P | UNI_CAUSE_REJ_USER_P |
-		UNI_CAUSE_REJ_IE_P | UNI_CAUSE_IE_P | UNI_CAUSE_TRAFFIC_P |
-		UNI_CAUSE_VPCI_P | UNI_CAUSE_MTYPE_P | UNI_CAUSE_TIMER_P |
-		UNI_CAUSE_TNS_P | UNI_CAUSE_NUMBER_P | UNI_CAUSE_ATTR_P |
-		UNI_CAUSE_PARAM_P;
-
-	const struct causetab *ptr;
-
-	if ((int)ie->cause >= 128)
-		return (-1);
-
-	switch (ie->loc) {
-	  default:
-		return (-1);
-
-	  case UNI_CAUSE_LOC_USER:
-	  case UNI_CAUSE_LOC_PRIVLOC:
-	  case UNI_CAUSE_LOC_PUBLOC:
-	  case UNI_CAUSE_LOC_TRANSIT:
-	  case UNI_CAUSE_LOC_PUBREM:
-	  case UNI_CAUSE_LOC_PRIVREM:
-	  case UNI_CAUSE_LOC_INTERNAT:
-	  case UNI_CAUSE_LOC_BEYOND:
-		break;
-	}
-
-	if (tab1[ie->cause].str != NULL)
-		ptr = &tab1[ie->cause];
-	else if (tab2 != NULL && tab2[ie->cause].str != NULL)
-		ptr = &tab2[ie->cause];
-	else
-		return (cx->cause_hard ? -1 : 0);
-
-	switch (ptr->diag) {
-
-	  case UNI_DIAG_NONE:
-		switch (ie->h.present & mask) {
-		  default:
-			if (cx->cause_hard)
-				return (-1);
-			break;
-
-		  case 0:
-			break;
-		}
-		break;
-
-	  case UNI_DIAG_COND:
-		switch (ie->h.present & mask) {
-		  default:
-			if (cx->cause_hard)
-				return (-1);
-			break;
-
-		  case 0:
-		  case UNI_CAUSE_COND_P:
-			break;
-		}
-		break;
-
-	  case UNI_DIAG_REJ:
-		switch (ie->h.present & mask) {
-		  default:
-			if (cx->cause_hard)
-				return (-1);
-			break;
-
-		  case 0:
-		  case UNI_CAUSE_REJ_P:
-		  case UNI_CAUSE_REJ_P | UNI_CAUSE_REJ_USER_P:
-		  case UNI_CAUSE_REJ_P | UNI_CAUSE_REJ_IE_P:
-			break;
-		}
-		break;
-
-	  case UNI_DIAG_CRATE:
-		switch (ie->h.present & mask) {
-		  default:
-			if (cx->cause_hard)
-				return (-1);
-			break;
-
-		  case 0:
-		  case UNI_CAUSE_TRAFFIC_P:
-			break;
-		}
-		break;
-
-	  case UNI_DIAG_IE:
-		switch (ie->h.present & mask) {
-		  default:
-			if (cx->cause_hard)
-				return (-1);
-			break;
-
-		  case 0:
-		  case UNI_CAUSE_IE_P:
-			break;
-		}
-		break;
-
-	  case UNI_DIAG_CHANID:
-		switch (ie->h.present & mask) {
-		  default:
-			if (cx->cause_hard)
-				return (-1);
-			break;
-
-		  case 0:
-		  case UNI_CAUSE_VPCI_P:
-			break;
-		}
-		break;
-
-	  case UNI_DIAG_MTYPE:
-		switch (ie->h.present & mask) {
-		  default:
-			if (cx->cause_hard)
-				return (-1);
-			break;
-
-		  case 0:
-		  case UNI_CAUSE_MTYPE_P:
-			break;
-		}
-		break;
-
-	  case UNI_DIAG_TIMER:
-		switch (ie->h.present & mask) {
-		  default:
-			if (cx->cause_hard)
-				return (-1);
-			break;
-
-		  case 0:
-		  case UNI_CAUSE_TIMER_P:
-			break;
-		}
-		break;
-
-	  case UNI_DIAG_TNS:
-		switch (ie->h.present & mask) {
-		  default:
-			if (cx->cause_hard)
-				return (-1);
-			break;
-
-		  case 0:
-		  case UNI_CAUSE_TNS_P:
-			break;
-		}
-		break;
-
-	  case UNI_DIAG_NUMBER:
-		switch (ie->h.present & mask) {
-		  default:
-			if (cx->cause_hard)
-				return (-1);
-			break;
-
-		  case 0:
-		  case UNI_CAUSE_NUMBER_P:
-			break;
-		}
-		break;
-
-	  case UNI_DIAG_ATTR:
-		switch (ie->h.present & mask) {
-		  default:
-			if (cx->cause_hard)
-				return (-1);
-			break;
-
-		  case 0:
-		  case UNI_CAUSE_ATTR_P:
-			break;
-		}
-		break;
-
-	  case UNI_DIAG_PARAM:
-		switch (ie->h.present & mask) {
-		  default:
-			if (cx->cause_hard)
-				return (-1);
-			break;
-
-		  case 0:
-		  case UNI_CAUSE_PARAM_P:
-			break;
-		}
-		break;
-	}
-
-	if (ie->h.present & UNI_CAUSE_COND_P) {
-		switch (ie->u.cond.pu) {
-		  default:
-			return (-1);
-
-		  case UNI_CAUSE_PU_PROVIDER:
-		  case UNI_CAUSE_PU_USER:
-			break;
-		}
-		switch (ie->u.cond.na) {
-		  default:
-			return (-1);
-
-		  case UNI_CAUSE_NA_NORMAL:
-		  case UNI_CAUSE_NA_ABNORMAL:
-			break;
-		}
-		switch (ie->u.cond.cond) {
-		  default:
-			return (-1);
-
-		  case UNI_CAUSE_COND_UNKNOWN:
-		  case UNI_CAUSE_COND_PERM:
-		  case UNI_CAUSE_COND_TRANS:
-			break;
-		}
-	}
-	if (ie->h.present & UNI_CAUSE_REJ_P) {
-		switch (ie->u.rej.reason) {
-		  default:
-			return (-1);
-
-		  case UNI_CAUSE_REASON_USER:
-			switch (ie->h.present & mask) {
-			  default:
-				return (-1);
-
-			  case UNI_CAUSE_REJ_P:
-			  case UNI_CAUSE_REJ_P | UNI_CAUSE_REJ_USER_P:
-				break;
-			}
-			break;
-
-		  case UNI_CAUSE_REASON_IEMISS:
-		  case UNI_CAUSE_REASON_IESUFF:
-			switch (ie->h.present & mask) {
-			  default:
-				return (-1);
-
-			  case UNI_CAUSE_REJ_P:
-			  case UNI_CAUSE_REJ_P | UNI_CAUSE_REJ_IE_P:
-				break;
-			}
-			break;
-		}
-	}
-	if (ie->h.present & UNI_CAUSE_IE_P) {
-		if (ie->u.ie.len == 0 || ie->u.ie.len > UNI_CAUSE_IE_N)
-			return (-1);
-	}
-	if (ie->h.present & UNI_CAUSE_TRAFFIC_P) {
-		if (ie->u.traffic.len == 0 ||
-		    ie->u.traffic.len > UNI_CAUSE_TRAFFIC_N)
-			return (-1);
-	}
-
-	if (ie->h.present & UNI_CAUSE_TNS_P) {
-		if (uni_check_ie(UNI_IE_TNS, (union uni_ieall *)&ie->u.tns, cx))
-			return (-1);
-	}
-	if (ie->h.present & UNI_CAUSE_NUMBER_P) {
-		if(uni_check_ie(UNI_IE_CALLED, (union uni_ieall *)&ie->u.number, cx))
-			return (-1);
-	}
-	if (ie->h.present & UNI_CAUSE_ATTR_P) {
-		if(ie->u.attr.nattr > UNI_CAUSE_ATTR_N || ie->u.attr.nattr == 0)
-			return (-1);
-	}
-	if (ie->h.present & UNI_CAUSE_PARAM_P) {
-		UNUSED(cx);
-	}
-
-	return (0);
-}
-
-DEF_IE_CHECK(itu, cause)
-{
-	return (check_cause(ie, cx, itu_causes, NULL));
-}
-DEF_IE_CHECK(net, cause)
-{
-	return (check_cause(ie, cx, net_causes, itu_causes));
-}
-/**********************************************************************/
-
-static int
-encode_cause(struct uni_msg *msg, struct uni_ie_cause *ie, struct unicx *cx)
-{
-	u_int i;
-
-	START_IE(cause, UNI_IE_CAUSE, 30);
-
-	if (IE_ISERROR(*ie)) {
-		APP_BYTE(msg, 0x00 | ie->loc);
-	} else {
-		APP_BYTE(msg, 0x80 | ie->loc);
-	}
-	APP_BYTE(msg, 0x80 | ie->cause);
-
-	if (ie->h.present & UNI_CAUSE_COND_P)
-		APP_BYTE(msg, 0x80 | (ie->u.cond.pu << 3) |
-		    (ie->u.cond.na << 2) | ie->u.cond.cond);
-
-	else if (ie->h.present & UNI_CAUSE_REJ_P) {
-		APP_BYTE(msg, 0x80 | (ie->u.rej.reason << 2) | ie->u.rej.cond);
-		if (ie->h.present & UNI_CAUSE_REJ_USER_P)
-			APP_BYTE(msg, ie->u.rej.user);
-		else if (ie->h.present & UNI_CAUSE_REJ_IE_P)
-			APP_BYTE(msg, ie->u.rej.ie);
-
-	} else if(ie->h.present & UNI_CAUSE_IE_P)
-		APP_BUF(msg, ie->u.ie.ie, ie->u.ie.len);
-
-	else if (ie->h.present & UNI_CAUSE_TRAFFIC_P)
-		APP_BUF(msg, ie->u.traffic.traffic, ie->u.traffic.len);
-
-	else if (ie->h.present & UNI_CAUSE_VPCI_P) {
-		APP_BYTE(msg, (ie->u.vpci.vpci >> 8));
-		APP_BYTE(msg, (ie->u.vpci.vpci >> 0));
-		APP_BYTE(msg, (ie->u.vpci.vci >> 8));
-		APP_BYTE(msg, (ie->u.vpci.vci >> 0));
-
-	} else if (ie->h.present & UNI_CAUSE_MTYPE_P)
-		APP_BYTE(msg, ie->u.mtype);
-
-	else if (ie->h.present & UNI_CAUSE_TIMER_P) {
-		APP_BYTE(msg, ie->u.timer[0]);
-		APP_BYTE(msg, ie->u.timer[1]);
-		APP_BYTE(msg, ie->u.timer[2]);
-
-	} else if (ie->h.present & UNI_CAUSE_TNS_P)
-		uni_encode_ie(UNI_IE_TNS, msg,
-		    (union uni_ieall *)&ie->u.tns, cx);
-
-	else if (ie->h.present & UNI_CAUSE_NUMBER_P)
-		uni_encode_ie(UNI_IE_CALLED, msg,
-		    (union uni_ieall *)&ie->u.number, cx);
-
-	else if (ie->h.present & UNI_CAUSE_ATTR_P) {
-		for (i = 0; i < ie->u.attr.nattr; i++) {
-			APP_BYTE(msg, ie->u.attr.attr[i][0]);
-			if (!ie->u.attr.attr[i][0]) {
-				APP_BYTE(msg, ie->u.attr.attr[i][1]);
-				if (!ie->u.attr.attr[i][1])
-					APP_BYTE(msg, ie->u.attr.attr[i][2]);
-			}
-		}
-	} else if (ie->h.present & UNI_CAUSE_PARAM_P)
-		APP_BYTE(msg, ie->u.param);
-
-	SET_IE_LEN(msg);
-
-	return (0);
-}
-
-DEF_IE_ENCODE(itu, cause)
-{
-	return encode_cause(msg, ie, cx);
-}
-DEF_IE_ENCODE(net, cause)
-{
-	return encode_cause(msg, ie, cx);
-}
-
-/**********************************************************************/
-
-static int
-decode_cause(struct uni_ie_cause *ie, struct uni_msg *msg, u_int ielen,
-    struct unicx *cx, const struct causetab *tab1, const struct causetab *tab2)
-{
-	u_char c;
-	const struct causetab *ptr;
-	enum uni_ietype ietype;
-	u_int xielen;
-
-	IE_START(;);
-
-	if(ielen < 2 || ielen > 30)
-		goto rej;
-
-	c = *msg->b_rptr++;
-	ielen--;
-	if(!(c & 0x80))
-		goto rej;
-	ie->loc = c & 0xf;
-
-	c = *msg->b_rptr++;
-	ielen--;
-	if(!(c & 0x80))
-		goto rej;
-	ie->cause = c & 0x7f;
-
-	if(tab1[ie->cause].str != NULL)
-		ptr = &tab1[ie->cause];
-	else if(tab2 != NULL && tab2[ie->cause].str != NULL)
-		ptr = &tab2[ie->cause];
-	else {
-		ptr = NULL;
-		ielen = 0;	/* ignore diags */
-	}
-
-	if(ielen) {
-		switch(ptr->diag) {
-
-		  case UNI_DIAG_NONE:
-			break;
-
-		  case UNI_DIAG_COND:
-			if(ielen < 1)
-				goto rej;
-			c = *msg->b_rptr++;
-			ielen--;
-
-			ie->h.present |= UNI_CAUSE_COND_P;
-			ie->u.cond.pu = (c >> 3) & 1;
-			ie->u.cond.na = (c >> 2) & 1;
-			ie->u.cond.cond = c & 3;
-
-			if(!(c & 0x80))
-				goto rej;
-			break;
-
-		  case UNI_DIAG_REJ:
-			if(ielen < 1)
-				goto rej;
-			c = *msg->b_rptr++;
-			ielen--;
-
-			ie->h.present |= UNI_CAUSE_REJ_P;
-			ie->u.rej.reason = (c >> 2) & 0x1f;
-			ie->u.rej.cond = c & 3;
-
-			if(!(c & 0x80))
-				goto rej;
-
-			if(ielen > 0) {
-				c = *msg->b_rptr++;
-				ielen--;
-
-				switch(ie->u.rej.reason) {
-
-				  case UNI_CAUSE_REASON_USER:
-					ie->h.present |= UNI_CAUSE_REJ_USER_P;
-					ie->u.rej.user = c;
-					break;
-
-				  case UNI_CAUSE_REASON_IEMISS:
-				  case UNI_CAUSE_REASON_IESUFF:
-					ie->h.present |= UNI_CAUSE_REJ_IE_P;
-					ie->u.rej.ie = c;
-					break;
-				}
-			}
-			break;
-
-		  case UNI_DIAG_CRATE:
-			ie->h.present |= UNI_CAUSE_TRAFFIC_P;
-			while(ielen && ie->u.traffic.len < UNI_CAUSE_TRAFFIC_N) {
-				ie->u.traffic.traffic[ie->u.traffic.len++] =
-					*msg->b_rptr++;
-				ielen--;
-			}
-			break;
-
-		  case UNI_DIAG_IE:
-			ie->h.present |= UNI_CAUSE_IE_P;
-			while(ielen && ie->u.ie.len < UNI_CAUSE_IE_N) {
-				ie->u.ie.ie[ie->u.ie.len++] = *msg->b_rptr++;
-				ielen--;
-			}
-			break;
-
-		  case UNI_DIAG_CHANID:
-			if(ielen < 4)
-				break;
-			ie->h.present |= UNI_CAUSE_VPCI_P;
-			ie->u.vpci.vpci  = *msg->b_rptr++ << 8;
-			ie->u.vpci.vpci |= *msg->b_rptr++;
-			ie->u.vpci.vci  = *msg->b_rptr++ << 8;
-			ie->u.vpci.vci |= *msg->b_rptr++;
-			ielen -= 4;
-			break;
-
-		  case UNI_DIAG_MTYPE:
-			ie->h.present |= UNI_CAUSE_MTYPE_P;
-			ie->u.mtype = *msg->b_rptr++;
-			ielen--;
-			break;
-
-		  case UNI_DIAG_TIMER:
-			if(ielen < 3)
-				break;
-			ie->h.present |= UNI_CAUSE_TIMER_P;
-			ie->u.timer[0] = *msg->b_rptr++;
-			ie->u.timer[1] = *msg->b_rptr++;
-			ie->u.timer[2] = *msg->b_rptr++;
-			ielen -= 3;
-			break;
-
-		  case UNI_DIAG_TNS:
-			if(ielen < 4)
-				break;
-			if(uni_decode_ie_hdr(&ietype, &ie->u.tns.h, msg, cx, &xielen))
-				break;
-			if(ietype != UNI_IE_TNS)
-				break;
-			if(uni_decode_ie_body(ietype,
-			    (union uni_ieall *)&ie->u.tns, msg, xielen, cx))
-				break;
-			ie->h.present |= UNI_CAUSE_TNS_P;
-			break;
-
-		  case UNI_DIAG_NUMBER:
-			if(ielen < 4)
-				break;
-			if(uni_decode_ie_hdr(&ietype, &ie->u.number.h, msg, cx, &xielen))
-				break;
-			if(ietype != UNI_IE_CALLED)
-				break;
-			if(uni_decode_ie_body(ietype,
-			    (union uni_ieall *)&ie->u.number, msg, xielen, cx))
-				break;
-			ie->h.present |= UNI_CAUSE_NUMBER_P;
-			break;
-
-		  case UNI_DIAG_ATTR:
-			ie->h.present |= UNI_CAUSE_ATTR_P;
-			while(ielen > 0 && ie->u.attr.nattr < UNI_CAUSE_ATTR_N) {
-				c = *msg->b_rptr++;
-				ie->u.attr.attr[ie->u.attr.nattr][0] = c;
-				ielen--;
-				if(ielen > 0 && !(c & 0x80)) {
-					c = *msg->b_rptr++;
-					ie->u.attr.attr[ie->u.attr.nattr][1] = c;
-					ielen--;
-					if(ielen > 0 && !(c & 0x80)) {
-						c = *msg->b_rptr++;
-						ie->u.attr.attr[ie->u.attr.nattr][2] = c;
-						ielen--;
-					}
-				}
-			}
-			break;
-
-		  case UNI_DIAG_PARAM:
-			ie->h.present |= UNI_CAUSE_PARAM_P;
-			ie->u.param = *msg->b_rptr++;
-			ielen--;
-			break;
-		}
-	}
-
-	IE_END(CAUSE);
-}
-
-DEF_IE_DECODE(itu, cause)
-{
-	return decode_cause(ie, msg, ielen, cx, itu_causes, NULL);
-}
-DEF_IE_DECODE(net, cause)
-{
-	return decode_cause(ie, msg, ielen, cx, net_causes, itu_causes);
-}
-
-/*********************************************************************
- *
- * Callstate
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 59...60
- *  UNI4.0 pp. 14
- *
- * Only ITU-T coding allowed.
- */
-DEF_IE_PRINT(itu, callstate)
-{
-	static const struct uni_print_tbl tbl[] = {
-		MKT(UNI_CALLSTATE_U0,	U0/N0/REST0),
-		MKT(UNI_CALLSTATE_U1,	U1/N1),
-		MKT(UNI_CALLSTATE_U3,	U3/N3),
-		MKT(UNI_CALLSTATE_U4,	U4/N4),
-		MKT(UNI_CALLSTATE_U6,	U6/N6),
-		MKT(UNI_CALLSTATE_U7,	U7/N7),
-		MKT(UNI_CALLSTATE_U8,	U8/N8),
-		MKT(UNI_CALLSTATE_U9,	U9/N9),
-		MKT(UNI_CALLSTATE_U10,	U10/N10),
-		MKT(UNI_CALLSTATE_U11,	U11/N11),
-		MKT(UNI_CALLSTATE_U12,	U12/N12),
-		MKT(UNI_CALLSTATE_REST1,REST1),
-		MKT(UNI_CALLSTATE_REST2,REST2),
-		MKT(UNI_CALLSTATE_U13,	U13/N13),
-		MKT(UNI_CALLSTATE_U14,	U14/N14),
-		EOT()
-	};
-
-	if(uni_print_iehdr("callstate", &ie->h, cx))
-		return;
-	uni_print_tbl("state", ie->state, tbl, cx);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, callstate)
-{
-	UNUSED(cx);
-
-	switch(ie->state) {
-	  default:
-		return -1;
-
-	  case UNI_CALLSTATE_U0:
-	  case UNI_CALLSTATE_U1:
-	  case UNI_CALLSTATE_U3:
-	  case UNI_CALLSTATE_U4:
-	  case UNI_CALLSTATE_U6:
-	  case UNI_CALLSTATE_U7:
-	  case UNI_CALLSTATE_U8:
-	  case UNI_CALLSTATE_U9:
-	  case UNI_CALLSTATE_U10:
-	  case UNI_CALLSTATE_U11:
-	  case UNI_CALLSTATE_U12:
-	  case UNI_CALLSTATE_REST1:
-	  case UNI_CALLSTATE_REST2:
-	  case UNI_CALLSTATE_U13:
-	  case UNI_CALLSTATE_U14:
-		break;
-	}
-
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, callstate)
-{
-	START_IE(callstate, UNI_IE_CALLSTATE, 1);
-
-	APP_BYTE(msg, ie->state);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, callstate)
-{
-	IE_START(;);
-
-	if(ielen != 1)
-		goto rej;
-
-	ie->state = *msg->b_rptr++ & 0x3f;
-	ielen--;
-
-	IE_END(CALLSTATE);
-}
-
-/*********************************************************************
- *
- * Facility Information.
- *
- * References for this IE are:
- *
- *  Q.2932.1
- *
- * The standard allows only ROSE as protocol. We allow everything up to the
- * maximum size.
- *
- * Only ITU-T coding allowed.
- */
-DEF_IE_PRINT(itu, facility)
-{
-	u_int i;
-
-	if(uni_print_iehdr("facility", &ie->h, cx))
-		return;
-
-	if(ie->proto == UNI_FACILITY_ROSE)
-		uni_print_entry(cx, "proto", "rose");
-	else
-		uni_print_entry(cx, "proto", "0x%02x", ie->proto);
-
-	uni_print_entry(cx, "len", "%u", ie->len);
-	uni_print_entry(cx, "info", "(");
-	for(i = 0; i < ie->len; i++)
-		uni_printf(cx, "%s0x%02x", i == 0 ? "" : " ", ie->apdu[i]);
-	uni_printf(cx, ")");
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, facility)
-{
-	UNUSED(cx);
-
-	if(ie->len > UNI_FACILITY_MAXAPDU)
-		return -1;
-
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, facility)
-{
-	START_IE(facility, UNI_IE_FACILITY, 1 + ie->len);
-
-	APP_BYTE(msg, ie->proto | 0x80);
-	APP_BUF(msg, ie->apdu, ie->len);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, facility)
-{
-	u_char c;
-
-	IE_START(;);
-
-	if(ielen > UNI_FACILITY_MAXAPDU + 1 || ielen < 1)
-		goto rej;
-
-	ie->proto = (c = *msg->b_rptr++) & 0x1f;
-	ielen--;
-	if((c & 0xe0) != 0x80)
-		goto rej;
-
-	ie->len = ielen;
-	ielen = 0;
-	(void)memcpy(ie->apdu, msg->b_rptr, ie->len);
-	msg->b_rptr += ie->len;
-
-	IE_END(FACILITY);
-}
-
-/*********************************************************************
- *
- * Notification Indicator
- *
- * References for this IE are:
- *
- *  Q.2931 p.  76
- *  UNI4.0 p.  17
- *
- * Only ITU-T coding allowed.
- */
-
-DEF_IE_PRINT(itu, notify)
-{
-	u_int i;
-
-	if(uni_print_iehdr("notify", &ie->h, cx))
-		return;
-	uni_print_entry(cx, "len", "%u", ie->len);
-	uni_print_entry(cx, "info", "(");
-	for(i = 0; i < ie->len; i++)
-		uni_printf(cx, "%s0x%02x", i == 0 ? "" : " ", ie->notify[i]);
-	uni_printf(cx, ")");
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, notify)
-{
-	UNUSED(cx);
-
-	if(ie->len > UNI_NOTIFY_MAXLEN)
-		return -1;
-
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, notify)
-{
-	START_IE(notify, UNI_IE_NOTIFY, ie->len);
-
-	APP_BUF(msg, ie->notify, ie->len);
-	if (IE_ISERROR(*ie)) {
-		/* make it too long */
-		u_int i = ie->len;
-
-		while (i < UNI_NOTIFY_MAXLEN + 1) {
-			APP_BYTE(msg, 0x00);
-			i++;
-		}
-	}
-
-	SET_IE_LEN(msg);
-	return (0);
-}
-
-DEF_IE_DECODE(itu, notify)
-{
-	IE_START(;);
-
-	if (ielen > UNI_NOTIFY_MAXLEN || ielen < 1)
-		goto rej;
-
-	ie->len = ielen;
-	ielen = 0;
-	(void)memcpy(ie->notify, msg->b_rptr, ie->len);
-	msg->b_rptr += ie->len;
-
-	IE_END(NOTIFY);
-}
-
-/*********************************************************************
- *
- * End-to-end transit delay.
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 70...71
- *  UNI4.0 pp. 69...70
- *  PNNI1.0 pp. 198...200
- *
- * Not clear, whether the new indicator should be used with NET coding or
- * not.
- *
- * Only ITU-T coding allowed.
- */
-
-static void
-print_eetd(struct uni_ie_eetd *ie, struct unicx *cx)
-{
-	if (uni_print_iehdr("eetd", &ie->h, cx))
-		return;
-
-	if (ie->h.present & UNI_EETD_CUM_P)
-		uni_print_entry(cx, "cum", "%u", ie->cumulative);
-	if (ie->h.present & UNI_EETD_MAX_P) {
-		if (ie->maximum == UNI_EETD_ANYMAX)
-			uni_print_entry(cx, "max", "any");
-		else
-			uni_print_entry(cx, "max", "%u", ie->maximum);
-	}
-	if (ie->h.present & UNI_EETD_PCTD_P)
-		uni_print_entry(cx, "pnni_cum", "%u", ie->pctd);
-	if (ie->h.present & UNI_EETD_PMTD_P)
-		uni_print_entry(cx, "pnni_max", "%u", ie->pmtd);
-	if (ie->h.present & UNI_EETD_NET_P)
-		uni_print_flag("netgen", cx);
-
-	uni_print_ieend(cx);
-}
-DEF_IE_PRINT(itu, eetd)
-{
-	print_eetd(ie, cx);
-}
-DEF_IE_PRINT(net, eetd)
-{
-	print_eetd(ie, cx);
-}
-
-DEF_IE_CHECK(itu, eetd)
-{
-
-	UNUSED(cx);
-
-	if (!(ie->h.present & UNI_EETD_CUM_P))
-		return (-1);
-	if (ie->h.present & (UNI_EETD_PMTD_P | UNI_EETD_PCTD_P))
-		return (-1);
-	return (0);
-}
-
-DEF_IE_CHECK(net, eetd)
-{
-
-	if (!cx->pnni) {
-		if (!(ie->h.present & UNI_EETD_CUM_P))
-			return (-1);
-		if (ie->h.present & (UNI_EETD_PMTD_P | UNI_EETD_PCTD_P))
-			return (-1);
-	} else {
-		if (ie->h.present & UNI_EETD_MAX_P)
-			return (-1);
-		if ((ie->h.present & UNI_EETD_CUM_P) &&
-		    (ie->h.present & UNI_EETD_PCTD_P))
-			return (-1);
-	}
-	return (0);
-}
-
-DEF_IE_ENCODE(itu, eetd)
-{
-	START_IE(eetd, UNI_IE_EETD, 9);
-
-	if (ie->h.present & UNI_EETD_CUM_P) {
-		APP_BYTE(msg, UNI_EETD_CTD_ID);
-		APP_16BIT(msg, ie->cumulative);
-	}
-	if (ie->h.present & UNI_EETD_MAX_P) {
-		APP_BYTE(msg, UNI_EETD_MTD_ID);
-		APP_16BIT(msg, ie->maximum);
-	}
-	if (ie->h.present & UNI_EETD_PMTD_P) {
-		APP_BYTE(msg, UNI_EETD_PMTD_ID);
-		APP_24BIT(msg, ie->pmtd);
-	}
-	if (ie->h.present & UNI_EETD_PCTD_P) {
-		APP_BYTE(msg, UNI_EETD_PCTD_ID);
-		APP_24BIT(msg, ie->pctd);
-	}
-	if (ie->h.present & UNI_EETD_NET_P) {
-		APP_BYTE(msg, UNI_EETD_NET_ID);
-	}
-
-	SET_IE_LEN(msg);
-	return (0);
-}
-
-DEF_IE_ENCODE(net, eetd)
-{
-	return (uni_ie_encode_itu_eetd(msg, ie, cx));
-}
-
-DEF_IE_DECODE(itu, eetd)
-{
-	IE_START(;);
-
-	while (ielen > 0) {
-		switch (ielen--, *msg->b_rptr++) {
-
-		  case UNI_EETD_CTD_ID:
-			if (ielen < 2)
-				goto rej;
-			ie->h.present |= UNI_EETD_CUM_P;
-			ie->cumulative = *msg->b_rptr++ << 8;
-			ie->cumulative |= *msg->b_rptr++;
-			ielen -= 2;
-			break;
-
-		  case UNI_EETD_MTD_ID:
-			if (ielen < 2)
-				goto rej;
-			ie->h.present |= UNI_EETD_MAX_P;
-			ie->maximum = *msg->b_rptr++ << 8;
-			ie->maximum |= *msg->b_rptr++;
-			ielen -= 2;
-			break;
-
-		  case UNI_EETD_PCTD_ID:
-			if (ielen < 3)
-				goto rej;
-			ie->h.present |= UNI_EETD_PCTD_P;
-			ie->pctd = *msg->b_rptr++ << 16;
-			ie->pctd |= *msg->b_rptr++ << 8;
-			ie->pctd |= *msg->b_rptr++;
-			ielen -= 3;
-			break;
-
-		  case UNI_EETD_PMTD_ID:
-			if (ielen < 3)
-				goto rej;
-			ie->h.present |= UNI_EETD_PMTD_P;
-			ie->pmtd = *msg->b_rptr++ << 16;
-			ie->pmtd |= *msg->b_rptr++ << 8;
-			ie->pmtd |= *msg->b_rptr++;
-			ielen -= 3;
-			break;
-
-		  case UNI_EETD_NET_ID:
-			ie->h.present |= UNI_EETD_NET_P;
-			break;
-
-		  default:
-			goto rej;
-		}
-	}
-
-	IE_END(EETD);
-}
-DEF_IE_DECODE(net, eetd)
-{
-	return (uni_ie_decode_itu_eetd(ie, msg, ielen, cx));
-}
-
-/*********************************************************************
- *
- * Called address
- * Called subaddress
- * Calling address
- * Calling subaddress
- * Connected address
- * Connected subaddress
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 60...68
- *  ...A4  pp. 27...36
- *  UNI4.0 pp. 14...15
- *  Q.2951 pp. 28...40
- *
- * It is assumed, that the coding of the addr arrays is ok.
- *
- * Only ITU-T coding allowed.
- */
-
-static const struct uni_print_tbl screen_tbl[] = {
-	MKT(UNI_ADDR_SCREEN_NOT,	no),
-	MKT(UNI_ADDR_SCREEN_PASSED,	passed),
-	MKT(UNI_ADDR_SCREEN_FAILED,	failed),
-	MKT(UNI_ADDR_SCREEN_NET,	network),
-	EOT()
-};
-static const struct uni_print_tbl pres_tbl[] = {
-	MKT(UNI_ADDR_PRES,		allowed),
-	MKT(UNI_ADDR_RESTRICT,		restricted),
-	MKT(UNI_ADDR_NONUMBER,		no-number),
-	EOT()
-};
-
-
-static void
-print_addr(struct unicx *cx, struct uni_addr *addr)
-{
-	static const struct uni_print_tbl plan_tbl[] = {
-		MKT(UNI_ADDR_UNKNOWN,	unknown),
-		MKT(UNI_ADDR_E164,	E164),
-		MKT(UNI_ADDR_ATME,	ATME),
-		MKT(UNI_ADDR_DATA,	data),
-		MKT(UNI_ADDR_PRIVATE,	private),
-		EOT()
-	};
-	static const struct uni_print_tbl type_tbl[] = {
-		MKT(UNI_ADDR_UNKNOWN,		unknown),
-		MKT(UNI_ADDR_INTERNATIONAL,	international),
-		MKT(UNI_ADDR_NATIONAL,		national),
-		MKT(UNI_ADDR_NETWORK,		network),
-		MKT(UNI_ADDR_SUBSCR,		subscriber),
-		MKT(UNI_ADDR_ABBR,		abbreviated),
-		EOT()
-	};
-	u_int i;
-
-	uni_print_entry(cx, "addr", "(");
-	uni_print_tbl(NULL, addr->type, type_tbl, cx);
-	uni_putc(',', cx);
-	uni_print_tbl(NULL, addr->plan, plan_tbl, cx);
-	uni_putc(',', cx);
-	if(addr->plan == UNI_ADDR_E164) {
-		uni_putc('"', cx);
-		for(i = 0; i < addr->len; i++) {
-			if(addr->addr[i] < ' ')
-				uni_printf(cx, "^%c", addr->addr[i] + '@');
-			else if(addr->addr[i] <= '~')
-				uni_putc(addr->addr[i], cx);
-			else
-				uni_printf(cx, "\\%03o", addr->addr[i]);
-		}
-		uni_putc('"', cx);
-
-	} else if(addr->plan == UNI_ADDR_ATME) {
-		for(i = 0; i < addr->len; i++)
-			uni_printf(cx, "%02x", addr->addr[i]);
-	}
-	uni_putc(')', cx);
-}
-
-static void
-print_addrsub(struct unicx *cx, struct uni_subaddr *addr)
-{
-	static const struct uni_print_tbl type_tbl[] = {
-		MKT(UNI_SUBADDR_NSAP,	NSAP),
-		MKT(UNI_SUBADDR_ATME,	ATME),
-		MKT(UNI_SUBADDR_USER,	USER),
-		EOT()
-	};
-	u_int i;
-
-	uni_print_entry(cx, "addr", "(");
-	uni_print_tbl(NULL, addr->type, type_tbl, cx);
-	uni_putc(',', cx);
-
-	for(i = 0; i < addr->len; i++)
-		uni_printf(cx, "%02x", addr->addr[i]);
-
-	uni_putc(')', cx);
-}
-
-static int
-check_addr(struct uni_addr *addr)
-{
-	u_int i;
-
-	switch(addr->plan) {
-	  default:
-		return -1;
-
-	  case UNI_ADDR_E164:
-		if(addr->type != UNI_ADDR_INTERNATIONAL)
-			return -1;
-		if(addr->len > 15 || addr->len == 0)
-			return -1;
-		for(i = 0; i < addr->len; i++)
-			if(addr->addr[i] == 0 || (addr->addr[i] & 0x80))
-				return -1;
-		break;
-
-	  case UNI_ADDR_ATME:
-		if(addr->type != UNI_ADDR_UNKNOWN)
-			return -1;
-		if(addr->len != 20)
-			return -1;
-		break;
-	}
-
-	return 0;
-}
-
-static int
-check_subaddr(struct uni_subaddr *addr)
-{
-	switch(addr->type) {
-	  default:
-		return -1;
-
-	  case UNI_SUBADDR_NSAP:
-		if(addr->len != 20)
-			return -1;
-		break;
-
-	  case UNI_SUBADDR_ATME:
-		if(addr->len > 20)
-			return -1;
-		break;
-	}
-	return 0;
-}
-
-static int
-check_screen(enum uni_addr_screen screen, enum uni_addr_pres pres)
-{
-	switch(pres) {
-	  default:
-		return -1;
-
-	  case UNI_ADDR_PRES:
-	  case UNI_ADDR_RESTRICT:
-	  case UNI_ADDR_NONUMBER:
-		break;
-	}
-	switch(screen) {
-	  default:
-		return -1;
-
-	  case UNI_ADDR_SCREEN_NOT:
-	  case UNI_ADDR_SCREEN_PASSED:
-	  case UNI_ADDR_SCREEN_FAILED:
-	  case UNI_ADDR_SCREEN_NET:
-		break;
-	}
-
-	return 0;
-}
-
-static void
-encode_addr(struct uni_msg *msg, struct uni_addr *addr, u_int flag,
-    enum uni_addr_screen screen, enum uni_addr_pres pres, int err)
-{
-	u_char ext = err ? 0x00 : 0x80;
-
-	if (flag) {
-		APP_BYTE(msg, (addr->type << 4) | addr->plan);
-		APP_BYTE(msg, ext | (pres << 5) | (screen));
-	} else {
-		APP_BYTE(msg, ext | (addr->type << 4) | addr->plan);
-	}
-	APP_BUF(msg, addr->addr, addr->len);
-}
-
-static void
-encode_subaddr(struct uni_msg *msg, struct uni_subaddr *addr)
-{
-	APP_BYTE(msg, 0x80|(addr->type<<4));
-	APP_BUF(msg, addr->addr, addr->len);
-}
-
-static int
-decode_addr(struct uni_addr *addr, u_int ielen, struct uni_msg *msg, u_int plan)
-{
-	addr->plan = plan & 0xf;
-	addr->type = (plan >> 4) & 0x7;
-
-	switch(addr->plan) {
-
-	  case UNI_ADDR_E164:
-		if(ielen > 15 || ielen == 0)
-			return -1;
-		addr->addr[ielen] = 0;
-		break;
-
-	  case UNI_ADDR_ATME:
-		if(ielen != 20)
-			return -1;
-		break;
-
-	  default:
-		return -1;
-	}
-	(void)memcpy(addr->addr, msg->b_rptr, ielen);
-	addr->len = ielen;
-	msg->b_rptr += ielen;
-
-	return 0;
-}
-
-static int
-decode_subaddr(struct uni_subaddr *addr, u_int ielen, struct uni_msg *msg,
-    u_int type)
-{
-	switch(addr->type = (type >> 4) & 0x7) {
-
-	  case UNI_SUBADDR_NSAP:
-		if(ielen == 0 || ielen > 20)
-			return -1;
-		break;
-
-	  case UNI_SUBADDR_ATME:
-		if(ielen != 20)
-			return -1;
-		break;
-
-	  default:
-		return -1;
-	}
-	if(!(type & 0x80))
-		return -1;
-	if((type & 0x7) != 0)
-		return -1;
-
-	addr->len = ielen;
-	(void)memcpy(addr->addr, msg->b_rptr, ielen);
-	msg->b_rptr += ielen;
-
-	return 0;
-}
-
-/**********************************************************************/
-
-DEF_IE_PRINT(itu, called)
-{
-	if (uni_print_iehdr("called", &ie->h, cx))
-		return;
-	print_addr(cx, &ie->addr);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, called)
-{
-	UNUSED(cx);
-
-	if (check_addr(&ie->addr))
-		return (-1);
-	return (0);
-}
-
-DEF_IE_ENCODE(itu, called)
-{
-	START_IE(called, UNI_IE_CALLED, 21);
-	encode_addr(msg, &ie->addr, 0, 0, 0, IE_ISERROR(*ie));
-	SET_IE_LEN(msg);
-	return (0);
-}
-
-DEF_IE_DECODE(itu, called)
-{
-	u_char c;
-	IE_START(;);
-
-	if (ielen > 21 || ielen < 1)
-		goto rej;
-
-	c = *msg->b_rptr++;
-	ielen--;
-
-	if (!(c & 0x80))
-		goto rej;
-
-	if (decode_addr(&ie->addr, ielen, msg, c))
-		goto rej;
-
-	IE_END(CALLED);
-}
-
-/**********************************************************************/
-
-DEF_IE_PRINT(itu, calledsub)
-{
-	if(uni_print_iehdr("calledsub", &ie->h, cx))
-		return;
-	print_addrsub(cx, &ie->addr);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, calledsub)
-{
-	UNUSED(cx);
-
-	if(check_subaddr(&ie->addr))
-		return -1;
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, calledsub)
-{
-	START_IE(calledsub, UNI_IE_CALLEDSUB, 21);
-	encode_subaddr(msg, &ie->addr);
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, calledsub)
-{
-	u_char c;
-
-	IE_START(;);
-
-	if(ielen > 21)
-		goto rej;
-
-	c = *msg->b_rptr++;
-	ielen--;
-
-	if(decode_subaddr(&ie->addr, ielen, msg, c))
-		goto rej;
-
-	IE_END(CALLEDSUB);
-}
-
-/**********************************************************************/
-
-DEF_IE_PRINT(itu, calling)
-{
-	if(uni_print_iehdr("calling", &ie->h, cx))
-		return;
-	print_addr(cx, &ie->addr);
-
-	if(ie->h.present & UNI_CALLING_SCREEN_P) {
-		uni_print_tbl("screening", ie->screen, screen_tbl, cx);
-		uni_print_tbl("presentation", ie->pres, pres_tbl, cx);
-	}
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, calling)
-{
-	UNUSED(cx);
-
-	if(check_addr(&ie->addr))
-		return -1;
-
-	if(ie->h.present & UNI_CALLING_SCREEN_P)
-		if(check_screen(ie->screen, ie->pres))
-			return -1;
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, calling)
-{
-	START_IE(calling, UNI_IE_CALLING, 22);
-	encode_addr(msg, &ie->addr, ie->h.present & UNI_CALLING_SCREEN_P, ie->screen, ie->pres, IE_ISERROR(*ie));
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, calling)
-{
-	u_char c, plan;
-
-	IE_START(;);
-
-	if(ielen > 22 || ielen < 1)
-		goto rej;
-
-	plan = *msg->b_rptr++;
-	ielen--;
-
-	if(!(plan & 0x80)) {
-		if(ielen == 0)
-			goto rej;
-		ielen--;
-		c = *msg->b_rptr++;
-
-		ie->h.present |= UNI_CALLING_SCREEN_P;
-		ie->pres = (c >> 5) & 0x3;
-		ie->screen = c & 0x3;
-
-		if(!(c & 0x80))
-			goto rej;
-	}
-
-	if(decode_addr(&ie->addr, ielen, msg, plan))
-		goto rej;
-
-	IE_END(CALLING);
-}
-
-/**********************************************************************/
-
-DEF_IE_PRINT(itu, callingsub)
-{
-	if(uni_print_iehdr("callingsub", &ie->h, cx))
-		return;
-	print_addrsub(cx, &ie->addr);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, callingsub)
-{
-	UNUSED(cx);
-
-	if(check_subaddr(&ie->addr))
-		return -1;
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, callingsub)
-{
-	START_IE(callingsub, UNI_IE_CALLINGSUB, 21);
-	encode_subaddr(msg, &ie->addr);
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, callingsub)
-{
-	u_char c;
-
-	IE_START(;);
-
-	if(ielen > 21)
-		goto rej;
-
-	c = *msg->b_rptr++;
-	ielen--;
-
-	if(decode_subaddr(&ie->addr, ielen, msg, c))
-		goto rej;
-
-	IE_END(CALLINGSUB);
-}
-
-/**********************************************************************/
-
-DEF_IE_PRINT(itu, conned)
-{
-	if(uni_print_iehdr("conned", &ie->h, cx))
-		return;
-	print_addr(cx, &ie->addr);
-
-	if(ie->h.present & UNI_CONNED_SCREEN_P) {
-		uni_print_tbl("screening", ie->screen, screen_tbl, cx);
-		uni_print_tbl("presentation", ie->pres, pres_tbl, cx);
-	}
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, conned)
-{
-	UNUSED(cx);
-
-	if(check_addr(&ie->addr))
-		return -1;
-
-	if(ie->h.present & UNI_CONNED_SCREEN_P)
-		if(check_screen(ie->screen, ie->pres))
-			return -1;
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, conned)
-{
-	START_IE(conned, UNI_IE_CONNED, 22);
-	encode_addr(msg, &ie->addr, ie->h.present & UNI_CONNED_SCREEN_P, ie->screen, ie->pres, IE_ISERROR(*ie));
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, conned)
-{
-	u_char c, plan;
-
-	IE_START(;);
-
-	if(ielen > 22 || ielen < 1)
-		goto rej;
-
-	plan = *msg->b_rptr++;
-	ielen--;
-
-	if(!(plan & 0x80)) {
-		if(ielen == 0)
-			goto rej;
-		ielen--;
-		c = *msg->b_rptr++;
-
-		ie->h.present |= UNI_CONNED_SCREEN_P;
-		ie->pres = (c >> 5) & 0x3;
-		ie->screen = c & 0x3;
-
-		if(!(c & 0x80))
-			goto rej;
-	}
-
-	if(decode_addr(&ie->addr, ielen, msg, plan))
-		goto rej;
-
-	IE_END(CONNED);
-}
-
-/**********************************************************************/
-
-DEF_IE_PRINT(itu, connedsub)
-{
-	if(uni_print_iehdr("connedsub", &ie->h, cx))
-		return;
-	print_addrsub(cx, &ie->addr);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, connedsub)
-{
-	UNUSED(cx);
-
-	if(check_subaddr(&ie->addr))
-		return -1;
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, connedsub)
-{
-	START_IE(connedsub, UNI_IE_CONNEDSUB, 21);
-	encode_subaddr(msg, &ie->addr);
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, connedsub)
-{
-	u_char c;
-
-	IE_START(;);
-
-	if(ielen > 21)
-		goto rej;
-
-	c = *msg->b_rptr++;
-	ielen--;
-
-	if(decode_subaddr(&ie->addr, ielen, msg, c))
-		goto rej;
-
-	IE_END(CONNEDSUB);
-}
-
-/*********************************************************************
- *
- * Endpoint reference.
- *
- * References for this IE are:
- *
- *  Q.2971 p.  14
- *
- * Only ITU-T coding allowed.
- */
-
-DEF_IE_PRINT(itu, epref)
-{
-	if(uni_print_iehdr("epref", &ie->h, cx))
-		return;
-	uni_print_entry(cx, "epref", "(%u,%u)", ie->flag, ie->epref);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, epref)
-{
-	UNUSED(cx);
-
-	if(ie->epref >= (2<<15))
-		return -1;
-
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, epref)
-{
-	START_IE(epref, UNI_IE_EPREF, 3);
-
-	if (IE_ISERROR(*ie))
-		APP_BYTE(msg, 0xff);
-	else
-		APP_BYTE(msg, 0);
-	APP_BYTE(msg, (ie->flag << 7) | ((ie->epref >> 8) & 0x7f));
-	APP_BYTE(msg, (ie->epref & 0xff));
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, epref)
-{
-	u_char c;
-
-	IE_START(;);
-
-	if(ielen != 3)
-		goto rej;
-	if(*msg->b_rptr++ != 0)
-		goto rej;
-
-	c = *msg->b_rptr++;
-	ie->flag = (c & 0x80) ? 1 : 0;
-	ie->epref = (c & 0x7f) << 8;
-	ie->epref |= *msg->b_rptr++;
-
-	IE_END(EPREF);
-}
-
-/*********************************************************************
- *
- * Endpoint state.
- *
- * References for this IE are:
- *
- *  Q.2971 pp. 14...15
- *
- * Only ITU-T coding allowed.
- */
-
-DEF_IE_PRINT(itu, epstate)
-{
-	static const struct uni_print_tbl tbl[] = {
-		MKT(UNI_EPSTATE_NULL,		null),
-		MKT(UNI_EPSTATE_ADD_INIT,	add-initiated),
-		MKT(UNI_EPSTATE_ALERT_DLVD,	alerting-delivered),
-		MKT(UNI_EPSTATE_ADD_RCVD,	add-received),
-		MKT(UNI_EPSTATE_ALERT_RCVD,	alerting-received),
-		MKT(UNI_EPSTATE_ACTIVE,		active),
-		MKT(UNI_EPSTATE_DROP_INIT,	drop-initiated),
-		MKT(UNI_EPSTATE_DROP_RCVD,	drop-received),
-		EOT()
-	};
-
-	if(uni_print_iehdr("epstate", &ie->h, cx))
-		return;
-	uni_print_tbl("state", ie->state, tbl, cx);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, epstate)
-{
-	UNUSED(cx);
-
-	switch(ie->state) {
-	  default:
-		return -1;
-
-	  case UNI_EPSTATE_NULL:
-	  case UNI_EPSTATE_ADD_INIT:
-	  case UNI_EPSTATE_ALERT_DLVD:
-	  case UNI_EPSTATE_ADD_RCVD:
-	  case UNI_EPSTATE_ALERT_RCVD:
-	  case UNI_EPSTATE_DROP_INIT:
-	  case UNI_EPSTATE_DROP_RCVD:
-	  case UNI_EPSTATE_ACTIVE:
-		break;
-	}
-
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, epstate)
-{
-	START_IE(epstate, UNI_IE_EPSTATE, 1);
-
-	APP_BYTE(msg, ie->state);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, epstate)
-{
-	IE_START(;);
-
-	if(ielen != 1)
-		goto rej;
-
-	ie->state = *msg->b_rptr++ & 0x3f;
-
-	IE_END(EPSTATE);
-}
-
-/*********************************************************************
- *
- * ATM adaptation layer parameters
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 43...49
- *  Q.2931 Amd 2
- *  UNI4.0 p.  9
- *
- * UNI4.0 states, that AAL2 is not supported. However we keep it. No
- * parameters are associated with AAL2.
- *
- * Amd2 not checked. XXX
- *
- * Only ITU-T coding allowed.
- */
-DEF_IE_PRINT(itu, aal)
-{
-	static const struct uni_print_tbl aal_tbl[] = {
-		MKT(UNI_AAL_0,			VOICE),
-		MKT(UNI_AAL_1,			1),
-		MKT(UNI_AAL_2,			2),
-		MKT(UNI_AAL_4,			3/4),
-		MKT(UNI_AAL_5,			5),
-		MKT(UNI_AAL_USER,		USER),
-		EOT()
-	};
-	static const struct uni_print_tbl subtype_tbl[] = {
-		MKT(UNI_AAL1_SUB_NULL,		null),
-		MKT(UNI_AAL1_SUB_VOICE,		voice),
-		MKT(UNI_AAL1_SUB_CIRCUIT,	circuit),
-		MKT(UNI_AAL1_SUB_HQAUDIO,	hqaudio),
-		MKT(UNI_AAL1_SUB_VIDEO,		video),
-		EOT()
-	};
-	static const struct uni_print_tbl cbr_rate_tbl[] = {
-		MKT(UNI_AAL1_CBR_64,		64),
-		MKT(UNI_AAL1_CBR_1544,		1544(DS1)),
-		MKT(UNI_AAL1_CBR_6312,		6312(DS2)),
-		MKT(UNI_AAL1_CBR_32064,		32064),
-		MKT(UNI_AAL1_CBR_44736,		44736(DS3)),
-		MKT(UNI_AAL1_CBR_97728,		97728),
-		MKT(UNI_AAL1_CBR_2048,		2048(E1)),
-		MKT(UNI_AAL1_CBR_8448,		8448(E2)),
-		MKT(UNI_AAL1_CBR_34368,		34368(E3)),
-		MKT(UNI_AAL1_CBR_139264,	139264),
-		MKT(UNI_AAL1_CBR_N64,		Nx64),
-		MKT(UNI_AAL1_CBR_N8,		Nx8),
-		EOT()
-	};
-	static const struct uni_print_tbl screc_tbl[] = {
-		MKT(UNI_AAL1_SCREC_NULL,	null),
-		MKT(UNI_AAL1_SCREC_SRTS,	srts),
-		MKT(UNI_AAL1_SCREC_ACLK,	aclk),
-		EOT()
-	};
-	static const struct uni_print_tbl ecm_tbl[] = {
-		MKT(UNI_AAL1_ECM_NULL,		null),
-		MKT(UNI_AAL1_ECM_LOSS,		loss),
-		MKT(UNI_AAL1_ECM_DELAY,		delay),
-		EOT()
-	};
-	static const struct uni_print_tbl sscs_tbl[] = {
-		MKT(UNI_AAL_SSCS_NULL,		null),
-		MKT(UNI_AAL_SSCS_SSCOPA,	sscopa),
-		MKT(UNI_AAL_SSCS_SSCOPU,	sscopu),
-		MKT(UNI_AAL_SSCS_FRAME,		frame),
-		EOT()
-	};
-
-	if(uni_print_iehdr("aal", &ie->h, cx))
-		return;
-	uni_print_tbl("type", ie->type, aal_tbl, cx);
-
-	switch(ie->type) {
-
-	  case UNI_AAL_0:
-		uni_print_push_prefix("0", cx);
-		cx->indent++;
-		break;
-
-	  case UNI_AAL_2:
-		uni_print_push_prefix("2", cx);
-		cx->indent++;
-		break;
-
-	  case UNI_AAL_1:
-		uni_print_push_prefix("1", cx);
-		cx->indent++;
-		uni_print_tbl("subtype", ie->u.aal1.subtype, subtype_tbl, cx);
-		uni_print_tbl("cbr_rate", ie->u.aal1.cbr_rate, cbr_rate_tbl, cx);
-		if(ie->h.present & UNI_AAL1_MULT_P)
-			uni_print_entry(cx, "mult", "%u", ie->u.aal1.mult);
-		if(ie->h.present & UNI_AAL1_SCREC_P)
-			uni_print_tbl("screc", ie->u.aal1.screc, screc_tbl, cx);
-		if(ie->h.present & UNI_AAL1_ECM_P)
-			uni_print_tbl("ecm", ie->u.aal1.ecm, ecm_tbl, cx);
-		if(ie->h.present & UNI_AAL1_BSIZE_P)
-			uni_print_entry(cx, "bsize", "%u", ie->u.aal1.bsize);
-		if(ie->h.present & UNI_AAL1_PART_P)
-			uni_print_entry(cx, "part", "%u", ie->u.aal1.part);
-		break;
-
-	  case UNI_AAL_4:
-		uni_print_push_prefix("4", cx);
-		cx->indent++;
-		if(ie->h.present & UNI_AAL4_CPCS_P)
-			uni_print_entry(cx, "cpcs", "(%u,%u)", ie->u.aal4.fwd_cpcs,
-				ie->u.aal4.bwd_cpcs);
-		if(ie->h.present & UNI_AAL4_MID_P)
-			uni_print_entry(cx, "mid", "(%u,%u)", ie->u.aal4.mid_low,
-				ie->u.aal4.mid_high);
-		if(ie->h.present & UNI_AAL4_SSCS_P)
-			uni_print_tbl("sscs", ie->u.aal4.sscs, sscs_tbl, cx);
-		break;
-
-	  case UNI_AAL_5:
-		uni_print_push_prefix("5", cx);
-		cx->indent++;
-		if(ie->h.present & UNI_AAL5_CPCS_P)
-			uni_print_entry(cx, "cpcs", "(%u,%u)", ie->u.aal5.fwd_cpcs,
-				ie->u.aal5.bwd_cpcs);
-		if(ie->h.present & UNI_AAL5_SSCS_P)
-			uni_print_tbl("sscs", ie->u.aal5.sscs, sscs_tbl, cx);
-		break;
-
-	  case UNI_AAL_USER:
-		uni_print_push_prefix("user", cx);
-		cx->indent++;
-		if(ie->u.aalu.len > 4) {
-			uni_print_entry(cx, "info", "ERROR(len=%u)", ie->u.aalu.len);
-		} else {
-			u_int i;
-
-			uni_print_entry(cx, "info", "(");
-			for(i = 0; i < ie->u.aalu.len; i++)
-				uni_printf(cx, "%s%u", !i?"":",", ie->u.aalu.user[i]);
-			uni_printf(cx, ")");
-		}
-		break;
-	}
-	cx->indent--;
-	uni_print_pop_prefix(cx);
-	uni_print_eol(cx);
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, aal)
-{
-	UNUSED(cx);
-
-	if(ie->type == UNI_AAL_0) {
-		;
-	} else if(ie->type == UNI_AAL_1) {
-		switch(ie->u.aal1.subtype) {
-
-		  default:
-			return -1;
-
-		  case UNI_AAL1_SUB_NULL:
-		  case UNI_AAL1_SUB_VOICE:
-		  case UNI_AAL1_SUB_CIRCUIT:
-		  case UNI_AAL1_SUB_HQAUDIO:
-		  case UNI_AAL1_SUB_VIDEO:
-			break;
-		}
-		switch(ie->u.aal1.cbr_rate) {
-
-		  default:
-			return -1;
-
-		  case UNI_AAL1_CBR_64:
-		  case UNI_AAL1_CBR_1544:
-		  case UNI_AAL1_CBR_6312:
-		  case UNI_AAL1_CBR_32064:
-		  case UNI_AAL1_CBR_44736:
-		  case UNI_AAL1_CBR_97728:
-		  case UNI_AAL1_CBR_2048:
-		  case UNI_AAL1_CBR_8448:
-		  case UNI_AAL1_CBR_34368:
-		  case UNI_AAL1_CBR_139264:
-			if((ie->h.present & UNI_AAL1_MULT_P))
-				return -1;
-			break;
-
-		  case UNI_AAL1_CBR_N64:
-			if(!(ie->h.present & UNI_AAL1_MULT_P))
-				return -1;
-			if(ie->u.aal1.mult < 2)
-				return -1;
-			break;
-
-		  case UNI_AAL1_CBR_N8:
-			if(!(ie->h.present & UNI_AAL1_MULT_P))
-				return -1;
-			if(ie->u.aal1.mult == 0 || ie->u.aal1.mult > 7)
-				return -1;
-			break;
-		}
-		if(ie->h.present & UNI_AAL1_SCREC_P) {
-			switch(ie->u.aal1.screc) {
-
-			  default:
-				return -1;
-
-			  case UNI_AAL1_SCREC_NULL:
-			  case UNI_AAL1_SCREC_SRTS:
-			  case UNI_AAL1_SCREC_ACLK:
-				break;
-			}
-		}
-		if(ie->h.present & UNI_AAL1_ECM_P) {
-			switch(ie->u.aal1.ecm) {
-
-			  default:
-				return -1;
-
-			  case UNI_AAL1_ECM_NULL:
-			  case UNI_AAL1_ECM_LOSS:
-			  case UNI_AAL1_ECM_DELAY:
-				break;
-			}
-		}
-		if(ie->h.present & UNI_AAL1_BSIZE_P) {
-			if(ie->u.aal1.bsize == 0)
-				return -1;
-		}
-		if(ie->h.present & UNI_AAL1_PART_P) {
-			if(ie->u.aal1.part == 0 || ie->u.aal1.part > 47)
-				return -1;
-		}
-
-	} else if(ie->type == UNI_AAL_2) {
-		;
-
-	} else if(ie->type == UNI_AAL_4) {
-		if(ie->h.present & UNI_AAL4_MID_P) {
-			if(ie->u.aal4.mid_low >= 1024)
-				return -1;
-			if(ie->u.aal4.mid_high >= 1024)
-				return -1;
-			if(ie->u.aal4.mid_low > ie->u.aal4.mid_high)
-				return -1;
-		}
-		if(ie->h.present & UNI_AAL4_SSCS_P) {
-			switch(ie->u.aal4.sscs) {
-
-			  default:
-				return -1;
-
-			  case UNI_AAL_SSCS_NULL:
-			  case UNI_AAL_SSCS_SSCOPA:
-			  case UNI_AAL_SSCS_SSCOPU:
-			  case UNI_AAL_SSCS_FRAME:
-				break;
-			}
-		}
-
-	} else if(ie->type == UNI_AAL_5) {
-		if(ie->h.present & UNI_AAL5_SSCS_P) {
-			switch(ie->u.aal5.sscs) {
-
-			  default:
-				return -1;
-
-			  case UNI_AAL_SSCS_NULL:
-			  case UNI_AAL_SSCS_SSCOPA:
-			  case UNI_AAL_SSCS_SSCOPU:
-			  case UNI_AAL_SSCS_FRAME:
-				break;
-			}
-		}
-
-	} else if(ie->type == UNI_AAL_USER) {
-		if(ie->u.aalu.len > 4)
-			return -1;
-
-	} else
-		return -1;
-
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, aal)
-{
-	START_IE(aal, UNI_IE_AAL, 16);
-
-	APP_BYTE(msg, ie->type);
-	switch(ie->type) {
-
-	  case UNI_AAL_0:
-		break;
-
-	  case UNI_AAL_1:
-		APP_SUB_BYTE(msg,
-			UNI_AAL_SUB_ID, ie->u.aal1.subtype);
-		APP_SUB_BYTE(msg,
-			UNI_AAL_CBR_ID, ie->u.aal1.cbr_rate);
-		APP_OPT_16BIT(msg, ie->h.present, UNI_AAL1_MULT_P,
-			UNI_AAL_MULT_ID, ie->u.aal1.mult);
-		APP_OPT_BYTE(msg, ie->h.present, UNI_AAL1_SCREC_P,
-			UNI_AAL_SCREC_ID, ie->u.aal1.screc);
-		APP_OPT_BYTE(msg, ie->h.present, UNI_AAL1_ECM_P,
-			UNI_AAL_ECM_ID, ie->u.aal1.ecm);
-		APP_OPT_16BIT(msg, ie->h.present, UNI_AAL1_BSIZE_P,
-			UNI_AAL_BSIZE_ID, ie->u.aal1.bsize);
-		APP_OPT_BYTE(msg, ie->h.present, UNI_AAL1_PART_P,
-			UNI_AAL_PART_ID, ie->u.aal1.part);
-		break;
-
-	  case UNI_AAL_2:
-		break;
-
-	  case UNI_AAL_4:
-		if(ie->h.present & UNI_AAL4_CPCS_P) {
-			APP_SUB_16BIT(msg,
-				UNI_AAL_FWDCPCS_ID, ie->u.aal4.fwd_cpcs);
-			APP_SUB_16BIT(msg,
-				UNI_AAL_BWDCPCS_ID, ie->u.aal4.bwd_cpcs);
-		}
-		if(ie->h.present & UNI_AAL4_MID_P) {
-			APP_BYTE(msg, UNI_AAL_MID_ID);
-			APP_16BIT(msg, ie->u.aal4.mid_low);
-			APP_16BIT(msg, ie->u.aal4.mid_high);
-		}
-		APP_OPT_BYTE(msg, ie->h.present, UNI_AAL4_SSCS_P,
-			UNI_AAL_SSCS_ID, ie->u.aal4.sscs);
-		break;
-
-	  case UNI_AAL_5:
-		if(ie->h.present & UNI_AAL5_CPCS_P) {
-			APP_SUB_16BIT(msg,
-				UNI_AAL_FWDCPCS_ID, ie->u.aal5.fwd_cpcs);
-			APP_SUB_16BIT(msg,
-				UNI_AAL_BWDCPCS_ID, ie->u.aal5.bwd_cpcs);
-		}
-		APP_OPT_BYTE(msg, ie->h.present, UNI_AAL5_SSCS_P,
-			UNI_AAL_SSCS_ID, ie->u.aal5.sscs);
-		break;
-
-	  case UNI_AAL_USER:
-		APP_BUF(msg, ie->u.aalu.user, ie->u.aalu.len);
-		break;
-
-	  default:
-		return -1;
-	}
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-/*
- * XXX What should we do with multiple subtype occurences? Ignore
- * or reject. Currently we reject.
- */
-static int
-decode_aal_1(struct uni_ie_aal *ie, struct uni_msg *msg, u_int ielen)
-{
-	int subtype_p, cbr_p;
-
-	subtype_p = cbr_p = 0;
-
-	while(ielen-- > 0) {
-		switch(*msg->b_rptr++) {
-
-		  case UNI_AAL_SUB_ID:
-			if(ielen == 0 || subtype_p)
-				return -1;
-			ielen--;
-			subtype_p = 1;
-			ie->u.aal1.subtype = *msg->b_rptr++;
-			break;
-
-		  case UNI_AAL_CBR_ID:
-			if(ielen == 0 || cbr_p)
-				return -1;
-			ielen--;
-			cbr_p = 1;
-			ie->u.aal1.cbr_rate = *msg->b_rptr++;
-			break;
-
-		  case UNI_AAL_MULT_ID:
-			if(ielen < 2 || (ie->h.present & UNI_AAL1_MULT_P))
-				return -1;
-			ielen -= 2;
-			ie->h.present |= UNI_AAL1_MULT_P;
-			ie->u.aal1.mult  = *msg->b_rptr++ << 8;
-			ie->u.aal1.mult |= *msg->b_rptr++;
-			break;
-			
-		  case UNI_AAL_SCREC_ID:
-			if(ielen == 0 || (ie->h.present & UNI_AAL1_SCREC_P))
-				return -1;
-			ielen--;
-			ie->h.present |= UNI_AAL1_SCREC_P;
-			ie->u.aal1.screc = *msg->b_rptr++;
-			break;
-
-		  case UNI_AAL_ECM_ID:
-			if(ielen == 0 || (ie->h.present & UNI_AAL1_ECM_P))
-				return -1;
-			ielen--;
-			ie->h.present |= UNI_AAL1_ECM_P;
-			ie->u.aal1.ecm = *msg->b_rptr++;
-			break;
-
-		  case UNI_AAL_BSIZE_ID:
-			if(ielen < 2 || (ie->h.present & UNI_AAL1_BSIZE_P))
-				return -1;
-			ielen -= 2;
-			ie->h.present |= UNI_AAL1_BSIZE_P;
-			ie->u.aal1.bsize  = *msg->b_rptr++ << 8;
-			ie->u.aal1.bsize |= *msg->b_rptr++;
-			break;
-
-		  case UNI_AAL_PART_ID:
-			if(ielen == 0 || (ie->h.present & UNI_AAL1_PART_P))
-				return -1;
-			ielen--;
-			ie->h.present |= UNI_AAL1_PART_P;
-			ie->u.aal1.part = *msg->b_rptr++;
-			break;
-
-		  default:
-			return -1;
-		}
-	}
-	if(!subtype_p || !cbr_p)
-		return -1;
-
-	return 0;
-}
-
-static int
-decode_aal_4(struct uni_ie_aal *ie, struct uni_msg *msg, u_int ielen)
-{
-	int fcpcs_p, bcpcs_p;
-
-	fcpcs_p = bcpcs_p = 0;
-
-	while(ielen-- > 0) {
-		switch(*msg->b_rptr++) {
-
-		  case UNI_AAL_FWDCPCS_ID:
-			if(ielen < 2 || fcpcs_p)
-				return -1;
-			ielen -= 2;
-			fcpcs_p = 1;
-			ie->u.aal4.fwd_cpcs  = *msg->b_rptr++ << 8;
-			ie->u.aal4.fwd_cpcs |= *msg->b_rptr++;
-			break;
-
-		  case UNI_AAL_BWDCPCS_ID:
-			if(ielen < 2 || bcpcs_p)
-				return -1;
-			ielen -= 2;
-			bcpcs_p = 1;
-			ie->u.aal4.bwd_cpcs  = *msg->b_rptr++ << 8;
-			ie->u.aal4.bwd_cpcs |= *msg->b_rptr++;
-			break;
-
-		  case UNI_AAL_MID_ID:
-			if(ielen < 4 || (ie->h.present & UNI_AAL4_MID_P))
-				return -1;
-			ielen -= 4;
-			ie->h.present |= UNI_AAL4_MID_P;
-			ie->u.aal4.mid_low  = *msg->b_rptr++ << 8;
-			ie->u.aal4.mid_low |= *msg->b_rptr++;
-			ie->u.aal4.mid_high  = *msg->b_rptr++ << 8;
-			ie->u.aal4.mid_high |= *msg->b_rptr++;
-			break;
-
-		  case UNI_AAL_SSCS_ID:
-			if(ielen == 0 || (ie->h.present & UNI_AAL4_SSCS_P))
-				return -1;
-			ielen--;
-			ie->h.present |= UNI_AAL4_SSCS_P;
-			ie->u.aal4.sscs = *msg->b_rptr++;
-			break;
-
-		  default:
-			return -1;
-		}
-	}
-
-	if(fcpcs_p ^ bcpcs_p)
-		return -1;
-	if(fcpcs_p)
-		ie->h.present |= UNI_AAL4_CPCS_P;
-
-	return 0;
-}
-
-static int
-decode_aal_5(struct uni_ie_aal *ie, struct uni_msg *msg, u_int ielen)
-{
-	int fcpcs_p, bcpcs_p;
-
-	fcpcs_p = bcpcs_p = 0;
-
-	while(ielen-- > 0) {
-		switch(*msg->b_rptr++) {
-
-		  case UNI_AAL_FWDCPCS_ID:
-			if(ielen < 2 || fcpcs_p)
-				return -1;
-			ielen -= 2;
-			fcpcs_p = 1;
-			ie->u.aal5.fwd_cpcs  = *msg->b_rptr++ << 8;
-			ie->u.aal5.fwd_cpcs |= *msg->b_rptr++;
-			break;
-
-		  case UNI_AAL_BWDCPCS_ID:
-			if(ielen < 2 || bcpcs_p)
-				return -1;
-			ielen -= 2;
-			bcpcs_p = 1;
-			ie->u.aal5.bwd_cpcs  = *msg->b_rptr++ << 8;
-			ie->u.aal5.bwd_cpcs |= *msg->b_rptr++;
-			break;
-
-		  case UNI_AAL_SSCS_ID:
-			if(ielen == 0 || (ie->h.present & UNI_AAL5_SSCS_P))
-				return -1;
-			ielen--;
-			ie->h.present |= UNI_AAL5_SSCS_P;
-			ie->u.aal5.sscs = *msg->b_rptr++;
-			break;
-
-		  default:
-			return -1;
-		}
-	}
-
-	if(fcpcs_p ^ bcpcs_p)
-		return -1;
-	if(fcpcs_p)
-		ie->h.present |= UNI_AAL5_CPCS_P;
-
-	return 0;
-}
-
-static int
-decode_aal_user(struct uni_ie_aal *ie, struct uni_msg *msg, u_int ielen)
-{
-	if(ielen > 4)
-		return -1;
-
-	ie->u.aalu.len = 0;
-	while(ielen--)
-		ie->u.aalu.user[ie->u.aalu.len++] = *msg->b_rptr++;
-
-	return 0;
-}
-
-DEF_IE_DECODE(itu, aal)
-{
-	u_char c;
-
-	IE_START(DISC_ACC_ERR(AAL));
-
-	if(ielen < 1 || ielen > 21)
-		goto rej;
-
-	c = *msg->b_rptr++;
-	ielen--;
-
-	switch(c) {
-
-	  case UNI_AAL_0:
-		ie->type = c;
-		break;
-
-	  case UNI_AAL_1:
-		ie->type = c;
-		if(decode_aal_1(ie, msg, ielen))
-			goto rej;
-		break;
-
-	  case UNI_AAL_2:
-		ie->type = c;
-		break;
-
-	  case UNI_AAL_4:
-		ie->type = c;
-		if(decode_aal_4(ie, msg, ielen))
-			goto rej;
-		break;
-
-	  case UNI_AAL_5:
-		ie->type = c;
-		if(decode_aal_5(ie, msg, ielen))
-			goto rej;
-		break;
-
-	  case UNI_AAL_USER:
-		ie->type = c;
-		if(decode_aal_user(ie, msg, ielen))
-			goto rej;
-		break;
-
-	  default:
-		goto rej;
-	}
-
-	IE_END(AAL);
-}
-
-/*********************************************************************
- *
- * Traffic descriptor.
- * Alternate traffic descriptor.
- * Minimum traffic descriptor.
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 49...51
- *  Q.2961
- *  Q.2962
- *  UNI4.0 pp. 9...10, 106...109
- *
- * The Q.s specify the coding. UNI4.0 adds frame discard and best-effort.
- * Appendix in UNI4.0 lists the allowed combinations.
- *
- *		  PCR0 PCR1 SCR/MBS0 SCR/MBS1 BE TAG FDISC ABR
- *  1	CBR.1 	  -    Y    -        -        -  N   Y/N   -
- *  2	CBR.2 	  -    Y    -        -        -  N   Y/N   -    (*)
- *  3	CBR.3 	  Y    Y    -        -        -  Y   Y/N   -    (*)
- *  4	rt-VBR.1  -    Y    -        Y        -  N   Y/N   -
- *  5	rt-VBR.2  -    Y    Y        -        -  N   Y/N   -
- *  6	rt-VBR.3  -    Y    Y        -        -  Y   Y/N   -
- *  7	rt-VBR.4  Y    Y    -        -        -  Y/N Y/N   -    (*)
- *  8	rt-VBR.5  -    Y    -        -        -  N   Y/N   -    (*)
- *  9	rt-VBR.6  -    Y    -        Y        -  N   Y/N   -    (*)
- * 10	nrt-VBR.1 -    Y    -        Y        -  N   Y/N   -
- * 11	nrt-VBR.2 -    Y    Y        -        -  N   Y/N   -
- * 12	nrt-VBR.3 -    Y    Y        -        -  Y   Y/N   -
- * 13	nrt-VBR.4 Y    Y    -        -        -  Y/N Y/N   -	(*)
- * 14	nrt-VBR.5 -    Y    -        -        -  N   Y/N   -	(*)
- * 15	nrt-VBR.6 -    Y    -        Y        -  N   Y/N   -	(*)
- * 16	ABR	  -    Y    -        -        -  N   Y/N   O	(*)
- * 17	UBR.1	  -    Y    -        -        Y  N   Y/N   -
- * 18	UBR.2	  -    Y    -        -        Y  Y   Y/N   -
- *
- * Allow ITU-T and NET coding, because its not clear, whether the
- * new fields in UNI4.0 should be used with NET coding or not.
- * Does not allow for experimental codings yet.
- */
-
-static void
-print_ie_traffic_common(struct unicx *cx, u_int present, struct uni_xtraffic *ie)
-{
-	uni_print_entry(cx, "fwd", "(");
-	if(present & UNI_TRAFFIC_FPCR0_P)
-		uni_printf(cx, "%u", ie->fpcr0);
-	uni_putc(',', cx);
-	if(present & UNI_TRAFFIC_FPCR1_P)
-		uni_printf(cx, "%u", ie->fpcr1);
-	uni_putc(',', cx);
-	if(present & UNI_TRAFFIC_FSCR0_P)
-		uni_printf(cx, "%u", ie->fscr0);
-	uni_putc(',', cx);
-	if(present & UNI_TRAFFIC_FSCR1_P)
-		uni_printf(cx, "%u", ie->fscr1);
-	uni_putc(',', cx);
-	if(present & UNI_TRAFFIC_FMBS0_P)
-		uni_printf(cx, "%u", ie->fmbs0);
-	uni_putc(',', cx);
-	if(present & UNI_TRAFFIC_FMBS1_P)
-		uni_printf(cx, "%u", ie->fmbs1);
-	uni_putc(',', cx);
-	if(present & UNI_TRAFFIC_FABR1_P)
-		uni_printf(cx, "%u", ie->fabr1);
-	uni_printf(cx, ")");
-
-	uni_print_entry(cx, "bwd", "(");
-	if(present & UNI_TRAFFIC_BPCR0_P)
-		uni_printf(cx, "%u", ie->bpcr0);
-	uni_putc(',', cx);
-	if(present & UNI_TRAFFIC_BPCR1_P)
-		uni_printf(cx, "%u", ie->bpcr1);
-	uni_putc(',', cx);
-	if(present & UNI_TRAFFIC_BSCR0_P)
-		uni_printf(cx, "%u", ie->bscr0);
-	uni_putc(',', cx);
-	if(present & UNI_TRAFFIC_BSCR1_P)
-		uni_printf(cx, "%u", ie->bscr1);
-	uni_putc(',', cx);
-	if(present & UNI_TRAFFIC_BMBS0_P)
-		uni_printf(cx, "%u", ie->bmbs0);
-	uni_putc(',', cx);
-	if(present & UNI_TRAFFIC_BMBS1_P)
-		uni_printf(cx, "%u", ie->bmbs1);
-	uni_putc(',', cx);
-	if(present & UNI_TRAFFIC_BABR1_P)
-		uni_printf(cx, "%u", ie->babr1);
-	uni_printf(cx, ")");
-
-	if(present & UNI_TRAFFIC_BEST_P)
-		uni_print_flag("best_effort", cx);
-	if(present & UNI_TRAFFIC_MOPT_P) {
-		uni_print_entry(cx, "tag", "(");
-		if(ie->ftag)
-			uni_printf(cx, "fwd");
-		uni_putc(',', cx);
-		if(ie->btag)
-			uni_printf(cx, "bwd");
-		uni_putc(')', cx);
-
-		uni_print_entry(cx, "disc", "(");
-		if(ie->fdisc)
-			uni_printf(cx, "fwd");
-		uni_putc(',', cx);
-		if(ie->bdisc)
-			uni_printf(cx, "bwd");
-		uni_putc(')', cx);
-	}
-}
-
-struct tallow {
-	u_int	mask;
-	int	mopt_flag;
-	u_char	mopt_mask, mopt_val;
-};
-
-static int
-check_traffic(u_int mask, u_int mopt, struct tallow *a)
-{
-	if(mask != a->mask)
-		return 0;
-
-	if(a->mopt_flag == 0) {
-		/* not allowed */
-		if(mopt == 0xffff)
-			return 1;
-		return 0;
-	}
-
-	if(a->mopt_flag < 0) {
-		/* optional */
-		if(mopt == 0xffff)
-			return 1;
-		if((mopt & a->mopt_mask) == a->mopt_val)
-			return 1;
-		return 0;
-	}
-	
-	/* required */
-	if(mopt == 0xffff)
-		return 0;
-	if((mopt & a->mopt_mask) == a->mopt_val)
-		return 1;
-	return 0;
-}
-
-static int
-check_ie_traffic_common(struct uni_xtraffic *ie, u_int present,
-    struct unicx *cx __unused)
-{
-	static u_int fmask =
-		UNI_TRAFFIC_FPCR0_P | UNI_TRAFFIC_FPCR1_P |
-		UNI_TRAFFIC_FSCR0_P | UNI_TRAFFIC_FSCR1_P |
-		UNI_TRAFFIC_FMBS0_P | UNI_TRAFFIC_FMBS1_P |
-		UNI_TRAFFIC_FABR1_P;
-	static u_int bmask =
-		UNI_TRAFFIC_BPCR0_P | UNI_TRAFFIC_BPCR1_P |
-		UNI_TRAFFIC_BSCR0_P | UNI_TRAFFIC_BSCR1_P |
-		UNI_TRAFFIC_BMBS0_P | UNI_TRAFFIC_BMBS1_P |
-		UNI_TRAFFIC_BABR1_P;
-#define DTAB(U,X)							\
-	{ U##X##PCR1_P,							\
-	  -1, U##X##TAG,	0 },		/* 1, 2, 8, 14 */	\
-	{ U##X##PCR0_P | U##X##PCR1_P,					\
-	  +1, U##X##TAG,	U##X##TAG },	/* 3 */			\
-	{ U##X##PCR1_P | U##X##SCR1_P | U##X##MBS1_P,			\
-	  -1, U##X##TAG,	0 },		/* 4, 9, 10, 15 */	\
-	{ U##X##PCR1_P | U##X##SCR0_P | U##X##MBS0_P,			\
-	  -1, 0,		0 },		/* 5, 6, 11, 12 */	\
-	{ U##X##PCR0_P | U##X##PCR1_P,					\
-	  -1, 0,		0 },		/* 7, 13 */		\
-	{ U##X##PCR1_P | U##X##ABR1_P,					\
-	  -1, U##X##TAG,	0 },		/* 16a */
-#define DTABSIZE 6
-
-	static struct tallow allow[2][DTABSIZE] = {
-		{ DTAB(UNI_TRAFFIC_, F) },
-	  	{ DTAB(UNI_TRAFFIC_, B) },
-	};
-#undef DTAB
-
-	u_int f, b, p, m;
-	int i;
-
-	f = present & fmask;
-	b = present & bmask;
-	p = present & (fmask | bmask);
-	m = (present & UNI_TRAFFIC_MOPT_P)
-		? (  (ie->ftag ? UNI_TRAFFIC_FTAG : 0)
-		   | (ie->btag ? UNI_TRAFFIC_BTAG : 0)
-		   | (ie->fdisc ? UNI_TRAFFIC_FDISC : 0)
-		   | (ie->bdisc ? UNI_TRAFFIC_BDISC : 0))
-		: 0xffff;
-	
-
-	if(present & UNI_TRAFFIC_BEST_P) {
-		/*
-		 * Lines 17 and 18
-		 */
-		if(p != (UNI_TRAFFIC_FPCR1_P | UNI_TRAFFIC_BPCR1_P))
-			return -1;
-		return 0;
-	}
-
-	/*
-	 * Check forward and backward independent. There must be a higher
-	 * level checking in the CAC
-	 */
-	for(i = 0; i < DTABSIZE; i++)
-		if(check_traffic(f, m, &allow[0][i]))
-			break;
-	if(i == DTABSIZE)
-		return -1;
-
-	for(i = 0; i < DTABSIZE; i++)
-		if(check_traffic(b, m, &allow[1][i]))
-			break;
-	if(i == DTABSIZE)
-		return -1;
-
-	return 0;
-}
-
-static int
-encode_traffic_common(struct uni_msg *msg, struct uni_xtraffic *ie,
-    u_int present, struct unicx *cx __unused)
-{
-	APP_OPT_24BIT(msg, present, UNI_TRAFFIC_FPCR0_P,
-		UNI_TRAFFIC_FPCR0_ID, ie->fpcr0);
-	APP_OPT_24BIT(msg, present, UNI_TRAFFIC_BPCR0_P,
-		UNI_TRAFFIC_BPCR0_ID, ie->bpcr0);
-	APP_OPT_24BIT(msg, present, UNI_TRAFFIC_FPCR1_P,
-		UNI_TRAFFIC_FPCR1_ID, ie->fpcr1);
-	APP_OPT_24BIT(msg, present, UNI_TRAFFIC_BPCR1_P,
-		UNI_TRAFFIC_BPCR1_ID, ie->bpcr1);
-	APP_OPT_24BIT(msg, present, UNI_TRAFFIC_FSCR0_P,
-		UNI_TRAFFIC_FSCR0_ID, ie->fscr0);
-	APP_OPT_24BIT(msg, present, UNI_TRAFFIC_BSCR0_P,
-		UNI_TRAFFIC_BSCR0_ID, ie->bscr0);
-	APP_OPT_24BIT(msg, present, UNI_TRAFFIC_FSCR1_P,
-		UNI_TRAFFIC_FSCR1_ID, ie->fscr1);
-	APP_OPT_24BIT(msg, present, UNI_TRAFFIC_BSCR1_P,
-		UNI_TRAFFIC_BSCR1_ID, ie->bscr1);
-	APP_OPT_24BIT(msg, present, UNI_TRAFFIC_FMBS0_P,
-		UNI_TRAFFIC_FMBS0_ID, ie->fmbs0);
-	APP_OPT_24BIT(msg, present, UNI_TRAFFIC_BMBS0_P,
-		UNI_TRAFFIC_BMBS0_ID, ie->bmbs0);
-	APP_OPT_24BIT(msg, present, UNI_TRAFFIC_FMBS1_P,
-		UNI_TRAFFIC_FMBS1_ID, ie->fmbs1);
-	APP_OPT_24BIT(msg, present, UNI_TRAFFIC_BMBS1_P,
-		UNI_TRAFFIC_BMBS1_ID, ie->bmbs1);
-	APP_OPT_24BIT(msg, present, UNI_TRAFFIC_FABR1_P,
-		UNI_TRAFFIC_FABR1_ID, ie->fabr1);
-	APP_OPT_24BIT(msg, present, UNI_TRAFFIC_BABR1_P,
-		UNI_TRAFFIC_BABR1_ID, ie->babr1);
-
-	APP_OPT(msg, present, UNI_TRAFFIC_BEST_P,
-		UNI_TRAFFIC_BEST_ID);
-	APP_OPT_BYTE(msg, present, UNI_TRAFFIC_MOPT_P,
-		UNI_TRAFFIC_MOPT_ID,
-		(ie->ftag ? UNI_TRAFFIC_FTAG : 0) |
-		(ie->btag ? UNI_TRAFFIC_BTAG : 0) |
-		(ie->fdisc ? UNI_TRAFFIC_FDISC : 0) |
-		(ie->fdisc ? UNI_TRAFFIC_BDISC : 0));
-
-	return 0;
-}
-
-static int
-decode_traffic_common(struct uni_xtraffic *ie, struct uni_msg *msg,
-    u_int ielen, u_int *present)
-{
-	u_char c;
-
-	while(ielen--) {
-		switch(c = *msg->b_rptr++) {
-
-		  default:
-		  rej:
-			return -1;
-
-		  DEC_GETF3(TRAFFIC_FPCR0, fpcr0, *present);
-		  DEC_GETF3(TRAFFIC_BPCR0, bpcr0, *present);
-		  DEC_GETF3(TRAFFIC_FPCR1, fpcr1, *present);
-		  DEC_GETF3(TRAFFIC_BPCR1, bpcr1, *present);
-		  DEC_GETF3(TRAFFIC_FSCR0, fscr0, *present);
-		  DEC_GETF3(TRAFFIC_BSCR0, bscr0, *present);
-		  DEC_GETF3(TRAFFIC_FSCR1, fscr1, *present);
-		  DEC_GETF3(TRAFFIC_BSCR1, bscr1, *present);
-		  DEC_GETF3(TRAFFIC_FMBS0, fmbs0, *present);
-		  DEC_GETF3(TRAFFIC_BMBS0, bmbs0, *present);
-		  DEC_GETF3(TRAFFIC_BMBS1, bmbs1, *present);
-		  DEC_GETF3(TRAFFIC_FABR1, fabr1, *present);
-		  DEC_GETF3(TRAFFIC_BABR1, babr1, *present);
-
-		  case UNI_TRAFFIC_BEST_ID:
-			*present |= UNI_TRAFFIC_BEST_P;
-			break;
-
-		  case UNI_TRAFFIC_MOPT_ID:
-			if(ielen == 0)
-				return -1;
-			ielen--;
-			if(!(*present & UNI_TRAFFIC_MOPT_P)) {
-				*present |= UNI_TRAFFIC_MOPT_P;
-				ie->ftag = (*msg->b_rptr&UNI_TRAFFIC_FTAG)?1:0;
-				ie->btag = (*msg->b_rptr&UNI_TRAFFIC_BTAG)?1:0;
-				ie->fdisc = (*msg->b_rptr&UNI_TRAFFIC_FDISC)?1:0;
-				ie->bdisc = (*msg->b_rptr&UNI_TRAFFIC_BDISC)?1:0;
-			} 
-			msg->b_rptr++;
-			break;
-		}
-	}
-	return 0;
-}
-
-
-/*****************************************************************/
-
-DEF_IE_PRINT(itu, traffic)
-{
-	if(uni_print_iehdr("traffic", &ie->h, cx))
-		return;
-	print_ie_traffic_common(cx, ie->h.present, &ie->t);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, traffic)
-{
-	return check_ie_traffic_common(&ie->t, ie->h.present, cx);
-}
-
-DEF_IE_ENCODE(itu, traffic)
-{
-	START_IE(traffic, UNI_IE_TRAFFIC, 26);
-	encode_traffic_common(msg, &ie->t, ie->h.present, cx);
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, traffic)
-{
-	IE_START(;);
-
-	if(ielen > 30)
-		goto rej;
-
-	if(decode_traffic_common(&ie->t, msg, ielen, &ie->h.present))
-		goto rej;
-
-	IE_END(TRAFFIC);
-}
-
-/*****************************************************************/
-
-DEF_IE_PRINT(itu, atraffic)
-{
-	if(uni_print_iehdr("atraffic", &ie->h, cx))
-		return;
-	print_ie_traffic_common(cx, ie->h.present, &ie->t);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, atraffic)
-{
-	return check_ie_traffic_common(&ie->t, ie->h.present, cx);
-}
-
-DEF_IE_ENCODE(itu, atraffic)
-{
-	START_IE(traffic, UNI_IE_ATRAFFIC, 26);
-	encode_traffic_common(msg, &ie->t, ie->h.present, cx);
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, atraffic)
-{
-	IE_START(;);
-
-	if(ielen > 30)
-		goto rej;
-
-	if(decode_traffic_common(&ie->t, msg, ielen, &ie->h.present))
-		goto rej;
-
-	IE_END(ATRAFFIC);
-}
-
-/*****************************************************************/
-
-DEF_IE_PRINT(itu, mintraffic)
-{
-	if(uni_print_iehdr("mintraffic", &ie->h, cx))
-		return;
-
-	uni_print_entry(cx, "pcr0", "(");
-	if(ie->h.present & UNI_MINTRAFFIC_FPCR0_P)
-		uni_printf(cx, "%u", ie->fpcr0);
-	uni_putc(',', cx);
-	if(ie->h.present & UNI_MINTRAFFIC_BPCR0_P)
-		uni_printf(cx, "%u", ie->bpcr0);
-	uni_putc(')', cx);
-
-	uni_print_entry(cx, "pcr1", "(");
-	if(ie->h.present & UNI_MINTRAFFIC_FPCR1_P)
-		uni_printf(cx, "%u", ie->fpcr1);
-	uni_putc(',', cx);
-	if(ie->h.present & UNI_MINTRAFFIC_BPCR1_P)
-		uni_printf(cx, "%u", ie->bpcr1);
-	uni_putc(')', cx);
-
-	uni_print_entry(cx, "abr1", "(");
-	if(ie->h.present & UNI_MINTRAFFIC_FABR1_P)
-		uni_printf(cx, "%u", ie->fabr1);
-	uni_putc(',', cx);
-	if(ie->h.present & UNI_MINTRAFFIC_BABR1_P)
-		uni_printf(cx, "%u", ie->babr1);
-	uni_printf(cx, ")");
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, mintraffic)
-{
-	u_int abr;
-	u_int xbr;
-	UNUSED(cx);
-
-	abr = ie->h.present & (UNI_MINTRAFFIC_FABR1_P|UNI_MINTRAFFIC_BABR1_P);
-	xbr = ie->h.present & (UNI_MINTRAFFIC_FPCR0_P|UNI_MINTRAFFIC_BPCR0_P|
-			       UNI_MINTRAFFIC_FPCR1_P|UNI_MINTRAFFIC_BPCR1_P);
-
-	if(abr && xbr)
-		return -1;
-
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, mintraffic)
-{
-	START_IE(mintraffic, UNI_IE_MINTRAFFIC, 16);
-
-	APP_OPT_24BIT(msg, ie->h.present, UNI_MINTRAFFIC_FPCR0_P,
-		UNI_TRAFFIC_FPCR0_ID, ie->fpcr0);
-	APP_OPT_24BIT(msg, ie->h.present, UNI_MINTRAFFIC_BPCR0_P,
-		UNI_TRAFFIC_BPCR0_ID, ie->bpcr0);
-	APP_OPT_24BIT(msg, ie->h.present, UNI_MINTRAFFIC_FPCR1_P,
-		UNI_TRAFFIC_FPCR1_ID, ie->fpcr1);
-	APP_OPT_24BIT(msg, ie->h.present, UNI_MINTRAFFIC_BPCR1_P,
-		UNI_TRAFFIC_BPCR1_ID, ie->bpcr1);
-	APP_OPT_24BIT(msg, ie->h.present, UNI_MINTRAFFIC_FABR1_P,
-		UNI_TRAFFIC_FABR1_ID, ie->fabr1);
-	APP_OPT_24BIT(msg, ie->h.present, UNI_MINTRAFFIC_BABR1_P,
-		UNI_TRAFFIC_BABR1_ID, ie->babr1);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, mintraffic)
-{
-	u_char c;
-
-	IE_START(;);
-
-	if(ielen > 20)
-		goto rej;
-
-	while(ielen--) {
-		switch(c = *msg->b_rptr++) {
-
-		  default:
-			goto rej;
-
-		  DEC_GETF3(MINTRAFFIC_FPCR0, fpcr0, ie->h.present);
-		  DEC_GETF3(MINTRAFFIC_BPCR0, bpcr0, ie->h.present);
-		  DEC_GETF3(MINTRAFFIC_FPCR1, fpcr1, ie->h.present);
-		  DEC_GETF3(MINTRAFFIC_BPCR1, bpcr1, ie->h.present);
-		  DEC_GETF3(MINTRAFFIC_FABR1, fabr1, ie->h.present);
-		  DEC_GETF3(MINTRAFFIC_BABR1, babr1, ie->h.present);
-		}
-	}
-
-	IE_END(MINTRAFFIC);
-}
-
-/*****************************************************************/
-
-DEF_IE_PRINT(net, mdcr)
-{
-	static const struct uni_print_tbl origin_tbl[] = {
-		MKT(UNI_MDCR_ORIGIN_USER,	user),
-		MKT(UNI_MDCR_ORIGIN_NET,	net),
-		EOT()
-	};
-
-	if(uni_print_iehdr("mdcr", &ie->h, cx))
-		return;
-
-	uni_print_tbl("origin", ie->origin, origin_tbl, cx);
-	uni_print_entry(cx, "mdcr", "(");
-	uni_printf(cx, "%u", ie->fmdcr);
-	uni_putc(',', cx);
-	uni_printf(cx, "%u", ie->bmdcr);
-	uni_putc(')', cx);
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(net, mdcr)
-{
-	UNUSED(cx);
-
-	if ((ie->origin != UNI_MDCR_ORIGIN_USER &&
-	    ie->origin != UNI_MDCR_ORIGIN_NET) ||
-	    ie->fmdcr >= (1 << 24) || ie->bmdcr >= (1 << 24))
-		return (-1);
-
-	return (0);
-}
-
-DEF_IE_ENCODE(net, mdcr)
-{
-	START_IE(mdcr, UNI_IE_MDCR, 9);
-
-	APP_BYTE(msg, ie->origin);
-	APP_SUB_24BIT(msg, UNI_TRAFFIC_FMDCR_ID, ie->fmdcr);
-	APP_SUB_24BIT(msg, UNI_TRAFFIC_BMDCR_ID, ie->bmdcr);
-
-	SET_IE_LEN(msg);
-	return (0);
-}
-
-DEF_IE_DECODE(net, mdcr)
-{
-	u_char c;
-#define UNI_TRAFFIC_FMDCR_P 0x01
-#define UNI_TRAFFIC_BMDCR_P 0x02
-	u_int p = 0;
-
-	IE_START(;);
-
-	if(ielen != 9)
-		goto rej;
-
-	ie->origin = *msg->b_rptr++;
-	ielen--;
-
-	while(ielen--) {
-		switch(c = *msg->b_rptr++) {
-
-		  default:
-			goto rej;
-
-		  DEC_GETF3(TRAFFIC_FMDCR, fmdcr, p);
-		  DEC_GETF3(TRAFFIC_BMDCR, bmdcr, p);
-		}
-	}
-	if (p != (UNI_TRAFFIC_FMDCR_P | UNI_TRAFFIC_BMDCR_P))
-		goto rej;
-
-	IE_END(MDCR);
-}
-
-/*********************************************************************
- *
- * Connection identifier
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 69...70
- *  UNI4.0 pp. 15...16
- *  PNNI1.0 p. 198
- *
- * Only ITU-T coding allowed.
- */
-
-DEF_IE_PRINT(itu, connid)
-{
-	static const struct uni_print_tbl tbl[] = {
-		MKT(UNI_CONNID_VCI,	exclusive),
-		MKT(UNI_CONNID_ANYVCI,	any),
-		MKT(UNI_CONNID_NOVCI,	no),
-		EOT()
-	};
-	static const struct uni_print_tbl assoc_tbl[] = {
-		MKT(UNI_CONNID_ASSOC,	associated),
-		MKT(UNI_CONNID_NONASSOC,non-associated),
-		EOT()
-	};
-
-	if(uni_print_iehdr("connid", &ie->h, cx))
-		return;
-
-	uni_print_tbl("mode", ie->assoc, assoc_tbl, cx);
-	uni_print_entry(cx, "connid", "(%u,", ie->vpci);
-	if(ie->type == UNI_CONNID_VCI)
-		uni_printf(cx, "%u", ie->vci);
-	else
-		uni_print_tbl(NULL, ie->type, tbl, cx);
-	uni_printf(cx, ")");
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, connid)
-{
-	UNUSED(cx);
-	switch(ie->type) {
-	  default:
-		return -1;
-	  case UNI_CONNID_VCI:
-	  case UNI_CONNID_ANYVCI:
-	  case UNI_CONNID_NOVCI:
-		break;
-	}
-
-#if 0
-	/*
-	 * This field must be checked by the application to fulfil
-	 * Q.2931Amd4 27) 5.2.3 last sentence
-	 */
-	switch(ie->assoc) {
-
-	  case UNI_CONNID_ASSOC:
-		if(!cx->cx.pnni)
-			return -1;
-		break;
-
-	  case UNI_CONNID_NONASSOC:
-		break;
-
-	  default:
-		return -1;
-	}
-#endif
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, connid)
-{
-	START_IE(connid, UNI_IE_CONNID, 5);
-
-	APP_BYTE(msg, 0x80 | (ie->assoc << 3) | ie->type);
-	APP_BYTE(msg, ie->vpci >> 8);
-	APP_BYTE(msg, ie->vpci >> 0);
-	APP_BYTE(msg, ie->vci >> 8);
-	APP_BYTE(msg, ie->vci >> 0);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, connid)
-{
-	u_char c;
-
-	IE_START(;);
-
-	if(ielen != 5)
-		goto rej;
-
-	c = *msg->b_rptr++;
-	if((c & 0x80) == 0)
-		goto rej;
-	ie->assoc = (c >> 3) & 3;
-	ie->type = c & 7;
-	ie->vpci  = *msg->b_rptr++ << 8;
-	ie->vpci |= *msg->b_rptr++;
-	ie->vci  = *msg->b_rptr++ << 8;
-	ie->vci |= *msg->b_rptr++;
-
-	IE_END(CONNID);
-}
-
-/*********************************************************************
- *
- * Quality of Service
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 72
- *  UNI4.0 pp. 16...17
- */
-
-static void
-print_qos(struct unicx *cx, struct uni_ie_qos *ie)
-{
-	static const struct uni_print_tbl class_tbl[] = {
-		MKT(UNI_QOS_CLASS0,	Class0),
-		MKT(UNI_QOS_CLASS1,	Class1),
-		MKT(UNI_QOS_CLASS2,	Class2),
-		MKT(UNI_QOS_CLASS3,	Class3),
-		MKT(UNI_QOS_CLASS4,	Class4),
-		EOT()
-	};
-
-	if(uni_print_iehdr("qos", &ie->h, cx))
-		return;
-
-	uni_print_tbl("fwd", ie->fwd, class_tbl, cx);
-	uni_print_tbl("bwd", ie->bwd, class_tbl, cx);
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_PRINT(itu, qos)
-{
-	print_qos(cx, ie);
-}
-DEF_IE_PRINT(net, qos)
-{
-	print_qos(cx, ie);
-}
-
-DEF_IE_CHECK(itu, qos)
-{
-	UNUSED(cx);
-
-	switch(ie->fwd) {
-	  default:
-		return -1;
-
-	  case UNI_QOS_CLASS0:
-		break;
-	}
-	switch(ie->bwd) {
-	  default:
-		return -1;
-
-	  case UNI_QOS_CLASS0:
-		break;
-	}
-	return 0;
-}
-
-DEF_IE_CHECK(net, qos)
-{
-	UNUSED(cx);
-
-	switch(ie->fwd) {
-	  default:
-		return -1;
-
-	  case UNI_QOS_CLASS1:
-	  case UNI_QOS_CLASS2:
-	  case UNI_QOS_CLASS3:
-	  case UNI_QOS_CLASS4:
-		break;
-	}
-	switch(ie->bwd) {
-	  default:
-		return -1;
-
-	  case UNI_QOS_CLASS1:
-	  case UNI_QOS_CLASS2:
-	  case UNI_QOS_CLASS3:
-	  case UNI_QOS_CLASS4:
-		break;
-	}
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, qos)
-{
-	START_IE(qos, UNI_IE_QOS, 2);
-
-	APP_BYTE(msg, ie->fwd);
-	APP_BYTE(msg, ie->bwd);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-DEF_IE_ENCODE(net, qos)
-{
-	START_IE(qos, UNI_IE_QOS, 2);
-
-	APP_BYTE(msg, ie->fwd);
-	APP_BYTE(msg, ie->bwd);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, qos)
-{
-	IE_START(;);
-
-	if(ielen != 2)
-		goto rej;
-
-	ie->fwd = *msg->b_rptr++;
-	ie->bwd = *msg->b_rptr++;
-
-	IE_END(QOS);
-}
-
-DEF_IE_DECODE(net, qos)
-{
-	IE_START(;);
-
-	if(ielen != 2)
-		goto rej;
-
-	ie->fwd = *msg->b_rptr++;
-	ie->bwd = *msg->b_rptr++;
-
-	IE_END(QOS);
-}
-
-/*********************************************************************
- *
- * Broadband Lower Layer Information
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 53...54
- *  UNI4.0 p.  12
- *
- * Only ITU-T coding allowed.
- */
-
-DEF_IE_PRINT(itu, bhli)
-{
-	static const struct uni_print_tbl type_tbl[] = {
-		MKT(UNI_BHLI_ISO,	iso),
-		MKT(UNI_BHLI_USER,	user),
-		MKT(UNI_BHLI_VENDOR,	vendor),
-		EOT()
-	};
-	u_int i;
-
-	if(uni_print_iehdr("bhli", &ie->h, cx))
-		return;
-
-	uni_print_tbl("type", ie->type, type_tbl, cx);
-	uni_print_entry(cx, "len", "%d", ie->len);
-	uni_print_entry(cx, "info", "(");
-	for(i = 0; i < ie->len; i++)
-		uni_printf(cx, ",0x%02x", ie->info[i]);
-	uni_printf(cx, ")");
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, bhli)
-{
-	UNUSED(cx);
-
-	switch(ie->type) {
-	  default:
-		return -1;
-
-	  case UNI_BHLI_ISO:
-	  case UNI_BHLI_USER:
-	  case UNI_BHLI_VENDOR:
-		break;
-	}
-	if(ie->len > 8)
-		return -1;
-
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, bhli)
-{
-	START_IE(bhli, UNI_IE_BHLI, 9);
-
-	APP_BYTE(msg, 0x80 | ie->type);
-	APP_BUF(msg, ie->info, ie->len);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, bhli)
-{
-	u_char c;
-
-	IE_START(;);
-
-	if(ielen > 9)
-		goto rej;
-
-	c = *msg->b_rptr++;
-	ielen--;
-
-	if(!(c & 0x80))
-		goto rej;
-	ie->type = c & 0x7f;
-	ie->len = ielen;
-	(void)memcpy(ie->info, msg->b_rptr, ielen);
-	msg->b_rptr += ielen;
-
-	IE_END(BHLI);
-}
-
-/*********************************************************************
- *
- * Broadband bearer capabilities
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 51...52
- *  Q.2931 Amd 1
- *  UNI4.0 pp. 10...12, 106...109
- *
- * UNI4.0 changed the meaning of byte 5a. Instead of 3 bit traffic type and
- * 2 bit timing requirements there are now 7 bits ATM transfer capabilities.
- * However the old format is still supported: it should be recognized on
- * input, but never be generated on output. Mapping is left to the user of
- * UNI.
- *
- * Amd 1 not checked XXX.
- *
- * The Appendix in UNI4.0 lists all the supported combinations of various
- * traffic IE's. The check function implements part of it.
- *
- *			A		C		X		VP
- * 1	CBR.1		7		.		7		7
- * 2	CBR.2		-		.		4,5,6		5   (*)
- * 3	CBR.3		-		.		4,5,6		5   (*)
- * 4	rt-VBR.1	.		19		19		19
- * 5	rt-VBR.2	.		9		1,9		9
- * 6	rt-VBR.3	.		9		1,9		9
- * 7	rt-VBR.4	.		.		1,9		.   (*)
- * 8	rt-VBR.5	.		.		1,9		.   (*)
- * 9	rt-VBR.6	.		9		1,9		9   (*)
- * 10	nrt-VBR.1	.		11		11		11
- * 11	nrt-VBR.2	.		-		-,0,2,8,10	-,10
- * 12	nrt-VBR.3	.		-		-,0,2,8,10	-,10
- * 13	nrt-VBR.4	.		-		-,0,2,8,10	.   (*)
- * 14	nrt-VBR.5	.		-		-,0,2,8,10	.   (*)
- * 15	nrt-VBR.6	.		-		-,0,2,8,10	-,10(*)
- * 16	ABR		.		12		12		12
- * 17	UBR.1		.		-		-,0,2,8,10	-,10
- * 18	UBR.2		.		-		-,0,2,8,10	-,10
- *
- * (*) compatibility
- *
- * Only ITU-T coding allowed.
- */
-
-DEF_IE_PRINT(itu, bearer)
-{
-	static const struct uni_print_tbl bclass_tbl[] = {
-		MKT(UNI_BEARER_A,	bcob-A),
-		MKT(UNI_BEARER_C,	bcob-C),
-		MKT(UNI_BEARER_X,	bcob-X),
-		MKT(UNI_BEARER_TVP,	transparent-VP),
-		EOT()
-	};
-	static const struct uni_print_tbl atc_tbl[] = {
-		MKT(UNI_BEARER_ATC_CBR,		cbr),
-		MKT(UNI_BEARER_ATC_CBR1,	cbr1),
-		MKT(UNI_BEARER_ATC_VBR,		vbr),
-		MKT(UNI_BEARER_ATC_VBR1,	vbr1),
-		MKT(UNI_BEARER_ATC_NVBR,	nvbr),
-		MKT(UNI_BEARER_ATC_NVBR1,	nvbr1),
-		MKT(UNI_BEARER_ATC_ABR,		abr),
-
-		MKT(UNI_BEARER_ATCX_0,		x0),
-		MKT(UNI_BEARER_ATCX_1,		x1),
-		MKT(UNI_BEARER_ATCX_2,		x2),
-		MKT(UNI_BEARER_ATCX_4,		x4),
-		MKT(UNI_BEARER_ATCX_6,		x6),
-		MKT(UNI_BEARER_ATCX_8,		x8),
-		EOT()
-	};
-	static const struct uni_print_tbl cfg_tbl[] = {
-		MKT(UNI_BEARER_P2P,	p2p),
-		MKT(UNI_BEARER_MP,	mp),
-		EOT()
-	};
-	static const struct uni_print_tbl clip_tbl[] = {
-		MKT(UNI_BEARER_NOCLIP,	no),
-		MKT(UNI_BEARER_CLIP,	yes),
-		EOT()
-	};
-
-	if(uni_print_iehdr("bearer", &ie->h, cx))
-		return;
-
-	uni_print_tbl("class", ie->bclass, bclass_tbl, cx);
-
-	if(ie->h.present & UNI_BEARER_ATC_P) {
-		uni_print_tbl("atc", ie->atc, atc_tbl, cx);
-	}
-	uni_print_tbl("clip", ie->clip, clip_tbl, cx);
-	uni_print_tbl("cfg", ie->cfg, cfg_tbl, cx);
-
-	uni_print_ieend(cx);
-}
-
-#define QTYPE(C,A)	((UNI_BEARER_##C << 8) | UNI_BEARER_ATC_##A)
-#define QTYPEX(C,A)	((UNI_BEARER_##C << 8) | UNI_BEARER_ATCX_##A)
-#define QTYPE0(C)	((UNI_BEARER_##C << 8) | (1 << 16))
-DEF_IE_CHECK(itu, bearer)
-{
-	UNUSED(cx);
-
-	switch((ie->bclass << 8) |
-	       ((ie->h.present & UNI_BEARER_ATC_P) == 0
-			? (1 << 16)
-			: ie->atc)) {
-
-	  default:
-		return -1;
-
-	  case QTYPE (A,   CBR1):	/* 1 */
-	  case QTYPE (X,   CBR1):	/* 1 */
-	  case QTYPE (TVP, CBR1):	/* 1 */
-
-	  case QTYPE0(A):		/* 2,3 */
-	  case QTYPEX(X,   4):		/* 2,3 */
-	  case QTYPE (X,   CBR):	/* 2,3 */
-	  case QTYPEX(X,   6):		/* 2,3 */
-	  case QTYPE (TVP, CBR):	/* 2,3 */
-
-	  case QTYPE (C,   VBR1):	/* 4 */
-	  case QTYPE (X,   VBR1):	/* 4 */
-	  case QTYPE (TVP, VBR1):	/* 4 */
-
-	  case QTYPE (C,   VBR):	/* 5,6,9 */
-	  case QTYPEX(X,   1):		/* 5,6,7,8,9 */
-	  case QTYPE (X,   VBR):	/* 5,6,7,8,9 */
-	  case QTYPE (TVP, VBR):	/* 5,6,9 */
-
-	  case QTYPE (C,   NVBR1):	/* 10 */
-	  case QTYPE (X,   NVBR1):	/* 10 */
-	  case QTYPE (TVP, NVBR1):	/* 10 */
-
-	  case QTYPE0(C):		/* 11,12,13,14,15,17,18 */
-	  case QTYPE0(X):		/* 11,12,13,14,15,17,18 */
-	  case QTYPEX(X,   0):		/* 11,12,13,14,15,17,18 */
-	  case QTYPEX(X,   2):		/* 11,12,13,14,15,17,18 */
-	  case QTYPEX(X,   8):		/* 11,12,13,14,15,17,18 */
-	  case QTYPE (X,   NVBR):	/* 11,12,13,14,15,17,18 */
-	  case QTYPE0(TVP):		/* 11,12,15,17,18 */
-	  case QTYPE (TVP, NVBR):	/* 11,12,15,17,18 */
-
-	  case QTYPE (C,   ABR):	/* 16 */
-	  case QTYPE (X,   ABR):	/* 16 */
-	  case QTYPE (TVP, ABR):	/* 16 */
-		break;
-	}
-
-	switch(ie->clip) {
-	  default:
-		return -1;
-
-	  case UNI_BEARER_NOCLIP:
-	  case UNI_BEARER_CLIP:
-		break;
-	}
-	switch(ie->cfg) {
-	  default:
-		return -1;
-
-	  case UNI_BEARER_P2P:
-	  case UNI_BEARER_MP:
-		break;
-	}
-
-	return 0;
-}
-#undef QTYPE
-#undef QTYPEX
-#undef QTYPE0
-
-DEF_IE_ENCODE(itu, bearer)
-{
-	START_IE(bearer, UNI_IE_BEARER, 3);
-
-	APP_BYTE(msg, ie->bclass |
-		((ie->h.present & UNI_BEARER_ATC_P) ? 0:0x80));
-	APP_OPT(msg, ie->h.present, UNI_BEARER_ATC_P,
-		0x80 | ie->atc);
-	APP_BYTE(msg, 0x80 | (ie->clip << 5) | ie->cfg);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, bearer)
-{
-	u_char c;
-
-	IE_START(;);
-
-	if(ielen != 2 && ielen != 3)
-		goto rej;
-
-	c = *msg->b_rptr++;
-	ielen--;
-	ie->bclass = c & 0x1f;
-	if(!(c & 0x80)) {
-		c = *msg->b_rptr++;
-		ielen--;
-		ie->h.present |= UNI_BEARER_ATC_P;
-
-		switch(c & 0x7f) {
-		  /*
-		   * Real legal values
-		   */
-		  case UNI_BEARER_ATC_CBR:
-		  case UNI_BEARER_ATC_CBR1:
-		  case UNI_BEARER_ATC_VBR:
-		  case UNI_BEARER_ATC_VBR1:
-		  case UNI_BEARER_ATC_NVBR:
-		  case UNI_BEARER_ATC_NVBR1:
-		  case UNI_BEARER_ATC_ABR:
-			break;
-
-		  /*
-		   * Compat values
-		   */
-		  case UNI_BEARER_ATCX_0:
-		  case UNI_BEARER_ATCX_1:
-		  case UNI_BEARER_ATCX_2:
-		  case UNI_BEARER_ATCX_4:
-		  case UNI_BEARER_ATCX_6:
-		  case UNI_BEARER_ATCX_8:
-			break;
-
-		  default:
-			goto rej;
-		}
-
-		if(!(c & 0x80))
-			goto rej;
-
-		ie->atc = c & 0x7f;
-	}
-	if(ielen == 0)
-		goto rej;
-	c = *msg->b_rptr++;
-	ielen--;
-	if(!(c & 0x80))
-		goto rej;
-	ie->clip = (c >> 5) & 0x3;
-	ie->cfg = c & 0x3;
-
-	IE_END(BEARER);
-}
-
-/*********************************************************************
- *
- * Broadband Lower Layer Information
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 54...59
- *  UNI4.0 pp. 12...14
- *
- * UNI4.0 states, that layer 1 info is not supported.
- * We allow a layer 1 protocol identifier.
- *
- * UNI4.0 states, that the layer information subelements are NOT position
- * dependent. We allow them in any order on input, but generate always the
- * definit order on output.
- *
- * Only ITU-T coding allowed.
- */
-
-DEF_IE_PRINT(itu, blli)
-{
-	static const struct uni_print_tbl l2_tbl[] = {
-		MKT(UNI_BLLI_L2_BASIC,		basic),
-		MKT(UNI_BLLI_L2_Q921,		Q921),
-		MKT(UNI_BLLI_L2_X25LL,		X25-LL),
-		MKT(UNI_BLLI_L2_X25ML,		X25-ML),
-		MKT(UNI_BLLI_L2_LABP,		LAPB),
-		MKT(UNI_BLLI_L2_HDLC_ARM,	HDLC-ARM),
-		MKT(UNI_BLLI_L2_HDLC_NRM,	HDLC-NRM),
-		MKT(UNI_BLLI_L2_HDLC_ABM,	HDLC-ABM),
-		MKT(UNI_BLLI_L2_LAN,		LAN),
-		MKT(UNI_BLLI_L2_X75,		X75),
-		MKT(UNI_BLLI_L2_Q922,		Q922),
-		MKT(UNI_BLLI_L2_USER,		user),
-		MKT(UNI_BLLI_L2_ISO7776,	ISO7776),
-		EOT()
-	};
-	static const struct uni_print_tbl l2mode_tbl[] = {
-		MKT(UNI_BLLI_L2NORM,		normal),
-		MKT(UNI_BLLI_L2EXT,		extended),
-		EOT()
-	};
-	static const struct uni_print_tbl l3_tbl[] = {
-		MKT(UNI_BLLI_L3_X25,		X25),
-		MKT(UNI_BLLI_L3_ISO8208,	ISO8208),
-		MKT(UNI_BLLI_L3_X223,		X223),
-		MKT(UNI_BLLI_L3_CLMP,		CLMP),
-		MKT(UNI_BLLI_L3_T70,		T70),
-		MKT(UNI_BLLI_L3_TR9577,		TR9577),
-		MKT(UNI_BLLI_L3_USER,		user),
-		MKT(UNI_BLLI_L3_H310,		H310),
-		MKT(UNI_BLLI_L3_H321,		H321),
-		EOT()
-	};
-	static const struct uni_print_tbl l3mode_tbl[] = {
-		MKT(UNI_BLLI_L3NSEQ,		normal-seq),
-		MKT(UNI_BLLI_L3ESEQ,		extended-seq),
-		EOT()
-	};
-	static const struct uni_print_tbl l3psiz_tbl[] = {
-		MKT(UNI_BLLI_L3_16,	16),
-		MKT(UNI_BLLI_L3_32,	32),
-		MKT(UNI_BLLI_L3_64,	64),
-		MKT(UNI_BLLI_L3_128,	128),
-		MKT(UNI_BLLI_L3_256,	256),
-		MKT(UNI_BLLI_L3_512,	512),
-		MKT(UNI_BLLI_L3_1024,	1024),
-		MKT(UNI_BLLI_L3_2048,	2048),
-		MKT(UNI_BLLI_L3_4096,	4096),
-		EOT()
-	};
-	static const struct uni_print_tbl l3ttype_tbl[] = {
-		MKT(UNI_BLLI_L3_TTYPE_RECV,	receive_only),
-		MKT(UNI_BLLI_L3_TTYPE_SEND,	send_only),
-		MKT(UNI_BLLI_L3_TTYPE_BOTH,	both),
-		EOT()
-	};
-	static const struct uni_print_tbl l3mux_tbl[] = {
-		MKT(UNI_BLLI_L3_MUX_NOMUX,	NOMUX),
-		MKT(UNI_BLLI_L3_MUX_TS,		TS),
-		MKT(UNI_BLLI_L3_MUX_TSFEC,	TSFEC),
-		MKT(UNI_BLLI_L3_MUX_PS,		PS),
-		MKT(UNI_BLLI_L3_MUX_PSFEC,	PSFEC),
-		MKT(UNI_BLLI_L3_MUX_H221,	H221),
-		EOT()
-	};
-	static const struct uni_print_tbl l3tcap_tbl[] = {
-		MKT(UNI_BLLI_L3_TCAP_NOIND,	noind),
-		MKT(UNI_BLLI_L3_TCAP_AAL1,	aal1),
-		MKT(UNI_BLLI_L3_TCAP_AAL5,	aal5),
-		MKT(UNI_BLLI_L3_TCAP_AAL15,	aal1&5),
-		EOT()
-	};
-
-	if(uni_print_iehdr("blli", &ie->h, cx))
-		return;
-
-	if(ie->h.present & UNI_BLLI_L1_P) {
-		uni_print_entry(cx, "l1", "%u", ie->l1);
-		uni_print_eol(cx);
-	}
-	if(ie->h.present & UNI_BLLI_L2_P) {
-		uni_print_tbl("l2", ie->l2, l2_tbl, cx);
-		uni_print_push_prefix("l2", cx);
-		cx->indent++;
-		if(ie->h.present & UNI_BLLI_L2_USER_P)
-			uni_print_entry(cx, "proto", "%u", ie->l2_user);
-		if(ie->h.present & UNI_BLLI_L2_Q933_P) {
-			uni_print_entry(cx, "q933", "%u", ie->l2_q933);
-			uni_print_tbl("mode", ie->l2_mode, l2mode_tbl, cx);
-		}
-		if(ie->h.present & UNI_BLLI_L2_WSIZ_P)
-			uni_print_entry(cx, "wsize", "%u", ie->l2_wsiz);
-		uni_print_pop_prefix(cx);
-		cx->indent--;
-		uni_print_eol(cx);
-
-	}
-	if(ie->h.present & UNI_BLLI_L3_P) {
-		uni_print_tbl("l3", ie->l3, l3_tbl, cx);
-		uni_print_push_prefix("l3", cx);
-		cx->indent++;
-		if(ie->h.present & UNI_BLLI_L3_USER_P)
-			uni_print_entry(cx, "proto", "%u", ie->l3_user);
-		if(ie->h.present & UNI_BLLI_L3_MODE_P)
-			uni_print_tbl("mode", ie->l3_mode, l3mode_tbl, cx);
-		if(ie->h.present & UNI_BLLI_L3_PSIZ_P)
-			uni_print_tbl("packet-size", ie->l3_psiz, l3psiz_tbl, cx);
-		if(ie->h.present & UNI_BLLI_L3_WSIZ_P)
-			uni_print_entry(cx, "window-size", "%u", ie->l3_wsiz);
-		if(ie->h.present & UNI_BLLI_L3_TTYPE_P) {
-			uni_print_tbl("ttype", ie->l3_ttype, l3ttype_tbl, cx);
-			uni_print_tbl("tcap", ie->l3_tcap, l3tcap_tbl, cx);
-		}
-		if(ie->h.present & UNI_BLLI_L3_MUX_P) {
-			uni_print_tbl("fmux", ie->l3_fmux, l3mux_tbl, cx);
-			uni_print_tbl("bmux", ie->l3_bmux, l3mux_tbl, cx);
-		}
-		if(ie->h.present & UNI_BLLI_L3_IPI_P)
-			uni_print_entry(cx, "ipi", "0x%02x", ie->l3_ipi);
-		if(ie->h.present & UNI_BLLI_L3_SNAP_P)
-			uni_print_entry(cx, "snap", "%06x.%04x", ie->oui, ie->pid);
-		uni_print_pop_prefix(cx);
-		cx->indent--;
-		uni_print_eol(cx);
-	}
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, blli)
-{
-	UNUSED(cx);
-/*
-	if(ie->h.present & UNI_BLLI_L1_P)
-		;
-*/
-
-	if(ie->h.present & UNI_BLLI_L2_P) {
-		static u_int mask =
-			UNI_BLLI_L2_Q933_P | UNI_BLLI_L2_WSIZ_P |
-			UNI_BLLI_L2_USER_P;
-
-		switch(ie->l2) {
-		  default:
-			return -1;
-
-		  case UNI_BLLI_L2_BASIC:
-		  case UNI_BLLI_L2_Q921:
-		  case UNI_BLLI_L2_LABP:
-		  case UNI_BLLI_L2_LAN:
-		  case UNI_BLLI_L2_X75:
-			if(ie->h.present & mask)
-				return -1;
-			break;
-
-		  case UNI_BLLI_L2_X25LL:
-		  case UNI_BLLI_L2_X25ML:
-		  case UNI_BLLI_L2_HDLC_ARM:
-		  case UNI_BLLI_L2_HDLC_NRM:
-		  case UNI_BLLI_L2_HDLC_ABM:
-		  case UNI_BLLI_L2_Q922:
-		  case UNI_BLLI_L2_ISO7776:
-			switch(ie->h.present & mask) {
-			  default:
-				return -1;
-
-			  case 0:
-			  case UNI_BLLI_L2_Q933_P:
-			  case UNI_BLLI_L2_Q933_P | UNI_BLLI_L2_WSIZ_P:
-				break;
-			}
-			break;
-
-		  case UNI_BLLI_L2_USER:
-			switch(ie->h.present & mask) {
-			  default:
-				return -1;
-
-			  case 0:	/* XXX ? */
-			  case UNI_BLLI_L2_USER_P:
-				break;
-			}
-			break;
-		}
-		if(ie->h.present & UNI_BLLI_L2_Q933_P) {
-			if(ie->l2_q933 != 0)
-				return -1;
-
-			switch(ie->l2_mode) {
-			  default:
-				return -1;
-
-			  case UNI_BLLI_L2NORM:
-			  case UNI_BLLI_L2EXT:
-				break;
-			}
-		}
-		if(ie->h.present & UNI_BLLI_L2_WSIZ_P) {
-			if(ie->l2_wsiz == 0 || ie->l2_wsiz > 127)
-				return -1;
-		}
-		if(ie->h.present & UNI_BLLI_L2_USER_P) {
-			if(ie->l2_user > 127)
-				return -1;
-		}
-	}
-	if(ie->h.present & UNI_BLLI_L3_P) {
-		static u_int mask =
-			UNI_BLLI_L3_MODE_P | UNI_BLLI_L3_PSIZ_P |
-			UNI_BLLI_L3_WSIZ_P | UNI_BLLI_L3_USER_P |
-			UNI_BLLI_L3_IPI_P | UNI_BLLI_L3_SNAP_P |
-			UNI_BLLI_L3_TTYPE_P | UNI_BLLI_L3_MUX_P;
-
-		switch(ie->l3) {
-		  default:
-			return -1;
-
-		  case UNI_BLLI_L3_X25:
-		  case UNI_BLLI_L3_ISO8208:
-		  case UNI_BLLI_L3_X223:
-			switch(ie->h.present & mask) {
-			  default:
-				return -1;
-
-			  case 0:
-			  case UNI_BLLI_L3_MODE_P:
-			  case UNI_BLLI_L3_MODE_P |
-			       UNI_BLLI_L3_PSIZ_P:
-			  case UNI_BLLI_L3_MODE_P |
-			       UNI_BLLI_L3_PSIZ_P |
-			       UNI_BLLI_L3_WSIZ_P:
-				break;
-			}
-			break;
-
-		  case UNI_BLLI_L3_CLMP:
-		  case UNI_BLLI_L3_T70:
-			if(ie->h.present & mask)
-				return -1;
-			break;
-
-		  case UNI_BLLI_L3_TR9577:
-			switch(ie->h.present & mask) {
-			  default:
-				return -1;
-
-			  case 0:
-			  case UNI_BLLI_L3_IPI_P:
-			  case UNI_BLLI_L3_IPI_P | UNI_BLLI_L3_SNAP_P:
-				break;
-			}
-			break;
-
-		  case UNI_BLLI_L3_H310:
-			switch(ie->h.present & mask) {
-			  default:
-				return -1;
-
-			  case 0:
-			  case UNI_BLLI_L3_TTYPE_P:
-			  case UNI_BLLI_L3_TTYPE_P|UNI_BLLI_L3_MUX_P:
-				break;
-			}
-			break;
-
-		  case UNI_BLLI_L3_USER:
-			switch(ie->h.present & mask) {
-			  default:
-				return -1;
-
-			  case 0:	/* XXX ? */
-			  case UNI_BLLI_L3_USER_P:
-				break;
-			}
-			break;
-		}
-		if(ie->h.present & UNI_BLLI_L3_MODE_P) {
-			switch(ie->l3_mode) {
-			  default:
-				return -1;
-
-			  case UNI_BLLI_L3NSEQ:
-			  case UNI_BLLI_L3ESEQ:
-				break;
-			}
-		}
-		if(ie->h.present & UNI_BLLI_L3_PSIZ_P) {
-			switch(ie->l3_psiz) {
-			  default:
-				return -1;
-
-			  case UNI_BLLI_L3_16:
-			  case UNI_BLLI_L3_32:
-			  case UNI_BLLI_L3_64:
-			  case UNI_BLLI_L3_128:
-			  case UNI_BLLI_L3_256:
-			  case UNI_BLLI_L3_512:
-			  case UNI_BLLI_L3_1024:
-			  case UNI_BLLI_L3_2048:
-			  case UNI_BLLI_L3_4096:
-				break;
-			}
-		}
-		if(ie->h.present & UNI_BLLI_L3_WSIZ_P) {
-			if(ie->l3_wsiz == 0 || ie->l3_wsiz > 127)
-				return -1;
-		}
-		if(ie->h.present & UNI_BLLI_L3_IPI_P) {
-			if(ie->l3_ipi == UNI_BLLI_L3_SNAP) {
-				if(!(ie->h.present & UNI_BLLI_L3_SNAP_P))
-					return -1;
-			} else {
-				if(ie->h.present & UNI_BLLI_L3_SNAP_P)
-					return -1;
-			}
-		}
-		if(ie->h.present & UNI_BLLI_L3_USER_P) {
-			if(ie->l3_user > 127)
-				return -1;
-		}
-		if(ie->h.present & UNI_BLLI_L3_SNAP_P) {
-			if(ie->oui >= (1<<24))
-				return -1;
-			if(ie->pid >= (1<<16))
-				return -1;
-		}
-		if(ie->h.present & UNI_BLLI_L3_TTYPE_P) {
-			switch(ie->l3_ttype) {
-			  default:
-				return -1;
-
-			  case UNI_BLLI_L3_TTYPE_RECV:
-			  case UNI_BLLI_L3_TTYPE_SEND:
-			  case UNI_BLLI_L3_TTYPE_BOTH:
-				break;
-			}
-			switch(ie->l3_tcap) {
-			  default:
-				return -1;
-
-			  case UNI_BLLI_L3_TCAP_NOIND:
-			  case UNI_BLLI_L3_TCAP_AAL1:
-			  case UNI_BLLI_L3_TCAP_AAL5:
-			  case UNI_BLLI_L3_TCAP_AAL15:
-				break;
-			}
-		}
-		if(ie->h.present & UNI_BLLI_L3_MUX_P) {
-			switch(ie->l3_fmux) {
-			  default:
-				return -1;
-
-			  case UNI_BLLI_L3_MUX_NOMUX:
-			  case UNI_BLLI_L3_MUX_TS:
-			  case UNI_BLLI_L3_MUX_TSFEC:
-			  case UNI_BLLI_L3_MUX_PS:
-			  case UNI_BLLI_L3_MUX_PSFEC:
-			  case UNI_BLLI_L3_MUX_H221:
-				break;
-			}
-			switch(ie->l3_bmux) {
-			  default:
-				return -1;
-
-			  case UNI_BLLI_L3_MUX_NOMUX:
-			  case UNI_BLLI_L3_MUX_TS:
-			  case UNI_BLLI_L3_MUX_TSFEC:
-			  case UNI_BLLI_L3_MUX_PS:
-			  case UNI_BLLI_L3_MUX_PSFEC:
-			  case UNI_BLLI_L3_MUX_H221:
-				break;
-			}
-		}
-	}
-
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, blli)
-{
-	START_IE(blli, UNI_IE_BLLI, 13);
-
-	if (IE_ISERROR(*ie)) {
-		APP_BYTE(msg, 0xff);
-		APP_BYTE(msg, 0xff);
-		goto out;
-	}
-
-	if(ie->h.present & UNI_BLLI_L1_P)
-		APP_BYTE(msg, (UNI_BLLI_L1_ID<<5)|ie->l1|0x80);
-
-	if(ie->h.present & UNI_BLLI_L2_P) {
-		if(ie->h.present & UNI_BLLI_L2_Q933_P) {
-			APP_BYTE(msg, (UNI_BLLI_L2_ID<<5)|ie->l2);
-			if(ie->h.present & UNI_BLLI_L2_WSIZ_P) {
-				APP_BYTE(msg, (ie->l2_mode<<5)|ie->l2_q933);
-				APP_BYTE(msg, ie->l2_wsiz | 0x80);
-			} else {
-				APP_BYTE(msg, (ie->l2_mode<<5)|ie->l2_q933|0x80);
-			}
-		} else if(ie->h.present & UNI_BLLI_L2_USER_P) {
-			APP_BYTE(msg, (UNI_BLLI_L2_ID<<5)|ie->l2);
-			APP_BYTE(msg, ie->l2_user | 0x80);
-		} else {
-			APP_BYTE(msg, (UNI_BLLI_L2_ID << 5) | ie->l2 | 0x80);
-		}
-	}
-
-	if(ie->h.present & UNI_BLLI_L3_P) {
-		if(ie->h.present & UNI_BLLI_L3_MODE_P) {
-			if(ie->h.present & UNI_BLLI_L3_PSIZ_P) {
-				if(ie->h.present & UNI_BLLI_L3_WSIZ_P) {
-					APP_BYTE(msg,(UNI_BLLI_L3_ID<<5)|ie->l3);
-					APP_BYTE(msg,(ie->l3_mode<<5));
-					APP_BYTE(msg,ie->l3_psiz);
-					APP_BYTE(msg,ie->l3_wsiz|0x80);
-				} else {
-					APP_BYTE(msg,(UNI_BLLI_L3_ID<<5)|ie->l3);
-					APP_BYTE(msg,(ie->l3_mode<<5));
-					APP_BYTE(msg,(ie->l3_psiz|0x80));
-				}
-			} else {
-				APP_BYTE(msg, (UNI_BLLI_L3_ID<<5)|ie->l3);
-				APP_BYTE(msg, (ie->l3_mode<<5)|0x80);
-			}
-		} else if(ie->h.present & UNI_BLLI_L3_USER_P) {
-			APP_BYTE(msg, (UNI_BLLI_L3_ID<<5)|ie->l3);
-			APP_BYTE(msg,(ie->l3_user|0x80));
-		} else if(ie->h.present & UNI_BLLI_L3_IPI_P) {
-			APP_BYTE(msg, (UNI_BLLI_L3_ID<<5)|ie->l3);
-			APP_BYTE(msg,((ie->l3_ipi>>1) & 0x7f));
-			APP_BYTE(msg,(((ie->l3_ipi&1)<<6)|0x80));
-			if(ie->h.present & UNI_BLLI_L3_SNAP_P) {
-				APP_BYTE(msg, 0x80);
-				APP_BYTE(msg, (ie->oui >> 16));
-				APP_BYTE(msg, (ie->oui >>  8));
-				APP_BYTE(msg, (ie->oui >>  0));
-				APP_BYTE(msg, (ie->pid >>  8));
-				APP_BYTE(msg, (ie->pid >>  0));
-			}
-		} else if(ie->h.present & UNI_BLLI_L3_TTYPE_P) {
-			if(ie->h.present & UNI_BLLI_L3_MUX_P) {
-				APP_BYTE(msg, ie->l3_ttype | (ie->l3_tcap << 4));
-				APP_BYTE(msg, 0x80 | (ie->l3_fmux << 3) | ie->l3_bmux);
-			} else {
-				APP_BYTE(msg, 0x80 | ie->l3_ttype | (ie->l3_tcap << 4));
-			}
-		} else {
-			APP_BYTE(msg, (UNI_BLLI_L3_ID<<5)|ie->l3|0x80);
-		}
-	}
-
-  out:
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, blli)
-{
-	u_char c;
-
-	IE_START(;);
-
-	if(ielen > 17)
-		goto rej;
-
-	while(ielen--) {
-		switch(((c = *msg->b_rptr++) >> 5) & 0x3) {
-		  default:
-			goto rej;
-
-		  case UNI_BLLI_L1_ID:
-			ie->h.present |= UNI_BLLI_L1_P;
-			ie->l1 = c & 0x1f;
-			if(!(c & 0x80))
-				goto rej;
-			break;
-
-		  case UNI_BLLI_L2_ID:
-			ie->h.present |= UNI_BLLI_L2_P;
-			ie->l2 = c & 0x1f;
-			if(!(c & 0x80)) {
-				if(ielen == 0)
-					goto rej;
-				ielen--;
-				c = *msg->b_rptr++;
-				if(ie->l2 == UNI_BLLI_L2_USER) {
-					ie->h.present |= UNI_BLLI_L2_USER_P;
-					ie->l2_user = c & 0x7f;
-					if(!(c & 0x80))
-						goto rej;
-				} else {
-					ie->h.present |= UNI_BLLI_L2_Q933_P;
-					ie->l2_q933 = c & 0x3;
-					ie->l2_mode = (c >> 5) & 0x3;
-					if(!(c & 0x80)) {
-						if(ielen == 0)
-							goto rej;
-						ielen--;
-						c = *msg->b_rptr++;
-						ie->h.present |= UNI_BLLI_L2_WSIZ_P;
-						ie->l2_wsiz = c & 0x7f;
-						if(!(c & 0x80))
-							goto rej;
-					}
-				}
-			}
-			break;
-
-		  case UNI_BLLI_L3_ID:
-			ie->h.present |= UNI_BLLI_L3_P;
-			ie->l3 = c & 0x1f;
-			if(!(c & 0x80)) {
-				switch(ie->l3) {
-				  default:
-				  case UNI_BLLI_L3_CLMP:
-				  case UNI_BLLI_L3_T70:
-					goto rej;
-
-				  case UNI_BLLI_L3_X25:
-				  case UNI_BLLI_L3_ISO8208:
-				  case UNI_BLLI_L3_X223:
-					if(ielen == 0)
-						goto rej;
-					ielen--;
-					c = *msg->b_rptr++;
-					ie->l3_mode = (c >> 5) & 0x3;
-					ie->h.present |= UNI_BLLI_L3_MODE_P;
-
-					if(c & 0x80)
-						break;
-
-					if(ielen == 0)
-						goto rej;
-					ielen--;
-					c = *msg->b_rptr++;
-					ie->l3_psiz = c & 0xf;
-					ie->h.present |= UNI_BLLI_L3_PSIZ_P;
-
-					if(c & 0x80)
-						break;
-
-					if(ielen == 0)
-						goto rej;
-					ielen--;
-					c = *msg->b_rptr++;
-					ie->l3_wsiz = c & 0x7f;
-					ie->h.present |= UNI_BLLI_L3_WSIZ_P;
-
-					if(!(c & 0x80))
-						goto rej;
-					break;
-
-				  case UNI_BLLI_L3_TR9577:
-					if(ielen < 2)
-						goto rej;
-					ielen -= 2;
-					c = *msg->b_rptr++;
-					ie->l3_ipi = (c << 1) & 0xfe;
-					if(c & 0x80)
-						goto rej;
-					c = *msg->b_rptr++;
-					ie->l3_ipi |= c & 1;
-					if(!(c & 0x80))
-						goto rej;
-					ie->h.present |= UNI_BLLI_L3_IPI_P;
-
-					if(ie->l3_ipi != UNI_BLLI_L3_SNAP)
-						break;
-					if(ielen < 6)
-						goto rej;
-					ielen -= 6;
-					if(*msg->b_rptr++ != 0x80)
-						goto rej;
-					ie->h.present |= UNI_BLLI_L3_SNAP_P;
-					ie->oui  = *msg->b_rptr++ << 16;
-					ie->oui |= *msg->b_rptr++ << 8;
-					ie->oui |= *msg->b_rptr++;
-					ie->pid  = *msg->b_rptr++ << 8;
-					ie->pid |= *msg->b_rptr++;
-					break;
-
-				  case UNI_BLLI_L3_H310:
-					if(ielen == 0)
-						goto rej;
-					ielen--;
-					c = *msg->b_rptr++;
-					ie->l3_ttype = c & 0xf;
-					ie->l3_tcap = (c >> 4) & 0x7;
-					ie->h.present |= UNI_BLLI_L3_TTYPE_P;
-					if(c & 0x80)
-						break;
-					if(ielen == 0)
-						goto rej;
-					ielen--;
-					c = *msg->b_rptr++;
-					ie->l3_fmux = (c >> 3) & 7;
-					ie->l3_bmux = c & 7;
-					ie->h.present |= UNI_BLLI_L3_MUX_P;
-					if(!(c & 0x80))
-						goto rej;
-					break;
-
-				  case UNI_BLLI_L3_USER:
-					if(ielen == 0)
-						goto rej;
-					ielen--;
-					c = *msg->b_rptr++;
-					ie->l3_user = c & 0x7f;
-					ie->h.present |= UNI_BLLI_L3_USER_P;
-					if(!(c & 0x80))
-						goto rej;
-					break;
-				}
-			}
-			break;
-		}
-	}
-
-	IE_END(BLLI);
-}
-
-/*********************************************************************
- *
- * Broadband locking shift
- * Broadband non-locking shift.
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 41...42
- *  UNI4.0 pp. 9
- *
- * Procedure not supported in UNI4.0, but IE's must be recognized.
- *
- * Only ITU-T coding allowed.
- */
-
-DEF_IE_PRINT(itu, lshift)
-{
-	if(uni_print_iehdr("locking_shift", &ie->h, cx))
-		return;
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, lshift)
-{
-	UNUSED(cx); UNUSED(ie);
-	return -1;
-}
-
-DEF_IE_ENCODE(itu, lshift)
-{
-	START_IE(lshift, UNI_IE_LSHIFT, 1);
-	APP_BYTE(msg, 0x80 | ie->set);
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, lshift)
-{
-	u_char c;
-
-	IE_START(;);
-
-	if(ielen != 1)
-		goto rej;
-
-	c = *msg->b_rptr++;
-
-	if(!(c & 0x80))
-		goto rej;
-	ie->set = c & 7;
-
-	IE_END(LSHIFT);
-}
-
-/***********************************************************************/
-
-DEF_IE_PRINT(itu, nlshift)
-{
-	if(uni_print_iehdr("nonlocking_shift", &ie->h, cx))
-		return;
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, nlshift)
-{
-	UNUSED(cx); UNUSED(ie);
-	return -1;
-}
-
-DEF_IE_ENCODE(itu, nlshift)
-{
-	START_IE(nlshift, UNI_IE_NLSHIFT, 1);
-	APP_BYTE(msg, 0x80 | ie->set);
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, nlshift)
-{
-	u_char c;
-
-	IE_START(;);
-
-	if(ielen != 1)
-		goto rej;
-
-	c = *msg->b_rptr++;
-
-	if(!(c & 0x80))
-		goto rej;
-	ie->set = c & 7;
-
-	IE_END(NLSHIFT);
-}
-
-/*********************************************************************
- *
- * Broadband Sending Complete Indicator
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 74-75
- *
- * Only ITU-T coding allowed.
- */
-DEF_IE_PRINT(itu, scompl)
-{
-	if(uni_print_iehdr("sending_complete", &ie->h, cx))
-		return;
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, scompl)
-{
-	UNUSED(ie); UNUSED(cx);
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, scompl)
-{
-	START_IE(scompl, UNI_IE_SCOMPL, 1);
-
-	APP_BYTE(msg, 0x80 | 0x21);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, scompl)
-{
-	IE_START(;);
-
-	if(ielen != 1)
-  		goto rej;
-
-	if(*msg->b_rptr++ != (0x80 | 0x21))
-  		goto rej;
-
-	IE_END(SCOMPL);
-}
-
-/*********************************************************************
- *
- * Broadband Repeat Indicator
- *
- * References for this IE are:
- *
- *  Q.2931 p.  73
- *  PNNI1.0 p. 196
- *
- * Q.2931 has table 4-19. Only codepoints 0x2 and 0xa (for PNNI) supported.
- *
- * Only ITU-T coding allowed.
- */
-DEF_IE_PRINT(itu, repeat)
-{
-	static const struct uni_print_tbl tbl[] = {
-		MKT(UNI_REPEAT_PRIDESC,	desc),
-		MKT(UNI_REPEAT_STACK,   stack),
-		EOT()
-	};
-
-	if(uni_print_iehdr("repeat", &ie->h, cx))
-		return;
-	uni_print_tbl("type", ie->type, tbl, cx);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, repeat)
-{
-	switch(ie->type) {
-
-	  case UNI_REPEAT_PRIDESC:
-		break;
-
-	  case UNI_REPEAT_STACK:
-		if(!cx->pnni)
-			return -1;
-		break;
-
-	  default:
-		return -1;
-	}
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, repeat)
-{
-	START_IE(repeat, UNI_IE_REPEAT, 1);
-
-	APP_BYTE(msg, 0x80 | ie->type);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, repeat)
-{
-	u_char c;
-
-	IE_START(;);
-
-	if(ielen != 1)
-  		goto rej;
-
-	c = *msg->b_rptr++;
-	if(!(c & 0x80))
-  		goto rej;
-	ie->type = c & 0xf;
-
-	IE_END(REPEAT);
-}
-
-/*********************************************************************
- *
- * Transit Network Selection
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 75...76
- *  UNI4.0 pp. 17
- *
- * According to UNI4.0 this is always National Network Id/Carried Id.
- *
- * ITU-T/Net coding allowed.
- */
-
-DEF_IE_PRINT(itu, tns)
-{
-	u_int i;
-
-	if(uni_print_iehdr("tns", &ie->h, cx))
-		return;
-	uni_print_entry(cx, "net", "%u,\"", ie->len);
-	uni_putc('"', cx);
-	for(i = 0; i < ie->len; i++) {
-		if(ie->net[i] < ' ')
-			uni_printf(cx, "^%c", ie->net[i] + '@');
-		else if(ie->net[i] < '~')
-			uni_putc(ie->net[i], cx);
-		else
-			uni_printf(cx, "\\%03o", ie->net[i]);
-	}
-	uni_putc('"', cx);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, tns)
-{
-	u_int i;
-
-	UNUSED(cx);
-
-	if(ie->len == 0 || ie->len > UNI_TNS_MAXLEN)
-		return -1;
-	for(i = 0; i < ie->len; i++)
-		if(ie->net[i] < ' ' || ie->net[i] > '~')
-			return -1;
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, tns)
-{
-	START_IE(tns, UNI_IE_TNS, ie->len + 1);
-
-	APP_BYTE(msg, 0x80 | (0x2 << 4) | 0x1);
-	APP_BUF(msg, ie->net, ie->len);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, tns)
-{
-	IE_START(;);
-
-	if(ielen < 2 || ielen > 5)
-		goto rej;
-
-	if(*msg->b_rptr++ != (0x80 | (0x2 << 4) | 0x1))
-		goto rej;
-	ielen--;
-
-	ie->len = 0;
-	while(ielen--)
-		ie->net[ie->len++] = *msg->b_rptr++;
-
-	IE_END(TNS);
-}
-
-/*********************************************************************
- *
- * Restart indicator
- *
- * References for this IE are:
- *
- *  Q.2931 pp. 73...74
- *  UNI4.0 p.  17
- *
- * Only ITU-T coding allowed.
- */
-
-DEF_IE_PRINT(itu, restart)
-{
-	static const struct uni_print_tbl tbl[] = {
-		MKT(UNI_RESTART_CHANNEL,	channel),
-		MKT(UNI_RESTART_PATH,		path),
-		MKT(UNI_RESTART_ALL,		all),
-		EOT()
-	};
-
-	if(uni_print_iehdr("restart", &ie->h, cx))
-		return;
-	uni_print_tbl("class", ie->rclass, tbl, cx);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, restart)
-{
-	UNUSED(cx);
-
-	switch(ie->rclass) {
-	  default:
-		return -1;
-
-	  case UNI_RESTART_CHANNEL:
-	  case UNI_RESTART_PATH:
-	  case UNI_RESTART_ALL:
-		break;
-	}
-
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, restart)
-{
-	START_IE(restart, UNI_IE_RESTART, 1);
-
-	APP_BYTE(msg, 0x80 | ie->rclass);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, restart)
-{
-	u_char c;
-
-	IE_START(;);
-
-	if(ielen != 1)
-		goto rej;
-
-	ie->rclass = (c = *msg->b_rptr++) & 0x7;
-
-	if(!(c & 0x80))
-		goto rej;
-
-	IE_END(RESTART);
-}
-
-/*********************************************************************
- *
- * User-to-user info.
- *
- * References for this IE are:
- *
- *  Q.2957
- *
- * Only ITU-T coding allowed.
- */
-
-DEF_IE_PRINT(itu, uu)
-{
-	u_int i;
-
-	if(uni_print_iehdr("uu", &ie->h, cx))
-		return;
-	uni_print_entry(cx, "len", "%u", ie->len);
-	uni_print_entry(cx, "info", "(");
-	for(i = 0; i < ie->len; i++)
-		uni_printf(cx, "%s0x%02x", i == 0 ? "" : " ", ie->uu[i]);
-	uni_printf(cx, ")");
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, uu)
-{
-	UNUSED(cx);
-
-	if(ie->len > UNI_UU_MAXLEN)
-		return -1;
-
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, uu)
-{
-	START_IE(uu, UNI_IE_UU, ie->len);
-
-	APP_BUF(msg, ie->uu, ie->len);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, uu)
-{
-	IE_START(;);
-
-	if(ielen > UNI_UU_MAXLEN || ielen < 1)
-		goto rej;
-
-	ie->len = ielen;
-	ielen = 0;
-	(void)memcpy(ie->uu, msg->b_rptr, ie->len);
-	msg->b_rptr += ie->len;
-
-	IE_END(UU);
-}
-
-/*********************************************************************
- *
- * Generic Identifier Transport
- *
- * References for this IE are:
- *
- *  UNI4.0 pp. 26...28
- *
- * UNI4.0 prescribes a fixed format for this IE. We have a flag in the
- * context structur, which tells us whether the check of this IE should be
- * hard or soft. Probably it should be hard for end systems and soft for
- * network nodes.
- *
- * Only Net Coding allowed. (XXX)
- */
-
-DEF_IE_PRINT(net, git)
-{
-	static const struct uni_print_tbl std_tbl[] = {
-		MKT(UNI_GIT_STD_DSMCC,	dsmcc),
-		MKT(UNI_GIT_STD_H245,	H.245),
-		EOT()
-	};
-	static const struct uni_print_tbl type_tbl[] = {
-		MKT(UNI_GIT_TYPE_SESS,	sess),
-		MKT(UNI_GIT_TYPE_RES,	res),
-		EOT()
-	};
-	u_int i, j;
-	char buf[20];
-
-	if(uni_print_iehdr("git", &ie->h, cx))
-		return;
-
-	uni_print_tbl("std", ie->std, std_tbl, cx);
-
-	uni_print_eol(cx);
-	uni_print_push_prefix("id", cx);
-	cx->indent++;
-	for(i = 0; i < ie->numsub; i++) {
-		sprintf(buf, "%u", i);
-		uni_print_entry(cx, buf, "(");
-		uni_print_tbl(NULL, ie->sub[i].type, type_tbl, cx);
-		for(j = 0; j < ie->sub[i].len; j++)
-			uni_printf(cx, ",0x%02x", ie->sub[i].val[j]);
-		uni_printf(cx, ")");
-		uni_print_eol(cx);
-	}
-	cx->indent--;
-	uni_print_pop_prefix(cx);
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(net, git)
-{
-	u_int i;
-
-	if(cx->git_hard) {
-		switch(ie->std) {
-		  case UNI_GIT_STD_DSMCC:
-		  case UNI_GIT_STD_H245:
-			break;
-		  default:
-			return -1;
-		}
-		if(ie->numsub != 2)
-			return -1;
-		if(ie->sub[0].type != UNI_GIT_TYPE_SESS)
-			return -1;
-		if(ie->sub[0].len > UNI_GIT_MAXSESS)
-			return -1;
-		if(ie->sub[1].type != UNI_GIT_TYPE_RES)
-			return -1;
-		if(ie->sub[1].len > UNI_GIT_MAXRES)
-			return -1;
-	} else {
-		if(ie->numsub > UNI_GIT_MAXSUB)
-			return -1;
-		for(i = 0; i < ie->numsub; i++)
-			if(ie->sub[i].len > UNI_GIT_MAXVAL)
-				return -1;
-	}
-	return 0;
-}
-
-DEF_IE_ENCODE(net, git)
-{
-	u_int i;
-
-	START_IE(git, UNI_IE_GIT, 1 + ie->numsub * (1 + UNI_GIT_MAXVAL));
-
-	APP_BYTE(msg, ie->std);
-	for(i = 0; i < ie->numsub; i++) {
-		APP_BYTE(msg, ie->sub[i].type);
-		APP_BYTE(msg, ie->sub[i].len);
-		APP_BUF(msg, ie->sub[i].val, ie->sub[i].len);
-	}
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(net, git)
-{
-	IE_START(;);
-
-	if(ielen > 1 + UNI_GIT_MAXSUB * (1 + UNI_GIT_MAXVAL) || ielen < 1)
-		goto rej;
-
-	ie->std = *msg->b_rptr++;
-	ielen--;
-
-	ie->numsub = 0;
-	while(ielen > 0) {
-		if(ie->numsub >= UNI_GIT_MAXSUB)
-			goto rej;
-
-		ie->sub[ie->numsub].type = *msg->b_rptr++;
-		ielen--;
-
-		if(ielen == 0)
-			goto rej;
-		ie->sub[ie->numsub].len = *msg->b_rptr++;
-		ielen--;
-
-		if(ie->sub[ie->numsub].len > UNI_GIT_MAXVAL)
-			goto rej;
-		if(ie->sub[ie->numsub].len > (u_int)ielen)
-			goto rej;
-
-		(void)memcpy(ie->sub[ie->numsub].val, msg->b_rptr, ie->sub[ie->numsub].len);
-		ielen -= ie->sub[ie->numsub].len;
-		msg->b_rptr += ie->sub[ie->numsub].len;
-
-		ie->numsub++;
-	}
-
-	IE_END(GIT);
-}
-
-/*********************************************************************
- *
- * Additional ABR Parameters
- * ABR Setup parameters
- *
- * References for this IE are:
- *
- *  	UNI4.0 pp. 78...82
- *	PNNI1.0 p. 195
- *
- * Notes:
- *	Only NET coding.
- */
-
-static void
-print_abr_rec(struct unicx *cx, struct uni_abr_rec *rec)
-{
-	if(rec->present & UNI_ABR_REC_NRM_P)
-		uni_print_entry(cx, "nrm", "%d", rec->nrm);
-	if(rec->present & UNI_ABR_REC_TRM_P)
-		uni_print_entry(cx, "trm", "%d", rec->trm);
-	if(rec->present & UNI_ABR_REC_CDF_P)
-		uni_print_entry(cx, "cdf", "%d", rec->cdf);
-	if(rec->present & UNI_ABR_REC_ADTF_P)
-		uni_print_entry(cx, "adtf", "%d", rec->adtf);
-}
-
-DEF_IE_PRINT(net, abradd)
-{
-	if(uni_print_iehdr("abradd", &ie->h, cx))
-		return;
-
-	uni_print_push_prefix("fwd", cx);
-	print_abr_rec(cx, &ie->fwd);
-	uni_print_pop_prefix(cx);
-
-	uni_print_push_prefix("bwd", cx);
-	print_abr_rec(cx, &ie->bwd);
-	uni_print_pop_prefix(cx);
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(net, abradd)
-{
-	UNUSED(cx);
-	UNUSED(ie);
-
-	return 0;
-}
-
-static u_int
-encode_abr_rec(struct uni_abr_rec *rec)
-{
-	u_int ret = rec->present & 0xf000;
-
-	if(ret & UNI_ABR_REC_NRM_P)
-		ret |= (rec->nrm & 0x7) << 25;
-	if(ret & UNI_ABR_REC_TRM_P)
-		ret |= (rec->trm & 0x7) << 22;
-	if(ret & UNI_ABR_REC_CDF_P)
-		ret |= (rec->cdf & 0x7) << 19;
-	if(ret & UNI_ABR_REC_ADTF_P)
-		ret |= (rec->adtf & 0x3ff) << 9;
-
-	return ret;
-}
-
-DEF_IE_ENCODE(net, abradd)
-{
-	START_IE(abradd, UNI_IE_ABRADD, 10);
-
-	APP_SUB_32BIT(msg, UNI_ABRADD_FADD_ID, encode_abr_rec(&ie->fwd));
-	APP_SUB_32BIT(msg, UNI_ABRADD_BADD_ID, encode_abr_rec(&ie->bwd));
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-static int
-decode_abr_rec(struct uni_msg *msg, struct uni_abr_rec *rec)
-{
-	u_int val;
-
-	val  = *msg->b_rptr++ << 24;
-	val |= *msg->b_rptr++ << 16;
-	val |= *msg->b_rptr++ <<  8;
-	val |= *msg->b_rptr++ <<  0;
-
-	rec->present = val & 0xf000;
-
-	rec->nrm  = (val & UNI_ABR_REC_NRM_P) ? ((val >> 25) & 0x7) : 0;
-	rec->trm  = (val & UNI_ABR_REC_TRM_P) ? ((val >> 22) & 0x7) : 0;
-	rec->cdf  = (val & UNI_ABR_REC_CDF_P) ? ((val >> 19) & 0x7) : 0;
-	rec->adtf = (val & UNI_ABR_REC_ADTF_P)? ((val >>  9) & 0x3ff) : 0;
-
-	return 0;
-}
-
-DEF_IE_DECODE(net, abradd)
-{
-	IE_START(;);
-
-	if(ielen != 10)
-		goto rej;
-
-
-	while(ielen--) {
-		switch(*msg->b_rptr++) {
-
-		  default:
-			goto rej;
-
-		  case UNI_ABRADD_FADD_ID:
-			if(decode_abr_rec(msg, &ie->fwd))
-				goto rej;
-			ielen -= 4;
-			break;
-
-		  case UNI_ABRADD_BADD_ID:
-			if(decode_abr_rec(msg, &ie->bwd))
-				goto rej;
-			ielen -= 4;
-			break;
-		}
-	}
-	IE_END(ABRADD);
-}
-
-/*********************************************************************/
-
-DEF_IE_PRINT(net, abrsetup)
-{
-	if(uni_print_iehdr("abrsetup", &ie->h, cx))
-		return;
-
-	uni_print_entry(cx, "rm_frt", "%d", ie->rmfrt);
-
-	uni_print_push_prefix("fwd", cx);
-	if(ie->h.present & UNI_ABRSETUP_FICR_P)
-		uni_print_entry(cx, "icr", "%d", ie->ficr);
-	if(ie->h.present & UNI_ABRSETUP_FTBE_P)
-		uni_print_entry(cx, "tbe", "%d", ie->ftbe);
-	if(ie->h.present & UNI_ABRSETUP_FRIF_P)
-		uni_print_entry(cx, "rif", "%d", ie->frif);
-	if(ie->h.present & UNI_ABRSETUP_FRDF_P)
-		uni_print_entry(cx, "rdf", "%d", ie->frdf);
-	uni_print_pop_prefix(cx);
-
-	uni_print_push_prefix("bwd", cx);
-	if(ie->h.present & UNI_ABRSETUP_BICR_P)
-		uni_print_entry(cx, "icr", "%d", ie->bicr);
-	if(ie->h.present & UNI_ABRSETUP_BTBE_P)
-		uni_print_entry(cx, "tbe", "%d", ie->btbe);
-	if(ie->h.present & UNI_ABRSETUP_BRIF_P)
-		uni_print_entry(cx, "rif", "%d", ie->brif);
-	if(ie->h.present & UNI_ABRSETUP_BRDF_P)
-		uni_print_entry(cx, "rdf", "%d", ie->brdf);
-	uni_print_pop_prefix(cx);
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(net, abrsetup)
-{
-	if(cx->pnni) {
-		if(!(ie->h.present & UNI_ABRSETUP_FICR_P))
-			return -1;
-		if(!(ie->h.present & UNI_ABRSETUP_BICR_P))
-			return -1;
-		if(!(ie->h.present & UNI_ABRSETUP_FTBE_P))
-			return -1;
-		if(!(ie->h.present & UNI_ABRSETUP_BTBE_P))
-			return -1;
-		if(!(ie->h.present & UNI_ABRSETUP_FRIF_P))
-			return -1;
-		if(!(ie->h.present & UNI_ABRSETUP_BRIF_P))
-			return -1;
-		if(!(ie->h.present & UNI_ABRSETUP_FRDF_P))
-			return -1;
-		if(!(ie->h.present & UNI_ABRSETUP_BRDF_P))
-			return -1;
-		if(!(ie->h.present & UNI_ABRSETUP_RMFRT_P))
-			return -1;
-	}
-
-	if(!(ie->h.present & UNI_ABRSETUP_RMFRT_P))
-		return -1;
-
-	if(ie->h.present & UNI_ABRSETUP_FICR_P)
-		if(ie->ficr >= 1 << 24)
-			return -1;
-	if(ie->h.present & UNI_ABRSETUP_BICR_P)
-		if(ie->bicr >= 1 << 24)
-			return -1;
-
-	if(ie->h.present & UNI_ABRSETUP_FTBE_P)
-		if(ie->ftbe >= 1 << 24 || ie->ftbe == 0)
-			return -1;
-	if(ie->h.present & UNI_ABRSETUP_BTBE_P)
-		if(ie->btbe >= 1 << 24 || ie->btbe == 0)
-			return -1;
-
-	if(ie->rmfrt >= 1 << 24)
-		return -1;
-
-	if(ie->h.present & UNI_ABRSETUP_FRIF_P)
-		if(ie->frif > 15)
-			return -1;
-	if(ie->h.present & UNI_ABRSETUP_FRDF_P)
-		if(ie->frdf > 15)
-			return -1;
-	if(ie->h.present & UNI_ABRSETUP_BRIF_P)
-		if(ie->brif > 15)
-			return -1;
-	if(ie->h.present & UNI_ABRSETUP_BRDF_P)
-		if(ie->brdf > 15)
-			return -1;
-	return 0;
-}
-
-DEF_IE_ENCODE(net, abrsetup)
-{
-	START_IE(abrsetup, UNI_IE_ABRSETUP, 32);
-
-	APP_OPT_24BIT(msg, ie->h.present, UNI_ABRSETUP_FICR_P,
-		UNI_ABRSETUP_FICR_ID, ie->ficr);
-	APP_OPT_24BIT(msg, ie->h.present, UNI_ABRSETUP_BICR_P,
-		UNI_ABRSETUP_BICR_ID, ie->bicr);
-	APP_OPT_24BIT(msg, ie->h.present, UNI_ABRSETUP_FTBE_P,
-		UNI_ABRSETUP_FTBE_ID, ie->ftbe);
-	APP_OPT_24BIT(msg, ie->h.present, UNI_ABRSETUP_BTBE_P,
-		UNI_ABRSETUP_BTBE_ID, ie->btbe);
-	APP_SUB_24BIT(msg, UNI_ABRSETUP_RMFRT_ID, ie->rmfrt);
-	APP_OPT_BYTE(msg, ie->h.present, UNI_ABRSETUP_FRIF_P,
-		UNI_ABRSETUP_FRIF_ID, ie->frif);
-	APP_OPT_BYTE(msg, ie->h.present, UNI_ABRSETUP_BRIF_P,
-		UNI_ABRSETUP_BRIF_ID, ie->brif);
-	APP_OPT_BYTE(msg, ie->h.present, UNI_ABRSETUP_FRDF_P,
-		UNI_ABRSETUP_FRDF_ID, ie->frdf);
-	APP_OPT_BYTE(msg, ie->h.present, UNI_ABRSETUP_BRDF_P,
-		UNI_ABRSETUP_BRDF_ID, ie->brdf);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(net, abrsetup)
-{
-	IE_START(;);
-
-	if(ielen < 4 || ielen > 32)
-		goto rej;
-
-
-	while(ielen--) {
-		switch(*msg->b_rptr++) {
-
-		  default:
-			goto rej;
-
-
-		  DEC_GETF3(ABRSETUP_FICR, ficr, ie->h.present);
-		  DEC_GETF3(ABRSETUP_BICR, bicr, ie->h.present);
-		  DEC_GETF3(ABRSETUP_FTBE, ftbe, ie->h.present);
-		  DEC_GETF3(ABRSETUP_BTBE, btbe, ie->h.present);
-		  DEC_GETF1(ABRSETUP_FRIF, frif, ie->h.present);
-		  DEC_GETF1(ABRSETUP_BRIF, brif, ie->h.present);
-		  DEC_GETF1(ABRSETUP_FRDF, frdf, ie->h.present);
-		  DEC_GETF1(ABRSETUP_BRDF, brdf, ie->h.present);
-		  DEC_GETF3(ABRSETUP_RMFRT, frif, ie->h.present);
-		}
-	}
-	IE_END(ABRSETUP);
-}
-
-/*********************************************************************
- *
- * Broadband report type
- *
- * References for this IE are:
- *
- *  Q.2963.1  pp. 7...8
- *
- * Only ITU-T coding allowed.
- */
-
-DEF_IE_PRINT(itu, report)
-{
-	static const struct uni_print_tbl tbl[] = {
-		MKT(UNI_REPORT_MODCONF,	modconf),
-		MKT(UNI_REPORT_CLOCK,	clock),
-		MKT(UNI_REPORT_EEAVAIL,	eeavail),
-		MKT(UNI_REPORT_EEREQ,	eereq),
-		MKT(UNI_REPORT_EECOMPL,	eecompl),
-		EOT()
-	};
-
-	if(uni_print_iehdr("report", &ie->h, cx))
-		return;
-	uni_print_tbl("type", ie->report, tbl, cx);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, report)
-{
-	UNUSED(cx);
-
-	switch(ie->report) {
-
-	  default:
-		return -1;
-
-	  case UNI_REPORT_MODCONF:
-	  case UNI_REPORT_CLOCK:
-	  case UNI_REPORT_EEAVAIL:
-	  case UNI_REPORT_EEREQ:
-	  case UNI_REPORT_EECOMPL:
-		break;
-	}
-	return 0;
-}
-
-DEF_IE_ENCODE(itu, report)
-{
-	START_IE(report, UNI_IE_REPORT, 1);
-
-	APP_BYTE(msg, ie->report);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(itu, report)
-{
-	IE_START(;);
-	if(ielen != 1)
-		goto rej;
-
-	ie->report = *msg->b_rptr++;
-
-	IE_END(REPORT);
-}
-
-/*********************************************************************
- *
- * Soft PVPC/PVCC
- *
- * References for this IE are:
- *
- *  PNNI1.0 pp. 201...203
- *
- * Only NET coding allowed.
- */
-DEF_IE_PRINT(net, calling_soft)
-{
-	if(uni_print_iehdr("calling_soft", &ie->h, cx))
-		return;
-
-	uni_print_entry(cx, "vpi", "%d", ie->vpi);
-	if(ie->h.present & UNI_CALLING_SOFT_VCI_P)
-		uni_print_entry(cx, "vci", "%d", ie->vci);
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_PRINT(net, called_soft)
-{
-	static const struct uni_print_tbl tab[] = {
-		MKT(UNI_SOFT_SEL_ANY,	any),
-		MKT(UNI_SOFT_SEL_REQ,	required),
-		MKT(UNI_SOFT_SEL_ASS,	assigned),
-		EOT()
-	};
-
-	if(uni_print_iehdr("called_soft", &ie->h, cx))
-		return;
-
-	uni_print_tbl("selection", ie->sel, tab, cx);
-	if(ie->h.present & UNI_CALLED_SOFT_VPI_P)
-		uni_print_entry(cx, "vpi", "%d", ie->vpi);
-	if(ie->h.present & UNI_CALLED_SOFT_VCI_P)
-		uni_print_entry(cx, "vci", "%d", ie->vci);
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(net, calling_soft)
-{
-	UNUSED(cx);
-
-	if(ie->vpi >= 1 << 12)
-		return -1;
-	return 0;
-}
-
-DEF_IE_CHECK(net, called_soft)
-{
-	UNUSED(cx);
-
-	switch(ie->sel) {
-
-	  case UNI_SOFT_SEL_ANY:
-	  case UNI_SOFT_SEL_REQ:
-	  case UNI_SOFT_SEL_ASS:
-		break;
-
-	  default:
-		return -1;
-	}
-	if(ie->h.present & UNI_CALLED_SOFT_VPI_P) {
-		if(ie->vpi >= 1 << 12)
-			return -1;
-	} else {
-		if(ie->sel != UNI_SOFT_SEL_ANY)
-			return -1;
-	}
-
-	if(ie->h.present & UNI_CALLED_SOFT_VCI_P)
-		if(!(ie->h.present & UNI_CALLED_SOFT_VPI_P))
-			return -1;
-
-
-	return 0;
-}
-
-DEF_IE_ENCODE(net, calling_soft)
-{
-	START_IE(calling_soft, UNI_IE_CALLING_SOFT, 6);
-
-	APP_BYTE(msg, 0x81);
-	APP_16BIT(msg, ie->vpi);
-
-	if(ie->h.present & UNI_CALLING_SOFT_VCI_P) {
-		APP_BYTE(msg, 0x82);
-		APP_16BIT(msg, ie->vci);
-	}
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_ENCODE(net, called_soft)
-{
-	START_IE(called_soft, UNI_IE_CALLED_SOFT, 7);
-
-	APP_BYTE(msg, ie->sel);
-
-	if(ie->h.present & UNI_CALLED_SOFT_VPI_P) {
-		APP_BYTE(msg, 0x81);
-		APP_16BIT(msg, ie->vpi);
-	}
-
-	if(ie->h.present & UNI_CALLED_SOFT_VCI_P) {
-		APP_BYTE(msg, 0x82);
-		APP_16BIT(msg, ie->vci);
-	}
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(net, calling_soft)
-{
-	int vci_seen, vpi_seen;
-
-	IE_START(;);
-	if(ielen < 3)
-		goto rej;
-
-	vci_seen = 0;
-	vpi_seen = 0;
-
-	while(ielen) {
-		switch(*msg->b_rptr++) {
-
-		  case 0x81:
-			if(!vpi_seen) {
-				ie->vpi = *msg->b_rptr++ << 8;
-				ie->vpi |= *msg->b_rptr++;
-			} else {
-				msg->b_rptr += 2;
-			}
-			ielen -= 3;
-			break;
-
-		  case 0x82:
-			if(!vci_seen) {
-				ie->vci = *msg->b_rptr++ << 8;
-				ie->vci |= *msg->b_rptr++;
-			} else {
-				msg->b_rptr += 2;
-			}
-			ie->h.present |= UNI_CALLING_SOFT_VCI_P;
-			ielen -= 3;
-			break;
-
-		  default:
-			goto rej;
-		}
-	}
-
-	if(!vpi_seen)
-		goto rej;
-
-	IE_END(CALLING_SOFT);
-}
-
-DEF_IE_DECODE(net, called_soft)
-{
-	int vci_seen, vpi_seen;
-
-	IE_START(;);
-	if(ielen < 3)
-		goto rej;
-
-	vci_seen = 0;
-	vpi_seen = 0;
-
-	while(ielen) {
-		switch(*msg->b_rptr++) {
-
-		  case 0x81:
-			if(!vpi_seen) {
-				ie->vpi = *msg->b_rptr++ << 8;
-				ie->vpi |= *msg->b_rptr++;
-				vpi_seen = 1;
-			} else {
-				msg->b_rptr += 2;
-			}
-			ielen -= 3;
-			ie->h.present |= UNI_CALLED_SOFT_VCI_P;
-			break;
-
-		  case 0x82:
-			if(!vci_seen) {
-				ie->vci = *msg->b_rptr++ << 8;
-				ie->vci |= *msg->b_rptr++;
-				vci_seen = 1;
-			} else {
-				msg->b_rptr += 2;
-			}
-			ie->h.present |= UNI_CALLED_SOFT_VCI_P;
-			ielen -= 3;
-			break;
-
-		  default:
-			goto rej;
-		}
-	}
-
-	IE_END(CALLED_SOFT);
-}
-
-/*********************************************************************
- *
- * Crankback
- *
- * References for this IE are:
- *
- *  PNNI1.0 pp. 203...206
- *
- * Only NET coding allowed.
- */
-
-DEF_IE_PRINT(net, crankback)
-{
-	u_int j;
-
-	if(uni_print_iehdr("crankback", &ie->h, cx))
-		return;
-
-	uni_print_entry(cx, "level", "%d", ie->level);
-
-	switch(ie->type) {
-
-	  case UNI_CRANKBACK_IF:
-		uni_print_entry(cx, "type", "interface");
-		break;
-
-	  case UNI_CRANKBACK_NODE:
-		uni_print_entry(cx, "type", "node");
-		uni_print_entry(cx, "node", "{%d/", ie->id.node.level);
-		for(j = 0; j < 21; j++)
-			uni_printf(cx, "%02x", ie->id.node.id[j]);
-		uni_printf(cx, "}");
-		uni_print_eol(cx);
-		break;
-
-	  case UNI_CRANKBACK_LINK:
-		uni_print_entry(cx, "type", "link");
-		uni_print_push_prefix("link", cx);
-		cx->indent++;
-
-		uni_print_entry(cx, "prec", "{%d/", ie->id.link.plevel);
-		for(j = 0; j < 21; j++)
-			uni_printf(cx, "%02x", ie->id.link.pid[j]);
-		uni_printf(cx, "}");
-		uni_print_eol(cx);
-
-		uni_print_entry(cx, "port", "0x%04x", ie->id.link.port);
-		uni_print_eol(cx);
-
-		uni_print_entry(cx, "succ", "{%d/", ie->id.link.slevel);
-		for(j = 0; j < 21; j++)
-			uni_printf(cx, "%02x", ie->id.link.sid[j]);
-		uni_printf(cx, "}");
-		uni_print_eol(cx);
-
-		cx->indent--;
-		uni_print_pop_prefix(cx);
-		break;
-
-	  default:
-		uni_print_entry(cx, "type", "0x%02x", ie->type);
-		break;
-	}
-
-	uni_print_entry(cx, "cause", "0x%02x", ie->cause);
-
-	if(ie->h.present & UNI_CRANKBACK_TOP_P) {
-		uni_print_push_prefix("topol", cx);
-		uni_print_entry(cx, "dir", "%d", ie->diag.top.dir);
-		uni_print_entry(cx, "port", "0x%04x", ie->diag.top.port);
-		uni_print_entry(cx, "avcr", "%u", ie->diag.top.avcr);
-		if(ie->h.present & UNI_CRANKBACK_TOPX_P) {
-			uni_print_entry(cx, "crm", "%u", ie->diag.top.crm);
-			uni_print_entry(cx, "vf", "%u", ie->diag.top.vf);
-		}
-		uni_print_pop_prefix(cx);
-		uni_print_eol(cx);
-	}
-	if(ie->h.present & UNI_CRANKBACK_QOS_P) {
-		uni_print_push_prefix("qos", cx);
-		uni_print_entry(cx, "ctd", "%savail", ie->diag.qos.ctd ? "" : "un");
-		uni_print_entry(cx, "cdv", "%savail", ie->diag.qos.cdv ? "" : "un");
-		uni_print_entry(cx, "clr", "%savail", ie->diag.qos.clr ? "" : "un");
-		uni_print_entry(cx, "other", "%savail", ie->diag.qos.other ? "" : "un");
-		uni_print_pop_prefix(cx);
-		uni_print_eol(cx);
-	}
-
-	uni_print_eol(cx);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(net, crankback)
-{
-	UNUSED(cx);
-
-	if(ie->level > 104)
-		return -1;
-	switch(ie->type) {
-	  case UNI_CRANKBACK_IF:
-		break;
-	  case UNI_CRANKBACK_NODE:
-		if(ie->id.node.level > 104)
-			return -1;
-		break;
-
-	  case UNI_CRANKBACK_LINK:
-		if(ie->id.link.plevel > 104)
-			return -1;
-		if(ie->id.link.slevel > 104)
-			return -1;
-		break;
-
-	  default:
-		return -1;
-	}
-
-	if(ie->h.present & UNI_CRANKBACK_TOP_P) {
-		if(ie->h.present & UNI_CRANKBACK_QOS_P)
-			return -1;
-
-		if(ie->cause != UNI_CAUSE_CRATE_NAVL)
-			return -1;
-		switch(ie->diag.top.dir) {
-
-		  case 0x00:
-		  case 0x01:
-			break;
-
-		  default:
-			return -1;
-		}
-	}
-	if(ie->h.present & UNI_CRANKBACK_QOS_P) {
-		if(ie->cause != UNI_CAUSE_QOS_NAVL)
-			return -1;
-	}
-	return 0;
-}
-
-DEF_IE_ENCODE(net, crankback)
-{
-	START_IE(crankback, UNI_IE_CRANKBACK, 72);
-
-	APP_BYTE(msg, ie->level);
-	APP_BYTE(msg, ie->type);
-
-	switch(ie->type) {
-
-	  case UNI_CRANKBACK_IF:
-		break;
-
-	  case UNI_CRANKBACK_NODE:
-		APP_BYTE(msg, ie->id.node.level);
-		APP_BUF(msg, ie->id.node.id, 21);
-		break;
-
-	  case UNI_CRANKBACK_LINK:
-		APP_BYTE(msg, ie->id.link.plevel);
-		APP_BUF(msg, ie->id.link.pid, 21);
-		APP_32BIT(msg, ie->id.link.port);
-		APP_BYTE(msg, ie->id.link.slevel);
-		APP_BUF(msg, ie->id.link.sid, 21);
-		break;
-	}
-
-	APP_BYTE(msg, ie->cause);
-
-	if(ie->h.present & UNI_CRANKBACK_TOP_P) {
-		APP_BYTE(msg, ie->diag.top.dir);
-		APP_32BIT(msg, ie->diag.top.port);
-		APP_32BIT(msg, ie->diag.top.avcr);
-		if(ie->h.present & UNI_CRANKBACK_TOPX_P) {
-			APP_32BIT(msg, ie->diag.top.crm);
-			APP_32BIT(msg, ie->diag.top.vf);
-		}
-	}
-
-	if(ie->h.present & UNI_CRANKBACK_QOS_P) {
-		APP_BYTE(msg, (ie->diag.qos.ctd << 3)
-			     |(ie->diag.qos.cdv << 2)
-			     |(ie->diag.qos.clr << 1)
-			     |(ie->diag.qos.other));
-	}
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-
-DEF_IE_DECODE(net, crankback)
-{
-	IE_START(;);
-
-	if(ielen < 3)
-		goto rej;
-
-	ie->level = *msg->b_rptr++;
-	ielen--;
-
-	ie->type = *msg->b_rptr++;
-	ielen--;
-
-	switch(ie->type) {
-
-	  default:
-		goto rej;
-
-	  case UNI_CRANKBACK_IF:
-		break;
-
-	  case UNI_CRANKBACK_NODE:
-		if(ielen < 22)
-			goto rej;
-		ie->id.node.level = *msg->b_rptr++;
-		(void)memcpy(ie->id.node.id, msg->b_rptr, 21);
-		msg->b_rptr += 21;
-		ielen -= 22;
-		break;
-
-	  case UNI_CRANKBACK_LINK:
-		if(ielen < 48)
-			goto rej;
-		ie->id.link.plevel = *msg->b_rptr++;
-		(void)memcpy(ie->id.link.pid, msg->b_rptr, 21);
-		msg->b_rptr += 21;
-		ielen -= 22;
-
-		ie->id.link.port  = *msg->b_rptr++ << 24;
-		ie->id.link.port |= *msg->b_rptr++ << 16;
-		ie->id.link.port |= *msg->b_rptr++ <<  8;
-		ie->id.link.port |= *msg->b_rptr++ <<  0;
-		ielen -= 4;
-
-		ie->id.link.slevel = *msg->b_rptr++;
-		(void)memcpy(ie->id.link.sid, msg->b_rptr, 21);
-		msg->b_rptr += 21;
-		ielen -= 22;
-
-		break;
-	}
-
-	if(ielen < 1)
-		goto rej;
-	ie->cause = *msg->b_rptr++;
-	ielen--;
-
-	if(ie->cause == UNI_CAUSE_CRATE_NAVL) {
-		if(ielen > 0) {
-			if(ielen != 9 && ielen != 17)
-				goto rej;
-			ie->diag.top.dir = *msg->b_rptr++;
-			ie->diag.top.port  = *msg->b_rptr++ << 24;
-			ie->diag.top.port |= *msg->b_rptr++ << 16;
-			ie->diag.top.port |= *msg->b_rptr++ <<  8;
-			ie->diag.top.port |= *msg->b_rptr++ <<  0;
-			ie->diag.top.avcr  = *msg->b_rptr++ << 24;
-			ie->diag.top.avcr |= *msg->b_rptr++ << 16;
-			ie->diag.top.avcr |= *msg->b_rptr++ <<  8;
-			ie->diag.top.avcr |= *msg->b_rptr++ <<  0;
-			ielen -= 9;
-			ie->h.present |= UNI_CRANKBACK_TOP_P;
-			if(ielen > 0) {
-				ie->diag.top.crm  = *msg->b_rptr++ << 24;
-				ie->diag.top.crm |= *msg->b_rptr++ << 16;
-				ie->diag.top.crm |= *msg->b_rptr++ <<  8;
-				ie->diag.top.crm |= *msg->b_rptr++ <<  0;
-				ie->diag.top.vf  = *msg->b_rptr++ << 24;
-				ie->diag.top.vf |= *msg->b_rptr++ << 16;
-				ie->diag.top.vf |= *msg->b_rptr++ <<  8;
-				ie->diag.top.vf |= *msg->b_rptr++ <<  0;
-				ie->h.present |= UNI_CRANKBACK_TOPX_P;
-				ielen -= 8;
-			}
-		}
-	} else if(ie->cause == UNI_CAUSE_QOS_NAVL) {
-		if(ielen > 0) {
-			if(ielen != 1)
-				goto rej;
-			ie->diag.qos.ctd = *msg->b_rptr >> 3;
-			ie->diag.qos.cdv = *msg->b_rptr >> 2;
-			ie->diag.qos.clr = *msg->b_rptr >> 1;
-			ie->diag.qos.other = *msg->b_rptr >> 0;
-			ie->h.present |= UNI_CRANKBACK_QOS_P;
-			ielen -= 1;
-		}
-	} else {
-		if(ielen > 0)
-			goto rej;
-	}
-
-	IE_END(CRANKBACK);
-}
-
-/*********************************************************************
- *
- * Designated transit list
- *
- * References for this IE are:
- *
- *  PNNI1.0 pp. 206...208
- *
- * Only NET coding allowed.
- */
-DEF_IE_PRINT(net, dtl)
-{
-	u_int i, j;
-	char buf[10];
-
-	if(uni_print_iehdr("dtl", &ie->h, cx))
-		return;
-
-	uni_print_entry(cx, "ptr", "%d(%d)", ie->ptr, ie->ptr / UNI_DTL_LOGNP_SIZE);
-	uni_print_push_prefix("dtl", cx);
-	cx->indent++;
-	uni_printf(cx, "{");
-	for(i = 0; i < ie->num; i++) {
-		sprintf(buf, "%d", i);
-		uni_print_entry(cx, buf, "{%d/", ie->dtl[i].node_level);
-		for(j = 0; j < 21; j++)
-			uni_printf(cx, "%02x", ie->dtl[i].node_id[j]);
-		uni_printf(cx, ",%04x}", ie->dtl[i].port_id);
-		uni_print_eol(cx);
-	}
-	cx->indent--;
-	uni_print_pop_prefix(cx);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(net, dtl)
-{
-	u_int i;
-
-	UNUSED(cx);
-
-	if(ie->ptr % UNI_DTL_LOGNP_SIZE != 0)
-		return -1;
-	if(ie->ptr / UNI_DTL_LOGNP_SIZE > UNI_DTL_MAXNUM)
-		return -1;
-	if(ie->num > UNI_DTL_MAXNUM)
-		return -1;
-	for(i = 0; i < ie->num; i++)
-		if(ie->dtl[i].node_level > 104)
-			return -1;
-	return 0;
-}
-
-DEF_IE_ENCODE(net, dtl)
-{
-	u_int i;
-
-	START_IE(dtl, UNI_IE_DTL, 2 + UNI_DTL_LOGNP_SIZE * ie->num);
-
-	APP_16BIT(msg, ie->ptr);
-
-	for(i = 0; i < ie->num; i++) {
-		APP_BYTE(msg, UNI_DTL_LOGNP);
-		APP_BYTE(msg, ie->dtl[i].node_level);
-		APP_BUF(msg, ie->dtl[i].node_id, 21);
-		APP_32BIT(msg, ie->dtl[i].port_id);
-	}
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-
-DEF_IE_DECODE(net, dtl)
-{
-	IE_START(;);
-
-	if(ielen < 2)
-		goto rej;
-
-	ie->ptr = *msg->b_rptr++ << 8;
-	ie->ptr |= *msg->b_rptr++;
-	ielen -= 2;
-
-	if(ielen % UNI_DTL_LOGNP_SIZE != 0)
-		goto rej;
-	if(ielen / UNI_DTL_LOGNP_SIZE > UNI_DTL_MAXNUM)
-		goto rej;
-
-	ie->num = 0;
-	while(ielen) {
-		if(*msg->b_rptr++ != UNI_DTL_LOGNP)
-			goto rej;
-		ielen--;
-
-		ie->dtl[ie->num].node_level = *msg->b_rptr++;
-		ielen--;
-
-		(void)memcpy(ie->dtl[ie->num].node_id, msg->b_rptr, 21);
-		msg->b_rptr += 21;
-		ielen -= 21;
-
-		ie->dtl[ie->num].port_id  = *msg->b_rptr++ << 24;
-		ie->dtl[ie->num].port_id |= *msg->b_rptr++ << 16;
-		ie->dtl[ie->num].port_id |= *msg->b_rptr++ <<  8;
-		ie->dtl[ie->num].port_id |= *msg->b_rptr++ <<  0;
-		ielen -= 4;
-
-		ie->num++;
-	}
-
-	IE_END(DTL);
-}
-
-/*********************************************************************
- *
- * Leaf initiated join call identifier.
- * Leaf initiated join parameters.
- * Leaf initiated join sequence number.
- *
- * References for this IE are:
- *
- *  UNI4.0 pp. 46...48
- *
- * Only NET coding allowed.
- */
-
-/**********************************************************************/
-
-DEF_IE_PRINT(net, lij_callid)
-{
-	static const struct uni_print_tbl type_tbl[] = {
-		MKT(UNI_LIJ_IDTYPE_ROOT, root),
-		EOT()
-	};
-
-	if(uni_print_iehdr("lij_callid", &ie->h, cx))
-		return;
-
-	uni_print_tbl("type", ie->type, type_tbl, cx);
-	uni_print_entry(cx, "id", "0x%x", ie->callid);
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(net, lij_callid)
-{
-	UNUSED(cx);
-
-	switch(ie->type) {
-
-	  case UNI_LIJ_IDTYPE_ROOT:
-		break;
-
-	  default:
-		return -1;
-	}
-
-	return 0;
-}
-
-DEF_IE_ENCODE(net, lij_callid)
-{
-	START_IE(lij_callid, UNI_IE_LIJ_CALLID, 5);
-
-	APP_BYTE(msg, 0x80 | ie->type);
-	APP_32BIT(msg, ie->callid);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(net, lij_callid)
-{
-	IE_START(;);
-
-	if(ielen != 5)
-		goto rej;
-
-	ie->type = *msg->b_rptr++ & 0xf;
-	ie->callid  = *msg->b_rptr++ << 24;
-	ie->callid |= *msg->b_rptr++ << 16;
-	ie->callid |= *msg->b_rptr++ <<  8;
-	ie->callid |= *msg->b_rptr++ <<  0;
-
-	IE_END(LIJ_CALLID);
-}
-
-/**********************************************************************/
-
-DEF_IE_PRINT(net, lij_param)
-{
-	static const struct uni_print_tbl lscreen_tbl[] = {
-		MKT(UNI_LIJ_SCREEN_NETJOIN, netjoin),
-		EOT()
-	};
-
-	if(uni_print_iehdr("lij_param", &ie->h, cx))
-		return;
-	uni_print_tbl("screen", ie->screen, lscreen_tbl, cx);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(net, lij_param)
-{
-	UNUSED(cx);
-
-	switch(ie->screen) {
-
-	  case UNI_LIJ_SCREEN_NETJOIN:
-		break;
-
-	  default:
-		return -1;
-	}
-
-	return 0;
-}
-
-DEF_IE_ENCODE(net, lij_param)
-{
-	START_IE(lij_param, UNI_IE_LIJ_PARAM, 1);
-
-	APP_BYTE(msg, 0x80 | ie->screen);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(net, lij_param)
-{
-	IE_START(;);
-
-	if(ielen != 1)
-		goto rej;
-
-	ie->screen = *msg->b_rptr++ & 0xf;
-
-	IE_END(LIJ_PARAM);
-}
-
-/**********************************************************************/
-
-DEF_IE_PRINT(net, lij_seqno)
-{
-	if(uni_print_iehdr("lij_seqno", &ie->h, cx))
-		return;
-	uni_print_entry(cx, "seqno", "0x%x", ie->seqno);
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(net, lij_seqno)
-{
-	UNUSED(cx); UNUSED(ie);
-
-	return 0;
-}
-
-DEF_IE_ENCODE(net, lij_seqno)
-{
-	START_IE(lij_seqno, UNI_IE_LIJ_SEQNO, 4);
-
-	APP_32BIT(msg, ie->seqno);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(net, lij_seqno)
-{
-	IE_START(;);
-
-	if(ielen != 4)
-		goto rej;
-
-	ie->seqno  = *msg->b_rptr++ << 24;
-	ie->seqno |= *msg->b_rptr++ << 16;
-	ie->seqno |= *msg->b_rptr++ <<  8;
-	ie->seqno |= *msg->b_rptr++ <<  0;
-
-	IE_END(LIJ_SEQNO);
-}
-
-/*********************************************************************
- *
- * Connection scope
- *
- * References for this IE are:
- *
- *  UNI4.0 pp. 57...58
- *
- * Only NET coding allowed.
- */
-DEF_IE_PRINT(net, cscope)
-{
-	static const struct uni_print_tbl type_tbl[] = {
-		MKT(UNI_CSCOPE_ORG,	org),
-		EOT()
-	};
-	static const struct uni_print_tbl scope_tbl[] = {
-		MKT(UNI_CSCOPE_ORG_LOC,		local_network),
-		MKT(UNI_CSCOPE_ORG_LOC_P1,	local_network_plus_one),
-		MKT(UNI_CSCOPE_ORG_LOC_P2,	local_network_plus_two),
-		MKT(UNI_CSCOPE_ORG_SITE_M1,	site_minus_one),
-		MKT(UNI_CSCOPE_ORG_SITE,	intra_site),
-		MKT(UNI_CSCOPE_ORG_SITE_P1,	site_plus_one),
-		MKT(UNI_CSCOPE_ORG_ORG_M1,	organisation_minus_one),
-		MKT(UNI_CSCOPE_ORG_ORG,		intra_organisation),
-		MKT(UNI_CSCOPE_ORG_ORG_P1,	organisation_plus_one),
-		MKT(UNI_CSCOPE_ORG_COMM_M1,	community_minus_one),
-		MKT(UNI_CSCOPE_ORG_COMM,	intra_community),
-		MKT(UNI_CSCOPE_ORG_COMM_P1,	community_plus_one),
-		MKT(UNI_CSCOPE_ORG_REG,		regional),
-		MKT(UNI_CSCOPE_ORG_INTER,	inter_regional),
-		MKT(UNI_CSCOPE_ORG_GLOBAL,	global),
-		EOT()
-	};
-
-	if(uni_print_iehdr("cscope", &ie->h, cx))
-		return;
-
-	uni_print_tbl("type", ie->type, type_tbl, cx);
-	if(ie->type == UNI_CSCOPE_ORG)
-		uni_print_tbl("scope", (u_int)ie->scope, scope_tbl, cx);
-	else
-		uni_print_entry(cx, "scope", "0x%02x", ie->scope);
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(net, cscope)
-{
-	UNUSED(cx);
-
-	switch(ie->type) {
-
-	  default:
-		return -1;
-
-	  case UNI_CSCOPE_ORG:
-		switch(ie->scope) {
-
-		  default:
-			return -1;
-
-		  case UNI_CSCOPE_ORG_LOC:
-		  case UNI_CSCOPE_ORG_LOC_P1:
-		  case UNI_CSCOPE_ORG_LOC_P2:
-		  case UNI_CSCOPE_ORG_SITE_M1:
-		  case UNI_CSCOPE_ORG_SITE:
-		  case UNI_CSCOPE_ORG_SITE_P1:
-		  case UNI_CSCOPE_ORG_ORG_M1:
-		  case UNI_CSCOPE_ORG_ORG:
-		  case UNI_CSCOPE_ORG_ORG_P1:
-		  case UNI_CSCOPE_ORG_COMM_M1:
-		  case UNI_CSCOPE_ORG_COMM:
-		  case UNI_CSCOPE_ORG_COMM_P1:
-		  case UNI_CSCOPE_ORG_REG:
-		  case UNI_CSCOPE_ORG_INTER:
-		  case UNI_CSCOPE_ORG_GLOBAL:
-			break;
-		}
-		break;
-	}
-	return 0;
-}
-
-DEF_IE_ENCODE(net, cscope)
-{
-	START_IE(cscope, UNI_IE_CSCOPE, 2);
-
-	APP_BYTE(msg, ie->type | 0x80);
-	APP_BYTE(msg, ie->scope);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(net, cscope)
-{
-	IE_START(;);
-	if(ielen != 2)
-		goto rej;
-
-	if((*msg->b_rptr & 0xf0) != 0x80)
-		goto rej;
-
-	ie->type = *msg->b_rptr++ & 0xf;
-	ie->scope = *msg->b_rptr++;
-
-	IE_END(CSCOPE);
-}
-
-/*********************************************************************
- *
- * Extended Quality of Service
- *
- * References for this IE are:
- *
- *  	UNI4.0 pp. 70...72
- *
- * Notes:
- *	Only NET coding.
- */
-DEF_IE_PRINT(net, exqos)
-{
-	static const struct uni_print_tbl tab[] = {
-		MKT(UNI_EXQOS_USER,	user),
-		MKT(UNI_EXQOS_NET,	net),
-		EOT()
-	};
-
-	if(uni_print_iehdr("exqos", &ie->h, cx))
-		return;
-
-	uni_print_tbl("origin", ie->origin, tab, cx);
-
-	uni_print_entry(cx, "acceptable", "(");
-	if(ie->h.present & UNI_EXQOS_FACC_P) {
-		if(ie->facc == UNI_EXQOS_ANY_CDV)
-			uni_printf(cx, "ANY");
-		else
-			uni_printf(cx, "%d", ie->facc);
-	}
-	uni_putc(',', cx);
-	if(ie->h.present & UNI_EXQOS_BACC_P) {
-		if(ie->bacc == UNI_EXQOS_ANY_CDV)
-			uni_printf(cx, "ANY");
-		else
-			uni_printf(cx, "%d", ie->bacc);
-	}
-	uni_putc(')', cx);
-
-	uni_print_entry(cx, "cumulative", "(");
-	if(ie->h.present & UNI_EXQOS_FCUM_P)
-		uni_printf(cx, "%d", ie->fcum);
-	uni_putc(',', cx);
-	if(ie->h.present & UNI_EXQOS_BCUM_P)
-		uni_printf(cx, "%d", ie->bcum);
-	uni_putc(')', cx);
-
-	uni_print_entry(cx, "clrid", "(");
-	if(ie->h.present & UNI_EXQOS_FCLR_P) {
-		if(ie->fclr == UNI_EXQOS_ANY_CLR)
-			uni_printf(cx, "ANY");
-		else
-			uni_printf(cx, "%d", ie->fclr);
-	}
-	uni_putc(',', cx);
-	if(ie->h.present & UNI_EXQOS_BCLR_P) {
-		if(ie->bclr == UNI_EXQOS_ANY_CLR)
-			uni_printf(cx, "ANY");
-		else
-			uni_printf(cx, "%d", ie->bclr);
-	}
-	uni_putc(')', cx);
-
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(net, exqos)
-{
-	UNUSED(cx);
-
-	switch(ie->origin) {
-	  case UNI_EXQOS_USER:
-	  case UNI_EXQOS_NET:
-		break;
-
-	  default:
-		return -1;
-	}
-	if(ie->h.present & UNI_EXQOS_FACC_P)
-		if(!(ie->h.present & UNI_EXQOS_FCUM_P))
-			return -1;
-	if(ie->h.present & UNI_EXQOS_BACC_P)
-		if(!(ie->h.present & UNI_EXQOS_BCUM_P))
-			return -1;
-
-	if(ie->h.present & UNI_EXQOS_FACC_P)
-		if(ie->facc >= 1 << 24)
-			return -1;
-	if(ie->h.present & UNI_EXQOS_BACC_P)
-		if(ie->bacc >= 1 << 24)
-			return -1;
-	if(ie->h.present & UNI_EXQOS_FCUM_P)
-		if(ie->fcum >= 1 << 24)
-			return -1;
-	if(ie->h.present & UNI_EXQOS_BCUM_P)
-		if(ie->bcum >= 1 << 24)
-			return -1;
-
-	if(ie->h.present & UNI_EXQOS_FCLR_P)
-		if(ie->fclr==0 || (ie->fclr>15 && ie->fclr!=UNI_EXQOS_ANY_CLR))
-			return -1;
-	if(ie->h.present & UNI_EXQOS_BCLR_P)
-		if(ie->bclr==0 || (ie->bclr>15 && ie->bclr!=UNI_EXQOS_ANY_CLR))
-			return -1;
-	return 0;
-}
-
-DEF_IE_ENCODE(net, exqos)
-{
-	START_IE(exqos, UNI_IE_EXQOS, 21);
-
-	APP_BYTE(msg, ie->origin);
-
-	APP_OPT_24BIT(msg, ie->h.present, UNI_EXQOS_FACC_P,
-		UNI_EXQOS_FACC_ID, ie->facc);
-	APP_OPT_24BIT(msg, ie->h.present, UNI_EXQOS_BACC_P,
-		UNI_EXQOS_BACC_ID, ie->bacc);
-	APP_OPT_24BIT(msg, ie->h.present, UNI_EXQOS_FCUM_P,
-		UNI_EXQOS_FCUM_ID, ie->fcum);
-	APP_OPT_24BIT(msg, ie->h.present, UNI_EXQOS_BCUM_P,
-		UNI_EXQOS_BCUM_ID, ie->bcum);
-
-	APP_OPT_BYTE(msg, ie->h.present, UNI_EXQOS_FCLR_P,
-		UNI_EXQOS_FCLR_ID, ie->fclr);
-	APP_OPT_BYTE(msg, ie->h.present, UNI_EXQOS_BCLR_P,
-		UNI_EXQOS_BCLR_ID, ie->bclr);
-
-	SET_IE_LEN(msg);
-	return 0;
-}
-
-DEF_IE_DECODE(net, exqos)
-{
-	IE_START(;);
-
-	if(ielen < 1 || ielen > 21)
-		goto rej;
-
-	ie->origin = *msg->b_rptr++;
-	ielen--;
-
-	while(ielen--) {
-		switch(*msg->b_rptr++) {
-
-		  default:
-			goto rej;
-
-		  DEC_GETF3(EXQOS_FACC, facc, ie->h.present);
-		  DEC_GETF3(EXQOS_BACC, bacc, ie->h.present);
-		  DEC_GETF3(EXQOS_FCUM, fcum, ie->h.present);
-		  DEC_GETF3(EXQOS_BCUM, bcum, ie->h.present);
-
-		  DEC_GETF1(EXQOS_FCLR, fclr, ie->h.present);
-		  DEC_GETF1(EXQOS_BCLR, bclr, ie->h.present);
-
-		}
-	}
-	IE_END(EXQOS);
-}
-
-/**************************************************************
- *
- * Free form IE (for testing mainly)
- */
-DEF_IE_PRINT(itu, unrec)
-{
-	u_int i;
-
-	if (uni_print_iehdr("unrec", &ie->h, cx))
-		return;
-	uni_print_entry(cx, "len", "%u", ie->len);
-	uni_print_entry(cx, "data", "(");
-	for (i = 0; i < ie->len; i++)
-		uni_printf(cx, "%s0x%02x", i == 0 ? "" : " ", ie->data[i]);
-	uni_printf(cx, ")");
-	uni_print_ieend(cx);
-}
-
-DEF_IE_CHECK(itu, unrec)
-{
-	UNUSED(cx);
-
-	if (ie->len > sizeof(ie->data))
-		return (-1);
-
-	return (0);
-}
-
-DEF_IE_ENCODE(itu, unrec)
-{
-	START_IE2(unrec, UNI_IE_UNREC, ie->len, ie->id);
-
-	APP_BUF(msg, ie->data, ie->len);
-
-	SET_IE_LEN(msg);
-	return (0);
-}
-
-DEF_IE_DECODE(itu, unrec)
-{
-	IE_START(;);
-
-	if (ielen > sizeof(ie->data) / sizeof(ie->data[0]) || ielen < 1)
-		goto rej;
-
-	ie->len = ielen;
-	ielen = 0;
-	(void)memcpy(ie->data, msg->b_rptr, ie->len);
-	msg->b_rptr += ie->len;
-
-	IE_END(UNREC);
-}
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_ie.h b/sys/contrib/ngatm/netnatm/msg/uni_ie.h
deleted file mode 100644
index f24c560fb8de..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/uni_ie.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* This file was created automatically
- * Source file: $Begemot: libunimsg/atm/msg/ie.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
- */
-
-#ifndef _NETNATM_MSG_UNI_IE_H_
-#define _NETNATM_MSG_UNI_IE_H_
-
-union uni_ieall {
-	struct uni_iehdr h;
-	struct uni_ie_cause cause;
-	struct uni_ie_callstate callstate;
-	struct uni_ie_facility facility;
-	struct uni_ie_notify notify;
-	struct uni_ie_eetd eetd;
-	struct uni_ie_conned conned;
-	struct uni_ie_connedsub connedsub;
-	struct uni_ie_epref epref;
-	struct uni_ie_epstate epstate;
-	struct uni_ie_aal aal;
-	struct uni_ie_traffic traffic;
-	struct uni_ie_connid connid;
-	struct uni_ie_qos qos;
-	struct uni_ie_bhli bhli;
-	struct uni_ie_bearer bearer;
-	struct uni_ie_blli blli;
-	struct uni_ie_lshift lshift;
-	struct uni_ie_nlshift nlshift;
-	struct uni_ie_scompl scompl;
-	struct uni_ie_repeat repeat;
-	struct uni_ie_calling calling;
-	struct uni_ie_callingsub callingsub;
-	struct uni_ie_called called;
-	struct uni_ie_calledsub calledsub;
-	struct uni_ie_tns tns;
-	struct uni_ie_restart restart;
-	struct uni_ie_uu uu;
-	struct uni_ie_git git;
-	struct uni_ie_mintraffic mintraffic;
-	struct uni_ie_atraffic atraffic;
-	struct uni_ie_abrsetup abrsetup;
-	struct uni_ie_report report;
-	struct uni_ie_called_soft called_soft;
-	struct uni_ie_crankback crankback;
-	struct uni_ie_dtl dtl;
-	struct uni_ie_calling_soft calling_soft;
-	struct uni_ie_abradd abradd;
-	struct uni_ie_lij_callid lij_callid;
-	struct uni_ie_lij_param lij_param;
-	struct uni_ie_lij_seqno lij_seqno;
-	struct uni_ie_cscope cscope;
-	struct uni_ie_exqos exqos;
-	struct uni_ie_mdcr mdcr;
-	struct uni_ie_unrec unrec;
-};
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_ietab.h b/sys/contrib/ngatm/netnatm/msg/uni_ietab.h
deleted file mode 100644
index 62cba33cd91d..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/uni_ietab.h
+++ /dev/null
@@ -1,958 +0,0 @@
-/* This file was created automatically
- * Source file: $Begemot: libunimsg/atm/msg/ie.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
- */
-
-
-static void uni_ie_print_itu_cause(struct uni_ie_cause *, struct unicx *);
-static int uni_ie_check_itu_cause(struct uni_ie_cause *, struct unicx *);
-static int uni_ie_encode_itu_cause(struct uni_msg *, struct uni_ie_cause *, struct unicx *);
-static int uni_ie_decode_itu_cause(struct uni_ie_cause *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_cause = {
-	0,
-	34,
-	(uni_print_f)uni_ie_print_itu_cause,
-	(uni_check_f)uni_ie_check_itu_cause,
-	(uni_encode_f)uni_ie_encode_itu_cause,
-	(uni_decode_f)uni_ie_decode_itu_cause
-};
-
-static void uni_ie_print_net_cause(struct uni_ie_cause *, struct unicx *);
-static int uni_ie_check_net_cause(struct uni_ie_cause *, struct unicx *);
-static int uni_ie_encode_net_cause(struct uni_msg *, struct uni_ie_cause *, struct unicx *);
-static int uni_ie_decode_net_cause(struct uni_ie_cause *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_cause = {
-	0,
-	34,
-	(uni_print_f)uni_ie_print_net_cause,
-	(uni_check_f)uni_ie_check_net_cause,
-	(uni_encode_f)uni_ie_encode_net_cause,
-	(uni_decode_f)uni_ie_decode_net_cause
-};
-
-static void uni_ie_print_itu_callstate(struct uni_ie_callstate *, struct unicx *);
-static int uni_ie_check_itu_callstate(struct uni_ie_callstate *, struct unicx *);
-static int uni_ie_encode_itu_callstate(struct uni_msg *, struct uni_ie_callstate *, struct unicx *);
-static int uni_ie_decode_itu_callstate(struct uni_ie_callstate *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_callstate = {
-	0,
-	5,
-	(uni_print_f)uni_ie_print_itu_callstate,
-	(uni_check_f)uni_ie_check_itu_callstate,
-	(uni_encode_f)uni_ie_encode_itu_callstate,
-	(uni_decode_f)uni_ie_decode_itu_callstate
-};
-
-static void uni_ie_print_itu_facility(struct uni_ie_facility *, struct unicx *);
-static int uni_ie_check_itu_facility(struct uni_ie_facility *, struct unicx *);
-static int uni_ie_encode_itu_facility(struct uni_msg *, struct uni_ie_facility *, struct unicx *);
-static int uni_ie_decode_itu_facility(struct uni_ie_facility *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_facility = {
-	0,
-	UNI_FACILITY_MAXAPDU+1+4,
-	(uni_print_f)uni_ie_print_itu_facility,
-	(uni_check_f)uni_ie_check_itu_facility,
-	(uni_encode_f)uni_ie_encode_itu_facility,
-	(uni_decode_f)uni_ie_decode_itu_facility
-};
-
-static void uni_ie_print_itu_notify(struct uni_ie_notify *, struct unicx *);
-static int uni_ie_check_itu_notify(struct uni_ie_notify *, struct unicx *);
-static int uni_ie_encode_itu_notify(struct uni_msg *, struct uni_ie_notify *, struct unicx *);
-static int uni_ie_decode_itu_notify(struct uni_ie_notify *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_notify = {
-	0,
-	UNI_NOTIFY_MAXLEN+4,
-	(uni_print_f)uni_ie_print_itu_notify,
-	(uni_check_f)uni_ie_check_itu_notify,
-	(uni_encode_f)uni_ie_encode_itu_notify,
-	(uni_decode_f)uni_ie_decode_itu_notify
-};
-
-static void uni_ie_print_itu_eetd(struct uni_ie_eetd *, struct unicx *);
-static int uni_ie_check_itu_eetd(struct uni_ie_eetd *, struct unicx *);
-static int uni_ie_encode_itu_eetd(struct uni_msg *, struct uni_ie_eetd *, struct unicx *);
-static int uni_ie_decode_itu_eetd(struct uni_ie_eetd *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_eetd = {
-	0,
-	11,
-	(uni_print_f)uni_ie_print_itu_eetd,
-	(uni_check_f)uni_ie_check_itu_eetd,
-	(uni_encode_f)uni_ie_encode_itu_eetd,
-	(uni_decode_f)uni_ie_decode_itu_eetd
-};
-
-static void uni_ie_print_net_eetd(struct uni_ie_eetd *, struct unicx *);
-static int uni_ie_check_net_eetd(struct uni_ie_eetd *, struct unicx *);
-static int uni_ie_encode_net_eetd(struct uni_msg *, struct uni_ie_eetd *, struct unicx *);
-static int uni_ie_decode_net_eetd(struct uni_ie_eetd *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_eetd = {
-	0,
-	13,
-	(uni_print_f)uni_ie_print_net_eetd,
-	(uni_check_f)uni_ie_check_net_eetd,
-	(uni_encode_f)uni_ie_encode_net_eetd,
-	(uni_decode_f)uni_ie_decode_net_eetd
-};
-
-static void uni_ie_print_itu_conned(struct uni_ie_conned *, struct unicx *);
-static int uni_ie_check_itu_conned(struct uni_ie_conned *, struct unicx *);
-static int uni_ie_encode_itu_conned(struct uni_msg *, struct uni_ie_conned *, struct unicx *);
-static int uni_ie_decode_itu_conned(struct uni_ie_conned *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_conned = {
-	0,
-	25,
-	(uni_print_f)uni_ie_print_itu_conned,
-	(uni_check_f)uni_ie_check_itu_conned,
-	(uni_encode_f)uni_ie_encode_itu_conned,
-	(uni_decode_f)uni_ie_decode_itu_conned
-};
-
-static void uni_ie_print_itu_connedsub(struct uni_ie_connedsub *, struct unicx *);
-static int uni_ie_check_itu_connedsub(struct uni_ie_connedsub *, struct unicx *);
-static int uni_ie_encode_itu_connedsub(struct uni_msg *, struct uni_ie_connedsub *, struct unicx *);
-static int uni_ie_decode_itu_connedsub(struct uni_ie_connedsub *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_connedsub = {
-	UNIFL_ACCESS,
-	25,
-	(uni_print_f)uni_ie_print_itu_connedsub,
-	(uni_check_f)uni_ie_check_itu_connedsub,
-	(uni_encode_f)uni_ie_encode_itu_connedsub,
-	(uni_decode_f)uni_ie_decode_itu_connedsub
-};
-
-static void uni_ie_print_itu_epref(struct uni_ie_epref *, struct unicx *);
-static int uni_ie_check_itu_epref(struct uni_ie_epref *, struct unicx *);
-static int uni_ie_encode_itu_epref(struct uni_msg *, struct uni_ie_epref *, struct unicx *);
-static int uni_ie_decode_itu_epref(struct uni_ie_epref *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_epref = {
-	0,
-	7,
-	(uni_print_f)uni_ie_print_itu_epref,
-	(uni_check_f)uni_ie_check_itu_epref,
-	(uni_encode_f)uni_ie_encode_itu_epref,
-	(uni_decode_f)uni_ie_decode_itu_epref
-};
-
-static void uni_ie_print_itu_epstate(struct uni_ie_epstate *, struct unicx *);
-static int uni_ie_check_itu_epstate(struct uni_ie_epstate *, struct unicx *);
-static int uni_ie_encode_itu_epstate(struct uni_msg *, struct uni_ie_epstate *, struct unicx *);
-static int uni_ie_decode_itu_epstate(struct uni_ie_epstate *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_epstate = {
-	0,
-	5,
-	(uni_print_f)uni_ie_print_itu_epstate,
-	(uni_check_f)uni_ie_check_itu_epstate,
-	(uni_encode_f)uni_ie_encode_itu_epstate,
-	(uni_decode_f)uni_ie_decode_itu_epstate
-};
-
-static void uni_ie_print_itu_aal(struct uni_ie_aal *, struct unicx *);
-static int uni_ie_check_itu_aal(struct uni_ie_aal *, struct unicx *);
-static int uni_ie_encode_itu_aal(struct uni_msg *, struct uni_ie_aal *, struct unicx *);
-static int uni_ie_decode_itu_aal(struct uni_ie_aal *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_aal = {
-	UNIFL_ACCESS,
-	21,
-	(uni_print_f)uni_ie_print_itu_aal,
-	(uni_check_f)uni_ie_check_itu_aal,
-	(uni_encode_f)uni_ie_encode_itu_aal,
-	(uni_decode_f)uni_ie_decode_itu_aal
-};
-
-static void uni_ie_print_itu_traffic(struct uni_ie_traffic *, struct unicx *);
-static int uni_ie_check_itu_traffic(struct uni_ie_traffic *, struct unicx *);
-static int uni_ie_encode_itu_traffic(struct uni_msg *, struct uni_ie_traffic *, struct unicx *);
-static int uni_ie_decode_itu_traffic(struct uni_ie_traffic *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_traffic = {
-	0,
-	30,
-	(uni_print_f)uni_ie_print_itu_traffic,
-	(uni_check_f)uni_ie_check_itu_traffic,
-	(uni_encode_f)uni_ie_encode_itu_traffic,
-	(uni_decode_f)uni_ie_decode_itu_traffic
-};
-
-static const struct iedecl decl_net_traffic = {
-	UNIFL_DEFAULT,
-	0,
-	(uni_print_f)NULL,
-	(uni_check_f)NULL,
-	(uni_encode_f)NULL,
-	(uni_decode_f)NULL
-};
-
-static void uni_ie_print_itu_connid(struct uni_ie_connid *, struct unicx *);
-static int uni_ie_check_itu_connid(struct uni_ie_connid *, struct unicx *);
-static int uni_ie_encode_itu_connid(struct uni_msg *, struct uni_ie_connid *, struct unicx *);
-static int uni_ie_decode_itu_connid(struct uni_ie_connid *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_connid = {
-	0,
-	9,
-	(uni_print_f)uni_ie_print_itu_connid,
-	(uni_check_f)uni_ie_check_itu_connid,
-	(uni_encode_f)uni_ie_encode_itu_connid,
-	(uni_decode_f)uni_ie_decode_itu_connid
-};
-
-static void uni_ie_print_itu_qos(struct uni_ie_qos *, struct unicx *);
-static int uni_ie_check_itu_qos(struct uni_ie_qos *, struct unicx *);
-static int uni_ie_encode_itu_qos(struct uni_msg *, struct uni_ie_qos *, struct unicx *);
-static int uni_ie_decode_itu_qos(struct uni_ie_qos *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_qos = {
-	0,
-	6,
-	(uni_print_f)uni_ie_print_itu_qos,
-	(uni_check_f)uni_ie_check_itu_qos,
-	(uni_encode_f)uni_ie_encode_itu_qos,
-	(uni_decode_f)uni_ie_decode_itu_qos
-};
-
-static void uni_ie_print_net_qos(struct uni_ie_qos *, struct unicx *);
-static int uni_ie_check_net_qos(struct uni_ie_qos *, struct unicx *);
-static int uni_ie_encode_net_qos(struct uni_msg *, struct uni_ie_qos *, struct unicx *);
-static int uni_ie_decode_net_qos(struct uni_ie_qos *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_qos = {
-	0,
-	6,
-	(uni_print_f)uni_ie_print_net_qos,
-	(uni_check_f)uni_ie_check_net_qos,
-	(uni_encode_f)uni_ie_encode_net_qos,
-	(uni_decode_f)uni_ie_decode_net_qos
-};
-
-static void uni_ie_print_itu_bhli(struct uni_ie_bhli *, struct unicx *);
-static int uni_ie_check_itu_bhli(struct uni_ie_bhli *, struct unicx *);
-static int uni_ie_encode_itu_bhli(struct uni_msg *, struct uni_ie_bhli *, struct unicx *);
-static int uni_ie_decode_itu_bhli(struct uni_ie_bhli *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_bhli = {
-	UNIFL_ACCESS,
-	13,
-	(uni_print_f)uni_ie_print_itu_bhli,
-	(uni_check_f)uni_ie_check_itu_bhli,
-	(uni_encode_f)uni_ie_encode_itu_bhli,
-	(uni_decode_f)uni_ie_decode_itu_bhli
-};
-
-static void uni_ie_print_itu_bearer(struct uni_ie_bearer *, struct unicx *);
-static int uni_ie_check_itu_bearer(struct uni_ie_bearer *, struct unicx *);
-static int uni_ie_encode_itu_bearer(struct uni_msg *, struct uni_ie_bearer *, struct unicx *);
-static int uni_ie_decode_itu_bearer(struct uni_ie_bearer *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_bearer = {
-	0,
-	7,
-	(uni_print_f)uni_ie_print_itu_bearer,
-	(uni_check_f)uni_ie_check_itu_bearer,
-	(uni_encode_f)uni_ie_encode_itu_bearer,
-	(uni_decode_f)uni_ie_decode_itu_bearer
-};
-
-static void uni_ie_print_itu_blli(struct uni_ie_blli *, struct unicx *);
-static int uni_ie_check_itu_blli(struct uni_ie_blli *, struct unicx *);
-static int uni_ie_encode_itu_blli(struct uni_msg *, struct uni_ie_blli *, struct unicx *);
-static int uni_ie_decode_itu_blli(struct uni_ie_blli *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_blli = {
-	UNIFL_ACCESS,
-	17,
-	(uni_print_f)uni_ie_print_itu_blli,
-	(uni_check_f)uni_ie_check_itu_blli,
-	(uni_encode_f)uni_ie_encode_itu_blli,
-	(uni_decode_f)uni_ie_decode_itu_blli
-};
-
-static void uni_ie_print_itu_lshift(struct uni_ie_lshift *, struct unicx *);
-static int uni_ie_check_itu_lshift(struct uni_ie_lshift *, struct unicx *);
-static int uni_ie_encode_itu_lshift(struct uni_msg *, struct uni_ie_lshift *, struct unicx *);
-static int uni_ie_decode_itu_lshift(struct uni_ie_lshift *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_lshift = {
-	0,
-	5,
-	(uni_print_f)uni_ie_print_itu_lshift,
-	(uni_check_f)uni_ie_check_itu_lshift,
-	(uni_encode_f)uni_ie_encode_itu_lshift,
-	(uni_decode_f)uni_ie_decode_itu_lshift
-};
-
-static void uni_ie_print_itu_nlshift(struct uni_ie_nlshift *, struct unicx *);
-static int uni_ie_check_itu_nlshift(struct uni_ie_nlshift *, struct unicx *);
-static int uni_ie_encode_itu_nlshift(struct uni_msg *, struct uni_ie_nlshift *, struct unicx *);
-static int uni_ie_decode_itu_nlshift(struct uni_ie_nlshift *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_nlshift = {
-	0,
-	5,
-	(uni_print_f)uni_ie_print_itu_nlshift,
-	(uni_check_f)uni_ie_check_itu_nlshift,
-	(uni_encode_f)uni_ie_encode_itu_nlshift,
-	(uni_decode_f)uni_ie_decode_itu_nlshift
-};
-
-static void uni_ie_print_itu_scompl(struct uni_ie_scompl *, struct unicx *);
-static int uni_ie_check_itu_scompl(struct uni_ie_scompl *, struct unicx *);
-static int uni_ie_encode_itu_scompl(struct uni_msg *, struct uni_ie_scompl *, struct unicx *);
-static int uni_ie_decode_itu_scompl(struct uni_ie_scompl *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_scompl = {
-	0,
-	5,
-	(uni_print_f)uni_ie_print_itu_scompl,
-	(uni_check_f)uni_ie_check_itu_scompl,
-	(uni_encode_f)uni_ie_encode_itu_scompl,
-	(uni_decode_f)uni_ie_decode_itu_scompl
-};
-
-static void uni_ie_print_itu_repeat(struct uni_ie_repeat *, struct unicx *);
-static int uni_ie_check_itu_repeat(struct uni_ie_repeat *, struct unicx *);
-static int uni_ie_encode_itu_repeat(struct uni_msg *, struct uni_ie_repeat *, struct unicx *);
-static int uni_ie_decode_itu_repeat(struct uni_ie_repeat *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_repeat = {
-	0,
-	5,
-	(uni_print_f)uni_ie_print_itu_repeat,
-	(uni_check_f)uni_ie_check_itu_repeat,
-	(uni_encode_f)uni_ie_encode_itu_repeat,
-	(uni_decode_f)uni_ie_decode_itu_repeat
-};
-
-static void uni_ie_print_itu_calling(struct uni_ie_calling *, struct unicx *);
-static int uni_ie_check_itu_calling(struct uni_ie_calling *, struct unicx *);
-static int uni_ie_encode_itu_calling(struct uni_msg *, struct uni_ie_calling *, struct unicx *);
-static int uni_ie_decode_itu_calling(struct uni_ie_calling *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_calling = {
-	0,
-	26,
-	(uni_print_f)uni_ie_print_itu_calling,
-	(uni_check_f)uni_ie_check_itu_calling,
-	(uni_encode_f)uni_ie_encode_itu_calling,
-	(uni_decode_f)uni_ie_decode_itu_calling
-};
-
-static void uni_ie_print_itu_callingsub(struct uni_ie_callingsub *, struct unicx *);
-static int uni_ie_check_itu_callingsub(struct uni_ie_callingsub *, struct unicx *);
-static int uni_ie_encode_itu_callingsub(struct uni_msg *, struct uni_ie_callingsub *, struct unicx *);
-static int uni_ie_decode_itu_callingsub(struct uni_ie_callingsub *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_callingsub = {
-	UNIFL_ACCESS,
-	25,
-	(uni_print_f)uni_ie_print_itu_callingsub,
-	(uni_check_f)uni_ie_check_itu_callingsub,
-	(uni_encode_f)uni_ie_encode_itu_callingsub,
-	(uni_decode_f)uni_ie_decode_itu_callingsub
-};
-
-static void uni_ie_print_itu_called(struct uni_ie_called *, struct unicx *);
-static int uni_ie_check_itu_called(struct uni_ie_called *, struct unicx *);
-static int uni_ie_encode_itu_called(struct uni_msg *, struct uni_ie_called *, struct unicx *);
-static int uni_ie_decode_itu_called(struct uni_ie_called *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_called = {
-	0,
-	25,
-	(uni_print_f)uni_ie_print_itu_called,
-	(uni_check_f)uni_ie_check_itu_called,
-	(uni_encode_f)uni_ie_encode_itu_called,
-	(uni_decode_f)uni_ie_decode_itu_called
-};
-
-static void uni_ie_print_itu_calledsub(struct uni_ie_calledsub *, struct unicx *);
-static int uni_ie_check_itu_calledsub(struct uni_ie_calledsub *, struct unicx *);
-static int uni_ie_encode_itu_calledsub(struct uni_msg *, struct uni_ie_calledsub *, struct unicx *);
-static int uni_ie_decode_itu_calledsub(struct uni_ie_calledsub *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_calledsub = {
-	UNIFL_ACCESS,
-	25,
-	(uni_print_f)uni_ie_print_itu_calledsub,
-	(uni_check_f)uni_ie_check_itu_calledsub,
-	(uni_encode_f)uni_ie_encode_itu_calledsub,
-	(uni_decode_f)uni_ie_decode_itu_calledsub
-};
-
-static void uni_ie_print_itu_tns(struct uni_ie_tns *, struct unicx *);
-static int uni_ie_check_itu_tns(struct uni_ie_tns *, struct unicx *);
-static int uni_ie_encode_itu_tns(struct uni_msg *, struct uni_ie_tns *, struct unicx *);
-static int uni_ie_decode_itu_tns(struct uni_ie_tns *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_tns = {
-	0,
-	9,
-	(uni_print_f)uni_ie_print_itu_tns,
-	(uni_check_f)uni_ie_check_itu_tns,
-	(uni_encode_f)uni_ie_encode_itu_tns,
-	(uni_decode_f)uni_ie_decode_itu_tns
-};
-
-static const struct iedecl decl_net_tns = {
-	UNIFL_DEFAULT,
-	0,
-	(uni_print_f)NULL,
-	(uni_check_f)NULL,
-	(uni_encode_f)NULL,
-	(uni_decode_f)NULL
-};
-
-static void uni_ie_print_itu_restart(struct uni_ie_restart *, struct unicx *);
-static int uni_ie_check_itu_restart(struct uni_ie_restart *, struct unicx *);
-static int uni_ie_encode_itu_restart(struct uni_msg *, struct uni_ie_restart *, struct unicx *);
-static int uni_ie_decode_itu_restart(struct uni_ie_restart *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_restart = {
-	0,
-	5,
-	(uni_print_f)uni_ie_print_itu_restart,
-	(uni_check_f)uni_ie_check_itu_restart,
-	(uni_encode_f)uni_ie_encode_itu_restart,
-	(uni_decode_f)uni_ie_decode_itu_restart
-};
-
-static void uni_ie_print_itu_uu(struct uni_ie_uu *, struct unicx *);
-static int uni_ie_check_itu_uu(struct uni_ie_uu *, struct unicx *);
-static int uni_ie_encode_itu_uu(struct uni_msg *, struct uni_ie_uu *, struct unicx *);
-static int uni_ie_decode_itu_uu(struct uni_ie_uu *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_uu = {
-	UNIFL_ACCESS,
-	UNI_UU_MAXLEN+4,
-	(uni_print_f)uni_ie_print_itu_uu,
-	(uni_check_f)uni_ie_check_itu_uu,
-	(uni_encode_f)uni_ie_encode_itu_uu,
-	(uni_decode_f)uni_ie_decode_itu_uu
-};
-
-static void uni_ie_print_net_git(struct uni_ie_git *, struct unicx *);
-static int uni_ie_check_net_git(struct uni_ie_git *, struct unicx *);
-static int uni_ie_encode_net_git(struct uni_msg *, struct uni_ie_git *, struct unicx *);
-static int uni_ie_decode_net_git(struct uni_ie_git *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_git = {
-	0,
-	33,
-	(uni_print_f)uni_ie_print_net_git,
-	(uni_check_f)uni_ie_check_net_git,
-	(uni_encode_f)uni_ie_encode_net_git,
-	(uni_decode_f)uni_ie_decode_net_git
-};
-
-static void uni_ie_print_itu_mintraffic(struct uni_ie_mintraffic *, struct unicx *);
-static int uni_ie_check_itu_mintraffic(struct uni_ie_mintraffic *, struct unicx *);
-static int uni_ie_encode_itu_mintraffic(struct uni_msg *, struct uni_ie_mintraffic *, struct unicx *);
-static int uni_ie_decode_itu_mintraffic(struct uni_ie_mintraffic *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_mintraffic = {
-	0,
-	20,
-	(uni_print_f)uni_ie_print_itu_mintraffic,
-	(uni_check_f)uni_ie_check_itu_mintraffic,
-	(uni_encode_f)uni_ie_encode_itu_mintraffic,
-	(uni_decode_f)uni_ie_decode_itu_mintraffic
-};
-
-static const struct iedecl decl_net_mintraffic = {
-	UNIFL_DEFAULT,
-	0,
-	(uni_print_f)NULL,
-	(uni_check_f)NULL,
-	(uni_encode_f)NULL,
-	(uni_decode_f)NULL
-};
-
-static void uni_ie_print_itu_atraffic(struct uni_ie_atraffic *, struct unicx *);
-static int uni_ie_check_itu_atraffic(struct uni_ie_atraffic *, struct unicx *);
-static int uni_ie_encode_itu_atraffic(struct uni_msg *, struct uni_ie_atraffic *, struct unicx *);
-static int uni_ie_decode_itu_atraffic(struct uni_ie_atraffic *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_atraffic = {
-	0,
-	30,
-	(uni_print_f)uni_ie_print_itu_atraffic,
-	(uni_check_f)uni_ie_check_itu_atraffic,
-	(uni_encode_f)uni_ie_encode_itu_atraffic,
-	(uni_decode_f)uni_ie_decode_itu_atraffic
-};
-
-static const struct iedecl decl_net_atraffic = {
-	UNIFL_DEFAULT,
-	0,
-	(uni_print_f)NULL,
-	(uni_check_f)NULL,
-	(uni_encode_f)NULL,
-	(uni_decode_f)NULL
-};
-
-static void uni_ie_print_net_abrsetup(struct uni_ie_abrsetup *, struct unicx *);
-static int uni_ie_check_net_abrsetup(struct uni_ie_abrsetup *, struct unicx *);
-static int uni_ie_encode_net_abrsetup(struct uni_msg *, struct uni_ie_abrsetup *, struct unicx *);
-static int uni_ie_decode_net_abrsetup(struct uni_ie_abrsetup *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_abrsetup = {
-	0,
-	36,
-	(uni_print_f)uni_ie_print_net_abrsetup,
-	(uni_check_f)uni_ie_check_net_abrsetup,
-	(uni_encode_f)uni_ie_encode_net_abrsetup,
-	(uni_decode_f)uni_ie_decode_net_abrsetup
-};
-
-static void uni_ie_print_itu_report(struct uni_ie_report *, struct unicx *);
-static int uni_ie_check_itu_report(struct uni_ie_report *, struct unicx *);
-static int uni_ie_encode_itu_report(struct uni_msg *, struct uni_ie_report *, struct unicx *);
-static int uni_ie_decode_itu_report(struct uni_ie_report *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_report = {
-	0,
-	5,
-	(uni_print_f)uni_ie_print_itu_report,
-	(uni_check_f)uni_ie_check_itu_report,
-	(uni_encode_f)uni_ie_encode_itu_report,
-	(uni_decode_f)uni_ie_decode_itu_report
-};
-
-static void uni_ie_print_net_called_soft(struct uni_ie_called_soft *, struct unicx *);
-static int uni_ie_check_net_called_soft(struct uni_ie_called_soft *, struct unicx *);
-static int uni_ie_encode_net_called_soft(struct uni_msg *, struct uni_ie_called_soft *, struct unicx *);
-static int uni_ie_decode_net_called_soft(struct uni_ie_called_soft *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_called_soft = {
-	0,
-	11,
-	(uni_print_f)uni_ie_print_net_called_soft,
-	(uni_check_f)uni_ie_check_net_called_soft,
-	(uni_encode_f)uni_ie_encode_net_called_soft,
-	(uni_decode_f)uni_ie_decode_net_called_soft
-};
-
-static void uni_ie_print_net_crankback(struct uni_ie_crankback *, struct unicx *);
-static int uni_ie_check_net_crankback(struct uni_ie_crankback *, struct unicx *);
-static int uni_ie_encode_net_crankback(struct uni_msg *, struct uni_ie_crankback *, struct unicx *);
-static int uni_ie_decode_net_crankback(struct uni_ie_crankback *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_crankback = {
-	0,
-	72,
-	(uni_print_f)uni_ie_print_net_crankback,
-	(uni_check_f)uni_ie_check_net_crankback,
-	(uni_encode_f)uni_ie_encode_net_crankback,
-	(uni_decode_f)uni_ie_decode_net_crankback
-};
-
-static void uni_ie_print_net_dtl(struct uni_ie_dtl *, struct unicx *);
-static int uni_ie_check_net_dtl(struct uni_ie_dtl *, struct unicx *);
-static int uni_ie_encode_net_dtl(struct uni_msg *, struct uni_ie_dtl *, struct unicx *);
-static int uni_ie_decode_net_dtl(struct uni_ie_dtl *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_dtl = {
-	0,
-	UNI_DTL_LOGNP_SIZE*UNI_DTL_MAXNUM+6,
-	(uni_print_f)uni_ie_print_net_dtl,
-	(uni_check_f)uni_ie_check_net_dtl,
-	(uni_encode_f)uni_ie_encode_net_dtl,
-	(uni_decode_f)uni_ie_decode_net_dtl
-};
-
-static void uni_ie_print_net_calling_soft(struct uni_ie_calling_soft *, struct unicx *);
-static int uni_ie_check_net_calling_soft(struct uni_ie_calling_soft *, struct unicx *);
-static int uni_ie_encode_net_calling_soft(struct uni_msg *, struct uni_ie_calling_soft *, struct unicx *);
-static int uni_ie_decode_net_calling_soft(struct uni_ie_calling_soft *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_calling_soft = {
-	0,
-	10,
-	(uni_print_f)uni_ie_print_net_calling_soft,
-	(uni_check_f)uni_ie_check_net_calling_soft,
-	(uni_encode_f)uni_ie_encode_net_calling_soft,
-	(uni_decode_f)uni_ie_decode_net_calling_soft
-};
-
-static void uni_ie_print_net_abradd(struct uni_ie_abradd *, struct unicx *);
-static int uni_ie_check_net_abradd(struct uni_ie_abradd *, struct unicx *);
-static int uni_ie_encode_net_abradd(struct uni_msg *, struct uni_ie_abradd *, struct unicx *);
-static int uni_ie_decode_net_abradd(struct uni_ie_abradd *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_abradd = {
-	0,
-	14,
-	(uni_print_f)uni_ie_print_net_abradd,
-	(uni_check_f)uni_ie_check_net_abradd,
-	(uni_encode_f)uni_ie_encode_net_abradd,
-	(uni_decode_f)uni_ie_decode_net_abradd
-};
-
-static void uni_ie_print_net_lij_callid(struct uni_ie_lij_callid *, struct unicx *);
-static int uni_ie_check_net_lij_callid(struct uni_ie_lij_callid *, struct unicx *);
-static int uni_ie_encode_net_lij_callid(struct uni_msg *, struct uni_ie_lij_callid *, struct unicx *);
-static int uni_ie_decode_net_lij_callid(struct uni_ie_lij_callid *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_lij_callid = {
-	0,
-	9,
-	(uni_print_f)uni_ie_print_net_lij_callid,
-	(uni_check_f)uni_ie_check_net_lij_callid,
-	(uni_encode_f)uni_ie_encode_net_lij_callid,
-	(uni_decode_f)uni_ie_decode_net_lij_callid
-};
-
-static void uni_ie_print_net_lij_param(struct uni_ie_lij_param *, struct unicx *);
-static int uni_ie_check_net_lij_param(struct uni_ie_lij_param *, struct unicx *);
-static int uni_ie_encode_net_lij_param(struct uni_msg *, struct uni_ie_lij_param *, struct unicx *);
-static int uni_ie_decode_net_lij_param(struct uni_ie_lij_param *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_lij_param = {
-	0,
-	5,
-	(uni_print_f)uni_ie_print_net_lij_param,
-	(uni_check_f)uni_ie_check_net_lij_param,
-	(uni_encode_f)uni_ie_encode_net_lij_param,
-	(uni_decode_f)uni_ie_decode_net_lij_param
-};
-
-static void uni_ie_print_net_lij_seqno(struct uni_ie_lij_seqno *, struct unicx *);
-static int uni_ie_check_net_lij_seqno(struct uni_ie_lij_seqno *, struct unicx *);
-static int uni_ie_encode_net_lij_seqno(struct uni_msg *, struct uni_ie_lij_seqno *, struct unicx *);
-static int uni_ie_decode_net_lij_seqno(struct uni_ie_lij_seqno *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_lij_seqno = {
-	0,
-	8,
-	(uni_print_f)uni_ie_print_net_lij_seqno,
-	(uni_check_f)uni_ie_check_net_lij_seqno,
-	(uni_encode_f)uni_ie_encode_net_lij_seqno,
-	(uni_decode_f)uni_ie_decode_net_lij_seqno
-};
-
-static void uni_ie_print_net_cscope(struct uni_ie_cscope *, struct unicx *);
-static int uni_ie_check_net_cscope(struct uni_ie_cscope *, struct unicx *);
-static int uni_ie_encode_net_cscope(struct uni_msg *, struct uni_ie_cscope *, struct unicx *);
-static int uni_ie_decode_net_cscope(struct uni_ie_cscope *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_cscope = {
-	0,
-	6,
-	(uni_print_f)uni_ie_print_net_cscope,
-	(uni_check_f)uni_ie_check_net_cscope,
-	(uni_encode_f)uni_ie_encode_net_cscope,
-	(uni_decode_f)uni_ie_decode_net_cscope
-};
-
-static void uni_ie_print_net_exqos(struct uni_ie_exqos *, struct unicx *);
-static int uni_ie_check_net_exqos(struct uni_ie_exqos *, struct unicx *);
-static int uni_ie_encode_net_exqos(struct uni_msg *, struct uni_ie_exqos *, struct unicx *);
-static int uni_ie_decode_net_exqos(struct uni_ie_exqos *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_exqos = {
-	0,
-	25,
-	(uni_print_f)uni_ie_print_net_exqos,
-	(uni_check_f)uni_ie_check_net_exqos,
-	(uni_encode_f)uni_ie_encode_net_exqos,
-	(uni_decode_f)uni_ie_decode_net_exqos
-};
-
-static void uni_ie_print_net_mdcr(struct uni_ie_mdcr *, struct unicx *);
-static int uni_ie_check_net_mdcr(struct uni_ie_mdcr *, struct unicx *);
-static int uni_ie_encode_net_mdcr(struct uni_msg *, struct uni_ie_mdcr *, struct unicx *);
-static int uni_ie_decode_net_mdcr(struct uni_ie_mdcr *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_net_mdcr = {
-	0,
-	13,
-	(uni_print_f)uni_ie_print_net_mdcr,
-	(uni_check_f)uni_ie_check_net_mdcr,
-	(uni_encode_f)uni_ie_encode_net_mdcr,
-	(uni_decode_f)uni_ie_decode_net_mdcr
-};
-
-static void uni_ie_print_itu_unrec(struct uni_ie_unrec *, struct unicx *);
-static int uni_ie_check_itu_unrec(struct uni_ie_unrec *, struct unicx *);
-static int uni_ie_encode_itu_unrec(struct uni_msg *, struct uni_ie_unrec *, struct unicx *);
-static int uni_ie_decode_itu_unrec(struct uni_ie_unrec *, struct uni_msg *, u_int, struct unicx *);
-
-static struct iedecl decl_itu_unrec = {
-	0,
-	128,
-	(uni_print_f)uni_ie_print_itu_unrec,
-	(uni_check_f)uni_ie_check_itu_unrec,
-	(uni_encode_f)uni_ie_encode_itu_unrec,
-	(uni_decode_f)uni_ie_decode_itu_unrec
-};
-
-const struct iedecl *uni_ietable[256][4] = {
-	{ NULL, NULL, NULL, NULL, }, /* 0x00 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x01 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x02 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x03 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x04 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x05 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x06 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x07 */
-	{ &decl_itu_cause, NULL, NULL, &decl_net_cause, }, /* 0x08 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x09 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x0a */
-	{ NULL, NULL, NULL, NULL, }, /* 0x0b */
-	{ NULL, NULL, NULL, NULL, }, /* 0x0c */
-	{ NULL, NULL, NULL, NULL, }, /* 0x0d */
-	{ NULL, NULL, NULL, NULL, }, /* 0x0e */
-	{ NULL, NULL, NULL, NULL, }, /* 0x0f */
-	{ NULL, NULL, NULL, NULL, }, /* 0x10 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x11 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x12 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x13 */
-	{ &decl_itu_callstate, NULL, NULL, NULL, }, /* 0x14 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x15 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x16 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x17 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x18 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x19 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x1a */
-	{ NULL, NULL, NULL, NULL, }, /* 0x1b */
-	{ &decl_itu_facility, NULL, NULL, NULL, }, /* 0x1c */
-	{ NULL, NULL, NULL, NULL, }, /* 0x1d */
-	{ NULL, NULL, NULL, NULL, }, /* 0x1e */
-	{ NULL, NULL, NULL, NULL, }, /* 0x1f */
-	{ NULL, NULL, NULL, NULL, }, /* 0x20 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x21 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x22 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x23 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x24 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x25 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x26 */
-	{ &decl_itu_notify, NULL, NULL, NULL, }, /* 0x27 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x28 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x29 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x2a */
-	{ NULL, NULL, NULL, NULL, }, /* 0x2b */
-	{ NULL, NULL, NULL, NULL, }, /* 0x2c */
-	{ NULL, NULL, NULL, NULL, }, /* 0x2d */
-	{ NULL, NULL, NULL, NULL, }, /* 0x2e */
-	{ NULL, NULL, NULL, NULL, }, /* 0x2f */
-	{ NULL, NULL, NULL, NULL, }, /* 0x30 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x31 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x32 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x33 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x34 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x35 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x36 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x37 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x38 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x39 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x3a */
-	{ NULL, NULL, NULL, NULL, }, /* 0x3b */
-	{ NULL, NULL, NULL, NULL, }, /* 0x3c */
-	{ NULL, NULL, NULL, NULL, }, /* 0x3d */
-	{ NULL, NULL, NULL, NULL, }, /* 0x3e */
-	{ NULL, NULL, NULL, NULL, }, /* 0x3f */
-	{ NULL, NULL, NULL, NULL, }, /* 0x40 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x41 */
-	{ &decl_itu_eetd, NULL, NULL, &decl_net_eetd, }, /* 0x42 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x43 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x44 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x45 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x46 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x47 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x48 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x49 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x4a */
-	{ NULL, NULL, NULL, NULL, }, /* 0x4b */
-	{ &decl_itu_conned, NULL, NULL, NULL, }, /* 0x4c */
-	{ &decl_itu_connedsub, NULL, NULL, NULL, }, /* 0x4d */
-	{ NULL, NULL, NULL, NULL, }, /* 0x4e */
-	{ NULL, NULL, NULL, NULL, }, /* 0x4f */
-	{ NULL, NULL, NULL, NULL, }, /* 0x50 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x51 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x52 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x53 */
-	{ &decl_itu_epref, NULL, NULL, NULL, }, /* 0x54 */
-	{ &decl_itu_epstate, NULL, NULL, NULL, }, /* 0x55 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x56 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x57 */
-	{ &decl_itu_aal, NULL, NULL, NULL, }, /* 0x58 */
-	{ &decl_itu_traffic, NULL, NULL, &decl_net_traffic, }, /* 0x59 */
-	{ &decl_itu_connid, NULL, NULL, NULL, }, /* 0x5a */
-	{ NULL, NULL, NULL, NULL, }, /* 0x5b */
-	{ &decl_itu_qos, NULL, NULL, &decl_net_qos, }, /* 0x5c */
-	{ &decl_itu_bhli, NULL, NULL, NULL, }, /* 0x5d */
-	{ &decl_itu_bearer, NULL, NULL, NULL, }, /* 0x5e */
-	{ &decl_itu_blli, NULL, NULL, NULL, }, /* 0x5f */
-	{ &decl_itu_lshift, NULL, NULL, NULL, }, /* 0x60 */
-	{ &decl_itu_nlshift, NULL, NULL, NULL, }, /* 0x61 */
-	{ &decl_itu_scompl, NULL, NULL, NULL, }, /* 0x62 */
-	{ &decl_itu_repeat, NULL, NULL, NULL, }, /* 0x63 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x64 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x65 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x66 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x67 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x68 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x69 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x6a */
-	{ NULL, NULL, NULL, NULL, }, /* 0x6b */
-	{ &decl_itu_calling, NULL, NULL, NULL, }, /* 0x6c */
-	{ &decl_itu_callingsub, NULL, NULL, NULL, }, /* 0x6d */
-	{ NULL, NULL, NULL, NULL, }, /* 0x6e */
-	{ NULL, NULL, NULL, NULL, }, /* 0x6f */
-	{ &decl_itu_called, NULL, NULL, NULL, }, /* 0x70 */
-	{ &decl_itu_calledsub, NULL, NULL, NULL, }, /* 0x71 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x72 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x73 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x74 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x75 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x76 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x77 */
-	{ &decl_itu_tns, NULL, NULL, &decl_net_tns, }, /* 0x78 */
-	{ &decl_itu_restart, NULL, NULL, NULL, }, /* 0x79 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x7a */
-	{ NULL, NULL, NULL, NULL, }, /* 0x7b */
-	{ NULL, NULL, NULL, NULL, }, /* 0x7c */
-	{ NULL, NULL, NULL, NULL, }, /* 0x7d */
-	{ &decl_itu_uu, NULL, NULL, NULL, }, /* 0x7e */
-	{ NULL, NULL, NULL, &decl_net_git, }, /* 0x7f */
-	{ NULL, NULL, NULL, NULL, }, /* 0x80 */
-	{ &decl_itu_mintraffic, NULL, NULL, &decl_net_mintraffic, }, /* 0x81 */
-	{ &decl_itu_atraffic, NULL, NULL, &decl_net_atraffic, }, /* 0x82 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x83 */
-	{ NULL, NULL, NULL, &decl_net_abrsetup, }, /* 0x84 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x85 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x86 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x87 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x88 */
-	{ &decl_itu_report, NULL, NULL, NULL, }, /* 0x89 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x8a */
-	{ NULL, NULL, NULL, NULL, }, /* 0x8b */
-	{ NULL, NULL, NULL, NULL, }, /* 0x8c */
-	{ NULL, NULL, NULL, NULL, }, /* 0x8d */
-	{ NULL, NULL, NULL, NULL, }, /* 0x8e */
-	{ NULL, NULL, NULL, NULL, }, /* 0x8f */
-	{ NULL, NULL, NULL, NULL, }, /* 0x90 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x91 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x92 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x93 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x94 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x95 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x96 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x97 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x98 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x99 */
-	{ NULL, NULL, NULL, NULL, }, /* 0x9a */
-	{ NULL, NULL, NULL, NULL, }, /* 0x9b */
-	{ NULL, NULL, NULL, NULL, }, /* 0x9c */
-	{ NULL, NULL, NULL, NULL, }, /* 0x9d */
-	{ NULL, NULL, NULL, NULL, }, /* 0x9e */
-	{ NULL, NULL, NULL, NULL, }, /* 0x9f */
-	{ NULL, NULL, NULL, NULL, }, /* 0xa0 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xa1 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xa2 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xa3 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xa4 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xa5 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xa6 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xa7 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xa8 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xa9 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xaa */
-	{ NULL, NULL, NULL, NULL, }, /* 0xab */
-	{ NULL, NULL, NULL, NULL, }, /* 0xac */
-	{ NULL, NULL, NULL, NULL, }, /* 0xad */
-	{ NULL, NULL, NULL, NULL, }, /* 0xae */
-	{ NULL, NULL, NULL, NULL, }, /* 0xaf */
-	{ NULL, NULL, NULL, NULL, }, /* 0xb0 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xb1 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xb2 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xb3 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xb4 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xb5 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xb6 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xb7 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xb8 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xb9 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xba */
-	{ NULL, NULL, NULL, NULL, }, /* 0xbb */
-	{ NULL, NULL, NULL, NULL, }, /* 0xbc */
-	{ NULL, NULL, NULL, NULL, }, /* 0xbd */
-	{ NULL, NULL, NULL, NULL, }, /* 0xbe */
-	{ NULL, NULL, NULL, NULL, }, /* 0xbf */
-	{ NULL, NULL, NULL, NULL, }, /* 0xc0 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xc1 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xc2 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xc3 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xc4 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xc5 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xc6 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xc7 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xc8 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xc9 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xca */
-	{ NULL, NULL, NULL, NULL, }, /* 0xcb */
-	{ NULL, NULL, NULL, NULL, }, /* 0xcc */
-	{ NULL, NULL, NULL, NULL, }, /* 0xcd */
-	{ NULL, NULL, NULL, NULL, }, /* 0xce */
-	{ NULL, NULL, NULL, NULL, }, /* 0xcf */
-	{ NULL, NULL, NULL, NULL, }, /* 0xd0 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xd1 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xd2 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xd3 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xd4 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xd5 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xd6 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xd7 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xd8 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xd9 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xda */
-	{ NULL, NULL, NULL, NULL, }, /* 0xdb */
-	{ NULL, NULL, NULL, NULL, }, /* 0xdc */
-	{ NULL, NULL, NULL, NULL, }, /* 0xdd */
-	{ NULL, NULL, NULL, NULL, }, /* 0xde */
-	{ NULL, NULL, NULL, NULL, }, /* 0xdf */
-	{ NULL, NULL, NULL, &decl_net_called_soft, }, /* 0xe0 */
-	{ NULL, NULL, NULL, &decl_net_crankback, }, /* 0xe1 */
-	{ NULL, NULL, NULL, &decl_net_dtl, }, /* 0xe2 */
-	{ NULL, NULL, NULL, &decl_net_calling_soft, }, /* 0xe3 */
-	{ NULL, NULL, NULL, &decl_net_abradd, }, /* 0xe4 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xe5 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xe6 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xe7 */
-	{ NULL, NULL, NULL, &decl_net_lij_callid, }, /* 0xe8 */
-	{ NULL, NULL, NULL, &decl_net_lij_param, }, /* 0xe9 */
-	{ NULL, NULL, NULL, &decl_net_lij_seqno, }, /* 0xea */
-	{ NULL, NULL, NULL, &decl_net_cscope, }, /* 0xeb */
-	{ NULL, NULL, NULL, &decl_net_exqos, }, /* 0xec */
-	{ NULL, NULL, NULL, NULL, }, /* 0xed */
-	{ NULL, NULL, NULL, NULL, }, /* 0xee */
-	{ NULL, NULL, NULL, NULL, }, /* 0xef */
-	{ NULL, NULL, NULL, &decl_net_mdcr, }, /* 0xf0 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xf1 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xf2 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xf3 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xf4 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xf5 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xf6 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xf7 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xf8 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xf9 */
-	{ NULL, NULL, NULL, NULL, }, /* 0xfa */
-	{ NULL, NULL, NULL, NULL, }, /* 0xfb */
-	{ NULL, NULL, NULL, NULL, }, /* 0xfc */
-	{ NULL, NULL, NULL, NULL, }, /* 0xfd */
-	{ &decl_itu_unrec, NULL, NULL, NULL, }, /* 0xfe */
-	{ NULL, NULL, NULL, NULL, }, /* 0xff */
-};
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_msg.c b/sys/contrib/ngatm/netnatm/msg/uni_msg.c
deleted file mode 100644
index f9991858b418..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/uni_msg.c
+++ /dev/null
@@ -1,4901 +0,0 @@
-/* This file was created automatically
- * Source file: $Begemot: libunimsg/atm/msg/msg.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
- */
-
-#include <sys/types.h>
-#include <sys/param.h>
-
-#ifdef _KERNEL
-#include <sys/libkern.h>
-#else
-#include <string.h>
-#endif
-#include <netnatm/unimsg.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#include <netnatm/msg/priv.h>
-#include <netnatm/msg/privmsg.c>
-
-static void
-print_alerting(struct uni_alerting *msg, struct unicx *cx)
-{
-	u_int i;
-
-	if(msg->connid.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CONNID, (union uni_ieall *)&msg->connid, cx);
-	if(msg->epref.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPREF, (union uni_ieall *)&msg->epref, cx);
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->uu.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UU, (union uni_ieall *)&msg->uu, cx);
-	if(msg->report.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_REPORT, (union uni_ieall *)&msg->report, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_alerting(struct uni_alerting *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->connid);
-	else
-		ret |= uni_check_ie(UNI_IE_CONNID, (union uni_ieall *)&m->connid, cx);
-	ret |= uni_check_ie(UNI_IE_EPREF, (union uni_ieall *)&m->epref, cx);
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->uu);
-	else
-		ret |= uni_check_ie(UNI_IE_UU, (union uni_ieall *)&m->uu, cx);
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->report);
-	else
-		ret |= uni_check_ie(UNI_IE_REPORT, (union uni_ieall *)&m->report, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_alerting(struct uni_msg *msg, struct uni_alerting *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_ALERTING, cx, &mlen))
-		return (-2);
-
-	if((p->connid.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CONNID, msg, (union uni_ieall *)&p->connid, cx))
-		return (UNI_IE_CONNID);
-	if((p->epref.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPREF, msg, (union uni_ieall *)&p->epref, cx))
-		return (UNI_IE_EPREF);
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->uu.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UU, msg, (union uni_ieall *)&p->uu, cx))
-		return (UNI_IE_UU);
-	if((p->report.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_REPORT, msg, (union uni_ieall *)&p->report, cx))
-		return (UNI_IE_REPORT);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_alerting(struct uni_alerting *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_CONNID:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->connid.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CONNID, (union uni_ieall *)&out->connid, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_EPREF:
-		out->epref.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPREF, (union uni_ieall *)&out->epref, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_GIT:
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_UU:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->uu.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UU, (union uni_ieall *)&out->uu, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_REPORT:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->report.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_REPORT, (union uni_ieall *)&out->report, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_alerting = {
-	0,
-	"alerting",
-	(uni_msg_print_f)print_alerting,
-	(uni_msg_check_f)check_alerting,
-	(uni_msg_encode_f)encode_alerting,
-	(uni_msg_decode_f)decode_alerting
-};
-
-static void
-print_call_proc(struct uni_call_proc *msg, struct unicx *cx)
-{
-	if(msg->connid.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CONNID, (union uni_ieall *)&msg->connid, cx);
-	if(msg->epref.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPREF, (union uni_ieall *)&msg->epref, cx);
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_call_proc(struct uni_call_proc *m, struct unicx *cx)
-{
-	int ret = 0;
-
-	ret |= uni_check_ie(UNI_IE_CONNID, (union uni_ieall *)&m->connid, cx);
-	ret |= uni_check_ie(UNI_IE_EPREF, (union uni_ieall *)&m->epref, cx);
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->notify);
-	else
-		ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_call_proc(struct uni_msg *msg, struct uni_call_proc *p, struct unicx *cx)
-{
-	u_int mlen;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_CALL_PROC, cx, &mlen))
-		return (-2);
-
-	if((p->connid.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CONNID, msg, (union uni_ieall *)&p->connid, cx))
-		return (UNI_IE_CONNID);
-	if((p->epref.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPREF, msg, (union uni_ieall *)&p->epref, cx))
-		return (UNI_IE_EPREF);
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_call_proc(struct uni_call_proc *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	switch (ie) {
-
-	  case UNI_IE_CONNID:
-		out->connid.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CONNID, (union uni_ieall *)&out->connid, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_EPREF:
-		out->epref.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPREF, (union uni_ieall *)&out->epref, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_NOTIFY:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_call_proc = {
-	0,
-	"call_proc",
-	(uni_msg_print_f)print_call_proc,
-	(uni_msg_check_f)check_call_proc,
-	(uni_msg_encode_f)encode_call_proc,
-	(uni_msg_decode_f)decode_call_proc
-};
-
-static void
-print_connect(struct uni_connect *msg, struct unicx *cx)
-{
-	u_int i;
-
-	if(msg->aal.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_AAL, (union uni_ieall *)&msg->aal, cx);
-	if(msg->blli.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_BLLI, (union uni_ieall *)&msg->blli, cx);
-	if(msg->connid.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CONNID, (union uni_ieall *)&msg->connid, cx);
-	if(msg->epref.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPREF, (union uni_ieall *)&msg->epref, cx);
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	if(msg->conned.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CONNED, (union uni_ieall *)&msg->conned, cx);
-	if(msg->connedsub.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CONNEDSUB, (union uni_ieall *)&msg->connedsub, cx);
-	if(msg->eetd.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EETD, (union uni_ieall *)&msg->eetd, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->uu.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UU, (union uni_ieall *)&msg->uu, cx);
-	if(msg->traffic.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_TRAFFIC, (union uni_ieall *)&msg->traffic, cx);
-	if(msg->exqos.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EXQOS, (union uni_ieall *)&msg->exqos, cx);
-	if(msg->facility.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_FACILITY, (union uni_ieall *)&msg->facility, cx);
-	if(msg->abrsetup.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_ABRSETUP, (union uni_ieall *)&msg->abrsetup, cx);
-	if(msg->abradd.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_ABRADD, (union uni_ieall *)&msg->abradd, cx);
-	if(msg->called_soft.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLED_SOFT, (union uni_ieall *)&msg->called_soft, cx);
-	if(msg->report.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_REPORT, (union uni_ieall *)&msg->report, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_connect(struct uni_connect *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	ret |= uni_check_ie(UNI_IE_AAL, (union uni_ieall *)&m->aal, cx);
-	ret |= uni_check_ie(UNI_IE_BLLI, (union uni_ieall *)&m->blli, cx);
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->connid);
-	else
-		ret |= uni_check_ie(UNI_IE_CONNID, (union uni_ieall *)&m->connid, cx);
-	ret |= uni_check_ie(UNI_IE_EPREF, (union uni_ieall *)&m->epref, cx);
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	ret |= uni_check_ie(UNI_IE_CONNED, (union uni_ieall *)&m->conned, cx);
-	ret |= uni_check_ie(UNI_IE_CONNEDSUB, (union uni_ieall *)&m->connedsub, cx);
-	ret |= uni_check_ie(UNI_IE_EETD, (union uni_ieall *)&m->eetd, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->uu);
-	else
-		ret |= uni_check_ie(UNI_IE_UU, (union uni_ieall *)&m->uu, cx);
-	ret |= uni_check_ie(UNI_IE_TRAFFIC, (union uni_ieall *)&m->traffic, cx);
-	ret |= uni_check_ie(UNI_IE_EXQOS, (union uni_ieall *)&m->exqos, cx);
-	if(!(cx->q2932))
-		ret |= IE_ISPRESENT(m->facility);
-	else
-		ret |= uni_check_ie(UNI_IE_FACILITY, (union uni_ieall *)&m->facility, cx);
-	ret |= uni_check_ie(UNI_IE_ABRSETUP, (union uni_ieall *)&m->abrsetup, cx);
-	ret |= uni_check_ie(UNI_IE_ABRADD, (union uni_ieall *)&m->abradd, cx);
-	if(!(cx->pnni))
-		ret |= IE_ISPRESENT(m->called_soft);
-	else
-		ret |= uni_check_ie(UNI_IE_CALLED_SOFT, (union uni_ieall *)&m->called_soft, cx);
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->report);
-	else
-		ret |= uni_check_ie(UNI_IE_REPORT, (union uni_ieall *)&m->report, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_connect(struct uni_msg *msg, struct uni_connect *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_CONNECT, cx, &mlen))
-		return (-2);
-
-	if((p->aal.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_AAL, msg, (union uni_ieall *)&p->aal, cx))
-		return (UNI_IE_AAL);
-	if((p->blli.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_BLLI, msg, (union uni_ieall *)&p->blli, cx))
-		return (UNI_IE_BLLI);
-	if((p->connid.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CONNID, msg, (union uni_ieall *)&p->connid, cx))
-		return (UNI_IE_CONNID);
-	if((p->epref.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPREF, msg, (union uni_ieall *)&p->epref, cx))
-		return (UNI_IE_EPREF);
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	if((p->conned.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CONNED, msg, (union uni_ieall *)&p->conned, cx))
-		return (UNI_IE_CONNED);
-	if((p->connedsub.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CONNEDSUB, msg, (union uni_ieall *)&p->connedsub, cx))
-		return (UNI_IE_CONNEDSUB);
-	if((p->eetd.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EETD, msg, (union uni_ieall *)&p->eetd, cx))
-		return (UNI_IE_EETD);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->uu.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UU, msg, (union uni_ieall *)&p->uu, cx))
-		return (UNI_IE_UU);
-	if((p->traffic.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_TRAFFIC, msg, (union uni_ieall *)&p->traffic, cx))
-		return (UNI_IE_TRAFFIC);
-	if((p->exqos.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EXQOS, msg, (union uni_ieall *)&p->exqos, cx))
-		return (UNI_IE_EXQOS);
-	if((p->facility.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_FACILITY, msg, (union uni_ieall *)&p->facility, cx))
-		return (UNI_IE_FACILITY);
-	if((p->abrsetup.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_ABRSETUP, msg, (union uni_ieall *)&p->abrsetup, cx))
-		return (UNI_IE_ABRSETUP);
-	if((p->abradd.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_ABRADD, msg, (union uni_ieall *)&p->abradd, cx))
-		return (UNI_IE_ABRADD);
-	if((p->called_soft.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLED_SOFT, msg, (union uni_ieall *)&p->called_soft, cx))
-		return (UNI_IE_CALLED_SOFT);
-	if((p->report.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_REPORT, msg, (union uni_ieall *)&p->report, cx))
-		return (UNI_IE_REPORT);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_connect(struct uni_connect *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_AAL:
-		out->aal.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_AAL, (union uni_ieall *)&out->aal, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_BLLI:
-		out->blli.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_BLLI, (union uni_ieall *)&out->blli, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CONNID:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->connid.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CONNID, (union uni_ieall *)&out->connid, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_EPREF:
-		out->epref.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPREF, (union uni_ieall *)&out->epref, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CONNED:
-		out->conned.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CONNED, (union uni_ieall *)&out->conned, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CONNEDSUB:
-		out->connedsub.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CONNEDSUB, (union uni_ieall *)&out->connedsub, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_EETD:
-		out->eetd.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EETD, (union uni_ieall *)&out->eetd, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_GIT:
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_UU:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->uu.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UU, (union uni_ieall *)&out->uu, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_TRAFFIC:
-		out->traffic.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_TRAFFIC, (union uni_ieall *)&out->traffic, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_EXQOS:
-		out->exqos.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EXQOS, (union uni_ieall *)&out->exqos, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_FACILITY:
-		if (!(cx->q2932))
-			return (DEC_ILL);
-		out->facility.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_FACILITY, (union uni_ieall *)&out->facility, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_ABRSETUP:
-		out->abrsetup.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_ABRSETUP, (union uni_ieall *)&out->abrsetup, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_ABRADD:
-		out->abradd.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_ABRADD, (union uni_ieall *)&out->abradd, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLED_SOFT:
-		if (!(cx->pnni))
-			return (DEC_ILL);
-		out->called_soft.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLED_SOFT, (union uni_ieall *)&out->called_soft, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_REPORT:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->report.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_REPORT, (union uni_ieall *)&out->report, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_connect = {
-	0,
-	"connect",
-	(uni_msg_print_f)print_connect,
-	(uni_msg_check_f)check_connect,
-	(uni_msg_encode_f)encode_connect,
-	(uni_msg_decode_f)decode_connect
-};
-
-static void
-print_connect_ack(struct uni_connect_ack *msg, struct unicx *cx)
-{
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_connect_ack(struct uni_connect_ack *m, struct unicx *cx)
-{
-	int ret = 0;
-
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_connect_ack(struct uni_msg *msg, struct uni_connect_ack *p, struct unicx *cx)
-{
-	u_int mlen;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_CONNECT_ACK, cx, &mlen))
-		return (-2);
-
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_connect_ack(struct uni_connect_ack *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	switch (ie) {
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_connect_ack = {
-	0,
-	"connect_ack",
-	(uni_msg_print_f)print_connect_ack,
-	(uni_msg_check_f)check_connect_ack,
-	(uni_msg_encode_f)encode_connect_ack,
-	(uni_msg_decode_f)decode_connect_ack
-};
-
-static void
-print_release(struct uni_release *msg, struct unicx *cx)
-{
-	u_int i;
-
-	for(i = 0; i < 2; i++)
-		if(msg->cause[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_CAUSE, (union uni_ieall *)&msg->cause[i], cx);
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->uu.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UU, (union uni_ieall *)&msg->uu, cx);
-	if(msg->facility.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_FACILITY, (union uni_ieall *)&msg->facility, cx);
-	if(msg->crankback.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CRANKBACK, (union uni_ieall *)&msg->crankback, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_release(struct uni_release *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	for(i = 0; i < 2 ; i++) {
-		ret |= uni_check_ie(UNI_IE_CAUSE, (union uni_ieall *)&m->cause[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->uu);
-	else
-		ret |= uni_check_ie(UNI_IE_UU, (union uni_ieall *)&m->uu, cx);
-	if(!(cx->q2932))
-		ret |= IE_ISPRESENT(m->facility);
-	else
-		ret |= uni_check_ie(UNI_IE_FACILITY, (union uni_ieall *)&m->facility, cx);
-	if(!(cx->pnni))
-		ret |= IE_ISPRESENT(m->crankback);
-	else
-		ret |= uni_check_ie(UNI_IE_CRANKBACK, (union uni_ieall *)&m->crankback, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_release(struct uni_msg *msg, struct uni_release *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_RELEASE, cx, &mlen))
-		return (-2);
-
-	for(i = 0; i < 2; i++)
-		if((p->cause[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_CAUSE, msg, (union uni_ieall *)&p->cause[i], cx))
-		return ((i << 16) + UNI_IE_CAUSE);
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->uu.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UU, msg, (union uni_ieall *)&p->uu, cx))
-		return (UNI_IE_UU);
-	if((p->facility.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_FACILITY, msg, (union uni_ieall *)&p->facility, cx))
-		return (UNI_IE_FACILITY);
-	if((p->crankback.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CRANKBACK, msg, (union uni_ieall *)&p->crankback, cx))
-		return (UNI_IE_CRANKBACK);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_release(struct uni_release *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_CAUSE:
-		for(i = 0; i < 2; i++)
-			if (!IE_ISPRESENT(out->cause[i])) {
-				out->cause[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_CAUSE, (union uni_ieall *)&out->cause[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_GIT:
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_UU:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->uu.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UU, (union uni_ieall *)&out->uu, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_FACILITY:
-		if (!(cx->q2932))
-			return (DEC_ILL);
-		out->facility.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_FACILITY, (union uni_ieall *)&out->facility, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CRANKBACK:
-		if (!(cx->pnni))
-			return (DEC_ILL);
-		out->crankback.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CRANKBACK, (union uni_ieall *)&out->crankback, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_release = {
-	0,
-	"release",
-	(uni_msg_print_f)print_release,
-	(uni_msg_check_f)check_release,
-	(uni_msg_encode_f)encode_release,
-	(uni_msg_decode_f)decode_release
-};
-
-static void
-print_release_compl(struct uni_release_compl *msg, struct unicx *cx)
-{
-	u_int i;
-
-	for(i = 0; i < 2; i++)
-		if(msg->cause[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_CAUSE, (union uni_ieall *)&msg->cause[i], cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->uu.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UU, (union uni_ieall *)&msg->uu, cx);
-	if(msg->crankback.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CRANKBACK, (union uni_ieall *)&msg->crankback, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_release_compl(struct uni_release_compl *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	for(i = 0; i < 2 ; i++) {
-		ret |= uni_check_ie(UNI_IE_CAUSE, (union uni_ieall *)&m->cause[i], cx);
-	}
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		if(!(!cx->pnni))
-			ret |= IE_ISPRESENT(m->git[i]);
-		else
-			ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->uu);
-	else
-		ret |= uni_check_ie(UNI_IE_UU, (union uni_ieall *)&m->uu, cx);
-	if(!(cx->pnni))
-		ret |= IE_ISPRESENT(m->crankback);
-	else
-		ret |= uni_check_ie(UNI_IE_CRANKBACK, (union uni_ieall *)&m->crankback, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_release_compl(struct uni_msg *msg, struct uni_release_compl *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_RELEASE_COMPL, cx, &mlen))
-		return (-2);
-
-	for(i = 0; i < 2; i++)
-		if((p->cause[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_CAUSE, msg, (union uni_ieall *)&p->cause[i], cx))
-		return ((i << 16) + UNI_IE_CAUSE);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->uu.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UU, msg, (union uni_ieall *)&p->uu, cx))
-		return (UNI_IE_UU);
-	if((p->crankback.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CRANKBACK, msg, (union uni_ieall *)&p->crankback, cx))
-		return (UNI_IE_CRANKBACK);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_release_compl(struct uni_release_compl *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_CAUSE:
-		for(i = 0; i < 2; i++)
-			if (!IE_ISPRESENT(out->cause[i])) {
-				out->cause[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_CAUSE, (union uni_ieall *)&out->cause[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_GIT:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_UU:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->uu.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UU, (union uni_ieall *)&out->uu, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CRANKBACK:
-		if (!(cx->pnni))
-			return (DEC_ILL);
-		out->crankback.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CRANKBACK, (union uni_ieall *)&out->crankback, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_release_compl = {
-	0,
-	"release_compl",
-	(uni_msg_print_f)print_release_compl,
-	(uni_msg_check_f)check_release_compl,
-	(uni_msg_encode_f)encode_release_compl,
-	(uni_msg_decode_f)decode_release_compl
-};
-
-static void
-print_setup(struct uni_setup *msg, struct unicx *cx)
-{
-	u_int i;
-
-	if(msg->aal.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_AAL, (union uni_ieall *)&msg->aal, cx);
-	if(msg->traffic.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_TRAFFIC, (union uni_ieall *)&msg->traffic, cx);
-	if(msg->bearer.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_BEARER, (union uni_ieall *)&msg->bearer, cx);
-	if(msg->bhli.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_BHLI, (union uni_ieall *)&msg->bhli, cx);
-	if(msg->blli_repeat.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_REPEAT, (union uni_ieall *)&msg->blli_repeat, cx);
-	for(i = 0; i < UNI_NUM_IE_BLLI; i++)
-		if(msg->blli[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_BLLI, (union uni_ieall *)&msg->blli[i], cx);
-	if(msg->called.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLED, (union uni_ieall *)&msg->called, cx);
-	for(i = 0; i < UNI_NUM_IE_CALLEDSUB; i++)
-		if(msg->calledsub[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_CALLEDSUB, (union uni_ieall *)&msg->calledsub[i], cx);
-	if(msg->calling.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLING, (union uni_ieall *)&msg->calling, cx);
-	for(i = 0; i < UNI_NUM_IE_CALLINGSUB; i++)
-		if(msg->callingsub[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_CALLINGSUB, (union uni_ieall *)&msg->callingsub[i], cx);
-	if(msg->connid.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CONNID, (union uni_ieall *)&msg->connid, cx);
-	if(msg->qos.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_QOS, (union uni_ieall *)&msg->qos, cx);
-	if(msg->eetd.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EETD, (union uni_ieall *)&msg->eetd, cx);
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	if(msg->scompl.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_SCOMPL, (union uni_ieall *)&msg->scompl, cx);
-	for(i = 0; i < UNI_NUM_IE_TNS; i++)
-		if(msg->tns[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_TNS, (union uni_ieall *)&msg->tns[i], cx);
-	if(msg->epref.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPREF, (union uni_ieall *)&msg->epref, cx);
-	if(msg->atraffic.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_ATRAFFIC, (union uni_ieall *)&msg->atraffic, cx);
-	if(msg->mintraffic.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_MINTRAFFIC, (union uni_ieall *)&msg->mintraffic, cx);
-	if(msg->uu.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UU, (union uni_ieall *)&msg->uu, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->lij_callid.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_LIJ_CALLID, (union uni_ieall *)&msg->lij_callid, cx);
-	if(msg->lij_param.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_LIJ_PARAM, (union uni_ieall *)&msg->lij_param, cx);
-	if(msg->lij_seqno.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_LIJ_SEQNO, (union uni_ieall *)&msg->lij_seqno, cx);
-	if(msg->exqos.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EXQOS, (union uni_ieall *)&msg->exqos, cx);
-	if(msg->abrsetup.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_ABRSETUP, (union uni_ieall *)&msg->abrsetup, cx);
-	if(msg->abradd.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_ABRADD, (union uni_ieall *)&msg->abradd, cx);
-	if(msg->cscope.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CSCOPE, (union uni_ieall *)&msg->cscope, cx);
-	if(msg->calling_soft.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLING_SOFT, (union uni_ieall *)&msg->calling_soft, cx);
-	if(msg->called_soft.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLED_SOFT, (union uni_ieall *)&msg->called_soft, cx);
-	if(msg->dtl_repeat.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_REPEAT, (union uni_ieall *)&msg->dtl_repeat, cx);
-	for(i = 0; i < UNI_NUM_IE_DTL; i++)
-		if(msg->dtl[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_DTL, (union uni_ieall *)&msg->dtl[i], cx);
-	if(msg->report.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_REPORT, (union uni_ieall *)&msg->report, cx);
-	if(msg->mdcr.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_MDCR, (union uni_ieall *)&msg->mdcr, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_setup(struct uni_setup *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	ret |= uni_check_ie(UNI_IE_AAL, (union uni_ieall *)&m->aal, cx);
-	ret |= uni_check_ie(UNI_IE_TRAFFIC, (union uni_ieall *)&m->traffic, cx);
-	ret |= uni_check_ie(UNI_IE_BEARER, (union uni_ieall *)&m->bearer, cx);
-	ret |= uni_check_ie(UNI_IE_BHLI, (union uni_ieall *)&m->bhli, cx);
-	ret |= uni_check_ie(UNI_IE_REPEAT, (union uni_ieall *)&m->blli_repeat, cx);
-	for(i = 0; i < UNI_NUM_IE_BLLI ; i++) {
-		ret |= uni_check_ie(UNI_IE_BLLI, (union uni_ieall *)&m->blli[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_CALLED, (union uni_ieall *)&m->called, cx);
-	for(i = 0; i < UNI_NUM_IE_CALLEDSUB ; i++) {
-		ret |= uni_check_ie(UNI_IE_CALLEDSUB, (union uni_ieall *)&m->calledsub[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_CALLING, (union uni_ieall *)&m->calling, cx);
-	for(i = 0; i < UNI_NUM_IE_CALLINGSUB ; i++) {
-		ret |= uni_check_ie(UNI_IE_CALLINGSUB, (union uni_ieall *)&m->callingsub[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_CONNID, (union uni_ieall *)&m->connid, cx);
-	ret |= uni_check_ie(UNI_IE_QOS, (union uni_ieall *)&m->qos, cx);
-	ret |= uni_check_ie(UNI_IE_EETD, (union uni_ieall *)&m->eetd, cx);
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->scompl);
-	else
-		ret |= uni_check_ie(UNI_IE_SCOMPL, (union uni_ieall *)&m->scompl, cx);
-	for(i = 0; i < UNI_NUM_IE_TNS ; i++) {
-		ret |= uni_check_ie(UNI_IE_TNS, (union uni_ieall *)&m->tns[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_EPREF, (union uni_ieall *)&m->epref, cx);
-	ret |= uni_check_ie(UNI_IE_ATRAFFIC, (union uni_ieall *)&m->atraffic, cx);
-	ret |= uni_check_ie(UNI_IE_MINTRAFFIC, (union uni_ieall *)&m->mintraffic, cx);
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->uu);
-	else
-		ret |= uni_check_ie(UNI_IE_UU, (union uni_ieall *)&m->uu, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->lij_callid);
-	else
-		ret |= uni_check_ie(UNI_IE_LIJ_CALLID, (union uni_ieall *)&m->lij_callid, cx);
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->lij_param);
-	else
-		ret |= uni_check_ie(UNI_IE_LIJ_PARAM, (union uni_ieall *)&m->lij_param, cx);
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->lij_seqno);
-	else
-		ret |= uni_check_ie(UNI_IE_LIJ_SEQNO, (union uni_ieall *)&m->lij_seqno, cx);
-	ret |= uni_check_ie(UNI_IE_EXQOS, (union uni_ieall *)&m->exqos, cx);
-	ret |= uni_check_ie(UNI_IE_ABRSETUP, (union uni_ieall *)&m->abrsetup, cx);
-	ret |= uni_check_ie(UNI_IE_ABRADD, (union uni_ieall *)&m->abradd, cx);
-	ret |= uni_check_ie(UNI_IE_CSCOPE, (union uni_ieall *)&m->cscope, cx);
-	if(!(cx->pnni))
-		ret |= IE_ISPRESENT(m->calling_soft);
-	else
-		ret |= uni_check_ie(UNI_IE_CALLING_SOFT, (union uni_ieall *)&m->calling_soft, cx);
-	if(!(cx->pnni))
-		ret |= IE_ISPRESENT(m->called_soft);
-	else
-		ret |= uni_check_ie(UNI_IE_CALLED_SOFT, (union uni_ieall *)&m->called_soft, cx);
-	if(!(cx->pnni))
-		ret |= IE_ISPRESENT(m->dtl_repeat);
-	else
-		ret |= uni_check_ie(UNI_IE_REPEAT, (union uni_ieall *)&m->dtl_repeat, cx);
-	for(i = 0; i < UNI_NUM_IE_DTL ; i++) {
-		if(!(cx->pnni))
-			ret |= IE_ISPRESENT(m->dtl[i]);
-		else
-			ret |= uni_check_ie(UNI_IE_DTL, (union uni_ieall *)&m->dtl[i], cx);
-	}
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->report);
-	else
-		ret |= uni_check_ie(UNI_IE_REPORT, (union uni_ieall *)&m->report, cx);
-	ret |= uni_check_ie(UNI_IE_MDCR, (union uni_ieall *)&m->mdcr, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_setup(struct uni_msg *msg, struct uni_setup *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_SETUP, cx, &mlen))
-		return (-2);
-
-	if((p->aal.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_AAL, msg, (union uni_ieall *)&p->aal, cx))
-		return (UNI_IE_AAL);
-	if((p->traffic.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_TRAFFIC, msg, (union uni_ieall *)&p->traffic, cx))
-		return (UNI_IE_TRAFFIC);
-	if((p->bearer.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_BEARER, msg, (union uni_ieall *)&p->bearer, cx))
-		return (UNI_IE_BEARER);
-	if((p->bhli.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_BHLI, msg, (union uni_ieall *)&p->bhli, cx))
-		return (UNI_IE_BHLI);
-	if((p->blli_repeat.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_BLLI, msg, (union uni_ieall *)&p->blli_repeat, cx))
-		return (0x10000000 + UNI_IE_BLLI);
-	for(i = 0; i < UNI_NUM_IE_BLLI; i++)
-		if((p->blli[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_BLLI, msg, (union uni_ieall *)&p->blli[i], cx))
-		return ((i << 16) + UNI_IE_BLLI);
-	if((p->called.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLED, msg, (union uni_ieall *)&p->called, cx))
-		return (UNI_IE_CALLED);
-	for(i = 0; i < UNI_NUM_IE_CALLEDSUB; i++)
-		if((p->calledsub[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_CALLEDSUB, msg, (union uni_ieall *)&p->calledsub[i], cx))
-		return ((i << 16) + UNI_IE_CALLEDSUB);
-	if((p->calling.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLING, msg, (union uni_ieall *)&p->calling, cx))
-		return (UNI_IE_CALLING);
-	for(i = 0; i < UNI_NUM_IE_CALLINGSUB; i++)
-		if((p->callingsub[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_CALLINGSUB, msg, (union uni_ieall *)&p->callingsub[i], cx))
-		return ((i << 16) + UNI_IE_CALLINGSUB);
-	if((p->connid.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CONNID, msg, (union uni_ieall *)&p->connid, cx))
-		return (UNI_IE_CONNID);
-	if((p->qos.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_QOS, msg, (union uni_ieall *)&p->qos, cx))
-		return (UNI_IE_QOS);
-	if((p->eetd.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EETD, msg, (union uni_ieall *)&p->eetd, cx))
-		return (UNI_IE_EETD);
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	if((p->scompl.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_SCOMPL, msg, (union uni_ieall *)&p->scompl, cx))
-		return (UNI_IE_SCOMPL);
-	for(i = 0; i < UNI_NUM_IE_TNS; i++)
-		if((p->tns[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_TNS, msg, (union uni_ieall *)&p->tns[i], cx))
-		return ((i << 16) + UNI_IE_TNS);
-	if((p->epref.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPREF, msg, (union uni_ieall *)&p->epref, cx))
-		return (UNI_IE_EPREF);
-	if((p->atraffic.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_ATRAFFIC, msg, (union uni_ieall *)&p->atraffic, cx))
-		return (UNI_IE_ATRAFFIC);
-	if((p->mintraffic.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_MINTRAFFIC, msg, (union uni_ieall *)&p->mintraffic, cx))
-		return (UNI_IE_MINTRAFFIC);
-	if((p->uu.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UU, msg, (union uni_ieall *)&p->uu, cx))
-		return (UNI_IE_UU);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->lij_callid.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_LIJ_CALLID, msg, (union uni_ieall *)&p->lij_callid, cx))
-		return (UNI_IE_LIJ_CALLID);
-	if((p->lij_param.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_LIJ_PARAM, msg, (union uni_ieall *)&p->lij_param, cx))
-		return (UNI_IE_LIJ_PARAM);
-	if((p->lij_seqno.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_LIJ_SEQNO, msg, (union uni_ieall *)&p->lij_seqno, cx))
-		return (UNI_IE_LIJ_SEQNO);
-	if((p->exqos.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EXQOS, msg, (union uni_ieall *)&p->exqos, cx))
-		return (UNI_IE_EXQOS);
-	if((p->abrsetup.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_ABRSETUP, msg, (union uni_ieall *)&p->abrsetup, cx))
-		return (UNI_IE_ABRSETUP);
-	if((p->abradd.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_ABRADD, msg, (union uni_ieall *)&p->abradd, cx))
-		return (UNI_IE_ABRADD);
-	if((p->cscope.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CSCOPE, msg, (union uni_ieall *)&p->cscope, cx))
-		return (UNI_IE_CSCOPE);
-	if((p->calling_soft.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLING_SOFT, msg, (union uni_ieall *)&p->calling_soft, cx))
-		return (UNI_IE_CALLING_SOFT);
-	if((p->called_soft.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLED_SOFT, msg, (union uni_ieall *)&p->called_soft, cx))
-		return (UNI_IE_CALLED_SOFT);
-	if((p->dtl_repeat.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_DTL, msg, (union uni_ieall *)&p->dtl_repeat, cx))
-		return (0x10000000 + UNI_IE_DTL);
-	for(i = 0; i < UNI_NUM_IE_DTL; i++)
-		if((p->dtl[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_DTL, msg, (union uni_ieall *)&p->dtl[i], cx))
-		return ((i << 16) + UNI_IE_DTL);
-	if((p->report.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_REPORT, msg, (union uni_ieall *)&p->report, cx))
-		return (UNI_IE_REPORT);
-	if((p->mdcr.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_MDCR, msg, (union uni_ieall *)&p->mdcr, cx))
-		return (UNI_IE_MDCR);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_setup(struct uni_setup *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_AAL:
-		out->aal.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_AAL, (union uni_ieall *)&out->aal, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_TRAFFIC:
-		out->traffic.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_TRAFFIC, (union uni_ieall *)&out->traffic, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_BEARER:
-		out->bearer.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_BEARER, (union uni_ieall *)&out->bearer, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_BHLI:
-		out->bhli.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_BHLI, (union uni_ieall *)&out->bhli, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_BLLI:
-		if (IE_ISPRESENT(cx->repeat))
-			out->blli_repeat = cx->repeat;
-		for(i = 0; i < UNI_NUM_IE_BLLI; i++)
-			if (!IE_ISPRESENT(out->blli[i])) {
-				out->blli[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_BLLI, (union uni_ieall *)&out->blli[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_CALLED:
-		out->called.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLED, (union uni_ieall *)&out->called, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLEDSUB:
-		for(i = 0; i < UNI_NUM_IE_CALLEDSUB; i++)
-			if (!IE_ISPRESENT(out->calledsub[i])) {
-				out->calledsub[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_CALLEDSUB, (union uni_ieall *)&out->calledsub[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_CALLING:
-		out->calling.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLING, (union uni_ieall *)&out->calling, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLINGSUB:
-		for(i = 0; i < UNI_NUM_IE_CALLINGSUB; i++)
-			if (!IE_ISPRESENT(out->callingsub[i])) {
-				out->callingsub[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_CALLINGSUB, (union uni_ieall *)&out->callingsub[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_CONNID:
-		out->connid.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CONNID, (union uni_ieall *)&out->connid, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_QOS:
-		out->qos.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_QOS, (union uni_ieall *)&out->qos, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_EETD:
-		out->eetd.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EETD, (union uni_ieall *)&out->eetd, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_SCOMPL:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->scompl.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_SCOMPL, (union uni_ieall *)&out->scompl, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_TNS:
-		for(i = 0; i < UNI_NUM_IE_TNS; i++)
-			if (!IE_ISPRESENT(out->tns[i])) {
-				out->tns[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_TNS, (union uni_ieall *)&out->tns[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_EPREF:
-		out->epref.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPREF, (union uni_ieall *)&out->epref, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_ATRAFFIC:
-		out->atraffic.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_ATRAFFIC, (union uni_ieall *)&out->atraffic, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_MINTRAFFIC:
-		out->mintraffic.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_MINTRAFFIC, (union uni_ieall *)&out->mintraffic, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UU:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->uu.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UU, (union uni_ieall *)&out->uu, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_GIT:
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_LIJ_CALLID:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->lij_callid.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_LIJ_CALLID, (union uni_ieall *)&out->lij_callid, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_LIJ_PARAM:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->lij_param.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_LIJ_PARAM, (union uni_ieall *)&out->lij_param, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_LIJ_SEQNO:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->lij_seqno.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_LIJ_SEQNO, (union uni_ieall *)&out->lij_seqno, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_EXQOS:
-		out->exqos.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EXQOS, (union uni_ieall *)&out->exqos, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_ABRSETUP:
-		out->abrsetup.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_ABRSETUP, (union uni_ieall *)&out->abrsetup, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_ABRADD:
-		out->abradd.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_ABRADD, (union uni_ieall *)&out->abradd, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CSCOPE:
-		out->cscope.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CSCOPE, (union uni_ieall *)&out->cscope, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLING_SOFT:
-		if (!(cx->pnni))
-			return (DEC_ILL);
-		out->calling_soft.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLING_SOFT, (union uni_ieall *)&out->calling_soft, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLED_SOFT:
-		if (!(cx->pnni))
-			return (DEC_ILL);
-		out->called_soft.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLED_SOFT, (union uni_ieall *)&out->called_soft, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_DTL:
-		if (!(cx->pnni))
-			return (DEC_ILL);
-		if (IE_ISPRESENT(cx->repeat))
-			out->dtl_repeat = cx->repeat;
-		for(i = 0; i < UNI_NUM_IE_DTL; i++)
-			if (!IE_ISPRESENT(out->dtl[i])) {
-				out->dtl[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_DTL, (union uni_ieall *)&out->dtl[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_REPORT:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->report.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_REPORT, (union uni_ieall *)&out->report, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_MDCR:
-		out->mdcr.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_MDCR, (union uni_ieall *)&out->mdcr, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_REPEAT:
-		cx->repeat.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if (uni_decode_ie_body(UNI_IE_REPEAT, (union uni_ieall *)&cx->repeat, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_setup = {
-	0,
-	"setup",
-	(uni_msg_print_f)print_setup,
-	(uni_msg_check_f)check_setup,
-	(uni_msg_encode_f)encode_setup,
-	(uni_msg_decode_f)decode_setup
-};
-
-static void
-print_status(struct uni_status *msg, struct unicx *cx)
-{
-	if(msg->callstate.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLSTATE, (union uni_ieall *)&msg->callstate, cx);
-	if(msg->cause.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CAUSE, (union uni_ieall *)&msg->cause, cx);
-	if(msg->epref.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPREF, (union uni_ieall *)&msg->epref, cx);
-	if(msg->epstate.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPSTATE, (union uni_ieall *)&msg->epstate, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_status(struct uni_status *m, struct unicx *cx)
-{
-	int ret = 0;
-
-	ret |= uni_check_ie(UNI_IE_CALLSTATE, (union uni_ieall *)&m->callstate, cx);
-	ret |= uni_check_ie(UNI_IE_CAUSE, (union uni_ieall *)&m->cause, cx);
-	ret |= uni_check_ie(UNI_IE_EPREF, (union uni_ieall *)&m->epref, cx);
-	ret |= uni_check_ie(UNI_IE_EPSTATE, (union uni_ieall *)&m->epstate, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_status(struct uni_msg *msg, struct uni_status *p, struct unicx *cx)
-{
-	u_int mlen;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_STATUS, cx, &mlen))
-		return (-2);
-
-	if((p->callstate.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLSTATE, msg, (union uni_ieall *)&p->callstate, cx))
-		return (UNI_IE_CALLSTATE);
-	if((p->cause.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CAUSE, msg, (union uni_ieall *)&p->cause, cx))
-		return (UNI_IE_CAUSE);
-	if((p->epref.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPREF, msg, (union uni_ieall *)&p->epref, cx))
-		return (UNI_IE_EPREF);
-	if((p->epstate.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPSTATE, msg, (union uni_ieall *)&p->epstate, cx))
-		return (UNI_IE_EPSTATE);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_status(struct uni_status *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	switch (ie) {
-
-	  case UNI_IE_CALLSTATE:
-		out->callstate.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLSTATE, (union uni_ieall *)&out->callstate, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CAUSE:
-		out->cause.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CAUSE, (union uni_ieall *)&out->cause, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_EPREF:
-		out->epref.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPREF, (union uni_ieall *)&out->epref, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_EPSTATE:
-		out->epstate.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPSTATE, (union uni_ieall *)&out->epstate, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_status = {
-	0,
-	"status",
-	(uni_msg_print_f)print_status,
-	(uni_msg_check_f)check_status,
-	(uni_msg_encode_f)encode_status,
-	(uni_msg_decode_f)decode_status
-};
-
-static void
-print_status_enq(struct uni_status_enq *msg, struct unicx *cx)
-{
-	if(msg->epref.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPREF, (union uni_ieall *)&msg->epref, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_status_enq(struct uni_status_enq *m, struct unicx *cx)
-{
-	int ret = 0;
-
-	ret |= uni_check_ie(UNI_IE_EPREF, (union uni_ieall *)&m->epref, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_status_enq(struct uni_msg *msg, struct uni_status_enq *p, struct unicx *cx)
-{
-	u_int mlen;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_STATUS_ENQ, cx, &mlen))
-		return (-2);
-
-	if((p->epref.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPREF, msg, (union uni_ieall *)&p->epref, cx))
-		return (UNI_IE_EPREF);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_status_enq(struct uni_status_enq *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	switch (ie) {
-
-	  case UNI_IE_EPREF:
-		out->epref.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPREF, (union uni_ieall *)&out->epref, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_status_enq = {
-	0,
-	"status_enq",
-	(uni_msg_print_f)print_status_enq,
-	(uni_msg_check_f)check_status_enq,
-	(uni_msg_encode_f)encode_status_enq,
-	(uni_msg_decode_f)decode_status_enq
-};
-
-static void
-print_notify(struct uni_notify *msg, struct unicx *cx)
-{
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	if(msg->epref.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPREF, (union uni_ieall *)&msg->epref, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_notify(struct uni_notify *m, struct unicx *cx)
-{
-	int ret = 0;
-
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	ret |= uni_check_ie(UNI_IE_EPREF, (union uni_ieall *)&m->epref, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_notify(struct uni_msg *msg, struct uni_notify *p, struct unicx *cx)
-{
-	u_int mlen;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_NOTIFY, cx, &mlen))
-		return (-2);
-
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	if((p->epref.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPREF, msg, (union uni_ieall *)&p->epref, cx))
-		return (UNI_IE_EPREF);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_notify(struct uni_notify *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	switch (ie) {
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_EPREF:
-		out->epref.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPREF, (union uni_ieall *)&out->epref, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_notify = {
-	0,
-	"notify",
-	(uni_msg_print_f)print_notify,
-	(uni_msg_check_f)check_notify,
-	(uni_msg_encode_f)encode_notify,
-	(uni_msg_decode_f)decode_notify
-};
-
-static void
-print_restart(struct uni_restart *msg, struct unicx *cx)
-{
-	if(msg->connid.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CONNID, (union uni_ieall *)&msg->connid, cx);
-	if(msg->restart.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_RESTART, (union uni_ieall *)&msg->restart, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_restart(struct uni_restart *m, struct unicx *cx)
-{
-	int ret = 0;
-
-	ret |= uni_check_ie(UNI_IE_CONNID, (union uni_ieall *)&m->connid, cx);
-	ret |= uni_check_ie(UNI_IE_RESTART, (union uni_ieall *)&m->restart, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_restart(struct uni_msg *msg, struct uni_restart *p, struct unicx *cx)
-{
-	u_int mlen;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_RESTART, cx, &mlen))
-		return (-2);
-
-	if((p->connid.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CONNID, msg, (union uni_ieall *)&p->connid, cx))
-		return (UNI_IE_CONNID);
-	if((p->restart.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_RESTART, msg, (union uni_ieall *)&p->restart, cx))
-		return (UNI_IE_RESTART);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_restart(struct uni_restart *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	switch (ie) {
-
-	  case UNI_IE_CONNID:
-		out->connid.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CONNID, (union uni_ieall *)&out->connid, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_RESTART:
-		out->restart.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_RESTART, (union uni_ieall *)&out->restart, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_restart = {
-	0,
-	"restart",
-	(uni_msg_print_f)print_restart,
-	(uni_msg_check_f)check_restart,
-	(uni_msg_encode_f)encode_restart,
-	(uni_msg_decode_f)decode_restart
-};
-
-static void
-print_restart_ack(struct uni_restart_ack *msg, struct unicx *cx)
-{
-	if(msg->connid.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CONNID, (union uni_ieall *)&msg->connid, cx);
-	if(msg->restart.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_RESTART, (union uni_ieall *)&msg->restart, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_restart_ack(struct uni_restart_ack *m, struct unicx *cx)
-{
-	int ret = 0;
-
-	ret |= uni_check_ie(UNI_IE_CONNID, (union uni_ieall *)&m->connid, cx);
-	ret |= uni_check_ie(UNI_IE_RESTART, (union uni_ieall *)&m->restart, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_restart_ack(struct uni_msg *msg, struct uni_restart_ack *p, struct unicx *cx)
-{
-	u_int mlen;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_RESTART_ACK, cx, &mlen))
-		return (-2);
-
-	if((p->connid.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CONNID, msg, (union uni_ieall *)&p->connid, cx))
-		return (UNI_IE_CONNID);
-	if((p->restart.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_RESTART, msg, (union uni_ieall *)&p->restart, cx))
-		return (UNI_IE_RESTART);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_restart_ack(struct uni_restart_ack *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	switch (ie) {
-
-	  case UNI_IE_CONNID:
-		out->connid.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CONNID, (union uni_ieall *)&out->connid, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_RESTART:
-		out->restart.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_RESTART, (union uni_ieall *)&out->restart, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_restart_ack = {
-	0,
-	"restart_ack",
-	(uni_msg_print_f)print_restart_ack,
-	(uni_msg_check_f)check_restart_ack,
-	(uni_msg_encode_f)encode_restart_ack,
-	(uni_msg_decode_f)decode_restart_ack
-};
-
-static void
-print_add_party(struct uni_add_party *msg, struct unicx *cx)
-{
-	u_int i;
-
-	if(msg->aal.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_AAL, (union uni_ieall *)&msg->aal, cx);
-	if(msg->bhli.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_BHLI, (union uni_ieall *)&msg->bhli, cx);
-	if(msg->blli.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_BLLI, (union uni_ieall *)&msg->blli, cx);
-	if(msg->called.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLED, (union uni_ieall *)&msg->called, cx);
-	for(i = 0; i < UNI_NUM_IE_CALLEDSUB; i++)
-		if(msg->calledsub[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_CALLEDSUB, (union uni_ieall *)&msg->calledsub[i], cx);
-	if(msg->calling.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLING, (union uni_ieall *)&msg->calling, cx);
-	for(i = 0; i < UNI_NUM_IE_CALLINGSUB; i++)
-		if(msg->callingsub[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_CALLINGSUB, (union uni_ieall *)&msg->callingsub[i], cx);
-	if(msg->scompl.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_SCOMPL, (union uni_ieall *)&msg->scompl, cx);
-	for(i = 0; i < UNI_NUM_IE_TNS; i++)
-		if(msg->tns[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_TNS, (union uni_ieall *)&msg->tns[i], cx);
-	if(msg->epref.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPREF, (union uni_ieall *)&msg->epref, cx);
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	if(msg->eetd.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EETD, (union uni_ieall *)&msg->eetd, cx);
-	if(msg->uu.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UU, (union uni_ieall *)&msg->uu, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->lij_seqno.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_LIJ_SEQNO, (union uni_ieall *)&msg->lij_seqno, cx);
-	if(msg->calling_soft.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLING_SOFT, (union uni_ieall *)&msg->calling_soft, cx);
-	if(msg->called_soft.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLED_SOFT, (union uni_ieall *)&msg->called_soft, cx);
-	if(msg->dtl_repeat.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_REPEAT, (union uni_ieall *)&msg->dtl_repeat, cx);
-	for(i = 0; i < UNI_NUM_IE_DTL; i++)
-		if(msg->dtl[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_DTL, (union uni_ieall *)&msg->dtl[i], cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_add_party(struct uni_add_party *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	ret |= uni_check_ie(UNI_IE_AAL, (union uni_ieall *)&m->aal, cx);
-	ret |= uni_check_ie(UNI_IE_BHLI, (union uni_ieall *)&m->bhli, cx);
-	ret |= uni_check_ie(UNI_IE_BLLI, (union uni_ieall *)&m->blli, cx);
-	ret |= uni_check_ie(UNI_IE_CALLED, (union uni_ieall *)&m->called, cx);
-	for(i = 0; i < UNI_NUM_IE_CALLEDSUB ; i++) {
-		ret |= uni_check_ie(UNI_IE_CALLEDSUB, (union uni_ieall *)&m->calledsub[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_CALLING, (union uni_ieall *)&m->calling, cx);
-	for(i = 0; i < UNI_NUM_IE_CALLINGSUB ; i++) {
-		ret |= uni_check_ie(UNI_IE_CALLINGSUB, (union uni_ieall *)&m->callingsub[i], cx);
-	}
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->scompl);
-	else
-		ret |= uni_check_ie(UNI_IE_SCOMPL, (union uni_ieall *)&m->scompl, cx);
-	for(i = 0; i < UNI_NUM_IE_TNS ; i++) {
-		ret |= uni_check_ie(UNI_IE_TNS, (union uni_ieall *)&m->tns[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_EPREF, (union uni_ieall *)&m->epref, cx);
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	ret |= uni_check_ie(UNI_IE_EETD, (union uni_ieall *)&m->eetd, cx);
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->uu);
-	else
-		ret |= uni_check_ie(UNI_IE_UU, (union uni_ieall *)&m->uu, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->lij_seqno);
-	else
-		ret |= uni_check_ie(UNI_IE_LIJ_SEQNO, (union uni_ieall *)&m->lij_seqno, cx);
-	if(!(cx->pnni))
-		ret |= IE_ISPRESENT(m->calling_soft);
-	else
-		ret |= uni_check_ie(UNI_IE_CALLING_SOFT, (union uni_ieall *)&m->calling_soft, cx);
-	if(!(cx->pnni))
-		ret |= IE_ISPRESENT(m->called_soft);
-	else
-		ret |= uni_check_ie(UNI_IE_CALLED_SOFT, (union uni_ieall *)&m->called_soft, cx);
-	if(!(cx->pnni))
-		ret |= IE_ISPRESENT(m->dtl_repeat);
-	else
-		ret |= uni_check_ie(UNI_IE_REPEAT, (union uni_ieall *)&m->dtl_repeat, cx);
-	for(i = 0; i < UNI_NUM_IE_DTL ; i++) {
-		if(!(cx->pnni))
-			ret |= IE_ISPRESENT(m->dtl[i]);
-		else
-			ret |= uni_check_ie(UNI_IE_DTL, (union uni_ieall *)&m->dtl[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_add_party(struct uni_msg *msg, struct uni_add_party *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_ADD_PARTY, cx, &mlen))
-		return (-2);
-
-	if((p->aal.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_AAL, msg, (union uni_ieall *)&p->aal, cx))
-		return (UNI_IE_AAL);
-	if((p->bhli.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_BHLI, msg, (union uni_ieall *)&p->bhli, cx))
-		return (UNI_IE_BHLI);
-	if((p->blli.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_BLLI, msg, (union uni_ieall *)&p->blli, cx))
-		return (UNI_IE_BLLI);
-	if((p->called.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLED, msg, (union uni_ieall *)&p->called, cx))
-		return (UNI_IE_CALLED);
-	for(i = 0; i < UNI_NUM_IE_CALLEDSUB; i++)
-		if((p->calledsub[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_CALLEDSUB, msg, (union uni_ieall *)&p->calledsub[i], cx))
-		return ((i << 16) + UNI_IE_CALLEDSUB);
-	if((p->calling.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLING, msg, (union uni_ieall *)&p->calling, cx))
-		return (UNI_IE_CALLING);
-	for(i = 0; i < UNI_NUM_IE_CALLINGSUB; i++)
-		if((p->callingsub[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_CALLINGSUB, msg, (union uni_ieall *)&p->callingsub[i], cx))
-		return ((i << 16) + UNI_IE_CALLINGSUB);
-	if((p->scompl.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_SCOMPL, msg, (union uni_ieall *)&p->scompl, cx))
-		return (UNI_IE_SCOMPL);
-	for(i = 0; i < UNI_NUM_IE_TNS; i++)
-		if((p->tns[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_TNS, msg, (union uni_ieall *)&p->tns[i], cx))
-		return ((i << 16) + UNI_IE_TNS);
-	if((p->epref.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPREF, msg, (union uni_ieall *)&p->epref, cx))
-		return (UNI_IE_EPREF);
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	if((p->eetd.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EETD, msg, (union uni_ieall *)&p->eetd, cx))
-		return (UNI_IE_EETD);
-	if((p->uu.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UU, msg, (union uni_ieall *)&p->uu, cx))
-		return (UNI_IE_UU);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->lij_seqno.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_LIJ_SEQNO, msg, (union uni_ieall *)&p->lij_seqno, cx))
-		return (UNI_IE_LIJ_SEQNO);
-	if((p->calling_soft.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLING_SOFT, msg, (union uni_ieall *)&p->calling_soft, cx))
-		return (UNI_IE_CALLING_SOFT);
-	if((p->called_soft.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLED_SOFT, msg, (union uni_ieall *)&p->called_soft, cx))
-		return (UNI_IE_CALLED_SOFT);
-	if((p->dtl_repeat.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_DTL, msg, (union uni_ieall *)&p->dtl_repeat, cx))
-		return (0x10000000 + UNI_IE_DTL);
-	for(i = 0; i < UNI_NUM_IE_DTL; i++)
-		if((p->dtl[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_DTL, msg, (union uni_ieall *)&p->dtl[i], cx))
-		return ((i << 16) + UNI_IE_DTL);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_add_party(struct uni_add_party *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_AAL:
-		out->aal.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_AAL, (union uni_ieall *)&out->aal, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_BHLI:
-		out->bhli.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_BHLI, (union uni_ieall *)&out->bhli, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_BLLI:
-		out->blli.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_BLLI, (union uni_ieall *)&out->blli, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLED:
-		out->called.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLED, (union uni_ieall *)&out->called, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLEDSUB:
-		for(i = 0; i < UNI_NUM_IE_CALLEDSUB; i++)
-			if (!IE_ISPRESENT(out->calledsub[i])) {
-				out->calledsub[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_CALLEDSUB, (union uni_ieall *)&out->calledsub[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_CALLING:
-		out->calling.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLING, (union uni_ieall *)&out->calling, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLINGSUB:
-		for(i = 0; i < UNI_NUM_IE_CALLINGSUB; i++)
-			if (!IE_ISPRESENT(out->callingsub[i])) {
-				out->callingsub[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_CALLINGSUB, (union uni_ieall *)&out->callingsub[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_SCOMPL:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->scompl.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_SCOMPL, (union uni_ieall *)&out->scompl, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_TNS:
-		for(i = 0; i < UNI_NUM_IE_TNS; i++)
-			if (!IE_ISPRESENT(out->tns[i])) {
-				out->tns[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_TNS, (union uni_ieall *)&out->tns[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_EPREF:
-		out->epref.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPREF, (union uni_ieall *)&out->epref, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_EETD:
-		out->eetd.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EETD, (union uni_ieall *)&out->eetd, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UU:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->uu.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UU, (union uni_ieall *)&out->uu, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_GIT:
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_LIJ_SEQNO:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->lij_seqno.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_LIJ_SEQNO, (union uni_ieall *)&out->lij_seqno, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLING_SOFT:
-		if (!(cx->pnni))
-			return (DEC_ILL);
-		out->calling_soft.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLING_SOFT, (union uni_ieall *)&out->calling_soft, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLED_SOFT:
-		if (!(cx->pnni))
-			return (DEC_ILL);
-		out->called_soft.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLED_SOFT, (union uni_ieall *)&out->called_soft, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_DTL:
-		if (!(cx->pnni))
-			return (DEC_ILL);
-		if (IE_ISPRESENT(cx->repeat))
-			out->dtl_repeat = cx->repeat;
-		for(i = 0; i < UNI_NUM_IE_DTL; i++)
-			if (!IE_ISPRESENT(out->dtl[i])) {
-				out->dtl[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_DTL, (union uni_ieall *)&out->dtl[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_REPEAT:
-		cx->repeat.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if (uni_decode_ie_body(UNI_IE_REPEAT, (union uni_ieall *)&cx->repeat, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_add_party = {
-	0,
-	"add_party",
-	(uni_msg_print_f)print_add_party,
-	(uni_msg_check_f)check_add_party,
-	(uni_msg_encode_f)encode_add_party,
-	(uni_msg_decode_f)decode_add_party
-};
-
-static void
-print_add_party_ack(struct uni_add_party_ack *msg, struct unicx *cx)
-{
-	u_int i;
-
-	if(msg->epref.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPREF, (union uni_ieall *)&msg->epref, cx);
-	if(msg->aal.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_AAL, (union uni_ieall *)&msg->aal, cx);
-	if(msg->blli.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_BLLI, (union uni_ieall *)&msg->blli, cx);
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	if(msg->eetd.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EETD, (union uni_ieall *)&msg->eetd, cx);
-	if(msg->conned.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CONNED, (union uni_ieall *)&msg->conned, cx);
-	if(msg->connedsub.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CONNEDSUB, (union uni_ieall *)&msg->connedsub, cx);
-	if(msg->uu.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UU, (union uni_ieall *)&msg->uu, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->called_soft.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLED_SOFT, (union uni_ieall *)&msg->called_soft, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_add_party_ack(struct uni_add_party_ack *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	ret |= uni_check_ie(UNI_IE_EPREF, (union uni_ieall *)&m->epref, cx);
-	ret |= uni_check_ie(UNI_IE_AAL, (union uni_ieall *)&m->aal, cx);
-	ret |= uni_check_ie(UNI_IE_BLLI, (union uni_ieall *)&m->blli, cx);
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	ret |= uni_check_ie(UNI_IE_EETD, (union uni_ieall *)&m->eetd, cx);
-	ret |= uni_check_ie(UNI_IE_CONNED, (union uni_ieall *)&m->conned, cx);
-	ret |= uni_check_ie(UNI_IE_CONNEDSUB, (union uni_ieall *)&m->connedsub, cx);
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->uu);
-	else
-		ret |= uni_check_ie(UNI_IE_UU, (union uni_ieall *)&m->uu, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	if(!(cx->pnni))
-		ret |= IE_ISPRESENT(m->called_soft);
-	else
-		ret |= uni_check_ie(UNI_IE_CALLED_SOFT, (union uni_ieall *)&m->called_soft, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_add_party_ack(struct uni_msg *msg, struct uni_add_party_ack *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_ADD_PARTY_ACK, cx, &mlen))
-		return (-2);
-
-	if((p->epref.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPREF, msg, (union uni_ieall *)&p->epref, cx))
-		return (UNI_IE_EPREF);
-	if((p->aal.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_AAL, msg, (union uni_ieall *)&p->aal, cx))
-		return (UNI_IE_AAL);
-	if((p->blli.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_BLLI, msg, (union uni_ieall *)&p->blli, cx))
-		return (UNI_IE_BLLI);
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	if((p->eetd.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EETD, msg, (union uni_ieall *)&p->eetd, cx))
-		return (UNI_IE_EETD);
-	if((p->conned.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CONNED, msg, (union uni_ieall *)&p->conned, cx))
-		return (UNI_IE_CONNED);
-	if((p->connedsub.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CONNEDSUB, msg, (union uni_ieall *)&p->connedsub, cx))
-		return (UNI_IE_CONNEDSUB);
-	if((p->uu.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UU, msg, (union uni_ieall *)&p->uu, cx))
-		return (UNI_IE_UU);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->called_soft.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLED_SOFT, msg, (union uni_ieall *)&p->called_soft, cx))
-		return (UNI_IE_CALLED_SOFT);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_add_party_ack(struct uni_add_party_ack *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_EPREF:
-		out->epref.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPREF, (union uni_ieall *)&out->epref, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_AAL:
-		out->aal.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_AAL, (union uni_ieall *)&out->aal, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_BLLI:
-		out->blli.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_BLLI, (union uni_ieall *)&out->blli, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_EETD:
-		out->eetd.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EETD, (union uni_ieall *)&out->eetd, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CONNED:
-		out->conned.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CONNED, (union uni_ieall *)&out->conned, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CONNEDSUB:
-		out->connedsub.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CONNEDSUB, (union uni_ieall *)&out->connedsub, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UU:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->uu.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UU, (union uni_ieall *)&out->uu, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_GIT:
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_CALLED_SOFT:
-		if (!(cx->pnni))
-			return (DEC_ILL);
-		out->called_soft.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLED_SOFT, (union uni_ieall *)&out->called_soft, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_add_party_ack = {
-	0,
-	"add_party_ack",
-	(uni_msg_print_f)print_add_party_ack,
-	(uni_msg_check_f)check_add_party_ack,
-	(uni_msg_encode_f)encode_add_party_ack,
-	(uni_msg_decode_f)decode_add_party_ack
-};
-
-static void
-print_party_alerting(struct uni_party_alerting *msg, struct unicx *cx)
-{
-	u_int i;
-
-	if(msg->epref.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPREF, (union uni_ieall *)&msg->epref, cx);
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	if(msg->uu.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UU, (union uni_ieall *)&msg->uu, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_party_alerting(struct uni_party_alerting *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	ret |= uni_check_ie(UNI_IE_EPREF, (union uni_ieall *)&m->epref, cx);
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->uu);
-	else
-		ret |= uni_check_ie(UNI_IE_UU, (union uni_ieall *)&m->uu, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_party_alerting(struct uni_msg *msg, struct uni_party_alerting *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_PARTY_ALERTING, cx, &mlen))
-		return (-2);
-
-	if((p->epref.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPREF, msg, (union uni_ieall *)&p->epref, cx))
-		return (UNI_IE_EPREF);
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	if((p->uu.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UU, msg, (union uni_ieall *)&p->uu, cx))
-		return (UNI_IE_UU);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_party_alerting(struct uni_party_alerting *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_EPREF:
-		out->epref.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPREF, (union uni_ieall *)&out->epref, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UU:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->uu.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UU, (union uni_ieall *)&out->uu, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_GIT:
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_party_alerting = {
-	0,
-	"party_alerting",
-	(uni_msg_print_f)print_party_alerting,
-	(uni_msg_check_f)check_party_alerting,
-	(uni_msg_encode_f)encode_party_alerting,
-	(uni_msg_decode_f)decode_party_alerting
-};
-
-static void
-print_add_party_rej(struct uni_add_party_rej *msg, struct unicx *cx)
-{
-	u_int i;
-
-	if(msg->cause.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CAUSE, (union uni_ieall *)&msg->cause, cx);
-	if(msg->epref.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPREF, (union uni_ieall *)&msg->epref, cx);
-	if(msg->uu.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UU, (union uni_ieall *)&msg->uu, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->crankback.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CRANKBACK, (union uni_ieall *)&msg->crankback, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_add_party_rej(struct uni_add_party_rej *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	ret |= uni_check_ie(UNI_IE_CAUSE, (union uni_ieall *)&m->cause, cx);
-	ret |= uni_check_ie(UNI_IE_EPREF, (union uni_ieall *)&m->epref, cx);
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->uu);
-	else
-		ret |= uni_check_ie(UNI_IE_UU, (union uni_ieall *)&m->uu, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	if(!(cx->pnni))
-		ret |= IE_ISPRESENT(m->crankback);
-	else
-		ret |= uni_check_ie(UNI_IE_CRANKBACK, (union uni_ieall *)&m->crankback, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_add_party_rej(struct uni_msg *msg, struct uni_add_party_rej *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_ADD_PARTY_REJ, cx, &mlen))
-		return (-2);
-
-	if((p->cause.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CAUSE, msg, (union uni_ieall *)&p->cause, cx))
-		return (UNI_IE_CAUSE);
-	if((p->epref.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPREF, msg, (union uni_ieall *)&p->epref, cx))
-		return (UNI_IE_EPREF);
-	if((p->uu.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UU, msg, (union uni_ieall *)&p->uu, cx))
-		return (UNI_IE_UU);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->crankback.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CRANKBACK, msg, (union uni_ieall *)&p->crankback, cx))
-		return (UNI_IE_CRANKBACK);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_add_party_rej(struct uni_add_party_rej *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_CAUSE:
-		out->cause.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CAUSE, (union uni_ieall *)&out->cause, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_EPREF:
-		out->epref.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPREF, (union uni_ieall *)&out->epref, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UU:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->uu.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UU, (union uni_ieall *)&out->uu, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_GIT:
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_CRANKBACK:
-		if (!(cx->pnni))
-			return (DEC_ILL);
-		out->crankback.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CRANKBACK, (union uni_ieall *)&out->crankback, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_add_party_rej = {
-	0,
-	"add_party_rej",
-	(uni_msg_print_f)print_add_party_rej,
-	(uni_msg_check_f)check_add_party_rej,
-	(uni_msg_encode_f)encode_add_party_rej,
-	(uni_msg_decode_f)decode_add_party_rej
-};
-
-static void
-print_drop_party(struct uni_drop_party *msg, struct unicx *cx)
-{
-	u_int i;
-
-	if(msg->cause.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CAUSE, (union uni_ieall *)&msg->cause, cx);
-	if(msg->epref.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPREF, (union uni_ieall *)&msg->epref, cx);
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	if(msg->uu.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UU, (union uni_ieall *)&msg->uu, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_drop_party(struct uni_drop_party *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	ret |= uni_check_ie(UNI_IE_CAUSE, (union uni_ieall *)&m->cause, cx);
-	ret |= uni_check_ie(UNI_IE_EPREF, (union uni_ieall *)&m->epref, cx);
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->uu);
-	else
-		ret |= uni_check_ie(UNI_IE_UU, (union uni_ieall *)&m->uu, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_drop_party(struct uni_msg *msg, struct uni_drop_party *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_DROP_PARTY, cx, &mlen))
-		return (-2);
-
-	if((p->cause.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CAUSE, msg, (union uni_ieall *)&p->cause, cx))
-		return (UNI_IE_CAUSE);
-	if((p->epref.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPREF, msg, (union uni_ieall *)&p->epref, cx))
-		return (UNI_IE_EPREF);
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	if((p->uu.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UU, msg, (union uni_ieall *)&p->uu, cx))
-		return (UNI_IE_UU);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_drop_party(struct uni_drop_party *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_CAUSE:
-		out->cause.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CAUSE, (union uni_ieall *)&out->cause, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_EPREF:
-		out->epref.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPREF, (union uni_ieall *)&out->epref, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UU:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->uu.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UU, (union uni_ieall *)&out->uu, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_GIT:
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_drop_party = {
-	0,
-	"drop_party",
-	(uni_msg_print_f)print_drop_party,
-	(uni_msg_check_f)check_drop_party,
-	(uni_msg_encode_f)encode_drop_party,
-	(uni_msg_decode_f)decode_drop_party
-};
-
-static void
-print_drop_party_ack(struct uni_drop_party_ack *msg, struct unicx *cx)
-{
-	u_int i;
-
-	if(msg->epref.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPREF, (union uni_ieall *)&msg->epref, cx);
-	if(msg->cause.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CAUSE, (union uni_ieall *)&msg->cause, cx);
-	if(msg->uu.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UU, (union uni_ieall *)&msg->uu, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_drop_party_ack(struct uni_drop_party_ack *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	ret |= uni_check_ie(UNI_IE_EPREF, (union uni_ieall *)&m->epref, cx);
-	ret |= uni_check_ie(UNI_IE_CAUSE, (union uni_ieall *)&m->cause, cx);
-	if(!(!cx->pnni))
-		ret |= IE_ISPRESENT(m->uu);
-	else
-		ret |= uni_check_ie(UNI_IE_UU, (union uni_ieall *)&m->uu, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_drop_party_ack(struct uni_msg *msg, struct uni_drop_party_ack *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_DROP_PARTY_ACK, cx, &mlen))
-		return (-2);
-
-	if((p->epref.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPREF, msg, (union uni_ieall *)&p->epref, cx))
-		return (UNI_IE_EPREF);
-	if((p->cause.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CAUSE, msg, (union uni_ieall *)&p->cause, cx))
-		return (UNI_IE_CAUSE);
-	if((p->uu.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UU, msg, (union uni_ieall *)&p->uu, cx))
-		return (UNI_IE_UU);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_drop_party_ack(struct uni_drop_party_ack *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_EPREF:
-		out->epref.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPREF, (union uni_ieall *)&out->epref, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CAUSE:
-		out->cause.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CAUSE, (union uni_ieall *)&out->cause, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UU:
-		if (!(!cx->pnni))
-			return (DEC_ILL);
-		out->uu.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UU, (union uni_ieall *)&out->uu, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_GIT:
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_drop_party_ack = {
-	0,
-	"drop_party_ack",
-	(uni_msg_print_f)print_drop_party_ack,
-	(uni_msg_check_f)check_drop_party_ack,
-	(uni_msg_encode_f)encode_drop_party_ack,
-	(uni_msg_decode_f)decode_drop_party_ack
-};
-
-static void
-print_leaf_setup_req(struct uni_leaf_setup_req *msg, struct unicx *cx)
-{
-	u_int i;
-
-	for(i = 0; i < UNI_NUM_IE_TNS; i++)
-		if(msg->tns[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_TNS, (union uni_ieall *)&msg->tns[i], cx);
-	if(msg->calling.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLING, (union uni_ieall *)&msg->calling, cx);
-	for(i = 0; i < UNI_NUM_IE_CALLINGSUB; i++)
-		if(msg->callingsub[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_CALLINGSUB, (union uni_ieall *)&msg->callingsub[i], cx);
-	if(msg->called.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLED, (union uni_ieall *)&msg->called, cx);
-	for(i = 0; i < UNI_NUM_IE_CALLEDSUB; i++)
-		if(msg->calledsub[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_CALLEDSUB, (union uni_ieall *)&msg->calledsub[i], cx);
-	if(msg->lij_callid.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_LIJ_CALLID, (union uni_ieall *)&msg->lij_callid, cx);
-	if(msg->lij_seqno.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_LIJ_SEQNO, (union uni_ieall *)&msg->lij_seqno, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_leaf_setup_req(struct uni_leaf_setup_req *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	for(i = 0; i < UNI_NUM_IE_TNS ; i++) {
-		ret |= uni_check_ie(UNI_IE_TNS, (union uni_ieall *)&m->tns[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_CALLING, (union uni_ieall *)&m->calling, cx);
-	for(i = 0; i < UNI_NUM_IE_CALLINGSUB ; i++) {
-		ret |= uni_check_ie(UNI_IE_CALLINGSUB, (union uni_ieall *)&m->callingsub[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_CALLED, (union uni_ieall *)&m->called, cx);
-	for(i = 0; i < UNI_NUM_IE_CALLEDSUB ; i++) {
-		ret |= uni_check_ie(UNI_IE_CALLEDSUB, (union uni_ieall *)&m->calledsub[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_LIJ_CALLID, (union uni_ieall *)&m->lij_callid, cx);
-	ret |= uni_check_ie(UNI_IE_LIJ_SEQNO, (union uni_ieall *)&m->lij_seqno, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_leaf_setup_req(struct uni_msg *msg, struct uni_leaf_setup_req *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_LEAF_SETUP_REQ, cx, &mlen))
-		return (-2);
-
-	for(i = 0; i < UNI_NUM_IE_TNS; i++)
-		if((p->tns[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_TNS, msg, (union uni_ieall *)&p->tns[i], cx))
-		return ((i << 16) + UNI_IE_TNS);
-	if((p->calling.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLING, msg, (union uni_ieall *)&p->calling, cx))
-		return (UNI_IE_CALLING);
-	for(i = 0; i < UNI_NUM_IE_CALLINGSUB; i++)
-		if((p->callingsub[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_CALLINGSUB, msg, (union uni_ieall *)&p->callingsub[i], cx))
-		return ((i << 16) + UNI_IE_CALLINGSUB);
-	if((p->called.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLED, msg, (union uni_ieall *)&p->called, cx))
-		return (UNI_IE_CALLED);
-	for(i = 0; i < UNI_NUM_IE_CALLEDSUB; i++)
-		if((p->calledsub[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_CALLEDSUB, msg, (union uni_ieall *)&p->calledsub[i], cx))
-		return ((i << 16) + UNI_IE_CALLEDSUB);
-	if((p->lij_callid.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_LIJ_CALLID, msg, (union uni_ieall *)&p->lij_callid, cx))
-		return (UNI_IE_LIJ_CALLID);
-	if((p->lij_seqno.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_LIJ_SEQNO, msg, (union uni_ieall *)&p->lij_seqno, cx))
-		return (UNI_IE_LIJ_SEQNO);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_leaf_setup_req(struct uni_leaf_setup_req *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_TNS:
-		for(i = 0; i < UNI_NUM_IE_TNS; i++)
-			if (!IE_ISPRESENT(out->tns[i])) {
-				out->tns[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_TNS, (union uni_ieall *)&out->tns[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_CALLING:
-		out->calling.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLING, (union uni_ieall *)&out->calling, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLINGSUB:
-		for(i = 0; i < UNI_NUM_IE_CALLINGSUB; i++)
-			if (!IE_ISPRESENT(out->callingsub[i])) {
-				out->callingsub[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_CALLINGSUB, (union uni_ieall *)&out->callingsub[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_CALLED:
-		out->called.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLED, (union uni_ieall *)&out->called, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLEDSUB:
-		for(i = 0; i < UNI_NUM_IE_CALLEDSUB; i++)
-			if (!IE_ISPRESENT(out->calledsub[i])) {
-				out->calledsub[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_CALLEDSUB, (union uni_ieall *)&out->calledsub[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_LIJ_CALLID:
-		out->lij_callid.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_LIJ_CALLID, (union uni_ieall *)&out->lij_callid, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_LIJ_SEQNO:
-		out->lij_seqno.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_LIJ_SEQNO, (union uni_ieall *)&out->lij_seqno, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_leaf_setup_req = {
-	0,
-	"leaf_setup_req",
-	(uni_msg_print_f)print_leaf_setup_req,
-	(uni_msg_check_f)check_leaf_setup_req,
-	(uni_msg_encode_f)encode_leaf_setup_req,
-	(uni_msg_decode_f)decode_leaf_setup_req
-};
-
-static void
-print_leaf_setup_fail(struct uni_leaf_setup_fail *msg, struct unicx *cx)
-{
-	u_int i;
-
-	if(msg->cause.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CAUSE, (union uni_ieall *)&msg->cause, cx);
-	if(msg->called.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLED, (union uni_ieall *)&msg->called, cx);
-	if(msg->calledsub.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLEDSUB, (union uni_ieall *)&msg->calledsub, cx);
-	if(msg->lij_seqno.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_LIJ_SEQNO, (union uni_ieall *)&msg->lij_seqno, cx);
-	for(i = 0; i < UNI_NUM_IE_TNS; i++)
-		if(msg->tns[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_TNS, (union uni_ieall *)&msg->tns[i], cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_leaf_setup_fail(struct uni_leaf_setup_fail *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	ret |= uni_check_ie(UNI_IE_CAUSE, (union uni_ieall *)&m->cause, cx);
-	ret |= uni_check_ie(UNI_IE_CALLED, (union uni_ieall *)&m->called, cx);
-	ret |= uni_check_ie(UNI_IE_CALLEDSUB, (union uni_ieall *)&m->calledsub, cx);
-	ret |= uni_check_ie(UNI_IE_LIJ_SEQNO, (union uni_ieall *)&m->lij_seqno, cx);
-	for(i = 0; i < UNI_NUM_IE_TNS ; i++) {
-		ret |= uni_check_ie(UNI_IE_TNS, (union uni_ieall *)&m->tns[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_leaf_setup_fail(struct uni_msg *msg, struct uni_leaf_setup_fail *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_LEAF_SETUP_FAIL, cx, &mlen))
-		return (-2);
-
-	if((p->cause.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CAUSE, msg, (union uni_ieall *)&p->cause, cx))
-		return (UNI_IE_CAUSE);
-	if((p->called.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLED, msg, (union uni_ieall *)&p->called, cx))
-		return (UNI_IE_CALLED);
-	if((p->calledsub.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLEDSUB, msg, (union uni_ieall *)&p->calledsub, cx))
-		return (UNI_IE_CALLEDSUB);
-	if((p->lij_seqno.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_LIJ_SEQNO, msg, (union uni_ieall *)&p->lij_seqno, cx))
-		return (UNI_IE_LIJ_SEQNO);
-	for(i = 0; i < UNI_NUM_IE_TNS; i++)
-		if((p->tns[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_TNS, msg, (union uni_ieall *)&p->tns[i], cx))
-		return ((i << 16) + UNI_IE_TNS);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_leaf_setup_fail(struct uni_leaf_setup_fail *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_CAUSE:
-		out->cause.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CAUSE, (union uni_ieall *)&out->cause, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLED:
-		out->called.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLED, (union uni_ieall *)&out->called, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLEDSUB:
-		out->calledsub.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLEDSUB, (union uni_ieall *)&out->calledsub, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_LIJ_SEQNO:
-		out->lij_seqno.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_LIJ_SEQNO, (union uni_ieall *)&out->lij_seqno, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_TNS:
-		for(i = 0; i < UNI_NUM_IE_TNS; i++)
-			if (!IE_ISPRESENT(out->tns[i])) {
-				out->tns[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_TNS, (union uni_ieall *)&out->tns[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_leaf_setup_fail = {
-	0,
-	"leaf_setup_fail",
-	(uni_msg_print_f)print_leaf_setup_fail,
-	(uni_msg_check_f)check_leaf_setup_fail,
-	(uni_msg_encode_f)encode_leaf_setup_fail,
-	(uni_msg_decode_f)decode_leaf_setup_fail
-};
-
-static void
-print_cobisetup(struct uni_cobisetup *msg, struct unicx *cx)
-{
-	if(msg->facility.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_FACILITY, (union uni_ieall *)&msg->facility, cx);
-	if(msg->called.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLED, (union uni_ieall *)&msg->called, cx);
-	if(msg->calledsub.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLEDSUB, (union uni_ieall *)&msg->calledsub, cx);
-	if(msg->calling.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLING, (union uni_ieall *)&msg->calling, cx);
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_cobisetup(struct uni_cobisetup *m, struct unicx *cx)
-{
-	int ret = 0;
-
-	ret |= uni_check_ie(UNI_IE_FACILITY, (union uni_ieall *)&m->facility, cx);
-	ret |= uni_check_ie(UNI_IE_CALLED, (union uni_ieall *)&m->called, cx);
-	ret |= uni_check_ie(UNI_IE_CALLEDSUB, (union uni_ieall *)&m->calledsub, cx);
-	ret |= uni_check_ie(UNI_IE_CALLING, (union uni_ieall *)&m->calling, cx);
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_cobisetup(struct uni_msg *msg, struct uni_cobisetup *p, struct unicx *cx)
-{
-	u_int mlen;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_COBISETUP, cx, &mlen))
-		return (-2);
-
-	if((p->facility.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_FACILITY, msg, (union uni_ieall *)&p->facility, cx))
-		return (UNI_IE_FACILITY);
-	if((p->called.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLED, msg, (union uni_ieall *)&p->called, cx))
-		return (UNI_IE_CALLED);
-	if((p->calledsub.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLEDSUB, msg, (union uni_ieall *)&p->calledsub, cx))
-		return (UNI_IE_CALLEDSUB);
-	if((p->calling.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLING, msg, (union uni_ieall *)&p->calling, cx))
-		return (UNI_IE_CALLING);
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_cobisetup(struct uni_cobisetup *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	switch (ie) {
-
-	  case UNI_IE_FACILITY:
-		out->facility.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_FACILITY, (union uni_ieall *)&out->facility, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLED:
-		out->called.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLED, (union uni_ieall *)&out->called, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLEDSUB:
-		out->calledsub.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLEDSUB, (union uni_ieall *)&out->calledsub, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLING:
-		out->calling.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLING, (union uni_ieall *)&out->calling, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_cobisetup = {
-	0,
-	"cobisetup",
-	(uni_msg_print_f)print_cobisetup,
-	(uni_msg_check_f)check_cobisetup,
-	(uni_msg_encode_f)encode_cobisetup,
-	(uni_msg_decode_f)decode_cobisetup
-};
-
-static void
-print_facility(struct uni_facility *msg, struct unicx *cx)
-{
-	if(msg->facility.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_FACILITY, (union uni_ieall *)&msg->facility, cx);
-	if(msg->called.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLED, (union uni_ieall *)&msg->called, cx);
-	if(msg->calledsub.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLEDSUB, (union uni_ieall *)&msg->calledsub, cx);
-	if(msg->calling.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CALLING, (union uni_ieall *)&msg->calling, cx);
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_facility(struct uni_facility *m, struct unicx *cx)
-{
-	int ret = 0;
-
-	ret |= uni_check_ie(UNI_IE_FACILITY, (union uni_ieall *)&m->facility, cx);
-	ret |= uni_check_ie(UNI_IE_CALLED, (union uni_ieall *)&m->called, cx);
-	ret |= uni_check_ie(UNI_IE_CALLEDSUB, (union uni_ieall *)&m->calledsub, cx);
-	ret |= uni_check_ie(UNI_IE_CALLING, (union uni_ieall *)&m->calling, cx);
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_facility(struct uni_msg *msg, struct uni_facility *p, struct unicx *cx)
-{
-	u_int mlen;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_FACILITY, cx, &mlen))
-		return (-2);
-
-	if((p->facility.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_FACILITY, msg, (union uni_ieall *)&p->facility, cx))
-		return (UNI_IE_FACILITY);
-	if((p->called.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLED, msg, (union uni_ieall *)&p->called, cx))
-		return (UNI_IE_CALLED);
-	if((p->calledsub.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLEDSUB, msg, (union uni_ieall *)&p->calledsub, cx))
-		return (UNI_IE_CALLEDSUB);
-	if((p->calling.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CALLING, msg, (union uni_ieall *)&p->calling, cx))
-		return (UNI_IE_CALLING);
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_facility(struct uni_facility *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	switch (ie) {
-
-	  case UNI_IE_FACILITY:
-		out->facility.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_FACILITY, (union uni_ieall *)&out->facility, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLED:
-		out->called.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLED, (union uni_ieall *)&out->called, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLEDSUB:
-		out->calledsub.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLEDSUB, (union uni_ieall *)&out->calledsub, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_CALLING:
-		out->calling.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CALLING, (union uni_ieall *)&out->calling, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_facility = {
-	0,
-	"facility",
-	(uni_msg_print_f)print_facility,
-	(uni_msg_check_f)check_facility,
-	(uni_msg_encode_f)encode_facility,
-	(uni_msg_decode_f)decode_facility
-};
-
-static void
-print_modify_req(struct uni_modify_req *msg, struct unicx *cx)
-{
-	u_int i;
-
-	if(msg->traffic.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_TRAFFIC, (union uni_ieall *)&msg->traffic, cx);
-	if(msg->atraffic.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_ATRAFFIC, (union uni_ieall *)&msg->atraffic, cx);
-	if(msg->mintraffic.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_MINTRAFFIC, (union uni_ieall *)&msg->mintraffic, cx);
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_modify_req(struct uni_modify_req *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	ret |= uni_check_ie(UNI_IE_TRAFFIC, (union uni_ieall *)&m->traffic, cx);
-	ret |= uni_check_ie(UNI_IE_ATRAFFIC, (union uni_ieall *)&m->atraffic, cx);
-	ret |= uni_check_ie(UNI_IE_MINTRAFFIC, (union uni_ieall *)&m->mintraffic, cx);
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_modify_req(struct uni_msg *msg, struct uni_modify_req *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_MODIFY_REQ, cx, &mlen))
-		return (-2);
-
-	if((p->traffic.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_TRAFFIC, msg, (union uni_ieall *)&p->traffic, cx))
-		return (UNI_IE_TRAFFIC);
-	if((p->atraffic.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_ATRAFFIC, msg, (union uni_ieall *)&p->atraffic, cx))
-		return (UNI_IE_ATRAFFIC);
-	if((p->mintraffic.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_MINTRAFFIC, msg, (union uni_ieall *)&p->mintraffic, cx))
-		return (UNI_IE_MINTRAFFIC);
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_modify_req(struct uni_modify_req *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_TRAFFIC:
-		out->traffic.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_TRAFFIC, (union uni_ieall *)&out->traffic, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_ATRAFFIC:
-		out->atraffic.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_ATRAFFIC, (union uni_ieall *)&out->atraffic, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_MINTRAFFIC:
-		out->mintraffic.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_MINTRAFFIC, (union uni_ieall *)&out->mintraffic, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_GIT:
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_modify_req = {
-	0,
-	"modify_req",
-	(uni_msg_print_f)print_modify_req,
-	(uni_msg_check_f)check_modify_req,
-	(uni_msg_encode_f)encode_modify_req,
-	(uni_msg_decode_f)decode_modify_req
-};
-
-static void
-print_modify_ack(struct uni_modify_ack *msg, struct unicx *cx)
-{
-	u_int i;
-
-	if(msg->report.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_REPORT, (union uni_ieall *)&msg->report, cx);
-	if(msg->traffic.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_TRAFFIC, (union uni_ieall *)&msg->traffic, cx);
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_modify_ack(struct uni_modify_ack *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	ret |= uni_check_ie(UNI_IE_REPORT, (union uni_ieall *)&m->report, cx);
-	ret |= uni_check_ie(UNI_IE_TRAFFIC, (union uni_ieall *)&m->traffic, cx);
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_modify_ack(struct uni_msg *msg, struct uni_modify_ack *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_MODIFY_ACK, cx, &mlen))
-		return (-2);
-
-	if((p->report.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_REPORT, msg, (union uni_ieall *)&p->report, cx))
-		return (UNI_IE_REPORT);
-	if((p->traffic.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_TRAFFIC, msg, (union uni_ieall *)&p->traffic, cx))
-		return (UNI_IE_TRAFFIC);
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_modify_ack(struct uni_modify_ack *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_REPORT:
-		out->report.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_REPORT, (union uni_ieall *)&out->report, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_TRAFFIC:
-		out->traffic.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_TRAFFIC, (union uni_ieall *)&out->traffic, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_GIT:
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_modify_ack = {
-	0,
-	"modify_ack",
-	(uni_msg_print_f)print_modify_ack,
-	(uni_msg_check_f)check_modify_ack,
-	(uni_msg_encode_f)encode_modify_ack,
-	(uni_msg_decode_f)decode_modify_ack
-};
-
-static void
-print_modify_rej(struct uni_modify_rej *msg, struct unicx *cx)
-{
-	u_int i;
-
-	if(msg->cause.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_CAUSE, (union uni_ieall *)&msg->cause, cx);
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_modify_rej(struct uni_modify_rej *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	ret |= uni_check_ie(UNI_IE_CAUSE, (union uni_ieall *)&m->cause, cx);
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_modify_rej(struct uni_msg *msg, struct uni_modify_rej *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_MODIFY_REJ, cx, &mlen))
-		return (-2);
-
-	if((p->cause.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_CAUSE, msg, (union uni_ieall *)&p->cause, cx))
-		return (UNI_IE_CAUSE);
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_modify_rej(struct uni_modify_rej *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_CAUSE:
-		out->cause.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_CAUSE, (union uni_ieall *)&out->cause, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_GIT:
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_modify_rej = {
-	0,
-	"modify_rej",
-	(uni_msg_print_f)print_modify_rej,
-	(uni_msg_check_f)check_modify_rej,
-	(uni_msg_encode_f)encode_modify_rej,
-	(uni_msg_decode_f)decode_modify_rej
-};
-
-static void
-print_conn_avail(struct uni_conn_avail *msg, struct unicx *cx)
-{
-	u_int i;
-
-	if(msg->notify.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_NOTIFY, (union uni_ieall *)&msg->notify, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if(msg->git[i].h.present & UNI_IE_PRESENT)
-			uni_print_ie_internal(UNI_IE_GIT, (union uni_ieall *)&msg->git[i], cx);
-	if(msg->report.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_REPORT, (union uni_ieall *)&msg->report, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_conn_avail(struct uni_conn_avail *m, struct unicx *cx)
-{
-	int ret = 0;
-	u_int i;
-
-	ret |= uni_check_ie(UNI_IE_NOTIFY, (union uni_ieall *)&m->notify, cx);
-	for(i = 0; i < UNI_NUM_IE_GIT ; i++) {
-		ret |= uni_check_ie(UNI_IE_GIT, (union uni_ieall *)&m->git[i], cx);
-	}
-	ret |= uni_check_ie(UNI_IE_REPORT, (union uni_ieall *)&m->report, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_conn_avail(struct uni_msg *msg, struct uni_conn_avail *p, struct unicx *cx)
-{
-	u_int mlen;
-	u_int i;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_CONN_AVAIL, cx, &mlen))
-		return (-2);
-
-	if((p->notify.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_NOTIFY, msg, (union uni_ieall *)&p->notify, cx))
-		return (UNI_IE_NOTIFY);
-	for(i = 0; i < UNI_NUM_IE_GIT; i++)
-		if((p->git[i].h.present & UNI_IE_PRESENT) &&
-		   uni_encode_ie(UNI_IE_GIT, msg, (union uni_ieall *)&p->git[i], cx))
-		return ((i << 16) + UNI_IE_GIT);
-	if((p->report.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_REPORT, msg, (union uni_ieall *)&p->report, cx))
-		return (UNI_IE_REPORT);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_conn_avail(struct uni_conn_avail *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	u_int i;
-
-	switch (ie) {
-
-	  case UNI_IE_NOTIFY:
-		out->notify.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_NOTIFY, (union uni_ieall *)&out->notify, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_GIT:
-		for(i = 0; i < UNI_NUM_IE_GIT; i++)
-			if (!IE_ISPRESENT(out->git[i])) {
-				out->git[i].h = *hdr;
-				if (hdr->present & UNI_IE_ERROR)
-					return (DEC_ERR);
-				if(uni_decode_ie_body(UNI_IE_GIT, (union uni_ieall *)&out->git[i], msg, ielen, cx))
-					return (DEC_ERR);
-				break;
-			}
-		break;
-
-	  case UNI_IE_REPORT:
-		out->report.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_REPORT, (union uni_ieall *)&out->report, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_conn_avail = {
-	0,
-	"conn_avail",
-	(uni_msg_print_f)print_conn_avail,
-	(uni_msg_check_f)check_conn_avail,
-	(uni_msg_encode_f)encode_conn_avail,
-	(uni_msg_decode_f)decode_conn_avail
-};
-
-static void
-print_unknown(struct uni_unknown *msg, struct unicx *cx)
-{
-	if(msg->epref.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_EPREF, (union uni_ieall *)&msg->epref, cx);
-	if(msg->unrec.h.present & UNI_IE_PRESENT)
-		uni_print_ie_internal(UNI_IE_UNREC, (union uni_ieall *)&msg->unrec, cx);
-}
-
-static int
-check_unknown(struct uni_unknown *m, struct unicx *cx)
-{
-	int ret = 0;
-
-	ret |= uni_check_ie(UNI_IE_EPREF, (union uni_ieall *)&m->epref, cx);
-	ret |= uni_check_ie(UNI_IE_UNREC, (union uni_ieall *)&m->unrec, cx);
-
-	return ret;
-}
-
-static int
-encode_unknown(struct uni_msg *msg, struct uni_unknown *p, struct unicx *cx)
-{
-	u_int mlen;
-
-	if(uni_encode_msg_hdr(msg, &p->hdr, UNI_UNKNOWN, cx, &mlen))
-		return (-2);
-
-	if((p->epref.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_EPREF, msg, (union uni_ieall *)&p->epref, cx))
-		return (UNI_IE_EPREF);
-	if((p->unrec.h.present & UNI_IE_PRESENT) &&
-	   uni_encode_ie(UNI_IE_UNREC, msg, (union uni_ieall *)&p->unrec, cx))
-		return (UNI_IE_UNREC);
-
-	msg->b_buf[mlen+0] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 8;
-	msg->b_buf[mlen+1] = ((msg->b_wptr-msg->b_rptr)-mlen-2) >> 0;
-
-	return (0);
-}
-
-static int
-decode_unknown(struct uni_unknown *out, struct uni_msg *msg,
-    enum uni_ietype ie, struct uni_iehdr *hdr, u_int ielen,
-    struct unicx *cx)
-{
-	switch (ie) {
-
-	  case UNI_IE_EPREF:
-		out->epref.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_EPREF, (union uni_ieall *)&out->epref, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  case UNI_IE_UNREC:
-		out->unrec.h = *hdr;
-		if (hdr->present & UNI_IE_ERROR)
-			return (DEC_ERR);
-		if(uni_decode_ie_body(UNI_IE_UNREC, (union uni_ieall *)&out->unrec, msg, ielen, cx))
-			return (DEC_ERR);
-		break;
-
-	  default:
-		return (DEC_ILL);
-	}
-	return (DEC_OK);
-}
-
-static const struct msgdecl decl_unknown = {
-	0,
-	"unknown",
-	(uni_msg_print_f)print_unknown,
-	(uni_msg_check_f)check_unknown,
-	(uni_msg_encode_f)encode_unknown,
-	(uni_msg_decode_f)decode_unknown
-};
-
-const struct msgdecl *uni_msgtable[256] = {
-	&decl_unknown,	/* 0x00 */
-	&decl_alerting,	/* 0x01 */
-	&decl_call_proc,	/* 0x02 */
-	&decl_unknown,	/* 0x03 */
-	&decl_unknown,	/* 0x04 */
-	&decl_setup,	/* 0x05 */
-	&decl_unknown,	/* 0x06 */
-	&decl_connect,	/* 0x07 */
-	&decl_unknown,	/* 0x08 */
-	&decl_unknown,	/* 0x09 */
-	&decl_unknown,	/* 0x0a */
-	&decl_unknown,	/* 0x0b */
-	&decl_unknown,	/* 0x0c */
-	&decl_unknown,	/* 0x0d */
-	&decl_unknown,	/* 0x0e */
-	&decl_connect_ack,	/* 0x0f */
-	&decl_unknown,	/* 0x10 */
-	&decl_unknown,	/* 0x11 */
-	&decl_unknown,	/* 0x12 */
-	&decl_unknown,	/* 0x13 */
-	&decl_unknown,	/* 0x14 */
-	&decl_cobisetup,	/* 0x15 */
-	&decl_unknown,	/* 0x16 */
-	&decl_unknown,	/* 0x17 */
-	&decl_unknown,	/* 0x18 */
-	&decl_unknown,	/* 0x19 */
-	&decl_unknown,	/* 0x1a */
-	&decl_unknown,	/* 0x1b */
-	&decl_unknown,	/* 0x1c */
-	&decl_unknown,	/* 0x1d */
-	&decl_unknown,	/* 0x1e */
-	&decl_unknown,	/* 0x1f */
-	&decl_unknown,	/* 0x20 */
-	&decl_unknown,	/* 0x21 */
-	&decl_unknown,	/* 0x22 */
-	&decl_unknown,	/* 0x23 */
-	&decl_unknown,	/* 0x24 */
-	&decl_unknown,	/* 0x25 */
-	&decl_unknown,	/* 0x26 */
-	&decl_unknown,	/* 0x27 */
-	&decl_unknown,	/* 0x28 */
-	&decl_unknown,	/* 0x29 */
-	&decl_unknown,	/* 0x2a */
-	&decl_unknown,	/* 0x2b */
-	&decl_unknown,	/* 0x2c */
-	&decl_unknown,	/* 0x2d */
-	&decl_unknown,	/* 0x2e */
-	&decl_unknown,	/* 0x2f */
-	&decl_unknown,	/* 0x30 */
-	&decl_unknown,	/* 0x31 */
-	&decl_unknown,	/* 0x32 */
-	&decl_unknown,	/* 0x33 */
-	&decl_unknown,	/* 0x34 */
-	&decl_unknown,	/* 0x35 */
-	&decl_unknown,	/* 0x36 */
-	&decl_unknown,	/* 0x37 */
-	&decl_unknown,	/* 0x38 */
-	&decl_unknown,	/* 0x39 */
-	&decl_unknown,	/* 0x3a */
-	&decl_unknown,	/* 0x3b */
-	&decl_unknown,	/* 0x3c */
-	&decl_unknown,	/* 0x3d */
-	&decl_unknown,	/* 0x3e */
-	&decl_unknown,	/* 0x3f */
-	&decl_unknown,	/* 0x40 */
-	&decl_unknown,	/* 0x41 */
-	&decl_unknown,	/* 0x42 */
-	&decl_unknown,	/* 0x43 */
-	&decl_unknown,	/* 0x44 */
-	&decl_unknown,	/* 0x45 */
-	&decl_restart,	/* 0x46 */
-	&decl_unknown,	/* 0x47 */
-	&decl_unknown,	/* 0x48 */
-	&decl_unknown,	/* 0x49 */
-	&decl_unknown,	/* 0x4a */
-	&decl_unknown,	/* 0x4b */
-	&decl_unknown,	/* 0x4c */
-	&decl_release,	/* 0x4d */
-	&decl_restart_ack,	/* 0x4e */
-	&decl_unknown,	/* 0x4f */
-	&decl_unknown,	/* 0x50 */
-	&decl_unknown,	/* 0x51 */
-	&decl_unknown,	/* 0x52 */
-	&decl_unknown,	/* 0x53 */
-	&decl_unknown,	/* 0x54 */
-	&decl_unknown,	/* 0x55 */
-	&decl_unknown,	/* 0x56 */
-	&decl_unknown,	/* 0x57 */
-	&decl_unknown,	/* 0x58 */
-	&decl_unknown,	/* 0x59 */
-	&decl_release_compl,	/* 0x5a */
-	&decl_unknown,	/* 0x5b */
-	&decl_unknown,	/* 0x5c */
-	&decl_unknown,	/* 0x5d */
-	&decl_unknown,	/* 0x5e */
-	&decl_unknown,	/* 0x5f */
-	&decl_unknown,	/* 0x60 */
-	&decl_unknown,	/* 0x61 */
-	&decl_facility,	/* 0x62 */
-	&decl_unknown,	/* 0x63 */
-	&decl_unknown,	/* 0x64 */
-	&decl_unknown,	/* 0x65 */
-	&decl_unknown,	/* 0x66 */
-	&decl_unknown,	/* 0x67 */
-	&decl_unknown,	/* 0x68 */
-	&decl_unknown,	/* 0x69 */
-	&decl_unknown,	/* 0x6a */
-	&decl_unknown,	/* 0x6b */
-	&decl_unknown,	/* 0x6c */
-	&decl_unknown,	/* 0x6d */
-	&decl_notify,	/* 0x6e */
-	&decl_unknown,	/* 0x6f */
-	&decl_unknown,	/* 0x70 */
-	&decl_unknown,	/* 0x71 */
-	&decl_unknown,	/* 0x72 */
-	&decl_unknown,	/* 0x73 */
-	&decl_unknown,	/* 0x74 */
-	&decl_status_enq,	/* 0x75 */
-	&decl_unknown,	/* 0x76 */
-	&decl_unknown,	/* 0x77 */
-	&decl_unknown,	/* 0x78 */
-	&decl_unknown,	/* 0x79 */
-	&decl_unknown,	/* 0x7a */
-	&decl_unknown,	/* 0x7b */
-	&decl_unknown,	/* 0x7c */
-	&decl_status,	/* 0x7d */
-	&decl_unknown,	/* 0x7e */
-	&decl_unknown,	/* 0x7f */
-	&decl_add_party,	/* 0x80 */
-	&decl_add_party_ack,	/* 0x81 */
-	&decl_add_party_rej,	/* 0x82 */
-	&decl_drop_party,	/* 0x83 */
-	&decl_drop_party_ack,	/* 0x84 */
-	&decl_party_alerting,	/* 0x85 */
-	&decl_unknown,	/* 0x86 */
-	&decl_unknown,	/* 0x87 */
-	&decl_modify_req,	/* 0x88 */
-	&decl_modify_ack,	/* 0x89 */
-	&decl_modify_rej,	/* 0x8a */
-	&decl_conn_avail,	/* 0x8b */
-	&decl_unknown,	/* 0x8c */
-	&decl_unknown,	/* 0x8d */
-	&decl_unknown,	/* 0x8e */
-	&decl_unknown,	/* 0x8f */
-	&decl_leaf_setup_fail,	/* 0x90 */
-	&decl_leaf_setup_req,	/* 0x91 */
-	&decl_unknown,	/* 0x92 */
-	&decl_unknown,	/* 0x93 */
-	&decl_unknown,	/* 0x94 */
-	&decl_unknown,	/* 0x95 */
-	&decl_unknown,	/* 0x96 */
-	&decl_unknown,	/* 0x97 */
-	&decl_unknown,	/* 0x98 */
-	&decl_unknown,	/* 0x99 */
-	&decl_unknown,	/* 0x9a */
-	&decl_unknown,	/* 0x9b */
-	&decl_unknown,	/* 0x9c */
-	&decl_unknown,	/* 0x9d */
-	&decl_unknown,	/* 0x9e */
-	&decl_unknown,	/* 0x9f */
-	&decl_unknown,	/* 0xa0 */
-	&decl_unknown,	/* 0xa1 */
-	&decl_unknown,	/* 0xa2 */
-	&decl_unknown,	/* 0xa3 */
-	&decl_unknown,	/* 0xa4 */
-	&decl_unknown,	/* 0xa5 */
-	&decl_unknown,	/* 0xa6 */
-	&decl_unknown,	/* 0xa7 */
-	&decl_unknown,	/* 0xa8 */
-	&decl_unknown,	/* 0xa9 */
-	&decl_unknown,	/* 0xaa */
-	&decl_unknown,	/* 0xab */
-	&decl_unknown,	/* 0xac */
-	&decl_unknown,	/* 0xad */
-	&decl_unknown,	/* 0xae */
-	&decl_unknown,	/* 0xaf */
-	&decl_unknown,	/* 0xb0 */
-	&decl_unknown,	/* 0xb1 */
-	&decl_unknown,	/* 0xb2 */
-	&decl_unknown,	/* 0xb3 */
-	&decl_unknown,	/* 0xb4 */
-	&decl_unknown,	/* 0xb5 */
-	&decl_unknown,	/* 0xb6 */
-	&decl_unknown,	/* 0xb7 */
-	&decl_unknown,	/* 0xb8 */
-	&decl_unknown,	/* 0xb9 */
-	&decl_unknown,	/* 0xba */
-	&decl_unknown,	/* 0xbb */
-	&decl_unknown,	/* 0xbc */
-	&decl_unknown,	/* 0xbd */
-	&decl_unknown,	/* 0xbe */
-	&decl_unknown,	/* 0xbf */
-	&decl_unknown,	/* 0xc0 */
-	&decl_unknown,	/* 0xc1 */
-	&decl_unknown,	/* 0xc2 */
-	&decl_unknown,	/* 0xc3 */
-	&decl_unknown,	/* 0xc4 */
-	&decl_unknown,	/* 0xc5 */
-	&decl_unknown,	/* 0xc6 */
-	&decl_unknown,	/* 0xc7 */
-	&decl_unknown,	/* 0xc8 */
-	&decl_unknown,	/* 0xc9 */
-	&decl_unknown,	/* 0xca */
-	&decl_unknown,	/* 0xcb */
-	&decl_unknown,	/* 0xcc */
-	&decl_unknown,	/* 0xcd */
-	&decl_unknown,	/* 0xce */
-	&decl_unknown,	/* 0xcf */
-	&decl_unknown,	/* 0xd0 */
-	&decl_unknown,	/* 0xd1 */
-	&decl_unknown,	/* 0xd2 */
-	&decl_unknown,	/* 0xd3 */
-	&decl_unknown,	/* 0xd4 */
-	&decl_unknown,	/* 0xd5 */
-	&decl_unknown,	/* 0xd6 */
-	&decl_unknown,	/* 0xd7 */
-	&decl_unknown,	/* 0xd8 */
-	&decl_unknown,	/* 0xd9 */
-	&decl_unknown,	/* 0xda */
-	&decl_unknown,	/* 0xdb */
-	&decl_unknown,	/* 0xdc */
-	&decl_unknown,	/* 0xdd */
-	&decl_unknown,	/* 0xde */
-	&decl_unknown,	/* 0xdf */
-	&decl_unknown,	/* 0xe0 */
-	&decl_unknown,	/* 0xe1 */
-	&decl_unknown,	/* 0xe2 */
-	&decl_unknown,	/* 0xe3 */
-	&decl_unknown,	/* 0xe4 */
-	&decl_unknown,	/* 0xe5 */
-	&decl_unknown,	/* 0xe6 */
-	&decl_unknown,	/* 0xe7 */
-	&decl_unknown,	/* 0xe8 */
-	&decl_unknown,	/* 0xe9 */
-	&decl_unknown,	/* 0xea */
-	&decl_unknown,	/* 0xeb */
-	&decl_unknown,	/* 0xec */
-	&decl_unknown,	/* 0xed */
-	&decl_unknown,	/* 0xee */
-	&decl_unknown,	/* 0xef */
-	&decl_unknown,	/* 0xf0 */
-	&decl_unknown,	/* 0xf1 */
-	&decl_unknown,	/* 0xf2 */
-	&decl_unknown,	/* 0xf3 */
-	&decl_unknown,	/* 0xf4 */
-	&decl_unknown,	/* 0xf5 */
-	&decl_unknown,	/* 0xf6 */
-	&decl_unknown,	/* 0xf7 */
-	&decl_unknown,	/* 0xf8 */
-	&decl_unknown,	/* 0xf9 */
-	&decl_unknown,	/* 0xfa */
-	&decl_unknown,	/* 0xfb */
-	&decl_unknown,	/* 0xfc */
-	&decl_unknown,	/* 0xfd */
-	&decl_unknown,	/* 0xfe */
-	&decl_unknown,	/* 0xff */
-};
diff --git a/sys/contrib/ngatm/netnatm/msg/uni_msg.h b/sys/contrib/ngatm/netnatm/msg/uni_msg.h
deleted file mode 100644
index ddb095b612c5..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/uni_msg.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/* This file was created automatically
- * Source file: $Begemot: libunimsg/atm/msg/msg.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
- */
-
-#ifndef _NETNATM_MSG_UNI_MSG_H_
-#define _NETNATM_MSG_UNI_MSG_H_
-
-struct uni_alerting {
-	struct uni_msghdr	hdr;
-	struct uni_ie_connid	connid;
-	struct uni_ie_epref	epref;
-	struct uni_ie_notify	notify;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_uu	uu;
-	struct uni_ie_report	report;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_call_proc {
-	struct uni_msghdr	hdr;
-	struct uni_ie_connid	connid;
-	struct uni_ie_epref	epref;
-	struct uni_ie_notify	notify;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_connect {
-	struct uni_msghdr	hdr;
-	struct uni_ie_aal	aal;
-	struct uni_ie_blli	blli;
-	struct uni_ie_connid	connid;
-	struct uni_ie_epref	epref;
-	struct uni_ie_notify	notify;
-	struct uni_ie_conned	conned;
-	struct uni_ie_connedsub	connedsub;
-	struct uni_ie_eetd	eetd;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_uu	uu;
-	struct uni_ie_traffic	traffic;
-	struct uni_ie_exqos	exqos;
-	struct uni_ie_facility	facility;
-	struct uni_ie_abrsetup	abrsetup;
-	struct uni_ie_abradd	abradd;
-	struct uni_ie_called_soft	called_soft;
-	struct uni_ie_report	report;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_connect_ack {
-	struct uni_msghdr	hdr;
-	struct uni_ie_notify	notify;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_release {
-	struct uni_msghdr	hdr;
-	struct uni_ie_cause	cause[2];
-	struct uni_ie_notify	notify;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_uu	uu;
-	struct uni_ie_facility	facility;
-	struct uni_ie_crankback	crankback;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_release_compl {
-	struct uni_msghdr	hdr;
-	struct uni_ie_cause	cause[2];
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_uu	uu;
-	struct uni_ie_crankback	crankback;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_setup {
-	struct uni_msghdr	hdr;
-	struct uni_ie_aal	aal;
-	struct uni_ie_traffic	traffic;
-	struct uni_ie_bearer	bearer;
-	struct uni_ie_bhli	bhli;
-	struct uni_ie_repeat	blli_repeat;
-	struct uni_ie_blli	blli[UNI_NUM_IE_BLLI];
-	struct uni_ie_called	called;
-	struct uni_ie_calledsub	calledsub[UNI_NUM_IE_CALLEDSUB];
-	struct uni_ie_calling	calling;
-	struct uni_ie_callingsub	callingsub[UNI_NUM_IE_CALLINGSUB];
-	struct uni_ie_connid	connid;
-	struct uni_ie_qos	qos;
-	struct uni_ie_eetd	eetd;
-	struct uni_ie_notify	notify;
-	struct uni_ie_scompl	scompl;
-	struct uni_ie_tns	tns[UNI_NUM_IE_TNS];
-	struct uni_ie_epref	epref;
-	struct uni_ie_atraffic	atraffic;
-	struct uni_ie_mintraffic	mintraffic;
-	struct uni_ie_uu	uu;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_lij_callid	lij_callid;
-	struct uni_ie_lij_param	lij_param;
-	struct uni_ie_lij_seqno	lij_seqno;
-	struct uni_ie_exqos	exqos;
-	struct uni_ie_abrsetup	abrsetup;
-	struct uni_ie_abradd	abradd;
-	struct uni_ie_cscope	cscope;
-	struct uni_ie_calling_soft	calling_soft;
-	struct uni_ie_called_soft	called_soft;
-	struct uni_ie_repeat	dtl_repeat;
-	struct uni_ie_dtl	dtl[UNI_NUM_IE_DTL];
-	struct uni_ie_report	report;
-	struct uni_ie_mdcr	mdcr;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_status {
-	struct uni_msghdr	hdr;
-	struct uni_ie_callstate	callstate;
-	struct uni_ie_cause	cause;
-	struct uni_ie_epref	epref;
-	struct uni_ie_epstate	epstate;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_status_enq {
-	struct uni_msghdr	hdr;
-	struct uni_ie_epref	epref;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_notify {
-	struct uni_msghdr	hdr;
-	struct uni_ie_notify	notify;
-	struct uni_ie_epref	epref;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_restart {
-	struct uni_msghdr	hdr;
-	struct uni_ie_connid	connid;
-	struct uni_ie_restart	restart;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_restart_ack {
-	struct uni_msghdr	hdr;
-	struct uni_ie_connid	connid;
-	struct uni_ie_restart	restart;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_add_party {
-	struct uni_msghdr	hdr;
-	struct uni_ie_aal	aal;
-	struct uni_ie_bhli	bhli;
-	struct uni_ie_blli	blli;
-	struct uni_ie_called	called;
-	struct uni_ie_calledsub	calledsub[UNI_NUM_IE_CALLEDSUB];
-	struct uni_ie_calling	calling;
-	struct uni_ie_callingsub	callingsub[UNI_NUM_IE_CALLINGSUB];
-	struct uni_ie_scompl	scompl;
-	struct uni_ie_tns	tns[UNI_NUM_IE_TNS];
-	struct uni_ie_epref	epref;
-	struct uni_ie_notify	notify;
-	struct uni_ie_eetd	eetd;
-	struct uni_ie_uu	uu;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_lij_seqno	lij_seqno;
-	struct uni_ie_calling_soft	calling_soft;
-	struct uni_ie_called_soft	called_soft;
-	struct uni_ie_repeat	dtl_repeat;
-	struct uni_ie_dtl	dtl[UNI_NUM_IE_DTL];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_add_party_ack {
-	struct uni_msghdr	hdr;
-	struct uni_ie_epref	epref;
-	struct uni_ie_aal	aal;
-	struct uni_ie_blli	blli;
-	struct uni_ie_notify	notify;
-	struct uni_ie_eetd	eetd;
-	struct uni_ie_conned	conned;
-	struct uni_ie_connedsub	connedsub;
-	struct uni_ie_uu	uu;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_called_soft	called_soft;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_party_alerting {
-	struct uni_msghdr	hdr;
-	struct uni_ie_epref	epref;
-	struct uni_ie_notify	notify;
-	struct uni_ie_uu	uu;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_add_party_rej {
-	struct uni_msghdr	hdr;
-	struct uni_ie_cause	cause;
-	struct uni_ie_epref	epref;
-	struct uni_ie_uu	uu;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_crankback	crankback;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_drop_party {
-	struct uni_msghdr	hdr;
-	struct uni_ie_cause	cause;
-	struct uni_ie_epref	epref;
-	struct uni_ie_notify	notify;
-	struct uni_ie_uu	uu;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_drop_party_ack {
-	struct uni_msghdr	hdr;
-	struct uni_ie_epref	epref;
-	struct uni_ie_cause	cause;
-	struct uni_ie_uu	uu;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_leaf_setup_req {
-	struct uni_msghdr	hdr;
-	struct uni_ie_tns	tns[UNI_NUM_IE_TNS];
-	struct uni_ie_calling	calling;
-	struct uni_ie_callingsub	callingsub[UNI_NUM_IE_CALLINGSUB];
-	struct uni_ie_called	called;
-	struct uni_ie_calledsub	calledsub[UNI_NUM_IE_CALLEDSUB];
-	struct uni_ie_lij_callid	lij_callid;
-	struct uni_ie_lij_seqno	lij_seqno;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_leaf_setup_fail {
-	struct uni_msghdr	hdr;
-	struct uni_ie_cause	cause;
-	struct uni_ie_called	called;
-	struct uni_ie_calledsub	calledsub;
-	struct uni_ie_lij_seqno	lij_seqno;
-	struct uni_ie_tns	tns[UNI_NUM_IE_TNS];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_cobisetup {
-	struct uni_msghdr	hdr;
-	struct uni_ie_facility	facility;
-	struct uni_ie_called	called;
-	struct uni_ie_calledsub	calledsub;
-	struct uni_ie_calling	calling;
-	struct uni_ie_notify	notify;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_facility {
-	struct uni_msghdr	hdr;
-	struct uni_ie_facility	facility;
-	struct uni_ie_called	called;
-	struct uni_ie_calledsub	calledsub;
-	struct uni_ie_calling	calling;
-	struct uni_ie_notify	notify;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_modify_req {
-	struct uni_msghdr	hdr;
-	struct uni_ie_traffic	traffic;
-	struct uni_ie_atraffic	atraffic;
-	struct uni_ie_mintraffic	mintraffic;
-	struct uni_ie_notify	notify;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_modify_ack {
-	struct uni_msghdr	hdr;
-	struct uni_ie_report	report;
-	struct uni_ie_traffic	traffic;
-	struct uni_ie_notify	notify;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_modify_rej {
-	struct uni_msghdr	hdr;
-	struct uni_ie_cause	cause;
-	struct uni_ie_notify	notify;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_conn_avail {
-	struct uni_msghdr	hdr;
-	struct uni_ie_notify	notify;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_report	report;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_unknown {
-	struct uni_msghdr	hdr;
-	struct uni_ie_epref	epref;
-	struct uni_ie_unrec	unrec;
-};
-
-union uni_msgall {
-	struct uni_msghdr	hdr;
-	struct uni_alerting	alerting;
-	struct uni_call_proc	call_proc;
-	struct uni_connect	connect;
-	struct uni_connect_ack	connect_ack;	/* !pnni */
-	struct uni_release	release;
-	struct uni_release_compl	release_compl;
-	struct uni_setup	setup;
-	struct uni_status	status;
-	struct uni_status_enq	status_enq;
-	struct uni_notify	notify;
-	struct uni_restart	restart;
-	struct uni_restart_ack	restart_ack;
-	struct uni_add_party	add_party;
-	struct uni_add_party_ack	add_party_ack;
-	struct uni_party_alerting	party_alerting;
-	struct uni_add_party_rej	add_party_rej;
-	struct uni_drop_party	drop_party;
-	struct uni_drop_party_ack	drop_party_ack;
-	struct uni_leaf_setup_req	leaf_setup_req;	/* !pnni */
-	struct uni_leaf_setup_fail	leaf_setup_fail;	/* !pnni */
-	struct uni_cobisetup	cobisetup;	/* !pnni&&q2932 */
-	struct uni_facility	facility;	/* !pnni&&q2932 */
-	struct uni_modify_req	modify_req;	/* !pnni */
-	struct uni_modify_ack	modify_ack;	/* !pnni */
-	struct uni_modify_rej	modify_rej;	/* !pnni */
-	struct uni_conn_avail	conn_avail;	/* !pnni */
-	struct uni_unknown	unknown;
-};
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/msg/unimsglib.h b/sys/contrib/ngatm/netnatm/msg/unimsglib.h
deleted file mode 100644
index f8489dbffc0c..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/unimsglib.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/msg/unimsglib.h,v 1.6 2004/07/08 08:22:07 brandt Exp $
- */
-#ifndef _NETNATM_MSG_UNIMSGLIB_H_
-#define _NETNATM_MSG_UNIMSGLIB_H_
-
-#include <netnatm/msg/uni_config.h>
-
-struct uni_msg;
-
-enum uni_ierr_type {
-	UNI_IERR_UNK,	/* unknown IE */
-	UNI_IERR_LEN,	/* length error */
-	UNI_IERR_BAD,	/* content error */
-	UNI_IERR_ACC,	/* access element content error */
-	UNI_IERR_MIS,	/* mandatory IE missing (not used here) */
-};
-
-struct uni_ierr {
-	enum uni_ierr_type	err;	/* what error */
-	enum uni_ieact		act;	/* the action indicator */
-	u_int			ie:8;	/* the ie type */
-	u_int			man:1;	/* mandatory flag */
-	u_int			epref:1;/* Q.2971 9.5.3.2.1 low-pri epref */
-};
-
-/*
- * Context buffer. Needed to reduce number of arguments to routines.
- */
-struct unicx {
-	/*
-	 * globals for error handling
-	 */
-	u_int		errcnt;		/* number of bad IEs */
-	struct uni_ierr	err[UNI_MAX_ERRIE]; /* the errors */
-
-	int		q2932;		/* Enable GFP */
-	int		pnni;		/* Enable PNNI */
-
-	int		git_hard;	/* do hard check on GIT IE */
-	int		bearer_hard;	/* do hard check on BEARER IE */
-	int		cause_hard;	/* do hard check on cause */
-
-	int		multiline;	/* printing mode */
-	u_int		tabsiz;		/* tabulation size */
-
-	/*
-	 * Internal context of library -- don't touch
-	 */
-	struct uni_ie_repeat	repeat;	/* repeat IE during decoding */
-	enum uni_ietype		ielast;	/* last IE seen for repeat handling */
-
-	const char 		*prefix[20];
-	u_int			nprefix;
-	int			doindent;
-	char			*buf;
-	size_t			bufsiz;
-	u_int			indent;		/* indentation */
-	int			dont_init;
-};
-
-/*
- * Functions for all messages
- */
-void uni_print_cref(char *, size_t, const struct uni_cref *, struct unicx *);
-void uni_print_msghdr(char *, size_t, const struct uni_msghdr *, struct unicx *);
-void uni_print(char *, size_t, const struct uni_all *, struct unicx *);
-void uni_print_msg(char *, size_t, u_int _mtype, const union uni_msgall *,
-    struct unicx *);
-int uni_encode(struct uni_msg *, struct uni_all *, struct unicx *);
-int uni_decode(struct uni_msg *, struct uni_all *, struct unicx *);
-
-int uni_decode_head(struct uni_msg *, struct uni_all *, struct unicx *);
-int uni_decode_body(struct uni_msg *, struct uni_all *, struct unicx *);
-
-int uni_encode_msg_hdr(struct uni_msg *, struct uni_msghdr *, enum uni_msgtype,
-    struct unicx *, int *);
-
-
-/*
- * Functions for all information elements
- */
-void uni_print_ie(char *, size_t, enum uni_ietype, const union uni_ieall *,
-    struct unicx *);
-int uni_check_ie(enum uni_ietype, union uni_ieall *, struct unicx *);
-int uni_encode_ie(enum uni_ietype, struct uni_msg *, union uni_ieall *,
-    struct unicx *);
-int uni_decode_ie_hdr(enum uni_ietype *, struct uni_iehdr *, struct uni_msg *,
-    struct unicx *, u_int *);
-int uni_encode_ie_hdr(struct uni_msg *, enum uni_ietype, struct uni_iehdr *,
-    u_int, struct unicx *);
-int uni_decode_ie_body(enum uni_ietype, union uni_ieall *, struct uni_msg *,
-    u_int, struct unicx *);
-
-
-/*
- * Context handling
- */
-void uni_initcx(struct unicx *);
-void uni_print_cx(char *, size_t, struct unicx *);
-
-#define	UNI_SAVE_IERR(CX, IETYPE, ACT, ERRCODE)				\
-	(((CX)->errcnt < UNI_MAX_ERRIE) ?				\
-	 ((CX)->err[(CX)->errcnt].ie = (IETYPE),			\
-	  (CX)->err[(CX)->errcnt].act = (ACT),				\
-	  (CX)->err[(CX)->errcnt].err = (ERRCODE),			\
-	  (CX)->err[(CX)->errcnt].man = 0,				\
-	  (CX)->errcnt++,						\
-	  1) : 0)
-
-/*
- * Traffic classification
- */
-enum uni_traffic_class {
-	UNI_TRAFFIC_CBR1,
-	UNI_TRAFFIC_CBR2,
-	UNI_TRAFFIC_CBR3,
-	UNI_TRAFFIC_rtVBR1,
-	UNI_TRAFFIC_rtVBR2,
-	UNI_TRAFFIC_rtVBR3,
-	UNI_TRAFFIC_rtVBR4,
-	UNI_TRAFFIC_rtVBR5,
-	UNI_TRAFFIC_rtVBR6,
-	UNI_TRAFFIC_nrtVBR1,
-	UNI_TRAFFIC_nrtVBR2,
-	UNI_TRAFFIC_nrtVBR3,
-	UNI_TRAFFIC_nrtVBR4,
-	UNI_TRAFFIC_nrtVBR5,
-	UNI_TRAFFIC_nrtVBR6,
-	UNI_TRAFFIC_ABR,
-	UNI_TRAFFIC_UBR1,
-	UNI_TRAFFIC_UBR2,
-};
-
-/* classify traffic */
-int uni_classify_traffic(const struct uni_ie_bearer *,
-    const struct uni_ie_traffic *,
-    enum uni_traffic_class *, enum uni_traffic_class *,
-    char *, size_t);
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/msg/uniprint.h b/sys/contrib/ngatm/netnatm/msg/uniprint.h
deleted file mode 100644
index 239fa2dd4076..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/uniprint.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/msg/uniprint.h,v 1.4 2004/07/08 08:22:08 brandt Exp $
- *
- * Print utility functions. These are only needed if you want to hook to
- * the format of the uni printing routines.
- */
-#ifndef _NETNATM_MSG_UNIPRINT_H_
-#define _NETNATM_MSG_UNIPRINT_H_
-
-#include <netnatm/msg/uni_config.h>
-
-/*
- * This structure is used to define value->string mappings.
- * It must be terminated by a { NULL, 0 } entry.
- */
-struct uni_print_tbl {
-	const char *name;
-	u_int val;
-};
-void uni_print_tbl(const char *_entry, u_int _val,
-    const struct uni_print_tbl *_tbl, struct unicx *_cx);
-
-/* initialize printing. This must be called at the start from each external
- * callable printing function. */
-void uni_print_init(char *_buf, size_t _bufsiz, struct unicx *_cx);
-
-/* End the current (semantical) line. This takes care of indendation and
- * actually print the newline in the appropriate modes. */
-void uni_print_eol(struct unicx *_cx);
-
-/* Push or pop a prefix. This takes care of indendation. */
-void uni_print_push_prefix(const char *_prefix, struct unicx *_cx);
-void uni_print_pop_prefix(struct unicx *_cx);
-
-/* Print a flag taking care of the right prefixing */
-void uni_print_flag(const char *_flag, struct unicx *_cx);
-
-/* Print an entry taking care of the right prefixing */
-void uni_print_entry(struct unicx *_cx, const char *_entry,
-    const char *_fmt, ...) __printflike(3, 4);
-
-/* Generic printf */
-void uni_printf(struct unicx *_cx, const char *_fmt, ...) __printflike(2, 3);
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/msg/unistruct.h b/sys/contrib/ngatm/netnatm/msg/unistruct.h
deleted file mode 100644
index ceb1f5b5f8d4..000000000000
--- a/sys/contrib/ngatm/netnatm/msg/unistruct.h
+++ /dev/null
@@ -1,1371 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Begemot: libunimsg/netnatm/msg/unistruct.h,v 1.7 2004/07/16 18:42:22 brandt Exp $
- *
- * This file defines all structures that are used by
- * API users.
- */
-#ifndef _NETNATM_MSG_UNISTRUCT_H_
-#define _NETNATM_MSG_UNISTRUCT_H_
-
-#include <netnatm/msg/uni_config.h>
-
-/*
- * define IE and MSG header
- */
-#include <netnatm/msg/uni_hdr.h>
-
-/*
- * define all IE's
- */
-/*************************************************************************
- *
- * Free FORM IE
- */
-struct uni_ie_unrec {
-	struct uni_iehdr h;
-	uint8_t id;		/* ID of this IE */
-	u_int len;		/* data length */
-	u_char data[128];	/* arbitrary maximum length */
-};
-
-/*************************************************************************
- *
- * ATM adaptation layer parameters information element
- */
-enum {
-	UNI_AAL_SUB_ID		= 0x85,
-	UNI_AAL_CBR_ID		= 0x86,
-	UNI_AAL_MULT_ID		= 0x87,
-	UNI_AAL_SCREC_ID	= 0x88,
-	UNI_AAL_ECM_ID		= 0x89,
-	UNI_AAL_BSIZE_ID	= 0x8a,
-	UNI_AAL_PART_ID		= 0x8b,
-	UNI_AAL_FWDCPCS_ID	= 0x8c,
-	UNI_AAL_BWDCPCS_ID	= 0x81,
-	UNI_AAL_MID_ID		= 0x82,
-	UNI_AAL_SSCS_ID		= 0x84,
-};
-
-enum uni_aal {
-	UNI_AAL_0	= 0x00,	/* voice */
-	UNI_AAL_1	= 0x01,
-	UNI_AAL_2	= 0x02,
-	UNI_AAL_4	= 0x03,	/* same as AAL 3 */
-	UNI_AAL_5	= 0x05,
-	UNI_AAL_USER	= 0x10,
-};
-enum uni_aal1_subtype {
-	UNI_AAL1_SUB_NULL	= 0x00,
-	UNI_AAL1_SUB_VOICE	= 0x01,
-	UNI_AAL1_SUB_CIRCUIT	= 0x02,
-	UNI_AAL1_SUB_HQAUDIO	= 0x04,
-	UNI_AAL1_SUB_VIDEO	= 0x05,
-};
-enum uni_aal1_cbr {
-	UNI_AAL1_CBR_64		= 0x01,
-	UNI_AAL1_CBR_1544	= 0x04,
-	UNI_AAL1_CBR_6312	= 0x05,
-	UNI_AAL1_CBR_32064	= 0x06,
-	UNI_AAL1_CBR_44736	= 0x07,
-	UNI_AAL1_CBR_97728	= 0x08,
-	UNI_AAL1_CBR_2048	= 0x10,
-	UNI_AAL1_CBR_8448	= 0x11,
-	UNI_AAL1_CBR_34368	= 0x12,
-	UNI_AAL1_CBR_139264	= 0x13,
-	UNI_AAL1_CBR_N64	= 0x40,
-	UNI_AAL1_CBR_N8		= 0x41,
-};
-enum uni_aal1_screc {
-	UNI_AAL1_SCREC_NULL	= 0x00,	/* synchr. circuit transport */
-	UNI_AAL1_SCREC_SRTS	= 0x01,	/* synchr. residual timestamp */
-	UNI_AAL1_SCREC_ACLK	= 0x02,	/* adaptive clock */
-};
-enum uni_aal1_ecm {
-	UNI_AAL1_ECM_NULL	= 0x00,	/* no error correction */
-	UNI_AAL1_ECM_LOSS	= 0x01,	/* for loss sensitive signals */
-	UNI_AAL1_ECM_DELAY	= 0x02,	/* for delay sensitive signals */
-};
-enum uni_aal_sscs {
-	UNI_AAL_SSCS_NULL	= 0x00,	/* Null */
-	UNI_AAL_SSCS_SSCOPA	= 0x01,	/* assured SSCOP */
-	UNI_AAL_SSCS_SSCOPU	= 0x02,	/* unassured SSCOP */
-	UNI_AAL_SSCS_FRAME	= 0x04,	/* frame relay */
-};
-
-struct uni_ie_aal {
-	struct uni_iehdr h;
-	enum uni_aal	type;		/* aal type */
-
-	union {
-#define UNI_AAL1_MULT_P	0x01
-#define UNI_AAL1_SCREC_P	0x02
-#define UNI_AAL1_ECM_P		0x04
-#define UNI_AAL1_BSIZE_P	0x08
-#define UNI_AAL1_PART_P	0x10
-	    struct {
-		enum uni_aal1_subtype subtype;	/* AAL1 subtype */
-		enum uni_aal1_cbr cbr_rate;	/* AAL1 CBR rate */
-		u_int		mult;		/* AAL1 CBR mutliplier */
-		enum uni_aal1_screc screc;	/* AAL1 source clock recovery */
-		enum uni_aal1_ecm ecm;		/* AAL1 error correction */
-		u_int	bsize;			/* AAL1 SDT blocksize */
-		u_int	part;			/* AAL1 partial cell fill */
-	    } aal1;
-
-#define UNI_AAL4_CPCS_P	0x01
-#define UNI_AAL4_MID_P		0x02
-#define UNI_AAL4_SSCS_P	0x04
-	    struct {
-		u_int	fwd_cpcs;	/* max fwd cpcs blocksize */
-		u_int	bwd_cpcs;	/* max bkw cpcs blocksize */
-		u_int	mid_low;	/* MID low range */
-		u_int	mid_high;	/* MID high range */
-		enum uni_aal_sscs sscs;	/* sscs type */
-	     } aal4;
-
-#define UNI_AAL5_CPCS_P	0x01
-#define UNI_AAL5_SSCS_P	0x02
-	    struct {
-		u_int	fwd_cpcs;	/* max fwd cpcs blocksize */
-		u_int	bwd_cpcs;	/* max bkw cpcs blocksize */
-		enum uni_aal_sscs sscs;	/* sscs type */
-	     } aal5;
-
-	    struct {
-		u_int	len;		/* number of bytes */
-		u_char	user[4];	/* user data */
-	    } aalu;
-	} u;
-};
-
-/*************************************************************************
- *
- * Called party number information element
- * Called party subaddress information element
- * Calling party number information element
- * Calling party subaddress information element
- * Q.2951/UNI4.0 Connected number information element
- * Q.2951/UNI4.0 Connected subaddress information element
- */
-enum uni_addr_type {
-	UNI_ADDR_UNKNOWN	= 0x0,
-	UNI_ADDR_INTERNATIONAL	= 0x1,
-	UNI_ADDR_NATIONAL	= 0x2,	/* not sup */
-	UNI_ADDR_NETWORK	= 0x3,	/* not sup */
-	UNI_ADDR_SUBSCR		= 0x4,	/* not sup */
-	UNI_ADDR_ABBR		= 0x6,	/* not sup */
-};
-enum uni_addr_plan {
-	/* UNI_ADDR_UNKNOWN	= 0x0, */	/* not sup */
-	UNI_ADDR_E164		= 0x1,
-	UNI_ADDR_ATME		= 0x2,
-	UNI_ADDR_DATA		= 0x3,	/* not sup */
-	UNI_ADDR_PRIVATE	= 0x9,	/* not sup */
-};
-enum uni_subaddr_type {
-	UNI_SUBADDR_NSAP	= 0x0,
-	UNI_SUBADDR_ATME	= 0x1,
-	UNI_SUBADDR_USER	= 0x2,	/* not sup */
-};
-enum uni_addr_pres {
-	UNI_ADDR_PRES		= 0x0,
-	UNI_ADDR_RESTRICT	= 0x1,
-	UNI_ADDR_NONUMBER	= 0x2,
-};
-enum uni_addr_screen {
-	UNI_ADDR_SCREEN_NOT	= 0x0,
-	UNI_ADDR_SCREEN_PASSED	= 0x1,
-	UNI_ADDR_SCREEN_FAILED	= 0x2,
-	UNI_ADDR_SCREEN_NET	= 0x3,
-};
-
-/* don't use bitfields to get a defined structure layout */
-struct uni_addr {
-	uint8_t			type;
-	uint8_t			plan;
-	uint8_t			len;
-	u_char			addr[UNI_ADDR_MAXLEN];
-};
-struct uni_subaddr {
-	enum uni_subaddr_type	type;
-	u_int			len;
-	u_char			addr[UNI_SUBADDR_MAXLEN];
-};
-
-struct uni_ie_called {
-	struct uni_iehdr	h;
-	struct uni_addr	addr;
-};
-
-struct uni_ie_calledsub {
-	struct uni_iehdr	h;
-	struct uni_subaddr	addr;
-};
-
-struct uni_ie_calling {
-	struct uni_iehdr	h;
-#define UNI_CALLING_SCREEN_P 0x0001
-
-	struct uni_addr		addr;
-	enum uni_addr_pres	pres;
-	enum uni_addr_screen	screen;
-};
-
-struct uni_ie_callingsub {
-	struct uni_iehdr	h;
-	struct uni_subaddr	addr;
-};
-
-struct uni_ie_conned {
-	struct uni_iehdr	h;
-#define UNI_CONNED_SCREEN_P 0x0001
-
-	struct uni_addr		addr;
-	enum uni_addr_pres	pres;
-	enum uni_addr_screen	screen;
-};
-
-struct uni_ie_connedsub {
-	struct uni_iehdr	h;
-	struct uni_subaddr	addr;
-};
-
-/*************************************************************************
- *
- * Broadband bearer capability descriptor
- * On reception of an old bearer descriptor, it is automatically
- * converted to a new, legal one.
- */
-enum uni_bearer_class {
-	UNI_BEARER_A		= 0x01,
-	UNI_BEARER_C		= 0x03,
-	UNI_BEARER_X		= 0x10,
-	UNI_BEARER_TVP		= 0x30,
-};
-
-enum uni_bearer_atc {
-	UNI_BEARER_ATC_CBR	= 0x05,
-	UNI_BEARER_ATC_CBR1	= 0x07,
-	UNI_BEARER_ATC_VBR	= 0x09,
-	UNI_BEARER_ATC_VBR1	= 0x13,
-	UNI_BEARER_ATC_NVBR	= 0x0a,
-	UNI_BEARER_ATC_NVBR1	= 0x0b,
-	UNI_BEARER_ATC_ABR	= 0x0c,
-
-	UNI_BEARER_ATCX_0	= 0x00,
-	UNI_BEARER_ATCX_1	= 0x01,
-	UNI_BEARER_ATCX_2	= 0x02,
-	UNI_BEARER_ATCX_4	= 0x04,
-	UNI_BEARER_ATCX_6	= 0x06,
-	UNI_BEARER_ATCX_8	= 0x08,
-};
-
-enum uni_bearer_clip {
-	UNI_BEARER_NOCLIP	= 0x0,
-	UNI_BEARER_CLIP		= 0x1,
-};
-
-enum uni_bearer_cfg {
-	UNI_BEARER_P2P		= 0x0,
-	UNI_BEARER_MP		= 0x1,
-};
-
-struct uni_ie_bearer {
-	struct uni_iehdr	h;
-#define UNI_BEARER_ATC_P	0x02
-
-	enum uni_bearer_class	bclass;		/* bearer class */
-	enum uni_bearer_atc	atc;		/* ATM transfer capability */
-	enum uni_bearer_clip	clip;		/* suspectibility to clipping */
-	enum uni_bearer_cfg	cfg;		/* u-plane configuration */
-};
-
-/*************************************************************************
- *
- * Broadband higher layer information element
- */
-enum uni_bhli {
-	UNI_BHLI_ISO	= 0x00,	/* IDO defined */
-	UNI_BHLI_USER	= 0x01,	/* user specific */
-	UNI_BHLI_VENDOR	= 0x03,	/* vendor specific */
-};
-
-struct uni_ie_bhli {
-	struct uni_iehdr	h;
-	enum uni_bhli		type;
-	u_char			info[8];
-	u_int			len;
-};
-
-/*************************************************************************
- *
- * Boradband lower layer information element
- */
-enum {
-	UNI_BLLI_L1_ID		= 0x1,
-	UNI_BLLI_L2_ID		= 0x2,
-	UNI_BLLI_L3_ID		= 0x3,
-};
-
-enum uni_blli_l2 {
-	UNI_BLLI_L2_BASIC	= 0x01,
-	UNI_BLLI_L2_Q921	= 0x02,
-	UNI_BLLI_L2_X25LL	= 0x06,
-	UNI_BLLI_L2_X25ML	= 0x07,
-	UNI_BLLI_L2_LABP	= 0x08,
-	UNI_BLLI_L2_HDLC_ARM	= 0x09,
-	UNI_BLLI_L2_HDLC_NRM	= 0x0a,
-	UNI_BLLI_L2_HDLC_ABM	= 0x0b,
-	UNI_BLLI_L2_LAN		= 0x0c,
-	UNI_BLLI_L2_X75		= 0x0d,
-	UNI_BLLI_L2_Q922	= 0x0e,
-	UNI_BLLI_L2_USER	= 0x10,
-	UNI_BLLI_L2_ISO7776	= 0x11,
-};
-
-enum uni_blli_l2_mode {
-	UNI_BLLI_L2NORM		= 0x1,
-	UNI_BLLI_L2EXT		= 0x2,
-};
-
-enum uni_blli_l3 {
-	UNI_BLLI_L3_X25		= 0x06,
-	UNI_BLLI_L3_ISO8208	= 0x07,
-	UNI_BLLI_L3_X223	= 0x08,
-	UNI_BLLI_L3_CLMP	= 0x09,
-	UNI_BLLI_L3_T70		= 0x0a,
-	UNI_BLLI_L3_TR9577	= 0x0b,
-	UNI_BLLI_L3_H310	= 0x0c,
-	UNI_BLLI_L3_H321	= 0x0d,
-	UNI_BLLI_L3_USER	= 0x10,
-};
-
-enum uni_blli_l3_mode {
-	UNI_BLLI_L3NSEQ		= 0x1,	/* normal sequence numbering */
-	UNI_BLLI_L3ESEQ		= 0x2,	/* extended sequence numbering */
-};
-
-enum uni_blli_l3_psiz {
-	UNI_BLLI_L3_16		= 0x4,	/* 16 byte packets */
-	UNI_BLLI_L3_32		= 0x5,	/* 32 byte packets */
-	UNI_BLLI_L3_64		= 0x6,	/* 64 byte packets */
-	UNI_BLLI_L3_128		= 0x7,	/* 128 byte packets */
-	UNI_BLLI_L3_256		= 0x8,	/* 256 byte packets */
-	UNI_BLLI_L3_512		= 0x9,	/* 512 byte packets */
-	UNI_BLLI_L3_1024	= 0xa,	/* 1024 byte packets */
-	UNI_BLLI_L3_2048	= 0xb,	/* 2048 byte packets */
-	UNI_BLLI_L3_4096	= 0xc,	/* 4096 byte packets */
-};
-
-enum uni_blli_l3_ttype {
-	UNI_BLLI_L3_TTYPE_RECV	= 0x1,	/* receive only */
-	UNI_BLLI_L3_TTYPE_SEND	= 0x2,	/* send only */
-	UNI_BLLI_L3_TTYPE_BOTH	= 0x3,	/* both */
-};
-
-enum uni_blli_l3_mux {
-	UNI_BLLI_L3_MUX_NOMUX	= 0,	/* no multiplexing */
-	UNI_BLLI_L3_MUX_TS	= 1,	/* transport stream */
-	UNI_BLLI_L3_MUX_TSFEC	= 2,	/* transport stream with FEC */
-	UNI_BLLI_L3_MUX_PS	= 3,	/* program stream */
-	UNI_BLLI_L3_MUX_PSFEC	= 4,	/* program stream with FEC */
-	UNI_BLLI_L3_MUX_H221	= 5,	/* H.221 */
-};
-
-enum uni_blli_l3_tcap {
-	UNI_BLLI_L3_TCAP_NOIND	= 0,	/* no indication */
-	UNI_BLLI_L3_TCAP_AAL1	= 1,	/* only AAL1 */
-	UNI_BLLI_L3_TCAP_AAL5	= 2,	/* only AAL5 */
-	UNI_BLLI_L3_TCAP_AAL15	= 3,	/* AAL1 and AAL5 */
-};
-
-/* Value for l3_ipi: */
-enum {
-	UNI_BLLI_L3_SNAP	= 0x80,	/* IEEE 802.1 SNAP */
-};
-
-struct uni_ie_blli {
-	struct uni_iehdr	h;
-#define UNI_BLLI_L1_P		0x0001
-#define UNI_BLLI_L2_P		0x0002
-#define UNI_BLLI_L2_Q933_P	0x0004
-#define UNI_BLLI_L2_WSIZ_P	0x0008
-#define UNI_BLLI_L2_USER_P	0x0010
-#define UNI_BLLI_L3_P		0x0020
-#define UNI_BLLI_L3_MODE_P	0x0040
-#define UNI_BLLI_L3_PSIZ_P	0x0080
-#define UNI_BLLI_L3_WSIZ_P	0x0100
-#define UNI_BLLI_L3_USER_P	0x0200
-#define UNI_BLLI_L3_IPI_P	0x0400
-#define UNI_BLLI_L3_SNAP_P	0x0800
-#define UNI_BLLI_L3_TTYPE_P	0x1000
-#define UNI_BLLI_L3_MUX_P	0x2000
-
-	u_int			l1:5;		/* layer 1 info */
-
-	enum uni_blli_l2	l2;		/* layer 2 info */
-	u_int			l2_q933:2;	/* layer 2 Q.933 use */
-	enum uni_blli_l2_mode	l2_mode;	/* layer 2 HDLC mode */ 
-	u_char			l2_user;	/* layer 2 user info */
-	u_char			l2_wsiz;	/* layer 2 window size */
-
-	enum uni_blli_l3	l3;		/* layer 3 info */
-	enum uni_blli_l3_mode	l3_mode;	/* layer 3 mode */
-	enum uni_blli_l3_psiz	l3_psiz;	/* layer 3 default packet size */
-	u_char			l3_wsiz;	/* layer 3 window size */
-	u_char			l3_user;	/* layer 3 user info */
-	u_char			l3_ipi;		/* IPI byte */
-	u_int			oui;		/* OUI bytes */
-	u_int			pid;		/* PID bytes */
-	enum uni_blli_l3_ttype	l3_ttype;	/* terminal bytes */
-	enum uni_blli_l3_tcap	l3_tcap;	/* terminal capability */
-	enum uni_blli_l3_mux	l3_fmux;	/* forward muxing */
-	enum uni_blli_l3_mux	l3_bmux;	/* forward muxing */
-};
-
-/*************************************************************************
- *
- * Transit network selection IE
- */
-struct uni_ie_tns {
-	struct uni_iehdr h;
-	u_char		net[UNI_TNS_MAXLEN];
-	u_int		len;
-};
-
-/*************************************************************************
- *
- * Call state information element
- */
-enum uni_callstate {
-	UNI_CALLSTATE_U0	= 0x00,
-	UNI_CALLSTATE_N0	= 0x00,
-	UNI_CALLSTATE_NN0	= 0x00,
-
-	UNI_CALLSTATE_U1	= 0x01,
-	UNI_CALLSTATE_N1	= 0x01,
-	UNI_CALLSTATE_NN1	= 0x01,
-
-	UNI_CALLSTATE_U3	= 0x03,
-	UNI_CALLSTATE_N3	= 0x03,
-	UNI_CALLSTATE_NN3	= 0x03,
-
-	UNI_CALLSTATE_U4	= 0x04,
-	UNI_CALLSTATE_N4	= 0x04,
-	UNI_CALLSTATE_NN4	= 0x04,
-
-	UNI_CALLSTATE_U6	= 0x06,
-	UNI_CALLSTATE_N6	= 0x06,
-	UNI_CALLSTATE_NN6	= 0x06,
-
-	UNI_CALLSTATE_U7	= 0x07,
-	UNI_CALLSTATE_N7	= 0x07,
-	UNI_CALLSTATE_NN7	= 0x07,
-
-	UNI_CALLSTATE_U8	= 0x08,
-	UNI_CALLSTATE_N8	= 0x08,
-
-	UNI_CALLSTATE_U9	= 0x09,
-	UNI_CALLSTATE_N9	= 0x09,
-	UNI_CALLSTATE_NN9	= 0x09,
-
-	UNI_CALLSTATE_U10	= 0x0a,
-	UNI_CALLSTATE_N10	= 0x0a,
-	UNI_CALLSTATE_NN10	= 0x0a,
-
-	UNI_CALLSTATE_U11	= 0x0b,
-	UNI_CALLSTATE_N11	= 0x0b,
-	UNI_CALLSTATE_NN11	= 0x0b,
-
-	UNI_CALLSTATE_U12	= 0x0c,
-	UNI_CALLSTATE_N12	= 0x0c,
-	UNI_CALLSTATE_NN12	= 0x0c,
-
-	UNI_CALLSTATE_REST0	= 0x00,
-	UNI_CALLSTATE_REST1	= 0x3d,
-	UNI_CALLSTATE_REST2	= 0x3e,
-
-	UNI_CALLSTATE_U13	= 0x0d,
-	UNI_CALLSTATE_N13	= 0x0d,
-
-	UNI_CALLSTATE_U14	= 0x0e,
-	UNI_CALLSTATE_N14	= 0x0e,
-};
-
-struct uni_ie_callstate {
-	struct uni_iehdr	h;
-	enum uni_callstate	state;
-};
-
-/*************************************************************************
- *
- * Cause information element
- */
-enum uni_cause_loc {
-	UNI_CAUSE_LOC_USER	= 0x0,
-	UNI_CAUSE_LOC_PRIVLOC	= 0x1,
-	UNI_CAUSE_LOC_PUBLOC	= 0x2,
-	UNI_CAUSE_LOC_TRANSIT	= 0x3,
-	UNI_CAUSE_LOC_PUBREM	= 0x4,
-	UNI_CAUSE_LOC_PRIVREM	= 0x5,
-	UNI_CAUSE_LOC_INTERNAT	= 0x6,
-	UNI_CAUSE_LOC_BEYOND	= 0x7,
-};
-
-#define UNI_DECLARE_CAUSE_VALUES \
-D(UNALL_NUM,	0x01 /*  1*/, COND,	Q.850,	"Unallocated (unassigned) number") \
-D(NOROUTE_NET,	0x02 /*  2*/, TNS,	Q.850,	"No route to specified transit network") \
-D(NOROUTE,	0x03 /*  3*/, COND,	Q.850,	"No route to destination") \
-D(SPTONE,	0x04 /*  4*/, NONE,	Q.850,	"Send special information tone") \
-D(BADTRUNK,	0x05 /*  5*/, NONE,	Q.850,	"Misdialled trunk prefix") \
-D(BADCHAN,	0x06 /*  6*/, NONE,	Q.850,	"Channel unacceptable") \
-D(CALLAWARDED,	0x07 /*  7*/, NONE,	Q.850,	"Call awarded and being delivered in an established channel") \
-D(PREEMPT,	0x08 /*  8*/, NONE,	Q.850,	"Preemption") \
-D(PREEMPT_RES,	0x09 /*  9*/, NONE,	Q.850,	"Preemption - circuit reserved for reuse") \
-D(CLEARING,	0x10 /* 16*/, COND,	Q.850,	"Normal call clearing") \
-D(BUSY,		0x11 /* 17*/, CCBS,	Q.850,	"User busy") \
-D(NO_RESPONSE,	0x12 /* 18*/, NONE,	Q.850,	"No user responding") \
-D(NO_RESP_ALERT,0x13 /* 19*/, NONE,	Q.850,	"No answer from user (user alerted)") \
-D(ABSENT,	0x14 /* 20*/, NONE,	Q.850,	"Subscriber absent") \
-D(REJECTED,	0x15 /* 21*/, REJ,	Q.850,	"Call rejected") \
-D(NUMCHG,	0x16 /* 22*/, NUMBER,	Q.850,	"Number changed") \
-D(REDIR,	0x17 /* 23*/, NONE,	Q.850,	"Redirection to new destination") \
-N(CLIR_REJECTED,0x17 /* 23*/, NONE,	UNI4.0,	"User rejects call with calling line identification restriction (CLIR)") \
-D(EXCHG_ERR,	0x19 /* 25*/, NONE,	Q.850,	"Exchange routing error") \
-D(NOSEL_CLEAR,	0x1a /* 26*/, NONE,	Q.850,	"Non-selected user clearing") \
-D(DST_OOO,	0x1b /* 27*/, NONE,	Q.850,	"Destination out of order") \
-D(INV_ADDR,	0x1c /* 28*/, NONE,	Q.850,	"Invalid number format (address incomplete)") \
-D(FAC_REJ,	0x1d /* 29*/, FAC,	Q.850,	"Facility rejected") \
-D(STATUS,	0x1e /* 30*/, NONE,	Q.850,	"Response to STATUS ENQUIRY") \
-D(UNSPEC,	0x1f /* 31*/, NONE,	Q.850,	"Normal, unspecified") \
-D(TMY_PARTY,	0x20 /* 32*/, NONE,	Q.2971,	"Too many pending add party requests") \
-D(NOCHAN,	0x22 /* 34*/, CCBS,	Q.850,	"No circuit/channel available") \
-N(SOFT_NAVL,	0x22 /* 34*/, NONE,	PNNI1.0,"Requested called party soft PVPC or PVCC not available")\
-D(VPCI_NAVL,	0x23 /* 35*/, NONE,	Q.2610,	"Requested VPCI/VCI not available") \
-D(VPCI_FAIL,	0x24 /* 36*/, NONE,	Q.2610,	"VPCI/VPI assignment failure") \
-D(CRATE_NAVL,	0x25 /* 37*/, CRATE,	Q.2610,	"User cell rate not available") \
-D(NET_OOO,	0x26 /* 38*/, NONE,	Q.850,	"Network out of order") \
-D(FRAME_OOS,	0x27 /* 39*/, NONE,	Q.850,	"Permanent frame mode connection out of service") \
-D(FRAME_OP,	0x28 /* 40*/, NONE,	Q.850,	"Permanent frame mode connection operational") \
-D(TEMP,		0x29 /* 41*/, NONE,	Q.850,	"Temporary failure") \
-D(CONG,		0x2a /* 42*/, NONE,	Q.850,	"Switching equipment congestion") \
-D(ACC_DISC,	0x2b /* 43*/, IE,	Q.850,	"Access information discarded") \
-D(REQNOCHAN,	0x2c /* 44*/, NONE,	Q.850,	"Requested circuit/channel not available") \
-D(NOVPCI,	0x2d /* 45*/, NONE,	Q.2610,	"No VPCI/VCI available") \
-D(PREC_BLOCK,	0x2e /* 46*/, NONE,	Q.850,	"Precedence call blocked") \
-D(RESRC_NAVL,	0x2f /* 47*/, NONE,	Q.850,	"Resource unavailable, unspecified") \
-D(QOS_NAVL,	0x31 /* 49*/, COND,	Q.850,	"Quality of service not available") \
-D(FAC_NOTSUB,	0x32 /* 50*/, FAC,	Q.850,	"Requested facility not subscribed") \
-D(OUT_CUG,	0x35 /* 53*/, NONE,	Q.850,	"Outgoing calls barred within CUG") \
-N(PGL_CHG,	0x35 /* 53*/, NONE,	PNNI1.0,"Call cleared due to change in PGL") \
-D(IN_CUG,	0x37 /* 55*/, NONE,	Q.850,	"Incoming call barred within CUG") \
-D(BEARER_NAUTH,	0x39 /* 57*/, ATTR,	Q.850,	"Bearer capability not authorized") \
-D(BEARER_NAVL,	0x3a /* 58*/, ATTR,	Q.850,	"Bearer capability not presently available") \
-D(INCONS,	0x3e /* 62*/, NONE,	Q.850,	"Inconsistency in designated outgoing access information and subscriber class") \
-D(OPT_NAVL,	0x3f /* 63*/, NONE,	Q.850,	"Service or option not available, unspecified") \
-D(BEARER_NIMPL,	0x41 /* 65*/, ATTR,	Q.850,	"Bearer capability not implemented") \
-D(CHANNEL_NIMPL,0x42 /* 66*/, CHANNEL,	Q.850,	"Channel type not implemented") \
-D(FAC_NIMPL,	0x45 /* 69*/, FAC,	Q.850,	"Requested facility not implemented") \
-D(RESTR_DIG,	0x46 /* 70*/, NONE,	Q.850,	"Only restricted digital information bearer capability is available") \
-D(TRAFFIC_UNSUP,0x49 /* 73*/, NONE,	Q.2971,	"Unsupported combination of traffic parameters") \
-N(AAL_UNSUP,	0x4c /* 78*/, NONE,	UNI3.1,	"AAL parameters cannot be supported") \
-D(CREF_INV,	0x51 /* 81*/, NONE,	Q.850,	"Invalid call reference value") \
-D(CHANNEL_NEX,	0x52 /* 82*/, CHANID,	Q.850,	"Identified channel does not exist") \
-D(SUSPENDED,	0x53 /* 83*/, NONE,	Q.850,	"A suspended call exists, but this call identity does not") \
-D(CID_INUSE,	0x54 /* 84*/, NONE,	Q.850,	"Call identity in use") \
-D(NOTSUSP,	0x55 /* 85*/, NONE,	Q.850,	"No call suspended") \
-D(CLEARED,	0x56 /* 86*/, CAUSE,	Q.850,	"Call having requested call identity has been cleared") \
-D(NOT_MEMBER,	0x57 /* 87*/, NONE,	Q.850,	"User not member of CUG") \
-D(INCOMP,	0x58 /* 88*/, PARAM,	Q.850,	"Incompatible destination") \
-D(ENDP_INV,	0x59 /* 89*/, IE,	UNI3.1,	"Invalid endpoint reference") \
-D(NEX_CUG,	0x5a /* 90*/, NONE,	Q.850,	"Non-existend CUG") \
-D(TRANSIT_INV,	0x5b /* 91*/, NONE,	Q.850,	"Invalid transit network selection") \
-D(AALNOTSUPP,	0x5d /* 93*/, NONE,	Q.2610,	"AAL parameters cannot be supported") \
-D(INVMSG,	0x5f /* 95*/, NONE,	Q.850,	"Invalid message, unspecified") \
-D(MANDAT,	0x60 /* 96*/, IE,	Q.850,	"Mandatory information element is missing") \
-D(MTYPE_NIMPL,	0x61 /* 97*/, MTYPE,	Q.850,	"Message type non-existent or not implemented") \
-D(MSG_NOTCOMP,	0x62 /* 98*/, MTYPE,	Q.850,	"Message not compatible with call state or message type non-existent or not implemented") \
-D(IE_NIMPL,	0x63 /* 99*/, IE,	Q.850,	"Information element/parameter non-existent or not implemented") \
-D(IE_INV,	0x64 /*100*/, IE,	Q.850,	"Invalid information element contents") \
-D(MSG_INCOMP,	0x65 /*101*/, MTYPE,	Q.850,	"Message not compatible with call state") \
-D(RECOVER,	0x66 /*102*/, TIMER,	Q.850,	"Recovery on timer expiry") \
-D(PARAM_NEX,	0x67 /*103*/, PARAM,	Q.850,	"Parameter non-existent or not implemented, passed on") \
-N(BAD_LENGTH,	0x68 /*104*/, NONE,	UNI3.1,	"Incorrect message length") \
-D(PARAM_UNREC,	0x6e /*110*/, PARAM,	Q.850,	"Message with unrecognized parameter, discarded") \
-D(PROTO,	0x6f /*111*/, NONE,	Q.850,	"Protocol error, unspecified") \
-D(INTERWORKING,	0x7f /*127*/, NONE,	Q.850,	"Interworking, unspecified")
-
-#define D(NAME,VAL,DIAG,STD,STR) UNI_CAUSE_##NAME = VAL,
-#define N(NAME,VAL,DIAG,STD,STR) UNI_CAUSE_##NAME = VAL,
-
-enum uni_cause {
-UNI_DECLARE_CAUSE_VALUES
-};
-
-#undef D
-#undef N
-
-enum uni_cause_class {
-	UNI_CAUSE_CLASS_NORM	= 0x0,
-	UNI_CAUSE_CLASS_NORM1	= 0x1,
-	UNI_CAUSE_CLASS_RES	= 0x2,
-	UNI_CAUSE_CLASS_NAVL	= 0x3,
-	UNI_CAUSE_CLASS_NIMPL	= 0x4,
-	UNI_CAUSE_CLASS_INV	= 0x5,
-	UNI_CAUSE_CLASS_PROTO	= 0x6,
-	UNI_CAUSE_CLASS_INTER	= 0x7,
-};
-enum uni_cause_pu {
-	UNI_CAUSE_PU_PROVIDER	= 0,
-	UNI_CAUSE_PU_USER	= 1,
-};
-enum uni_cause_na {
-	UNI_CAUSE_NA_NORMAL	= 0,
-	UNI_CAUSE_NA_ABNORMAL	= 1,
-};
-enum uni_cause_cond {
-	UNI_CAUSE_COND_UNKNOWN	= 0,
-	UNI_CAUSE_COND_PERM	= 1,
-	UNI_CAUSE_COND_TRANS	= 2,
-};
-enum uni_cause_reason {
-	UNI_CAUSE_REASON_USER	= 0x00,
-	UNI_CAUSE_REASON_IEMISS	= 0x01,
-	UNI_CAUSE_REASON_IESUFF	= 0x02,
-};
-
-enum uni_diag {
-	UNI_DIAG_NONE,		/* no diagnostics */
-
-	UNI_DIAG_COND,		/* Condition */
-	UNI_DIAG_TNS,		/* Transit Network Selector */
-	UNI_DIAG_REJ,		/* Call Rejected */
-	UNI_DIAG_NUMBER,	/* New Destination */
-	UNI_DIAG_CRATE,		/* Traffic descriptor subfield */
-	UNI_DIAG_ATTR,		/* Attribute idendity */
-	UNI_DIAG_PARAM,		/* Parameter, same as one IE */
-	UNI_DIAG_TIMER,		/* timer in ASCII */
-	UNI_DIAG_MTYPE,		/* Message type */
-	UNI_DIAG_IE,		/* Information element */
-	UNI_DIAG_CHANID,	/* VPCI/VCI */
-
-	UNI_DIAG_CAUSE = UNI_DIAG_NONE,		/* Not specified */
-	UNI_DIAG_CHANNEL = UNI_DIAG_NONE,	/* For N-ISDN */
-	UNI_DIAG_CCBS = UNI_DIAG_NONE,		/* Not used in Q.931 */
-	UNI_DIAG_FAC = UNI_DIAG_NONE,		/* Not specified */
-};
-
-enum {
-	UNI_CAUSE_TRAFFIC_N	= 34-6,
-	UNI_CAUSE_IE_N		= 34-6,
-	UNI_CAUSE_ATTR_N	= (34-6)/3,
-};
-
-struct uni_ie_cause {
-	struct uni_iehdr	h;
-#define UNI_CAUSE_COND_P	0x0001
-#define UNI_CAUSE_REJ_P		0x0002
-#define UNI_CAUSE_REJ_USER_P	0x0004
-#define UNI_CAUSE_REJ_IE_P	0x0008
-#define UNI_CAUSE_IE_P		0x0010
-#define UNI_CAUSE_TRAFFIC_P	0x0020
-#define UNI_CAUSE_VPCI_P	0x0040
-#define UNI_CAUSE_MTYPE_P	0x0080
-#define UNI_CAUSE_TIMER_P	0x0100
-#define UNI_CAUSE_TNS_P		0x0200
-#define UNI_CAUSE_NUMBER_P	0x0400
-#define UNI_CAUSE_ATTR_P	0x0800
-#define UNI_CAUSE_PARAM_P	0x1000
-
-	enum uni_cause_loc	loc;
-	enum uni_cause		cause;
-
-	union {
-	    struct {
-		enum uni_cause_pu	pu;
-		enum uni_cause_na	na;
-		enum uni_cause_cond	cond;
-	    } cond;
-	    struct {
-		enum uni_cause_reason	reason;
-		enum uni_cause_cond	cond;
-		u_int			user;
-		uint8_t			ie;
-	    } rej;
-	    struct {
-		uint8_t			ie[UNI_CAUSE_IE_N];
-		u_int			len;
-	    } ie;
-	    struct {
-		uint8_t			traffic[UNI_CAUSE_TRAFFIC_N];
-		u_int			len;
-	    } traffic;
-	    struct {
-		uint16_t		vpci;
-		uint16_t		vci;
-	    } vpci;
-	    uint8_t			mtype;
-	    u_char			timer[3];
-	    struct uni_ie_tns		tns;
-	    struct uni_ie_called	number;		/* TNS does not fit */
-	    uint8_t			param;
-	    struct {
-		u_int			nattr;
-	        u_char			attr[UNI_CAUSE_ATTR_N][3];
-	    }				attr;
-	} u;
-};
-enum uni_diag uni_diag(enum uni_cause, enum uni_coding);
-
-/* return a string for the cause (NULL if the coding/cause are illegal) */
-const char *uni_ie_cause2str(enum uni_coding, u_int);
-
-/*************************************************************************
- *
- * Connection identifier information element
- */
-enum uni_connid_type {
-	UNI_CONNID_VCI		= 0,
-	UNI_CONNID_ANYVCI	= 1,
-	UNI_CONNID_NOVCI	= 4,
-};
-enum uni_connid_assoc {
-	UNI_CONNID_ASSOC	= 0,
-	UNI_CONNID_NONASSOC	= 1,
-};
-struct uni_ie_connid {
-	struct uni_iehdr	h;
-	enum uni_connid_assoc	assoc;
-	enum uni_connid_type	type;
-	u_int			vpci : 16;
-	u_int			vci : 16;
-};
-
-/*************************************************************************
- *
- * End point reference IE
- */
-struct uni_ie_epref {
-	struct uni_iehdr	h;
-	u_int			flag : 1;
-	u_int			epref : 15;
-};
-
-/*************************************************************************
- *
- * End point state IE
- */
-enum uni_epstate {
-	UNI_EPSTATE_NULL	= 0x00,
-	UNI_EPSTATE_ADD_INIT	= 0x01,
-	UNI_EPSTATE_ALERT_DLVD	= 0x04,
-	UNI_EPSTATE_ADD_RCVD	= 0x06,
-	UNI_EPSTATE_ALERT_RCVD	= 0x07,
-	UNI_EPSTATE_ACTIVE	= 0x0a,
-	UNI_EPSTATE_DROP_INIT	= 0x0b,
-	UNI_EPSTATE_DROP_RCVD	= 0x0c,
-};
-
-struct uni_ie_epstate {
-	struct uni_iehdr h;
-	enum uni_epstate state;
-};
-
-/*************************************************************************
- *
- * Q.2932 Facility IE
- */
-enum {
-	UNI_FACILITY_ROSE	= 0x11,
-
-	UNI_FACILITY_MAXAPDU	= 128,
-};
-
-struct uni_ie_facility {
-	struct uni_iehdr h;
-
-	u_char		proto;
-	u_char		apdu[UNI_FACILITY_MAXAPDU];
-	u_int		len;
-};
-
-/*************************************************************************
- *
- * Notification indicator
- */
-enum {
-	UNI_NOTIFY_MAXLEN	= 128,	/* maximum info length */
-};
-struct uni_ie_notify {
-	struct uni_iehdr h;
-	u_int		len;
-	u_char		notify[UNI_NOTIFY_MAXLEN];
-};
-
-/*************************************************************************
- *
- * QoS information element
- */
-enum uni_qos {
-	UNI_QOS_CLASS0	= 0x00,
-	UNI_QOS_CLASS1	= 0x01,
-	UNI_QOS_CLASS2	= 0x02,
-	UNI_QOS_CLASS3	= 0x03,
-	UNI_QOS_CLASS4	= 0x04,
-};
-
-struct uni_ie_qos {
-	struct uni_iehdr h;
-	enum uni_qos	fwd;
-	enum uni_qos	bwd;
-};
-
-/*************************************************************************
- *
- * Broadband repeat indicator information element
- */
-enum uni_repeat_type {
-	UNI_REPEAT_PRIDESC	= 0x02,
-	UNI_REPEAT_STACK	= 0x0a,		/* PNNI */
-};
-
-struct uni_ie_repeat {
-	struct uni_iehdr h;
-	enum uni_repeat_type type;
-};
-
-/*************************************************************************
- *
- * Restart indicator information element
- */
-enum uni_restart_type {
-	UNI_RESTART_CHANNEL	= 0x0,
-	UNI_RESTART_PATH	= 0x1,
-	UNI_RESTART_ALL		= 0x2,
-};
-
-struct uni_ie_restart {
-	struct uni_iehdr h;
-	enum uni_restart_type rclass;
-};
-
-/*************************************************************************
- *
- * Broadband sending complete indicator information element
- */
-struct uni_ie_scompl {
-	struct uni_iehdr h;
-};
-
-/*************************************************************************
- *
- * ATM traffic descriptor information element
- */
-enum {
-	UNI_TRAFFIC_FMDCR_ID	= 0x00,
-	UNI_TRAFFIC_BMDCR_ID	= 0x02,
-	UNI_TRAFFIC_FPCR0_ID	= 0x82,
-	UNI_TRAFFIC_BPCR0_ID	= 0x83,
-	UNI_TRAFFIC_FPCR1_ID	= 0x84,
-	UNI_TRAFFIC_BPCR1_ID	= 0x85,
-	UNI_TRAFFIC_FSCR0_ID	= 0x88,
-	UNI_TRAFFIC_BSCR0_ID	= 0x89,
-	UNI_TRAFFIC_FSCR1_ID	= 0x90,
-	UNI_TRAFFIC_BSCR1_ID	= 0x91,
-	UNI_TRAFFIC_FABR1_ID	= 0x92,
-	UNI_TRAFFIC_BABR1_ID	= 0x93,
-	UNI_TRAFFIC_FMBS0_ID	= 0xa0,
-	UNI_TRAFFIC_BMBS0_ID	= 0xa1,
-	UNI_TRAFFIC_FMBS1_ID	= 0xb0,
-	UNI_TRAFFIC_BMBS1_ID	= 0xb1,
-	UNI_TRAFFIC_BEST_ID	= 0xbe,
-	UNI_TRAFFIC_MOPT_ID	= 0xbf,
-
-	UNI_TRAFFIC_FTAG	= 0x01,
-	UNI_TRAFFIC_BTAG	= 0x02,
-	UNI_TRAFFIC_FDISC	= 0x80,
-	UNI_TRAFFIC_BDISC	= 0x40,
-
-	UNI_MINTRAFFIC_FPCR0_ID	= 0x82,
-	UNI_MINTRAFFIC_BPCR0_ID	= 0x83,
-	UNI_MINTRAFFIC_FPCR1_ID	= 0x84,
-	UNI_MINTRAFFIC_BPCR1_ID	= 0x85,
-	UNI_MINTRAFFIC_FABR1_ID	= 0x92,
-	UNI_MINTRAFFIC_BABR1_ID	= 0x93,
-
-	UNI_MDCR_ORIGIN_USER	= 0x00,
-	UNI_MDCR_ORIGIN_NET	= 0x01,
-};
-
-#define UNI_TRAFFIC_FPCR0_P	0x0001
-#define UNI_TRAFFIC_BPCR0_P	0x0002
-#define UNI_TRAFFIC_FPCR1_P	0x0004
-#define UNI_TRAFFIC_BPCR1_P	0x0008
-#define UNI_TRAFFIC_FSCR0_P	0x0010
-#define UNI_TRAFFIC_BSCR0_P	0x0020
-#define UNI_TRAFFIC_FSCR1_P	0x0040
-#define UNI_TRAFFIC_BSCR1_P	0x0080
-#define UNI_TRAFFIC_FMBS0_P	0x0100
-#define UNI_TRAFFIC_BMBS0_P	0x0200
-#define UNI_TRAFFIC_FMBS1_P	0x0400
-#define UNI_TRAFFIC_BMBS1_P	0x0800
-#define UNI_TRAFFIC_BEST_P	0x1000
-#define UNI_TRAFFIC_MOPT_P	0x2000
-#define UNI_TRAFFIC_FABR1_P	0x4000
-#define UNI_TRAFFIC_BABR1_P	0x8000
-struct uni_xtraffic {
-	u_int	fpcr0, bpcr0;
-	u_int	fpcr1, bpcr1;
-	u_int	fscr0, bscr0;
-	u_int	fscr1, bscr1;
-	u_int	fmbs0, bmbs0;
-	u_int	fmbs1, bmbs1;
-	u_int	fabr1, babr1;
-	u_int	ftag, btag;
-	u_int	fdisc, bdisc;
-};
-
-struct uni_ie_traffic {
-	struct uni_iehdr h;
-	struct uni_xtraffic t;
-};
-struct uni_ie_atraffic {
-	struct uni_iehdr h;
-	struct uni_xtraffic t;
-};
-
-/*
- * Q.2961 minimum traffic descriptor
- */
-struct uni_ie_mintraffic {
-	struct uni_iehdr h;
-#define UNI_MINTRAFFIC_FPCR0_P	0x0001
-#define UNI_MINTRAFFIC_BPCR0_P	0x0002
-#define UNI_MINTRAFFIC_FPCR1_P	0x0004
-#define UNI_MINTRAFFIC_BPCR1_P	0x0008
-#define UNI_MINTRAFFIC_FABR1_P	0x0010
-#define UNI_MINTRAFFIC_BABR1_P	0x0020
-
-	u_int	fpcr0, bpcr0;
-	u_int	fpcr1, bpcr1;
-	u_int	fabr1, babr1;
-};
-
-/*
- * UNI4.0+ (af-cs-0147.000) Minimum Desired Cell Rate
- */
-struct uni_ie_mdcr {
-	struct uni_iehdr h;
-	u_int	origin;
-	u_int	fmdcr, bmdcr;
-};
-
-/*************************************************************************
- *
- * User-user information information element
- */
-struct uni_ie_uu {
-	struct uni_iehdr h;
-	u_int		len;
-	u_char		uu[UNI_UU_MAXLEN];
-};
-
-/*************************************************************************
- *
- * Generic identifier transport
- */
-enum uni_git_std {
-	UNI_GIT_STD_DSMCC	= 0x01,	/* DSM-CC */
-	UNI_GIT_STD_H245	= 0x02,	/* H.245 */
-};
-enum uni_git_type {
-	UNI_GIT_TYPE_SESS	= 0x01,	/* session id */
-	UNI_GIT_TYPE_RES	= 0x02,	/* resource id */
-};
-
-enum {
-	UNI_GIT_MAXSESS		= 20,	/* max session value length */
-	UNI_GIT_MAXRES		= 4,	/* max resource value length */
-
-	UNI_GIT_MAXVAL		= 20,	/* the maximum of the above */
-	UNI_GIT_MAXSUB		= 2,	/* maximum number of og. 6 */
-};
-
-struct uni_ie_git {
-	struct uni_iehdr	h;
-
-	enum uni_git_std	std;	/* identifier related standard/application */
-	u_int			numsub;
-	struct {
-		enum uni_git_type type;	
-		u_int		len;
-		u_char		val[UNI_GIT_MAXVAL];
-	}			sub[UNI_GIT_MAXSUB];
-};
-
-/*************************************************************************
- *
- * End-to-end transit delay
- */
-enum {
-	UNI_EETD_CTD_ID		= 0x01,	/* cumulative transit delay */
-	UNI_EETD_MTD_ID		= 0x03,	/* maximum transit delay */
-	UNI_EETD_NET_ID		= 0x0a,	/* network generated */
-	UNI_EETD_PMTD_ID	= 0x0b,	/* PNNI acceptable forward maximum ctd */
-	UNI_EETD_PCTD_ID	= 0x11,	/* PNNI cumulative forward maximum ctd */
-
-	UNI_EETD_ANYMAX		= 0xffff,
-	UNI_EETD_MAXVAL		= 0xffff,	/* maximum value */
-};
-
-struct uni_ie_eetd {
-	struct uni_iehdr	h;
-#define UNI_EETD_CUM_P		0x0001
-#define UNI_EETD_MAX_P		0x0002
-#define UNI_EETD_NET_P		0x0004	/* UNI4.0 9.1.2.1 */
-#define UNI_EETD_PMTD_P		0x0008	/* PNNI1.0 6.4.5.24 */
-#define UNI_EETD_PCTD_P		0x0010	/* PNNI1.0 6.4.5.24 */
-
-	u_int	cumulative;
-	u_int	maximum;
-	u_int	pmtd;
-	u_int	pctd;
-};
-
-/*************************************************************************
- * 
- * Leaf-initiated-join call identifier
- */
-enum uni_lij_idtype {
-	UNI_LIJ_IDTYPE_ROOT	= 0x0,	/* root created */
-};
-
-struct uni_ie_lij_callid {
-	struct uni_iehdr	h;
-
-	enum uni_lij_idtype	type;
-	u_int			callid;
-};
-
-/*
- * LIJ parameters
- */
-enum uni_lij_screen {
-	UNI_LIJ_SCREEN_NETJOIN	= 0x0,	/* without root notification */
-};
-
-struct uni_ie_lij_param {
-	struct uni_iehdr	h;
-
-	enum uni_lij_screen	screen;
-};
-
-/*
- * LIJ sequence number
- */
-struct uni_ie_lij_seqno {
-	struct uni_iehdr	h;
-
-	u_int			seqno;
-};
-
-/*************************************************************************
- *
- * Locking/Non-locking shift not supported
- */
-struct uni_ie_lshift {
-	struct uni_iehdr h;
-	u_int		set:3;
-};
-
-struct uni_ie_nlshift {
-	struct uni_iehdr h;
-	u_int		set:3;
-};
-
-/*************************************************************************
- *
- * Externded QoS information element
- */
-enum {
-	UNI_EXQOS_FACC_ID	= 0x94,
-	UNI_EXQOS_BACC_ID	= 0x95,
-	UNI_EXQOS_FCUM_ID	= 0x96,
-	UNI_EXQOS_BCUM_ID	= 0x97,
-	UNI_EXQOS_FCLR_ID	= 0xa2,
-	UNI_EXQOS_BCLR_ID	= 0xa3,
-};
-
-enum uni_exqos_origin {
-	UNI_EXQOS_USER	= 0,
-	UNI_EXQOS_NET	= 1,
-};
-
-enum {
-	UNI_EXQOS_ANY_CDV	= 0xffffff,
-	UNI_EXQOS_ANY_CLR	= 0xff,
-};
-
-struct uni_ie_exqos {
-	struct uni_iehdr	h;
-#define UNI_EXQOS_FACC_P	0x0001
-#define UNI_EXQOS_BACC_P	0x0002
-#define UNI_EXQOS_FCUM_P	0x0004
-#define UNI_EXQOS_BCUM_P	0x0008
-#define UNI_EXQOS_FCLR_P	0x0010
-#define UNI_EXQOS_BCLR_P	0x0020
-
-	enum uni_exqos_origin	origin;
-	u_int			facc;
-	u_int			bacc;
-	u_int			fcum;
-	u_int			bcum;
-	u_int			fclr;
-	u_int			bclr;
-};
-
-/*************************************************************************
- *
- * Additional ABR parameters
- * ABR setup parameters
- */
-enum {
-	UNI_ABRADD_FADD_ID	= 0xc2,
-	UNI_ABRADD_BADD_ID	= 0xc3,
-	UNI_ABRSETUP_FICR_ID	= 0xc2,
-	UNI_ABRSETUP_BICR_ID	= 0xc3,
-	UNI_ABRSETUP_FTBE_ID	= 0xc4,
-	UNI_ABRSETUP_BTBE_ID	= 0xc5,
-	UNI_ABRSETUP_RMFRT_ID	= 0xc6,
-	UNI_ABRSETUP_FRIF_ID	= 0xc8,
-	UNI_ABRSETUP_BRIF_ID	= 0xc9,
-	UNI_ABRSETUP_FRDF_ID	= 0xca,
-	UNI_ABRSETUP_BRDF_ID	= 0xcb,
-};
-
-struct uni_abr_rec {
-	u_int			present;
-#define UNI_ABR_REC_NRM_P	0x80000000
-#define UNI_ABR_REC_TRM_P	0x40000000
-#define UNI_ABR_REC_CDF_P	0x20000000
-#define UNI_ABR_REC_ADTF_P	0x10000000
-	u_int		nrm:3;
-	u_int		trm:3;
-	u_int		cdf:3;
-	u_int		adtf:10;
-};
-
-struct uni_ie_abradd {
-	struct uni_iehdr	h;
-	struct uni_abr_rec	fwd, bwd;
-};
-
-struct uni_ie_abrsetup {
-	struct uni_iehdr	h;
-#define UNI_ABRSETUP_FICR_P	0x0001
-#define UNI_ABRSETUP_BICR_P	0x0002
-#define UNI_ABRSETUP_FTBE_P	0x0004
-#define UNI_ABRSETUP_BTBE_P	0x0008
-#define UNI_ABRSETUP_FRIF_P	0x0010
-#define UNI_ABRSETUP_BRIF_P	0x0020
-#define UNI_ABRSETUP_FRDF_P	0x0040
-#define UNI_ABRSETUP_BRDF_P	0x0080
-#define UNI_ABRSETUP_RMFRT_P	0x0100
-
-	u_int		ficr, bicr;
-	u_int		ftbe, btbe;
-	u_int		rmfrt;
-	u_int		frif, brif;
-	u_int		frdf, brdf;
-};
-
-/*************************************************************************
- *
- * Connection scope information element
- */
-enum uni_cscope {
-	UNI_CSCOPE_ORG	= 0x01,
-};
-
-enum {
-	UNI_CSCOPE_ORG_LOC	= 0x01,
-	UNI_CSCOPE_ORG_LOC_P1	= 0x02,
-	UNI_CSCOPE_ORG_LOC_P2	= 0x03,
-	UNI_CSCOPE_ORG_SITE_M1	= 0x04,
-	UNI_CSCOPE_ORG_SITE	= 0x05,
-	UNI_CSCOPE_ORG_SITE_P1	= 0x06,
-	UNI_CSCOPE_ORG_ORG_M1	= 0x07,
-	UNI_CSCOPE_ORG_ORG	= 0x08,
-	UNI_CSCOPE_ORG_ORG_P1	= 0x09,
-	UNI_CSCOPE_ORG_COMM_M1	= 0x0a,
-	UNI_CSCOPE_ORG_COMM	= 0x0b,
-	UNI_CSCOPE_ORG_COMM_P1	= 0x0c,
-	UNI_CSCOPE_ORG_REG	= 0x0d,
-	UNI_CSCOPE_ORG_INTER	= 0x0e,
-	UNI_CSCOPE_ORG_GLOBAL	= 0x0f,
-};
-
-struct uni_ie_cscope {
-	struct uni_iehdr	h;
-	enum uni_cscope		type;
-	u_int			scope:8;
-};
-
-/*************************************************************************
- *
- * Connection scope information element
- */
-enum uni_report {
-	UNI_REPORT_MODCONF	= 0x01,
-	UNI_REPORT_CLOCK	= 0x02,
-	UNI_REPORT_EEAVAIL	= 0x04,
-	UNI_REPORT_EEREQ	= 0x05,
-	UNI_REPORT_EECOMPL	= 0x06,
-};
-
-struct uni_ie_report {
-	struct uni_iehdr h;
-	enum uni_report	report;
-};
-
-/*************************************************************************
- *
- * PNNI Designated transit list information element
- */
-enum {
-	UNI_DTL_LOGNP	= 0x01,
-	UNI_DTL_LOGNP_SIZE = 27,
-};
-
-struct uni_ie_dtl {
-	struct uni_iehdr	h;
-	u_int			ptr:16;
-	u_int			num;
-	struct {
-	  u_char		node_level;
-	  u_char		node_id[21];
-	  u_int			port_id;
-	}			dtl[UNI_DTL_MAXNUM];
-};
-
-/*************************************************************************
- *
- * PNNI Crankback information element
- */
-enum uni_crankback {
-	UNI_CRANKBACK_IF	= 0x02,
-	UNI_CRANKBACK_NODE	= 0x03,
-	UNI_CRANKBACK_LINK	= 0x04,
-};
-
-enum {
-	UNI_CAUSE_NXNODE_UNREACH = 128,
-	UNI_CAUSE_DTL_NOT_MY_ID	= 160,
-};
-
-struct uni_ie_crankback {
-	struct uni_iehdr	h;
-#define UNI_CRANKBACK_TOP_P	0x0001
-#define UNI_CRANKBACK_TOPX_P	0x0002
-#define UNI_CRANKBACK_QOS_P	0x0004
-	u_int			level:8;
-	enum uni_crankback	type;
-	union {
-	  struct {
-	    u_char		level;
-	    u_char		id[21];
-	  }			node;
-	  struct {
-	    u_char		plevel;
-	    u_char		pid[21];
-	    u_int		port;
-	    u_char		slevel;
-	    u_char		sid[21];
-	  }			link;
-	}			id;
-	u_int			cause:8;
-	union {
-	  struct {
-	    u_int		dir:8;
-	    u_int		port;
-	    u_int		avcr;
-	    u_int		crm;
-	    u_int		vf;
-	  }			top;
-	  struct {
-	    u_int		ctd:1;
-	    u_int		cdv:1;
-	    u_int		clr:1;
-	    u_int		other:1;
-	  }			qos;
-	}			diag;
-};
-
-/*************************************************************************
- *
- * PNNI Call_ing/called party soft PVPC/PVCC information element
- */
-enum uni_soft_sel {
-	UNI_SOFT_SEL_ANY	= 0x00,
-	UNI_SOFT_SEL_REQ	= 0x02,
-	UNI_SOFT_SEL_ASS	= 0x04,
-};
-
-struct uni_ie_calling_soft {
-	struct uni_iehdr h;
-#define UNI_CALLING_SOFT_VCI_P	0x0001
-	u_int		vpi:12;
-	u_int		vci:16;
-};
-struct uni_ie_called_soft {
-	struct uni_iehdr h;
-#define UNI_CALLED_SOFT_VPI_P	0x0001
-#define UNI_CALLED_SOFT_VCI_P	0x0002
-	enum uni_soft_sel sel;
-	u_int		vpi:12;
-	u_int		vci:16;
-};
-
-/*************************************************************************/
-
-#include <netnatm/msg/uni_ie.h>
-#include <netnatm/msg/uni_msg.h>
-
-struct uni_all {
-	enum uni_msgtype	mtype;
-	union uni_msgall	u;
-};
-
-struct uni_ie {
-	enum uni_ietype		ietype;
-	union uni_ieall		u;
-};
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/saal/saal_sscfu.c b/sys/contrib/ngatm/netnatm/saal/saal_sscfu.c
deleted file mode 100644
index 80140ba03d49..000000000000
--- a/sys/contrib/ngatm/netnatm/saal/saal_sscfu.c
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/saal/saal_sscfu.c,v 1.4 2004/07/08 08:22:10 brandt Exp $
- *
- * SSCF on the UNI
- */
-
-#include <netnatm/saal/sscfu.h>
-#include <netnatm/saal/sscfupriv.h>
-
-#define MKSTR(S)	#S
-
-static const char *const sscf_sigs[] = {
-	MKSTR(SAAL_ESTABLISH_request),
-	MKSTR(SAAL_ESTABLISH_indication),
-	MKSTR(SAAL_ESTABLISH_confirm),
-	MKSTR(SAAL_RELEASE_request),
-	MKSTR(SAAL_RELEASE_confirm),
-	MKSTR(SAAL_RELEASE_indication),
-	MKSTR(SAAL_DATA_request),
-	MKSTR(SAAL_DATA_indication),
-	MKSTR(SAAL_UDATA_request),
-	MKSTR(SAAL_UDATA_indication),
-};
-
-static const char *const sscf_states[] = {
-	MKSTR(SSCF_RELEASED),
-	MKSTR(SSCF_AWAITING_ESTABLISH),
-	MKSTR(SSCF_AWAITING_RELEASE),
-	MKSTR(SSCF_ESTABLISHED),
-	MKSTR(SSCF_RESYNC),
-};
-
-#define AA_SIG(S,G,M) \
-	((S)->funcs->send_upper((S), (S)->aarg, (G), (M)))
-
-#define SSCOP_AASIG(S,G,M,P) \
-	((S)->funcs->send_lower((S), (S)->aarg, (G), (M), (P)))
-
-MEMINIT();
-
-static void sscfu_unqueue(struct sscfu *sscf);
-
-/************************************************************/
-/*
- * INSTANCE AND CLASS MANAGEMENT
- */
-
-/*
- * Initialize SSCF.
- */
-struct sscfu *
-sscfu_create(void *a, const struct sscfu_funcs *funcs)
-{
-	struct sscfu *sscf;
-
-	MEMZALLOC(sscf, struct sscfu *, sizeof(struct sscfu));
-	if (sscf == NULL)
-		return (NULL);
-
-	sscf->funcs = funcs;
-	sscf->aarg = a;
-	sscf->state = SSCFU_RELEASED;
-	sscf->inhand = 0;
-	SIGQ_INIT(&sscf->sigs);
-	sscf->debug = 0;
-
-	return (sscf);
-}
-
-/*
- * Reset the instance. Call only if you know, what you're doing.
- */
-void
-sscfu_reset(struct sscfu *sscf)
-{
-	sscf->state = SSCFU_RELEASED;
-	sscf->inhand = 0;
-	SIGQ_CLEAR(&sscf->sigs);
-}
-
-/*
- * Destroy SSCF 
- */
-void
-sscfu_destroy(struct sscfu *sscf)
-{
-	SIGQ_CLEAR(&sscf->sigs);
-	MEMFREE(sscf);
-}
-
-enum sscfu_state
-sscfu_getstate(const struct sscfu *sscf)
-{
-	return (sscf->state);
-}
-
-u_int
-sscfu_getdefparam(struct sscop_param *p)
-{
-	memset(p, 0, sizeof(*p));
-
-	p->timer_cc = 1000;
-	p->timer_poll = 750;
-	p->timer_keep_alive = 2000;
-	p->timer_no_response = 7000;
-	p->timer_idle = 15000;
-	p->maxk = 4096;
-	p->maxj = 4096;
-	p->maxcc = 4;
-	p->maxpd = 25;
-
-	return (SSCOP_SET_TCC | SSCOP_SET_TPOLL | SSCOP_SET_TKA |
-	    SSCOP_SET_TNR | SSCOP_SET_TIDLE | SSCOP_SET_MAXK |
-	    SSCOP_SET_MAXJ | SSCOP_SET_MAXCC | SSCOP_SET_MAXPD);
-}
-
-const char *
-sscfu_signame(enum saal_sig sig)
-{
-	static char str[40];
-
-	if (sig >= sizeof(sscf_sigs)/sizeof(sscf_sigs[0])) {
-		sprintf(str, "BAD SAAL_SIGNAL %u", sig);
-		return (str);
-	} else {
-		return (sscf_sigs[sig]);
-	}
-}
-
-const char *
-sscfu_statename(enum sscfu_state s)
-{
-	static char str[40];
-
-	if (s >= sizeof(sscf_states)/sizeof(sscf_states[0])) {
-		sprintf(str, "BAD SSCFU state %u", s);
-		return (str);
-	} else {
-		return (sscf_states[s]);
-	}
-}
-
-/************************************************************/
-/*
- * EXTERNAL INPUT SIGNAL MAPPING
- */
-static __inline void
-set_state(struct sscfu *sscf, enum sscfu_state state)
-{
-	VERBOSE(sscf, SSCFU_DBG_STATE, (sscf, sscf->aarg,
-	    "change state from %s to %s",
-	    sscf_states[sscf->state], sscf_states[state]));
-	sscf->state = state;
-}
-
-/*
- * signal from SSCOP to SSCF
- * Message must be freed by the user specified handler, if
- * it is passed.
- */
-void
-sscfu_input(struct sscfu *sscf, enum sscop_aasig sig,
-    struct SSCFU_MBUF_T *m, u_int arg __unused)
-{
-	sscf->inhand = 1;
-
-	VERBOSE(sscf, SSCFU_DBG_LSIG, (sscf, sscf->aarg,
-	    "SSCF got signal %d. in state %s", sig, sscf_states[sscf->state]));
-
-	switch (sig) {
-
-	  case SSCOP_RELEASE_indication:
-		/* arg is: UU, SRC */
-		switch (sscf->state) {
-
-		  case SSCFU_RELEASED:
-			if (m)
-				MBUF_FREE(m);
-			goto badsig;
-
-		  case SSCFU_AWAITING_ESTABLISH:
-			set_state(sscf, SSCFU_RELEASED);
-			AA_SIG(sscf, SAAL_RELEASE_indication, m);
-			break;
-
-		  case SSCFU_AWAITING_RELEASE:
-			if (m)
-				MBUF_FREE(m);
-			goto badsig;
-
-		  case SSCFU_ESTABLISHED:
-			set_state(sscf, SSCFU_RELEASED);
-			AA_SIG(sscf, SAAL_RELEASE_indication, m);
-			break;
-
-		  case SSCFU_RESYNC:
-			set_state(sscf, SSCFU_RELEASED);
-			AA_SIG(sscf, SAAL_RELEASE_indication, m);
-			break;
-		}
-		break;
-
-	  case SSCOP_ESTABLISH_indication:
-		/* arg is: UU */
-		switch (sscf->state) {
-
-		  case SSCFU_RELEASED:
-			set_state(sscf, SSCFU_ESTABLISHED);
-			SSCOP_AASIG(sscf, SSCOP_ESTABLISH_response, NULL, 1);
-			AA_SIG(sscf, SAAL_ESTABLISH_indication, m);
-			break;
-
-		  case SSCFU_AWAITING_ESTABLISH:
-		  case SSCFU_AWAITING_RELEASE:
-		  case SSCFU_ESTABLISHED:
-		  case SSCFU_RESYNC:
-			if (m)
-				MBUF_FREE(m);
-			goto badsig;
-		}
-		break;
-
-	  case SSCOP_ESTABLISH_confirm:
-		/* arg is: UU */
-		switch (sscf->state) {
-
-		  case SSCFU_RELEASED:
-			if (m)
-				MBUF_FREE(m);
-			goto badsig;
-
-		  case SSCFU_AWAITING_ESTABLISH:
-			set_state(sscf, SSCFU_ESTABLISHED);
-			AA_SIG(sscf, SAAL_ESTABLISH_confirm, m);
-			break;
-
-		  case SSCFU_AWAITING_RELEASE:
-		  case SSCFU_ESTABLISHED:
-		  case SSCFU_RESYNC:
-			if (m)
-				MBUF_FREE(m);
-			goto badsig;
-		}
-		break;
-
-	  case SSCOP_RELEASE_confirm:
-		/* arg is: */
-		switch (sscf->state) {
-
-		  case SSCFU_RELEASED:
-		  case SSCFU_AWAITING_ESTABLISH:
-			goto badsig;
-
-		  case SSCFU_AWAITING_RELEASE:
-			set_state(sscf, SSCFU_RELEASED);
-			AA_SIG(sscf, SAAL_RELEASE_confirm, NULL);
-			break;
-
-		  case SSCFU_ESTABLISHED:
-		  case SSCFU_RESYNC:
-			goto badsig;
-		}
-		break;
-
-	  case SSCOP_DATA_indication:
-		/* arg is: MU */
-		sscf->funcs->window(sscf, sscf->aarg, 1);
-		switch (sscf->state) {
-
-		  case SSCFU_RELEASED:
-		  case SSCFU_AWAITING_ESTABLISH:
-		  case SSCFU_AWAITING_RELEASE:
-			MBUF_FREE(m);
-			goto badsig;
-
-		  case SSCFU_ESTABLISHED:
-			AA_SIG(sscf, SAAL_DATA_indication, m);
-			break;
-
-		  case SSCFU_RESYNC:
-			MBUF_FREE(m);
-			goto badsig;
-		}
-		break;
-
-	  case SSCOP_RECOVER_indication:
-		/* arg is: */
-		switch (sscf->state) {
-
-		  case SSCFU_RELEASED:
-		  case SSCFU_AWAITING_ESTABLISH:
-		  case SSCFU_AWAITING_RELEASE:
-			goto badsig;
-
-		  case SSCFU_ESTABLISHED:
-			SSCOP_AASIG(sscf, SSCOP_RECOVER_response, NULL, 0);
-			AA_SIG(sscf, SAAL_ESTABLISH_indication, NULL);
-			break;
-
-		  case SSCFU_RESYNC:
-			goto badsig;
-		}
-		break;
-
-	  case SSCOP_RESYNC_indication:
-		/* arg is: UU */
-		switch (sscf->state) {
-
-		  case SSCFU_RELEASED:
-		  case SSCFU_AWAITING_ESTABLISH:
-		  case SSCFU_AWAITING_RELEASE:
-			if (m)
-				MBUF_FREE(m);
-			goto badsig;
-
-		  case SSCFU_ESTABLISHED:
-			SSCOP_AASIG(sscf, SSCOP_RESYNC_response, NULL, 0);
-			AA_SIG(sscf, SAAL_ESTABLISH_indication, m);
-			break;
-
-		  case SSCFU_RESYNC:
-			if (m)
-				MBUF_FREE(m);
-			goto badsig;
-		}
-		break;
-
-	  case SSCOP_RESYNC_confirm:
-		/* arg is: */
-		switch (sscf->state) {
-
-		  case SSCFU_RELEASED:
-		  case SSCFU_AWAITING_ESTABLISH:
-		  case SSCFU_AWAITING_RELEASE:
-		  case SSCFU_ESTABLISHED:
-
-		  case SSCFU_RESYNC:
-			set_state(sscf, SSCFU_ESTABLISHED);
-			AA_SIG(sscf, SAAL_ESTABLISH_confirm, NULL);
-			break;
-		}
-		break;
-
-	  case SSCOP_UDATA_indication:
-		/* arg is: MD */
-		AA_SIG(sscf, SAAL_UDATA_indication, m);
-		break;
-
-
-	  case SSCOP_RETRIEVE_indication:
-		if (m)
-			MBUF_FREE(m);
-		goto badsig;
-
-	  case SSCOP_RETRIEVE_COMPL_indication:
-		goto badsig;
-
-	  case SSCOP_ESTABLISH_request:
-	  case SSCOP_RELEASE_request:
-	  case SSCOP_ESTABLISH_response:
-	  case SSCOP_DATA_request:
-	  case SSCOP_RECOVER_response:
-	  case SSCOP_RESYNC_request:
-	  case SSCOP_RESYNC_response:
-	  case SSCOP_UDATA_request:
-	  case SSCOP_RETRIEVE_request:
-		ASSERT(0);
-		break;
-	}
-
-	sscfu_unqueue(sscf);
-	return;
-
-  badsig:
-	VERBOSE(sscf, SSCFU_DBG_ERR, (sscf, sscf->aarg,
-	    "bad signal %d. in state %s", sig, sscf_states[sscf->state]));
-	sscfu_unqueue(sscf);
-}
-
-
-/*
- * Handle signals from the user
- */
-static void
-sscfu_dosig(struct sscfu *sscf, enum saal_sig sig, struct SSCFU_MBUF_T *m)
-{
-	VERBOSE(sscf, SSCFU_DBG_EXEC, (sscf, sscf->aarg,
-	    "executing signal %s(%s)",
-	    sscf_sigs[sig], sscf_states[sscf->state]));
-
-	switch (sig) {
-
-	  case SAAL_ESTABLISH_request:
-		/* arg is opt UU */
-		switch (sscf->state) {
-
-		  case SSCFU_RELEASED:
-			set_state(sscf, SSCFU_AWAITING_ESTABLISH);
-			SSCOP_AASIG(sscf, SSCOP_ESTABLISH_request, m, 1);
-			break;
-
-		  case SSCFU_AWAITING_ESTABLISH:
-			if (m)
-				MBUF_FREE(m);
-			goto badsig;
-
-		  case SSCFU_AWAITING_RELEASE:
-			set_state(sscf, SSCFU_AWAITING_ESTABLISH);
-			SSCOP_AASIG(sscf, SSCOP_ESTABLISH_request, m, 1);
-			break;
-
-		  case SSCFU_ESTABLISHED:
-			set_state(sscf, SSCFU_RESYNC);
-			SSCOP_AASIG(sscf, SSCOP_RESYNC_request, m, 0);
-			break;
-
-		  case SSCFU_RESYNC:
-			if (m)
-				MBUF_FREE(m);
-			goto badsig;
-		}
-		break;
-
-	  case SAAL_RELEASE_request:
-		/* arg is opt UU */
-		switch(sscf->state) {
-
-		  case SSCFU_RELEASED:
-			if (m)
-				MBUF_FREE(m);
-			AA_SIG(sscf, SAAL_RELEASE_confirm, NULL);
-			break;
-
-		  case SSCFU_AWAITING_ESTABLISH:
-			set_state(sscf, SSCFU_AWAITING_RELEASE);
-			SSCOP_AASIG(sscf, SSCOP_RELEASE_request, m, 0);
-			break;
-
-		  case SSCFU_AWAITING_RELEASE:
-			if (m)
-				MBUF_FREE(m);
-			goto badsig;
-
-		  case SSCFU_ESTABLISHED:
-			set_state(sscf, SSCFU_AWAITING_RELEASE);
-			SSCOP_AASIG(sscf, SSCOP_RELEASE_request, m, 0);
-			break;
-
-		  case SSCFU_RESYNC:
-			set_state(sscf, SSCFU_AWAITING_RELEASE);
-			SSCOP_AASIG(sscf, SSCOP_RELEASE_request, m, 0);
-			break;
-		}
-		break;
-
-	  case SAAL_DATA_request:
-		/* arg is DATA */
-		switch (sscf->state) {
-
-		  case SSCFU_RELEASED:
-		  case SSCFU_AWAITING_ESTABLISH:
-		  case SSCFU_AWAITING_RELEASE:
-			MBUF_FREE(m);
-			goto badsig;
-
-		  case SSCFU_ESTABLISHED:
-			SSCOP_AASIG(sscf, SSCOP_DATA_request, m, 0);
-			break;
-
-		  case SSCFU_RESYNC:
-			MBUF_FREE(m);
-			goto badsig;
-		}
-		break;
-
-	  case SAAL_UDATA_request:
-		/* arg is UDATA */
-		SSCOP_AASIG(sscf, SSCOP_UDATA_request, m, 0);
-		break;
-
-	  case SAAL_ESTABLISH_indication:
-	  case SAAL_ESTABLISH_confirm:
-	  case SAAL_RELEASE_confirm:
-	  case SAAL_RELEASE_indication:
-	  case SAAL_DATA_indication:
-	  case SAAL_UDATA_indication:
-		ASSERT(0);
-		break;
-	}
-	return;
-
-  badsig:
-	VERBOSE(sscf, SSCFU_DBG_ERR, (sscf, sscf->aarg,
-	    "bad signal %s in state %s", sscf_sigs[sig],
-	    sscf_states[sscf->state]));
-}
-
-/*
- * Handle user signal.
- */
-int
-sscfu_saalsig(struct sscfu *sscf, enum saal_sig sig, struct SSCFU_MBUF_T *m)
-{
-	struct sscfu_sig *s;
-
-	if (sscf->inhand) {
-		VERBOSE(sscf, SSCFU_DBG_EXEC, (sscf, sscf->aarg,
-		    "queuing user signal %s(%s)",
-		    sscf_sigs[sig], sscf_states[sscf->state]));
-		SIG_ALLOC(s);
-		if (s == NULL)
-			return (ENOMEM);
-		s->sig = sig;
-		s->m = m;
-		SIGQ_APPEND(&sscf->sigs, s);
-		return (0);
-	}
-
-	sscf->inhand = 1;
-	sscfu_dosig(sscf, sig, m);
-	sscfu_unqueue(sscf);
-	return (0);
-}
-
-/*
- * Unqueue all qeueued signals. Must be called with inhand==1.
- */
-static void
-sscfu_unqueue(struct sscfu *sscf)
-{
-	struct sscfu_sig *s;
-
-	while ((s = SIGQ_GET(&sscf->sigs)) != NULL) {
-		sscfu_dosig(sscf, s->sig, s->m);
-		SIG_FREE(s);
-	}
-	sscf->inhand = 0;
-}
-
-void
-sscfu_setdebug(struct sscfu *sscf, u_int n)
-{
-	sscf->debug = n;
-}
-
-u_int
-sscfu_getdebug(const struct sscfu *sscf)
-{
-	return (sscf->debug);
-}
diff --git a/sys/contrib/ngatm/netnatm/saal/saal_sscop.c b/sys/contrib/ngatm/netnatm/saal/saal_sscop.c
deleted file mode 100644
index 0776eda9e4f0..000000000000
--- a/sys/contrib/ngatm/netnatm/saal/saal_sscop.c
+++ /dev/null
@@ -1,4946 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/saal/saal_sscop.c,v 1.11 2004/07/08 08:22:13 brandt Exp $
- *
- * Core SSCOP code (ITU-T Q.2110)
- */
-
-#include <netnatm/saal/sscop.h>
-#include <netnatm/saal/sscoppriv.h>
-
-#ifndef FAILURE
-#define FAILURE(S)
-#endif
-
-#define MKSTR(S)	#S
-
-static const char *const sscop_sigs[] = {
-	MKSTR(SSCOP_ESTABLISH_request),
-	MKSTR(SSCOP_ESTABLISH_indication),
-	MKSTR(SSCOP_ESTABLISH_response),
-	MKSTR(SSCOP_ESTABLISH_confirm),
-	MKSTR(SSCOP_RELEASE_request),
-	MKSTR(SSCOP_RELEASE_indication),
-	MKSTR(SSCOP_RELEASE_confirm),
-	MKSTR(SSCOP_DATA_request),
-	MKSTR(SSCOP_DATA_indication),
-	MKSTR(SSCOP_UDATA_request),
-	MKSTR(SSCOP_UDATA_indication),
-	MKSTR(SSCOP_RECOVER_indication),
-	MKSTR(SSCOP_RECOVER_response),
-	MKSTR(SSCOP_RESYNC_request),
-	MKSTR(SSCOP_RESYNC_indication),
-	MKSTR(SSCOP_RESYNC_response),
-	MKSTR(SSCOP_RESYNC_confirm),
-	MKSTR(SSCOP_RETRIEVE_request),
-	MKSTR(SSCOP_RETRIEVE_indication),
-	MKSTR(SSCOP_RETRIEVE_COMPL_indication),
-};
-
-static const char *const sscop_msigs[] = {
-	MKSTR(SSCOP_MDATA_request),
-	MKSTR(SSCOP_MDATA_indication),
-	MKSTR(SSCOP_MERROR_indication),
-};
-
-static const char *const states[] = {
-	MKSTR(SSCOP_IDLE),
-	MKSTR(SSCOP_OUT_PEND),
-	MKSTR(SSCOP_IN_PEND),
-	MKSTR(SSCOP_OUT_DIS_PEND),
-	MKSTR(SSCOP_OUT_RESYNC_PEND),
-	MKSTR(SSCOP_IN_RESYNC_PEND),
-	MKSTR(SSCOP_OUT_REC_PEND),
-	MKSTR(SSCOP_REC_PEND),
-	MKSTR(SSCOP_IN_REC_PEND),
-	MKSTR(SSCOP_READY),
-};
-
-#ifdef SSCOP_DEBUG
-static const char *const events[] = {
-	MKSTR(SIG_BGN),
-	MKSTR(SIG_BGAK),
-	MKSTR(SIG_END),
-	MKSTR(SIG_ENDAK),
-	MKSTR(SIG_RS),
-	MKSTR(SIG_RSAK),
-	MKSTR(SIG_BGREJ),
-	MKSTR(SIG_SD),
-	MKSTR(SIG_ER),
-	MKSTR(SIG_POLL),
-	MKSTR(SIG_STAT),
-	MKSTR(SIG_USTAT),
-	MKSTR(SIG_UD),
-	MKSTR(SIG_MD),
-	MKSTR(SIG_ERAK),
-
-	MKSTR(SIG_T_CC),
-	MKSTR(SIG_T_POLL),
-	MKSTR(SIG_T_KA),
-	MKSTR(SIG_T_NR),
-	MKSTR(SIG_T_IDLE),
-
-	MKSTR(SIG_PDU_Q),
-	MKSTR(SIG_USER_DATA),
-	MKSTR(SIG_ESTAB_REQ),
-	MKSTR(SIG_ESTAB_RESP),
-	MKSTR(SIG_RELEASE_REQ),
-	MKSTR(SIG_RECOVER),
-	MKSTR(SIG_SYNC_REQ),
-	MKSTR(SIG_SYNC_RESP),
-	MKSTR(SIG_UDATA),
-	MKSTR(SIG_MDATA),
-	MKSTR(SIG_UPDU_Q),
-	MKSTR(SIG_MPDU_Q),
-	MKSTR(SIG_RETRIEVE),
-};
-
-static const char *const pdus[] = {
-	"illegale PDU type 0",		/* no PDU type 0 */
-	MKSTR(PDU_BGN),
-	MKSTR(PDU_BGAK),
-	MKSTR(PDU_END),
-	MKSTR(PDU_ENDAK),
-	MKSTR(PDU_RS),
-	MKSTR(PDU_RSAK),
-	MKSTR(PDU_BGREJ),
-	MKSTR(PDU_SD),
-	MKSTR(PDU_ER),
-	MKSTR(PDU_POLL),
-	MKSTR(PDU_STAT),
-	MKSTR(PDU_USTAT),
-	MKSTR(PDU_UD),
-	MKSTR(PDU_MD),
-	MKSTR(PDU_ERAK),
-};
-#endif
-
-MEMINIT();
-
-static void sscop_signal(struct sscop *, u_int, struct sscop_msg *);
-static void sscop_save_signal(struct sscop *, u_int, struct sscop_msg *);
-static void handle_sigs(struct sscop *);
-static void sscop_set_state(struct sscop *, u_int);
-
-/************************************************************/
-
-
-/************************************************************/
-/*
- * Queue macros
- */
-#define SSCOP_MSG_FREE(MSG)						\
-    do {								\
-	if(MSG) {							\
-		MBUF_FREE((MSG)->m);					\
-		MSG_FREE((MSG));					\
-	}								\
-    } while(0)
-
-static inline struct sscop_msg *QFIND(sscop_msgq_head_t *q, u_int rn)
-{
-	struct sscop_msg *msg = NULL, *m;
-	MSGQ_FOREACH(m, q) {
-		if(m->seqno == rn) {
-			msg = m;
-			break;
-		}
-	}
-	return msg;
-}
-
-#define QINSERT(Q,M)							\
-    do {								\
-	struct sscop_msg *_msg = NULL, *_m;				\
-	MSGQ_FOREACH(_m, (Q)) {						\
-		if (_m->seqno > (M)->seqno) {				\
-			_msg = _m;					\
-			break;						\
-		}							\
-	}								\
-	if (_msg != NULL)							\
-		MSGQ_INSERT_BEFORE(_msg, (M));				\
-	else								\
-		MSGQ_APPEND((Q), (M));					\
-    } while (0)
-
-
-/*
- * Send an error indication to the management plane.
- */
-#define MAAL_ERROR(S,E,C) 						\
-    do {								\
-	VERBOSE(S, SSCOP_DBG_USIG, ((S), (S)->aarg,			\
-	    "MAA-Signal %s in state %s", 				\
-	    sscop_msigs[SSCOP_MERROR_indication], states[(S)->state]));	\
-	(S)->funcs->send_manage((S), (S)->aarg,				\
-	    SSCOP_MERROR_indication, NULL, (E), (C));			\
-    } while(0)
-
-#define MAAL_DATA(S,M) 							\
-    do {								\
-	VERBOSE(S, SSCOP_DBG_USIG, ((S), (S)->aarg,			\
-	    "MAA-Signal %s in state %s",				\
-	    sscop_msigs[SSCOP_MDATA_indication], states[(S)->state]));	\
-	(S)->funcs->send_manage((S), (S)->aarg,				\
-	    SSCOP_MDATA_indication, (M), 0, 0);				\
-    } while(0)
-
-#define AAL_DATA(S,D,M,N)						\
-    do {								\
-	VERBOSE(S, SSCOP_DBG_USIG, ((S), (S)->aarg,			\
-	    "AA-Signal %s in state %s",					\
-	    sscop_sigs[D], states[(S)->state]));			\
-	(S)->funcs->send_upper((S), (S)->aarg, (D), (M), (N));		\
-    } while(0)
-
-#define AAL_SIG(S,D)							\
-    do {								\
-	VERBOSE(S, SSCOP_DBG_USIG, ((S), (S)->aarg,			\
-	    "AA-Signal %s in state %s",					\
-	    sscop_sigs[D], states[(S)->state]));			\
-	(S)->funcs->send_upper((S), (S)->aarg, (D), NULL, 0);		\
-    } while(0)
-
-#ifdef SSCOP_DEBUG
-#define AAL_SEND(S,M) do {						\
-	if (ISVERBOSE(S, SSCOP_DBG_PDU))				\
-		sscop_dump_pdu(S, "tx", (M));				\
-	(S)->funcs->send_lower((S), (S)->aarg, (M));			\
-    } while(0)
-#else
-#define AAL_SEND(S,M) (S)->funcs->send_lower((S), (S)->aarg, (M))
-#endif
-
-
-/*
- * Free a save user-to-user data buffer and set the pointer to zero
- * to signal, that it is free.
- */
-#define FREE_UU(F)							\
-	do {								\
-		if(sscop->F) {						\
-			MBUF_FREE(sscop->F);				\
-			sscop->F = NULL;				\
-		}							\
-	} while(0)
-
-#define SET_UU(F,U)							\
-	do {								\
-		FREE_UU(F);						\
-		sscop->F = U->m;					\
-		U->m = NULL;						\
-		SSCOP_MSG_FREE(U);					\
-	} while(0)
-
-#define AAL_UU_SIGNAL(S, SIG, M, PL, SN)				\
-	do {								\
-		if(MBUF_LEN((M)->m) > 0) { 				\
-			MBUF_UNPAD((M)->m,(PL));			\
-			AAL_DATA((S), (SIG), (M)->m, (SN)); 		\
-			(M)->m = NULL;					\
-		} else {						\
-			AAL_DATA((S), (SIG), NULL, (SN));		\
-		}							\
-		SSCOP_MSG_FREE((M));					\
-	} while(0)
-
-
-
-TIMER_FUNC(cc, CC)
-TIMER_FUNC(nr, NR)
-TIMER_FUNC(ka, KA)
-TIMER_FUNC(poll, POLL)
-TIMER_FUNC(idle, IDLE)
-
-/************************************************************/
-/*
- * INSTANCE AND TYPE HANDLING.
- */
-#ifdef SSCOP_DEBUG
-static void
-sscop_dump_pdu(struct sscop *sscop, const char *dir,
-    const struct SSCOP_MBUF_T *m)
-{
-	u_int32_t v1, v2, v3, v4;
-	u_int size = MBUF_LEN(m);
-	u_int n, i;
-
-	if (size < 8)
-		return;
-
-	v1 = MBUF_TRAIL32(m, -1);
-	v2 = MBUF_TRAIL32(m, -2);
-
-	switch ((v1 >> 24) & 0xf) {
-
-	  case 0:
-		return;
-
-	  case PDU_BGN:
-		sscop->funcs->verbose(sscop, sscop->aarg,
-		    "%s BGN n(mr)=%u n(sq)=%u pl=%u",
-		    dir, v1 & 0xffffff, v2 & 0xff, (v1 >> 30) & 0x3);
-		return;
-
-	  case PDU_BGAK:
-		sscop->funcs->verbose(sscop, sscop->aarg,
-		    "%s BGAK n(mr)=%u pl=%u",
-		    dir, v1 & 0xffffff, (v1 >> 30) & 0x3);
-		return;
-
-	  case PDU_END:
-		sscop->funcs->verbose(sscop, sscop->aarg,
-		    "%s END r=%u s=%u pl=%u",
-		    dir, (v1 >> 29) & 1, (v1 >> 28) & 1, (v1 >> 30) & 0x3);
-		return;
-
-	  case PDU_ENDAK:
-		sscop->funcs->verbose(sscop, sscop->aarg, "%s ENDAK", dir);
-		return;
-
-	  case PDU_RS:
-		sscop->funcs->verbose(sscop, sscop->aarg,
-		    "%s RS n(mr)=%u n(sq)=%u pl=%u",
-		    dir, v1 & 0xffffff, v2 & 0xff, (v1 >> 30) & 0x3);
-		return;
-
-	  case PDU_RSAK:
-		sscop->funcs->verbose(sscop, sscop->aarg, "%s RSAK n(mr)=%u",
-		    dir, v1 & 0xffffff);
-		return;
-
-	  case PDU_BGREJ:
-		sscop->funcs->verbose(sscop, sscop->aarg, "%s BGREJ pl=%u",
-		    dir, (v1 >> 30) & 0x3);
-		return;
-
-	  case PDU_SD:
-		sscop->funcs->verbose(sscop, sscop->aarg, "%s SD n(s)=%u pl=%u",
-		    dir, v1 & 0xffffff, (v1 >> 30) & 0x3);
-		return;
-
-	  case PDU_ER:
-		sscop->funcs->verbose(sscop, sscop->aarg, "%s ER n(mr)=%u n(sq)=%u",
-		    dir, v1 & 0xffffff, v2 & 0xff);
-		return;
-
-	  case PDU_POLL:
-		sscop->funcs->verbose(sscop, sscop->aarg, "%s POLL n(s)=%u n(ps)=%u",
-		    dir, v1 & 0xffffff, v2 & 0xffffff);
-		return;
-
-	  case PDU_STAT:
-		if (size < 12)
-			return;
-		v3 = MBUF_TRAIL32(m, -3);
-		sscop->funcs->verbose(sscop, sscop->aarg,
-		    "%s STAT n(r)=%u n(mr)=%u n(ps)=%u",
-		    dir, v1 & 0xffffff, v2 & 0xffffff, v3 & 0xffffff);
-		n = (size - 12) / 4;
-		for (i = 0; i < (size - 12) / 4; i++, n--) {
-			v4 = MBUF_TRAIL32(m, -4 - (int)i);
-			sscop->funcs->verbose(sscop, sscop->aarg,
-			    "   LE(%u)=%u", n, v4 & 0xffffff);
-		}
-		return;
-
-	  case PDU_USTAT:
-		if (size < 16)
-			return;
-		sscop->funcs->verbose(sscop, sscop->aarg,
-		    "%s STAT n(r)=%u n(mr)=%u LE1=%u LE2=%u",
-		    dir, v1 & 0xffffff, v2 & 0xffffff,
-		    MBUF_TRAIL32(m, -4) & 0xffffff,
-		    MBUF_TRAIL32(m, -3) & 0xffffff);
-		return;
-
-	  case PDU_UD:
-		sscop->funcs->verbose(sscop, sscop->aarg,
-		    "%s UD pl=%u", dir, (v1 >> 30) & 0x3);
-		return;
-
-	  case PDU_MD:
-		sscop->funcs->verbose(sscop, sscop->aarg,
-		    "%s MD pl=%u", dir, (v1 >> 30) & 0x3);
-		return;
-
-	  case PDU_ERAK:
-		sscop->funcs->verbose(sscop, sscop->aarg,
-		    "%s ERAK n(mr)=%u", dir, v1 & 0xffffff);
-		return;
-	}
-}
-#endif
-
-
-/*
- * Initialize state of variables
- */
-static void
-sscop_init(struct sscop *sscop)
-{
-	sscop->state = SSCOP_IDLE;
-
-	sscop->vt_sq = 0;
-	sscop->vr_sq = 0;
-	sscop->clear_buffers = 1;
-
-	sscop->ll_busy = 0;
-
-	sscop->rxq = 0;
-}
-
-static void
-sscop_clear(struct sscop *sscop)
-{
-	TIMER_STOP(sscop, cc);
-	TIMER_STOP(sscop, ka);
-	TIMER_STOP(sscop, nr);
-	TIMER_STOP(sscop, idle);
-	TIMER_STOP(sscop, poll);
-
-	FREE_UU(uu_bgn);
-	FREE_UU(uu_bgak);
-	FREE_UU(uu_bgrej);
-	FREE_UU(uu_end);
-	FREE_UU(uu_rs);
-
-	MSGQ_CLEAR(&sscop->xq);
-	MSGQ_CLEAR(&sscop->uxq);
-	MSGQ_CLEAR(&sscop->mxq);
-	MSGQ_CLEAR(&sscop->xbuf);
-	MSGQ_CLEAR(&sscop->rbuf);
-
-	SIGQ_CLEAR(&sscop->sigs);
-	SIGQ_CLEAR(&sscop->saved_sigs);
-}
-
-
-/*
- * Allocate instance memory, initialize the state of all variables.
- */
-struct sscop *
-sscop_create(void *a, const struct sscop_funcs *funcs)
-{
-	struct sscop *sscop;
-
-	MEMZALLOC(sscop, struct sscop *, sizeof(struct sscop));
-	if (sscop == NULL)
-		return (NULL);
-
-	if (a == NULL)
-		sscop->aarg = sscop;
-	else
-		sscop->aarg = a;
-	sscop->funcs = funcs;
-
-	sscop->maxk = MAXK;
-	sscop->maxj = MAXJ;
-	sscop->maxcc = MAXCC;
-	sscop->maxpd = MAXPD;
-	sscop->maxstat = MAXSTAT;
-	sscop->timercc = TIMERCC;
-	sscop->timerka = TIMERKA;
-	sscop->timernr = TIMERNR;
-	sscop->timerpoll = TIMERPOLL;
-	sscop->timeridle = TIMERIDLE;
-	sscop->robustness = 0;
-	sscop->poll_after_rex = 0;
-	sscop->mr = MAXMR;
-
-	TIMER_INIT(sscop, cc);
-	TIMER_INIT(sscop, nr);
-	TIMER_INIT(sscop, ka);
-	TIMER_INIT(sscop, poll);
-	TIMER_INIT(sscop, idle);
-
-	MSGQ_INIT(&sscop->xq);
-	MSGQ_INIT(&sscop->uxq);
-	MSGQ_INIT(&sscop->mxq);
-	MSGQ_INIT(&sscop->rbuf);
-	MSGQ_INIT(&sscop->xbuf);
-
-	SIGQ_INIT(&sscop->sigs);
-	SIGQ_INIT(&sscop->saved_sigs);
-
-	sscop_init(sscop);
-
-	return (sscop);
-}
-
-/*
- * Free all resources in a sscop instance
- */
-void
-sscop_destroy(struct sscop *sscop)
-{
-	sscop_reset(sscop);
-
-	MEMFREE(sscop);
-}
-
-/*
- * Reset the SSCOP instance.
- */
-void
-sscop_reset(struct sscop *sscop)
-{
-	sscop_clear(sscop);
-	sscop_init(sscop);
-}
-
-void
-sscop_getparam(const struct sscop *sscop, struct sscop_param *p)
-{
-	p->timer_cc = sscop->timercc;
-	p->timer_poll = sscop->timerpoll;
-	p->timer_keep_alive = sscop->timerka;
-	p->timer_no_response = sscop->timernr;
-	p->timer_idle = sscop->timeridle;
-	p->maxk = sscop->maxk;
-	p->maxj = sscop->maxj;
-	p->maxcc = sscop->maxcc;
-	p->maxpd = sscop->maxpd;
-	p->maxstat = sscop->maxstat;
-	p->mr = sscop->mr;
-	p->flags = 0;
-	if(sscop->robustness)
-		p->flags |= SSCOP_ROBUST;
-	if(sscop->poll_after_rex)
-		p->flags |= SSCOP_POLLREX;
-}
-
-int
-sscop_setparam(struct sscop *sscop, struct sscop_param *p, u_int *pmask)
-{
-	u_int mask = *pmask;
-
-	/* can change only in idle state */
-	if (sscop->state != SSCOP_IDLE)
-		return (EISCONN);
-
-	*pmask = 0;
-
-	/*
-	 * first check all parameters
-	 */
-	if ((mask & SSCOP_SET_TCC) && p->timer_cc == 0)
-		*pmask |= SSCOP_SET_TCC;
-	if ((mask & SSCOP_SET_TPOLL) && p->timer_poll == 0)
-		*pmask |= SSCOP_SET_TPOLL;
-	if ((mask & SSCOP_SET_TKA) && p->timer_keep_alive == 0)
-		*pmask |= SSCOP_SET_TKA;
-	if ((mask & SSCOP_SET_TNR) && p->timer_no_response == 0)
-		*pmask |= SSCOP_SET_TNR;
-	if ((mask & SSCOP_SET_TIDLE) && p->timer_idle == 0)
-		*pmask |= SSCOP_SET_TIDLE;
-	if ((mask & SSCOP_SET_MAXK) && p->maxk > MAXMAXK)
-		*pmask |= SSCOP_SET_MAXK;
-	if ((mask & SSCOP_SET_MAXJ) && p->maxj > MAXMAXJ)
-		*pmask |= SSCOP_SET_MAXJ;
-	if ((mask & SSCOP_SET_MAXCC) && p->maxcc > 255)
-		*pmask |= SSCOP_SET_MAXCC;
-	if ((mask & SSCOP_SET_MAXPD) && p->maxpd >= (1 << 24))
-		*pmask |= SSCOP_SET_MAXPD;
-	if ((mask & SSCOP_SET_MAXSTAT) && 
-	    ((p->maxstat & 1) == 0 || p->maxstat == 1 || p->maxstat == 2 ||
-	    p->maxstat * 4 > MAXMAXK - 8))
-		*pmask |= SSCOP_SET_MAXSTAT;
-	if ((mask & SSCOP_SET_MR) && p->mr >= (1 << 24) - 1)
-		*pmask |= SSCOP_SET_MR;
-
-	if (*pmask)
-		return (EINVAL);
-
-
-	/*
-	 * now set it
-	 */
-	if (mask & SSCOP_SET_TCC)
-		sscop->timercc = p->timer_cc;
-
-	if (mask & SSCOP_SET_TPOLL)
-		sscop->timerpoll = p->timer_poll;
-
-	if (mask & SSCOP_SET_TKA)
-		sscop->timerka = p->timer_keep_alive;
-
-	if (mask & SSCOP_SET_TNR)
-		sscop->timernr = p->timer_no_response;
-
-	if (mask & SSCOP_SET_TIDLE)
-		sscop->timeridle = p->timer_idle;
-
-	if (mask & SSCOP_SET_MAXK)
-		sscop->maxk = p->maxk;
-	if (mask & SSCOP_SET_MAXJ)
-		sscop->maxj = p->maxj;
-
-	if (mask & SSCOP_SET_MAXCC)
-		sscop->maxcc = p->maxcc;
-	if (mask & SSCOP_SET_MAXPD)
-		sscop->maxpd = p->maxpd;
-	if (mask & SSCOP_SET_MAXSTAT)
-		sscop->maxstat = p->maxstat;
-
-	if (mask & SSCOP_SET_MR)
-		sscop->mr = p->mr;
-
-	if (mask & SSCOP_SET_ROBUST)
-		sscop->robustness = ((p->flags & SSCOP_ROBUST) != 0);
-
-	if (mask & SSCOP_SET_POLLREX)
-		sscop->poll_after_rex = ((p->flags & SSCOP_POLLREX) != 0);
-
-	return (0);
-}
-
-enum sscop_state
-sscop_getstate(const struct sscop *sscop)
-{
-	return (sscop->state);
-}
-
-
-/************************************************************/
-/*
- * EXTERNAL INPUT SIGNAL MAPPING
- */
-
-/*
- * Map AA signal to SSCOP internal signal
- */
-int
-sscop_aasig(struct sscop *sscop, enum sscop_aasig sig,
-    struct SSCOP_MBUF_T *m, u_int arg)
-{
-	struct sscop_msg *msg;
-
-	if (sig >= sizeof(sscop_sigs)/sizeof(sscop_sigs[0])) {
-		VERBOSE(sscop, SSCOP_DBG_INSIG, (sscop, sscop->aarg,
-		    "AA-Signal %u - bad signal", sig));
-		MBUF_FREE(m);
-		return (EINVAL);
-	}
-	VERBOSE(sscop, SSCOP_DBG_INSIG, (sscop, sscop->aarg,
-	    "AA-Signal %s in state %s with%s message",
-	    sscop_sigs[sig], states[sscop->state], m ? "" : "out"));
-
-	MSG_ALLOC(msg);
-	if (msg == NULL) {
-		FAILURE("sscop: cannot allocate aasig");
-		MBUF_FREE(m);
-		return (ENOMEM);
-	}
-
-	switch(sig) {
-
-	  case SSCOP_ESTABLISH_request:
-		msg->m = m;
-		msg->rexmit = arg;
-		sscop_signal(sscop, SIG_ESTAB_REQ, msg);
-		break;
-
-	  case SSCOP_ESTABLISH_response:
-		msg->m = m;
-		msg->rexmit = arg;
-		sscop_signal(sscop, SIG_ESTAB_RESP, msg);
-		break;
-
-	  case SSCOP_RELEASE_request:
-		msg->m = m;
-		sscop_signal(sscop, SIG_RELEASE_REQ, msg);
-		break;
-
-	  case SSCOP_DATA_request:
-		msg->m = m;
-		sscop_signal(sscop, SIG_USER_DATA, msg);
-		break;
-
-	  case SSCOP_UDATA_request:
-		msg->m = m;
-		sscop_signal(sscop, SIG_UDATA, msg);
-		break;
-
-	  case SSCOP_RECOVER_response:
-		MBUF_FREE(m);
-		MSG_FREE(msg);
-		sscop_signal(sscop, SIG_RECOVER, NULL);
-		break;
-
-	  case SSCOP_RESYNC_request:
-		msg->m = m;
-		sscop_signal(sscop, SIG_SYNC_REQ, msg);
-		break;
-
-	  case SSCOP_RESYNC_response:
-		MBUF_FREE(m);
-		MSG_FREE(msg);
-		sscop_signal(sscop, SIG_SYNC_RESP, NULL);
-		break;
-
-	  case SSCOP_RETRIEVE_request:
-		MBUF_FREE(m);
-		msg->rexmit = arg;
-		sscop_signal(sscop, SIG_RETRIEVE, msg);
-		break;
-
-	  case SSCOP_ESTABLISH_indication:
-	  case SSCOP_ESTABLISH_confirm:
-	  case SSCOP_RELEASE_indication:
-	  case SSCOP_RELEASE_confirm:
-	  case SSCOP_DATA_indication:
-	  case SSCOP_UDATA_indication:
-	  case SSCOP_RECOVER_indication:
-	  case SSCOP_RESYNC_indication:
-	  case SSCOP_RESYNC_confirm:
-	  case SSCOP_RETRIEVE_indication:
-	  case SSCOP_RETRIEVE_COMPL_indication:
-		MBUF_FREE(m);
-		MSG_FREE(msg);
-		return EINVAL;
-	}
-
-	return 0;
-}
-
-/*
- * Signal from layer management.
- */
-int
-sscop_maasig(struct sscop *sscop, enum sscop_maasig sig, struct SSCOP_MBUF_T *m)
-{
-	struct sscop_msg *msg;
-
-	if (sig >= sizeof(sscop_msigs)/sizeof(sscop_msigs[0])) {
-		VERBOSE(sscop, SSCOP_DBG_INSIG, (sscop, sscop->aarg,
-		    "MAA-Signal %u - bad signal", sig));
-		MBUF_FREE(m);
-		return (EINVAL);
-	}
-	VERBOSE(sscop, SSCOP_DBG_INSIG, (sscop, sscop->aarg,
-	    "MAA-Signal %s in state %s with%s message",
-	    sscop_msigs[sig], states[sscop->state], m ? "" : "out"));
-
-	MSG_ALLOC(msg);
-	if (msg == NULL) {
-		FAILURE("sscop: cannot allocate maasig");
-		MBUF_FREE(m);
-		return (ENOMEM);
-	}
-
-	switch (sig) {
-
-	  case SSCOP_MDATA_request:
-		msg->m = m;
-		sscop_signal(sscop, SIG_MDATA, msg);
-		break;
-
-	  case SSCOP_MDATA_indication:
-	  case SSCOP_MERROR_indication:
-		MBUF_FREE(m);
-		MSG_FREE(msg);
-		return (EINVAL);
-	}
-	return (0);
-}
-
-/*
- * Map PDU to SSCOP signal.
- */
-void
-sscop_input(struct sscop *sscop, struct SSCOP_MBUF_T *m)
-{
-	struct sscop_msg *msg;
-	union pdu pdu;
-	u_int size;
-
-	MSG_ALLOC(msg);
-	if(msg == NULL) {
-		FAILURE("sscop: cannot allocate in pdu msg");
-		MBUF_FREE(m);
-		return;
-	}
-
-	msg->m = m;
-	msg->rexmit = 0;
-
-	size = MBUF_LEN(m);
-
-	if(size % 4 != 0 || size < 4)
-		goto err;
-
-	pdu.sscop_null = MBUF_TRAIL32(m, -1);
-
-	VERBOSE(sscop, SSCOP_DBG_PDU, (sscop, sscop->aarg,
-	    "got %s, size=%u", pdus[pdu.sscop_type], size));
-
-#ifdef SSCOP_DEBUG
-#define ENSURE(C,F)	if(!(C)) { VERBOSE(sscop, SSCOP_DBG_PDU, F); goto err; }
-#else
-#define ENSURE(C,F)	if(!(C)) goto err
-#endif
-
-#ifdef SSCOP_DEBUG
-	if (ISVERBOSE(sscop, SSCOP_DBG_PDU))
-		sscop_dump_pdu(sscop, "rx", m);
-#endif
-
-	switch(pdu.sscop_type) {
-
-          default:
-		ENSURE(0, (sscop, sscop->aarg,
-		    "Bad PDU type %u", pdu.sscop_type));
-		break;
-
-	  case PDU_BGN:
-		ENSURE(size >= 8U, (sscop, sscop->aarg,
-			"PDU_BGN size=%u", size));
-		ENSURE(size >= 8U + pdu.sscop_pl, (sscop, sscop->aarg,
-			"PDU_BGN size=%u pl=%u", size, pdu.sscop_pl));
-		ENSURE(size <= 8U + sscop->maxj, (sscop, sscop->aarg,
-			"PDU_BGN size=%u", size));
-		sscop_signal(sscop, SIG_BGN, msg);
-		break;
-
-	  case PDU_BGAK:
-		ENSURE(size >= 8U, (sscop, sscop->aarg,
-			"PDU_BGAK size=%u", size));
-		ENSURE(size >= 8U + pdu.sscop_pl, (sscop, sscop->aarg,
-			"PDU_BGAK size=%u pl=%u", size, pdu.sscop_pl));
-		ENSURE(size <= 8U + sscop->maxj, (sscop, sscop->aarg,
-			"PDU_BGAK size=%u", size));
-		sscop_signal(sscop, SIG_BGAK, msg);
-		break;
-
-	  case PDU_END:
-		ENSURE(size >= 8U, (sscop, sscop->aarg,
-			"PDU_END size=%u", size));
-		ENSURE(size >= 8U + pdu.sscop_pl, (sscop, sscop->aarg,
-			"PDU_END size=%u pl=%u", size, pdu.sscop_pl));
-		ENSURE(size <= 8U + sscop->maxj, (sscop, sscop->aarg,
-			"PDU_END size=%u", size));
-		sscop_signal(sscop, SIG_END, msg);
-		break;
-
-	  case PDU_ENDAK:
-		ENSURE(size == 8U, (sscop, sscop->aarg,
-			"PDU_ENDAK size=%u", size));
-		sscop_signal(sscop, SIG_ENDAK, msg);
-		break;
-
-	  case PDU_BGREJ:
-		ENSURE(size >= 8U, (sscop, sscop->aarg,
-			"PDU_BGREJ size=%u", size));
-		ENSURE(size >= 8U + pdu.sscop_pl, (sscop, sscop->aarg,
-			"PDU_BGREJ size=%u pl=%u", size, pdu.sscop_pl));
-		ENSURE(size <= 8U + sscop->maxj, (sscop, sscop->aarg,
-			"PDU_BGREJ size=%u", size));
-		sscop_signal(sscop, SIG_BGREJ, msg);
-		break;
-
-	  case PDU_SD:
-		ENSURE(size >= 4U + pdu.sscop_pl, (sscop, sscop->aarg,
-			"PDU_SD size=%u pl=%u", size, pdu.sscop_pl));
-		ENSURE(size <= 4U + sscop->maxk, (sscop, sscop->aarg,
-			"PDU_SD size=%u", size));
-		sscop_signal(sscop, SIG_SD, msg);
-		break;
-
-	  case PDU_UD:
-		ENSURE(size >= 4U + pdu.sscop_pl, (sscop, sscop->aarg,
-			"PDU_UD size=%u pl=%u", size, pdu.sscop_pl));
-		ENSURE(size <= 4U + sscop->maxk, (sscop, sscop->aarg,
-			"PDU_UD size=%u", size));
-		sscop_signal(sscop, SIG_UD, msg);
-		break;
-
-	  case PDU_MD:
-		ENSURE(size >= 4U + pdu.sscop_pl, (sscop, sscop->aarg,
-			"PDU_MD size=%u pl=%u", size, pdu.sscop_pl));
-		ENSURE(size <= 4U + sscop->maxk, (sscop, sscop->aarg,
-			"PDU_MD size=%u", size));
-		sscop_signal(sscop, SIG_MD, msg);
-		break;
-
-	  case PDU_POLL:
-		ENSURE(size == 8U, (sscop, sscop->aarg,
-			"PDU_POLL size=%u", size));
-		sscop_signal(sscop, SIG_POLL, msg);
-		break;
-
-	  case PDU_STAT:
-		ENSURE(size >= 12U, (sscop, sscop->aarg,
-			"PDU_STAT size=%u", size));
-		ENSURE(size <= 12U + 4 * sscop->maxstat, (sscop, sscop->aarg,
-			"PDU_STAT size=%u", size));
-		sscop_signal(sscop, SIG_STAT, msg);
-		break;
-
-	  case PDU_RS:
-		ENSURE(size >= 8U, (sscop, sscop->aarg,
-			"PDU_RS size=%u", size));
-		ENSURE(size >= 8U + pdu.sscop_pl, (sscop, sscop->aarg,
-			"PDU_RS size=%u pl=%u", size, pdu.sscop_pl));
-		ENSURE(size <= 8U + sscop->maxj, (sscop, sscop->aarg,
-			"PDU_RS size=%u", size));
-		sscop_signal(sscop, SIG_RS, msg);
-		break;
-
-	  case PDU_RSAK:
-		ENSURE(size == 8U, (sscop, sscop->aarg,
-			"PDU_RSAK size=%u", size));
-		sscop_signal(sscop, SIG_RSAK, msg);
-		break;
-
-	  case PDU_ER:
-		ENSURE(size == 8U, (sscop, sscop->aarg,
-			"PDU_ER size=%u", size));
-		sscop_signal(sscop, SIG_ER, msg);
-		break;
-
-	  case PDU_ERAK:
-		ENSURE(size == 8U, (sscop, sscop->aarg,
-			"PDU_ERAK size=%u", size));
-		sscop_signal(sscop, SIG_ERAK, msg);
-		break;
-
-	  case PDU_USTAT:
-		ENSURE(size == 16U, (sscop, sscop->aarg,
-			"PDU_ERAK size=%u", size));
-		sscop_signal(sscop, SIG_USTAT, msg);
-		break;
-	}
-#undef ENSURE
-	return;
-
-  err:
-	MAAL_ERROR(sscop, 'U', 0);
-	SSCOP_MSG_FREE(msg);
-}
-
-/************************************************************/
-/*
- * UTILITIES
- */
-
-/*
- * Move the receiver window by N packets
- */
-u_int
-sscop_window(struct sscop *sscop, u_int n)
-{
-	sscop->vr_mr += n;
-	return (SEQNO_DIFF(sscop->vr_mr, sscop->vr_r));
-}
-
-/*
- * Lower layer busy handling
- */
-u_int
-sscop_setbusy(struct sscop *sscop, int busy)
-{
-	u_int old = sscop->ll_busy;
-
-	if (busy > 0)
-		sscop->ll_busy = 1;
-	else if (busy == 0) {
-		sscop->ll_busy = 0;
-		if(old)
-			handle_sigs(sscop);
-	}
-
-	return (old);
-}
-
-const char *
-sscop_signame(enum sscop_aasig sig)
-{
-	static char str[40];
-
-	if (sig >= sizeof(sscop_sigs)/sizeof(sscop_sigs[0])) {
-		sprintf(str, "BAD SSCOP_AASIG %u", sig);
-		return (str);
-	} else {
-		return (sscop_sigs[sig]);
-	}
-}
-
-const char *
-sscop_msigname(enum sscop_maasig sig)
-{
-	static char str[40];
-
-	if (sig >= sizeof(sscop_msigs)/sizeof(sscop_msigs[0])) {
-		sprintf(str, "BAD SSCOP_MAASIG %u", sig);
-		return (str);
-	} else {
-		return (sscop_msigs[sig]);
-	}
-}
-
-const char *
-sscop_statename(enum sscop_state s)
-{
-	static char str[40];
-
-	if (s >= sizeof(states)/sizeof(states[0])) {
-		sprintf(str, "BAD SSCOP_STATE %u", s);
-		return (str);
-	} else {
-		return (states[s]);
-	}
-}
-
-
-/************************************************************/
-/*
- * MACROS
- */
-
-/*
- * p 75: release buffers
- */
-static void
-m_release_buffers(struct sscop *sscop)
-{
-	MSGQ_CLEAR(&sscop->xq);
-	MSGQ_CLEAR(&sscop->xbuf);
-	sscop->rxq = 0;
-	MSGQ_CLEAR(&sscop->rbuf);
-}
-
-/*
- * P 75: Prepare retrival
- */
-static void
-m_prepare_retrieval(struct sscop *sscop)
-{
-	struct sscop_msg *msg;
-
-	if (sscop->clear_buffers) {
-		MSGQ_CLEAR(&sscop->xq);
-		MSGQ_CLEAR(&sscop->xbuf);
-	}
-	MSGQ_FOREACH(msg, &sscop->xbuf)
-		msg->rexmit = 0;
-	sscop->rxq = 0;
-
-	MSGQ_CLEAR(&sscop->rbuf);
-}
-
-/*
- * P 75: Prepare retrival
- */
-static void
-m_prepare_recovery(struct sscop *sscop)
-{
-	struct sscop_msg *msg;
-
-	if(sscop->clear_buffers) {
-		MSGQ_CLEAR(&sscop->xq);
-		MSGQ_CLEAR(&sscop->xbuf);
-	}
-	MSGQ_FOREACH(msg, &sscop->xbuf)
-		msg->rexmit = 0;
-	sscop->rxq = 0;
-}
-
-
-/*
- * P 75: Clear transmitter
- */
-static void
-m_clear_transmitter(struct sscop *sscop)
-{
-	if(!sscop->clear_buffers) {
-		MSGQ_CLEAR(&sscop->xq);
-		MSGQ_CLEAR(&sscop->xbuf);
-	}
-}
-
-
-/*
- * p 75: Deliver data
- * Freeing the message is the responibility of the handler function.
- */
-static void
-m_deliver_data(struct sscop *sscop)
-{
-	struct sscop_msg *msg;
-	u_int sn;
-
-	if ((msg = MSGQ_GET(&sscop->rbuf)) == NULL)
-		return;
-
-	if (sscop->clear_buffers) {
-		MSGQ_CLEAR(&sscop->rbuf);
-		return;
-	}
-
-	sn = msg->seqno + 1;
-	AAL_DATA(sscop, SSCOP_DATA_indication, msg->m, msg->seqno);
-	MSG_FREE(msg);
-
-	while ((msg = MSGQ_GET(&sscop->rbuf)) != NULL) {
-		ASSERT(msg->seqno == sn);
-		if (++sn == SSCOP_MAXSEQNO)
-			sn = 0;
-		AAL_DATA(sscop, SSCOP_DATA_indication, msg->m, msg->seqno);
-		MSG_FREE(msg);
-	}
-}
-
-/*
- * P 75: Initialize state variables
- */
-static void
-m_initialize_state(struct sscop *sscop)
-{
-	sscop->vt_s = 0;
-	sscop->vt_ps = 0;
-	sscop->vt_a = 0;
-
-	sscop->vt_pa = 1;
-	sscop->vt_pd = 0;
-	sscop->credit = 1;
-
-	sscop->vr_r = 0;
-	sscop->vr_h = 0;
-}
-
-/*
- * p 76: Data retrieval
- */
-static void
-m_data_retrieval(struct sscop *sscop, u_int rn)
-{
-	struct sscop_msg *s;
-
-	if (rn != SSCOP_RETRIEVE_UNKNOWN) {
-		if(rn >= SSCOP_RETRIEVE_TOTAL)
-			rn = sscop->vt_a;
-		else
-			rn++;
-		while(rn >= sscop->vt_a && rn < sscop->vt_s) {
-			if(rn == SSCOP_MAXSEQNO) rn = 0;
-			if((s = QFIND(&sscop->xbuf, rn)) != NULL) {
-				MSGQ_REMOVE(&sscop->xbuf, s);
-				AAL_DATA(sscop, SSCOP_RETRIEVE_indication,
-					s->m, 0);
-				MSG_FREE(s);
-			}
-			rn++;
-		}
-	}
-
-	while((s = MSGQ_GET(&sscop->xq)) != NULL) {
-		AAL_DATA(sscop, SSCOP_RETRIEVE_indication, s->m, 0);
-		MSG_FREE(s);
-	}
-	AAL_SIG(sscop, SSCOP_RETRIEVE_COMPL_indication);
-}
-
-/*
- * P 76: Detect retransmission. PDU type must already be stripped.
- */
-static int
-m_detect_retransmission(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union bgn bgn;
-
-	bgn.sscop_null = MBUF_TRAIL32(msg->m, -1);
-
-	if (sscop->vr_sq == bgn.sscop_bgns)
-		return (1);
-
-	sscop->vr_sq = bgn.sscop_bgns;
-	return (0);
-}
-
-/*
- * P 76: Set POLL timer
- */
-static void
-m_set_poll_timer(struct sscop *sscop)
-{
-	if(MSGQ_EMPTY(&sscop->xq) && sscop->vt_s == sscop->vt_a)
-		TIMER_RESTART(sscop, ka);
-	else
-		TIMER_RESTART(sscop, poll);
-}
-
-/*
- * P 77: Reset data transfer timers
- */
-static void
-m_reset_data_xfer_timers(struct sscop *sscop)
-{
-	TIMER_STOP(sscop, ka);
-	TIMER_STOP(sscop, nr);
-	TIMER_STOP(sscop, idle);
-	TIMER_STOP(sscop, poll);
-}
-
-/*
- * P 77: Set data transfer timers
- */
-static void
-m_set_data_xfer_timers(struct sscop *sscop)
-{
-	TIMER_RESTART(sscop, poll);
-	TIMER_RESTART(sscop, nr);
-}
-
-/*
- * P 77: Initialize VR(MR)
- */
-static void
-m_initialize_mr(struct sscop *sscop)
-{
-	sscop->vr_mr = sscop->mr;
-}
-
-/************************************************************/
-/*
- * CONDITIONS
- */
-static int
-c_ready_pduq(struct sscop *sscop)
-{
-	if (!sscop->ll_busy &&
-	    (sscop->rxq != 0 ||
-	    sscop->vt_s < sscop->vt_ms ||
-	    TIMER_ISACT(sscop, idle)))
-		return (1);
-	return (0);
-}
-
-/************************************************************/
-/*
- * SEND PDUS
- */
-
-/*
- * Send BG PDU.
- */
-static void
-send_bgn(struct sscop *sscop, struct SSCOP_MBUF_T *uu)
-{
-	union pdu pdu;
-	union bgn bgn;
-	struct SSCOP_MBUF_T *m;
-
-	pdu.sscop_null = 0;
-	pdu.sscop_type = PDU_BGN;
-	pdu.sscop_ns = sscop->vr_mr;
-
-	bgn.sscop_null = 0;
-	bgn.sscop_bgns = sscop->vt_sq;
-
-	if(uu) {
-		if ((m = MBUF_DUP(uu)) == NULL) {
-			FAILURE("sscop: cannot allocate BGN");
-			return;
-		}
-		pdu.sscop_pl += MBUF_PAD4(m);
-	} else {
-		if ((m = MBUF_ALLOC(8)) == NULL) {
-			FAILURE("sscop: cannot allocate BGN");
-			return;
-		}
-	}
-
-	MBUF_APPEND32(m, bgn.sscop_null);
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/*
- * Send BGREJ PDU.
- */
-static void
-send_bgrej(struct sscop *sscop, struct SSCOP_MBUF_T *uu)
-{
-	union pdu pdu;
-	union bgn bgn;
-	struct SSCOP_MBUF_T *m;
-
-	pdu.sscop_null = 0;
-	pdu.sscop_type = PDU_BGREJ;
-	bgn.sscop_null = 0;
-
-	if(uu) {
-		if((m = MBUF_DUP(uu)) == NULL) {
-			FAILURE("sscop: cannot allocate BGREJ");
-			return;
-		}
-		pdu.sscop_pl += MBUF_PAD4(m);
-	} else {
-		if((m = MBUF_ALLOC(8)) == NULL) {
-			FAILURE("sscop: cannot allocate BGREJ");
-			return;
-		}
-	}
-
-	MBUF_APPEND32(m, bgn.sscop_null);
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/*
- * Send BGAK PDU.
- */
-static void
-send_bgak(struct sscop *sscop, struct SSCOP_MBUF_T *uu)
-{
-	union pdu pdu;
-	union bgn bgn;
-	struct SSCOP_MBUF_T *m;
-
-	pdu.sscop_null = 0;
-	pdu.sscop_type = PDU_BGAK;
-	pdu.sscop_ns = sscop->vr_mr;
-	bgn.sscop_null = 0;
-
-	if(uu) {
-		if((m = MBUF_DUP(uu)) == NULL) {
-			FAILURE("sscop: cannot allocate BGAK");
-			return;
-		}
-		pdu.sscop_pl += MBUF_PAD4(m);
-	} else {
-		if((m = MBUF_ALLOC(8)) == NULL) {
-			FAILURE("sscop: cannot allocate BGAK");
-			return;
-		}
-	}
-
-	MBUF_APPEND32(m, bgn.sscop_null);
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/*
- * Send SD PDU. The function makes a duplicate of the message.
- */
-static void
-send_sd(struct sscop *sscop, struct SSCOP_MBUF_T *m, u_int seqno)
-{
-	union pdu pdu;
-
-	if((m = MBUF_DUP(m)) == NULL) {
-		FAILURE("sscop: cannot allocate SD");
-		return;
-	}
-
-	pdu.sscop_null = 0;
-	pdu.sscop_pl = 0;
-	pdu.sscop_type = PDU_SD;
-	pdu.sscop_ns = seqno;
-
-	pdu.sscop_pl += MBUF_PAD4(m);
-
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/*
- * Send a UD PDU. The caller must free the sscop msg part.
- */
-static void
-send_ud(struct sscop *sscop, struct SSCOP_MBUF_T *m)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = 0;
-	pdu.sscop_type = PDU_UD;
-
-	pdu.sscop_pl += MBUF_PAD4(m);
-
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/*
- * Send a MD PDU. The caller must free the sscop msg part.
- */
-static void
-send_md(struct sscop *sscop, struct SSCOP_MBUF_T *m)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = 0;
-	pdu.sscop_type = PDU_MD;
-
-	pdu.sscop_pl += MBUF_PAD4(m);
-
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/*
- * Send END PDU.
- */
-static void
-send_end(struct sscop *sscop, int src, struct SSCOP_MBUF_T *uu)
-{
-	union pdu pdu;
-	struct SSCOP_MBUF_T *m;
-
-	sscop->last_end_src = src;
-
-	pdu.sscop_null = 0;
-	pdu.sscop_s = src;
-	pdu.sscop_type = PDU_END;
-
-	if(uu) {
-		if((m = MBUF_DUP(uu)) == NULL) {
-			FAILURE("sscop: cannot allocate END");
-			return;
-		}
-		pdu.sscop_pl += MBUF_PAD4(m);
-	} else {
-		if((m = MBUF_ALLOC(8)) == NULL) {
-			FAILURE("sscop: cannot allocate END");
-			return;
-		}
-	}
-
-	MBUF_APPEND32(m, 0);
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/*
- * Send USTAT PDU. List must be terminated by -1.
- */
-static void
-send_ustat(struct sscop *sscop, ...)
-{
-	va_list ap;
-	int f;
-	u_int n;
-	union pdu pdu;
-	union seqno seqno;
-	struct SSCOP_MBUF_T *m;
-
-	va_start(ap, sscop);
-	n = 0;
-	while((f = va_arg(ap, int)) >= 0)
-		n++;
-	va_end(ap);
-
-	if((m = MBUF_ALLOC(n * 4 + 8)) == NULL) {
-		FAILURE("sscop: cannot allocate USTAT");
-		return;
-	}
-
-	va_start(ap, sscop);
-	while((f = va_arg(ap, int)) >= 0) {
-		seqno.sscop_null = 0;
-		seqno.sscop_n = f;
-		MBUF_APPEND32(m, seqno.sscop_null);
-	}
-	va_end(ap);
-
-	seqno.sscop_null = 0;
-	seqno.sscop_n = sscop->vr_mr;
-	MBUF_APPEND32(m, seqno.sscop_null);
-
-	pdu.sscop_null = 0;
-	pdu.sscop_type = PDU_USTAT;
-	pdu.sscop_ns = sscop->vr_r;
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/*
- * Send ER PDU.
- */
-static void
-send_er(struct sscop *sscop)
-{
-	union pdu pdu;
-	union bgn bgn;
-	struct SSCOP_MBUF_T *m;
-
-	pdu.sscop_null = 0;
-	pdu.sscop_type = PDU_ER;
-	pdu.sscop_ns = sscop->vr_mr;
-
-	bgn.sscop_null = 0;
-	bgn.sscop_bgns = sscop->vt_sq;
-
-	if((m = MBUF_ALLOC(8)) == NULL) {
-		FAILURE("sscop: cannot allocate ER");
-		return;
-	}
-	MBUF_APPEND32(m, bgn.sscop_null);
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/*
- * Send POLL PDU.
- */
-static void
-send_poll(struct sscop *sscop)
-{
-	union pdu pdu;
-	union seqno seqno;
-	struct SSCOP_MBUF_T *m;
-
-	seqno.sscop_null = 0;
-	seqno.sscop_n = sscop->vt_ps;
-
-	pdu.sscop_null = 0;
-	pdu.sscop_ns = sscop->vt_s;
-	pdu.sscop_type = PDU_POLL;
-
-	if((m = MBUF_ALLOC(8)) == NULL) {
-		FAILURE("sscop: cannot allocate POLL");
-		return;
-	}
-	MBUF_APPEND32(m, seqno.sscop_null);
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/*
- * Send STAT PDU. List is already in buffer.
- */
-static void
-send_stat(struct sscop *sscop, u_int nps, struct SSCOP_MBUF_T *m)
-{
-	union pdu pdu;
-	union seqno seqno;
-
-	seqno.sscop_null = 0;
-	seqno.sscop_n = nps;
-	MBUF_APPEND32(m, seqno.sscop_null);
-
-	seqno.sscop_null = 0;
-	seqno.sscop_n = sscop->vr_mr;
-	MBUF_APPEND32(m, seqno.sscop_null);
-
-	pdu.sscop_null = 0;
-	pdu.sscop_type = PDU_STAT;
-	pdu.sscop_ns = sscop->vr_r;
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/*
- * Send ENDAK PDU.
- */
-static void
-send_endak(struct sscop *sscop)
-{
-	union pdu pdu;
-	union seqno seqno;
-	struct SSCOP_MBUF_T *m;
-
-	seqno.sscop_null = 0;
-	pdu.sscop_null = 0;
-	pdu.sscop_type = PDU_ENDAK;
-
-	if((m = MBUF_ALLOC(8)) == NULL) {
-		FAILURE("sscop: cannot allocate ENDAK");
-		return;
-	}
-	MBUF_APPEND32(m, seqno.sscop_null);
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/*
- * Send ERAK PDU.
- */
-static void
-send_erak(struct sscop *sscop)
-{
-	union pdu pdu;
-	union seqno seqno;
-	struct SSCOP_MBUF_T *m;
-
-	seqno.sscop_null = 0;
-	pdu.sscop_null = 0;
-	pdu.sscop_type = PDU_ERAK;
-	pdu.sscop_ns = sscop->vr_mr;
-
-	if((m = MBUF_ALLOC(8)) == NULL) {
-		FAILURE("sscop: cannot allocate ERAK");
-		return;
-	}
-	MBUF_APPEND32(m, seqno.sscop_null);
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/*
- * Send RS PDU
- */
-static void
-send_rs(struct sscop *sscop, int resend, struct SSCOP_MBUF_T *uu)
-{
-	union pdu pdu;
-	union bgn bgn;
-	struct SSCOP_MBUF_T *m;
-
-	pdu.sscop_null = 0;
-	pdu.sscop_type = PDU_RS;
-	pdu.sscop_ns = resend ? sscop->rs_mr : sscop->vr_mr;
-
-	bgn.sscop_null = 0;
-	bgn.sscop_bgns = resend ? sscop->rs_sq : sscop->vt_sq;
-
-	sscop->rs_mr = pdu.sscop_ns;
-	sscop->rs_sq = bgn.sscop_bgns;
-
-	if(uu) {
-		if((m = MBUF_DUP(uu)) == NULL) {
-			FAILURE("sscop: cannot allocate RS");
-			return;
-		}
-		pdu.sscop_pl += MBUF_PAD4(m);
-	} else {
-		if((m = MBUF_ALLOC(8)) == NULL) {
-			FAILURE("sscop: cannot allocate RS");
-			return;
-		}
-	}
-
-	MBUF_APPEND32(m, bgn.sscop_null);
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/*
- * Send RSAK pdu
- */
-static void
-send_rsak(struct sscop *sscop)
-{
-	union pdu pdu;
-	union seqno seqno;
-	struct SSCOP_MBUF_T *m;
-
-	seqno.sscop_null = 0;
-	pdu.sscop_null = 0;
-	pdu.sscop_type = PDU_RSAK;
-	pdu.sscop_ns = sscop->vr_mr;
-
-	if((m = MBUF_ALLOC(8)) == NULL) {
-		FAILURE("sscop: cannot allocate RSAK");
-		return;
-	}
-
-	MBUF_APPEND32(m, seqno.sscop_null);
-	MBUF_APPEND32(m, pdu.sscop_null);
-
-	AAL_SEND(sscop, m);
-}
-
-/************************************************************/
-/*
- * P 31; IDLE && AA-ESTABLISH-request
- *	arg is UU data (opt).
- */
-static void
-sscop_idle_establish_req(struct sscop *sscop, struct sscop_msg *uu)
-{
-	u_int br = uu->rexmit;
-
-	SET_UU(uu_bgn, uu);
-
-	m_clear_transmitter(sscop);
-
-	sscop->clear_buffers = br;
-
-	sscop->vt_cc = 1;
-	sscop->vt_sq++;
-
-	m_initialize_mr(sscop);
-
-	send_bgn(sscop, sscop->uu_bgn);
-
-	TIMER_RESTART(sscop, cc);
-
-	sscop_set_state(sscop, SSCOP_OUT_PEND);
-}
-
-/*
- * P 31: IDLE && BGN PDU
- *	arg is the received PDU (freed).
- */
-static void
-sscop_idle_bgn(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-	union bgn bgn;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(sscop->robustness) {
-		bgn.sscop_null = MBUF_STRIP32(msg->m);
-		sscop->vr_sq = bgn.sscop_bgns;
-	} else {
-		if(m_detect_retransmission(sscop, msg)) {
-			send_bgrej(sscop, sscop->uu_bgrej);
-			SSCOP_MSG_FREE(msg);
-			return;
-		}
-		(void)MBUF_STRIP32(msg->m);
-	}
-
-	sscop->vt_ms = pdu.sscop_ns;
-	sscop_set_state(sscop, SSCOP_IN_PEND);
-
-	AAL_UU_SIGNAL(sscop, SSCOP_ESTABLISH_indication, msg, pdu.sscop_pl, 0);
-}
-
-/*
- * p 31: IDLE && ENDAK PDU
- * p 34: OUT_PEND && ENDAK PDU
- * p 34: OUT_PEND && SD PDU
- * p 34: OUT_PEND && ERAK PDU
- * p 34: OUT_PEND && END PDU
- * p 34: OUT_PEND && STAT PDU
- * p 34: OUT_PEND && USTAT PDU
- * p 34: OUT_PEND && POLL PDU
- * p 36: OUT_PEND && RS PDU
- * p 36: OUT_PEND && RSAK PDU
- * p 40: OUTGOING_DISCONNECT_PENDING && SD PDU
- * p 40: OUTGOING_DISCONNECT_PENDING && BGAK PDU
- * p 40: OUTGOING_DISCONNECT_PENDING && POLL PDU
- * p 40: OUTGOING_DISCONNECT_PENDING && STAT PDU
- * p 40: OUTGOING_DISCONNECT_PENDING && USTAT PDU
- * p 41: OUTGOING_DISCONNECT_PENDING && ERAK PDU
- * p 42: OUTGOING_DISCONNECT_PENDING && ER PDU
- * p 42: OUTGOING_DISCONNECT_PENDING && RS PDU
- * p 42: OUTGOING_DISCONNECT_PENDING && RSAK PDU
- * p 43: OUTGOING_RESYNC && ER PDU
- * p 43: OUTGOING_RESYNC && POLL PDU
- * p 44: OUTGOING_RESYNC && STAT PDU
- * p 44: OUTGOING_RESYNC && USTAT PDU
- * p 45: OUTGOING_RESYNC && BGAK PDU
- * p 45: OUTGOING_RESYNC && SD PDU
- * p 45: OUTGOING_RESYNC && ERAK PDU
- * P 60: READY && BGAK PDU
- * P 60: READY && ERAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_ignore_pdu(struct sscop *sscop __unused, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 31: IDLE && END PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_idle_end(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	send_endak(sscop);
-}
-
-/*
- * p 31: IDLE && ER PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_idle_er(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'L', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-}
-
-/*
- * p 31: IDLE && BGREJ PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_idle_bgrej(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'D', 0);
-	FREE_UU(uu_end);
-}
-
-/*
- * p 32: IDLE && POLL PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_idle_poll(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'G', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-}
-
-/*
- * p 32: IDLE && SD PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_idle_sd(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'A', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-}
-
-/*
- * p 32: IDLE && BGAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_idle_bgak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'C', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-}
-
-/*
- * p 32: IDLE && ERAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_idle_erak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'M', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-}
-
-/*
- * p 32: IDLE && STAT PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_idle_stat(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'H', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-}
-
-/*
- * p 32: IDLE && USTAT PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_idle_ustat(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'I', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-}
-
-/*
- * p 33: IDLE & RS PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_idle_rs(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'J', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-}
-
-/*
- * p 33: IDLE & RSAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_idle_rsak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'K', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-}
-
-/*
- * p 33: IDLE && PDU_Q
- * p XX: OUTPEND && PDU_Q
- * p 39: IN_PEND && PDU_Q
- * p 45: OUT_RESYNC_PEND && PDU_Q
- * p 48: IN_RESYNC_PEND && PDU_Q
- *	no arg
- */
-static void
-sscop_flush_pduq(struct sscop *sscop __unused, struct sscop_msg *unused __unused)
-{
-#if 0
-	MSGQ_CLEAR(&sscop->xq);
-#endif
-}
-
-/*
- * p 34: OUT_PEND && BGAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_outpend_bgak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	(void)MBUF_STRIP32(msg->m);
-
-	TIMER_STOP(sscop, cc);
-	sscop->vt_ms = pdu.sscop_ns;
-
-	AAL_UU_SIGNAL(sscop, SSCOP_ESTABLISH_confirm, msg, pdu.sscop_pl, 0);
-
-	m_initialize_state(sscop);
-	m_set_data_xfer_timers(sscop);
-
-	sscop_set_state(sscop, SSCOP_READY);
-}
-
-/*
- * P 34: OUT_PEND && BGREJ PDU
- */
-static void
-sscop_outpend_bgrej(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	(void)MBUF_STRIP32(msg->m);
-
-	TIMER_STOP(sscop, cc);
-
-	AAL_UU_SIGNAL(sscop, SSCOP_RELEASE_indication, msg, pdu.sscop_pl, 0);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * P 35: OUT_PEND && TIMER_CC expiry
- *	no arg
- */
-static void
-sscop_outpend_tcc(struct sscop *sscop, struct sscop_msg *unused __unused)
-{
-	if(sscop->vt_cc >= sscop->maxcc) {
-		MAAL_ERROR(sscop, 'O', 0);
-		FREE_UU(uu_end);
-		send_end(sscop, 1, NULL);
-
-		AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-
-		sscop_set_state(sscop, SSCOP_IDLE);
-	} else {
-		sscop->vt_cc++;
-		send_bgn(sscop, sscop->uu_bgn);
-		TIMER_RESTART(sscop, cc);
-	}
-}
-
-/*
- * P 35: OUT_PEND && RELEASE_REQ
- *	arg is UU
- */
-static void
-sscop_outpend_release_req(struct sscop *sscop, struct sscop_msg *uu)
-{
-	SET_UU(uu_end, uu);
-
-	TIMER_STOP(sscop, cc);
-	sscop->vt_cc = 1;
-	send_end(sscop, 0, sscop->uu_end);
-	TIMER_RESTART(sscop, cc);
-
-	sscop_set_state(sscop, SSCOP_OUT_DIS_PEND);
-}
-
-/*
- * P 36: OUT_PEND && BGN PDU
- *	arg is the received PDU (freed).
- */
-static void
-sscop_outpend_bgn(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		SSCOP_MSG_FREE(msg);
-		return;
-	}
-	(void)MBUF_STRIP32(msg->m);
-
-	TIMER_STOP(sscop, cc);
-
-	sscop->vt_ms = pdu.sscop_ns;
-
-	m_initialize_mr(sscop);
-
-	send_bgak(sscop, sscop->uu_bgak);
- 
-	AAL_UU_SIGNAL(sscop, SSCOP_ESTABLISH_confirm, msg, pdu.sscop_pl, 0);
-
-	m_initialize_state(sscop);
-
-	m_set_data_xfer_timers(sscop);
-
-	sscop_set_state(sscop, SSCOP_READY);
-}
-
-/*
- * p 37: IN_PEND && AA-ESTABLISH.response
- *	arg is UU
- */
-static void
-sscop_inpend_establish_resp(struct sscop *sscop, struct sscop_msg *uu)
-{
-	u_int br = uu->rexmit;
-
-	SET_UU(uu_bgak, uu);
-
-	m_clear_transmitter(sscop);
-	sscop->clear_buffers = br;
-	m_initialize_mr(sscop);
-	send_bgak(sscop, sscop->uu_bgak);
-	m_initialize_state(sscop);
-	m_set_data_xfer_timers(sscop);
-
-	sscop_set_state(sscop, SSCOP_READY);
-}
-
-/*
- * p 37: IN_PEND && AA-RELEASE.request
- *	arg is uu.
- */
-static void
-sscop_inpend_release_req(struct sscop *sscop, struct sscop_msg *uu)
-{
-	SET_UU(uu_bgrej, uu);
-
-	send_bgrej(sscop, sscop->uu_bgrej);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 37: IN_PEND && BGN PDU
- *	arg is pdu. (freed)
- */
-static void
-sscop_inpend_bgn(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		SSCOP_MSG_FREE(msg);
-		return;
-	}
-	(void)MBUF_STRIP32(msg->m);
-
-	sscop->vt_ms = pdu.sscop_ns;
-
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 0);
-	AAL_UU_SIGNAL(sscop, SSCOP_ESTABLISH_indication, msg, pdu.sscop_pl, 0);
-}
-
-/*
- * p 37: IN_PEND && ER PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_inpend_er(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'L', 0);
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 37: IN_PEND && ENDAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_inpend_endak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'F', 0);
-
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 38: IN_PEND && BGAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_inpend_bgak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'C', 0);
-
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 38: IN_PEND && BGREJ PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_inpend_bgrej(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'D', 0);
-
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-
-	SSCOP_MSG_FREE(msg);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 38: IN_PEND && SD PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_inpend_sd(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'A', 0);
-
-	SSCOP_MSG_FREE(msg);
-
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 38: IN_PEND && USTAT PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_inpend_ustat(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'I', 0);
-
-	SSCOP_MSG_FREE(msg);
-
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 38: IN_PEND && STAT PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_inpend_stat(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'H', 0);
-
-	SSCOP_MSG_FREE(msg);
-
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 38: IN_PEND && POLL PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_inpend_poll(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'G', 0);
-
-	SSCOP_MSG_FREE(msg);
-
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 39: IN_PEND && ERAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_inpend_erak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'M', 0);
-}
-
-/*
- * p 39: IN_PEND & RS PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_inpend_rs(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'J', 0);
-}
-
-/*
- * p 39: IN_PEND & RSAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_inpend_rsak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'K', 0);
-}
-
-/*
- * p 39: IN_PEND && END PDU
- *	arg is pdu (freed).
- *	no uui
- */
-static void
-sscop_inpend_end(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	(void)MBUF_STRIP32(msg->m);
-
-	send_endak(sscop);
-
-	AAL_UU_SIGNAL(sscop, SSCOP_RELEASE_indication,
-		msg, pdu.sscop_pl, (u_int)pdu.sscop_s);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 40: OUT_DIS_PEND && SSCOP_ESTABLISH_request
- *	no arg.
- *	no uui.
- */
-static void
-sscop_outdis_establish_req(struct sscop *sscop, struct sscop_msg *uu)
-{
-	SET_UU(uu_bgn, uu);
-
-	TIMER_STOP(sscop, cc);
-	m_clear_transmitter(sscop);
-	sscop->clear_buffers = 1;
-	sscop->vt_cc = 1;
-	sscop->vt_sq++;
-	m_initialize_mr(sscop);
-	send_bgn(sscop, sscop->uu_bgn);
-	TIMER_RESTART(sscop, cc);
-
-	sscop_set_state(sscop, SSCOP_OUT_PEND);
-}
-
-/*
- * p 41: OUT_DIS_PEND && END PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_outdis_end(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	(void)MBUF_STRIP32(msg->m);
-
-	TIMER_STOP(sscop, cc);
-	send_endak(sscop);
-
-	AAL_UU_SIGNAL(sscop, SSCOP_RELEASE_confirm, msg, pdu.sscop_pl, 0);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 41: OUT_DIS_PEND && ENDAK PDU
- * p 41: OUT_DIS_PEND && BGREJ PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_outdis_endak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	(void)MBUF_STRIP32(msg->m);
-
-	TIMER_STOP(sscop, cc);
-
-	AAL_UU_SIGNAL(sscop, SSCOP_RELEASE_confirm, msg, pdu.sscop_pl, 0);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 41: OUT_DIS_PEND && TIMER CC expiry
- *	no arg
- */
-static void
-sscop_outdis_cc(struct sscop *sscop, struct sscop_msg *unused __unused)
-{
-	if(sscop->vt_cc >= sscop->maxcc) {
-		MAAL_ERROR(sscop, 'O', 0);
-		AAL_SIG(sscop, SSCOP_RELEASE_confirm);
-		sscop_set_state(sscop, SSCOP_IDLE);
-	} else {
-		sscop->vt_cc++;
-		send_end(sscop, sscop->last_end_src, sscop->uu_end);
-		TIMER_RESTART(sscop, cc);
-	}
-}
-
-/*
- * p 42: OUT_DIS_PEND && BGN PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_outdis_bgn(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		FREE_UU(uu_bgak);
-		send_bgak(sscop, NULL);
-		send_end(sscop, sscop->last_end_src, sscop->uu_end);
-		SSCOP_MSG_FREE(msg);
-
-	} else {
-		(void)MBUF_STRIP32(msg->m);
-
-		TIMER_STOP(sscop, cc);
-		sscop->vt_ms = pdu.sscop_ns;
-		AAL_SIG(sscop, SSCOP_RELEASE_confirm);
-		AAL_UU_SIGNAL(sscop, SSCOP_ESTABLISH_indication,
-			msg, pdu.sscop_pl, 0);
-		sscop_set_state(sscop, SSCOP_IN_PEND);
-	}
-}
-
-/*
- * p 43: OUT_RESYNC_PEND && BGN PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_outsync_bgn(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		send_bgak(sscop, sscop->uu_bgak);
-		send_rs(sscop, 1, sscop->uu_rs);
-		SSCOP_MSG_FREE(msg);
-	} else {
-		(void)MBUF_STRIP32(msg->m);
-
-		TIMER_STOP(sscop, cc);
-		sscop->vt_ms = pdu.sscop_ns;
-		AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 0);
-		AAL_UU_SIGNAL(sscop, SSCOP_ESTABLISH_indication,
-			msg, pdu.sscop_pl, 0);
-		sscop_set_state(sscop, SSCOP_IN_PEND);
-	}
-}
-
-/*
- * p 43: OUT_RESYNC_PEND && ENDAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_outsync_endak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	TIMER_STOP(sscop, cc);
-	MAAL_ERROR(sscop, 'F', 0);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 43: OUT_RESYNC_PEND && BGREJ PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_outsync_bgrej(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	TIMER_STOP(sscop, cc);
-	MAAL_ERROR(sscop, 'D', 0);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 43: OUT_RESYNC_PEND && END PDU
- *	arg is pdu (freed).
- *	no UU-data
- */
-static void
-sscop_outsync_end(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	(void)MBUF_STRIP32(msg->m);
-
-	TIMER_STOP(sscop, cc);
-	send_endak(sscop);
-	AAL_UU_SIGNAL(sscop, SSCOP_RELEASE_indication, msg, pdu.sscop_pl,
-		(u_int)pdu.sscop_s);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 44: OUT_RESYNC && TIMER CC expiry
- */
-static void
-sscop_outsync_cc(struct sscop *sscop, struct sscop_msg *msg __unused)
-{
-	if(sscop->vt_cc == sscop->maxcc) {
-		MAAL_ERROR(sscop, 'O', 0);
-		FREE_UU(uu_end);
-		send_end(sscop, 1, NULL);
-		AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-		sscop_set_state(sscop, SSCOP_IDLE);
-	} else {
-		sscop->vt_cc++;
-		send_rs(sscop, 1, sscop->uu_rs);
-		TIMER_RESTART(sscop, cc);
-	}
-}
-
-/*
- * p 44: OUT_RESYNC && AA-RELEASE.request
- *	arg is UU
- */
-static void
-sscop_outsync_release_req(struct sscop *sscop, struct sscop_msg *uu)
-{
-	SET_UU(uu_end, uu);
-
-	TIMER_STOP(sscop, cc);
-	sscop->vt_cc = 1;
-	send_end(sscop, 0, sscop->uu_end);
-	TIMER_RESTART(sscop, cc);
-	sscop_set_state(sscop, SSCOP_OUT_DIS_PEND);
-}
-
-/*
- * p 45: OUT_RESYNC && RS PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_outsync_rs(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		SSCOP_MSG_FREE(msg);
-		return;
-	}
-	(void)MBUF_STRIP32(msg->m);
-
-	TIMER_STOP(sscop, cc);
-	sscop->vt_ms = pdu.sscop_ns;
-	m_initialize_mr(sscop);
-	send_rsak(sscop);
-	AAL_UU_SIGNAL(sscop, SSCOP_RESYNC_confirm, msg, pdu.sscop_pl, 0);
-	m_initialize_state(sscop);
-	m_set_data_xfer_timers(sscop);
-	sscop_set_state(sscop, SSCOP_READY);
-}
-
-/*
- * p 45: OUT_RESYNC && RSAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_outsync_rsak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	SSCOP_MSG_FREE(msg);
-
-	TIMER_STOP(sscop, cc);
-	sscop->vt_ms = pdu.sscop_ns;
-	AAL_SIG(sscop, SSCOP_RESYNC_confirm);
-	m_initialize_state(sscop);
-	m_set_data_xfer_timers(sscop);
-	sscop_set_state(sscop, SSCOP_READY);
-}
-
-/*
- * p 46: IN_RESYNC_PEND && AA-RESYNC.response
- */
-static void
-sscop_insync_sync_resp(struct sscop *sscop, struct sscop_msg *noarg __unused)
-{
-	m_initialize_mr(sscop);
-	send_rsak(sscop);
-	m_clear_transmitter(sscop);
-	m_initialize_state(sscop);
-	m_set_data_xfer_timers(sscop);
-	sscop_set_state(sscop, SSCOP_READY);
-}
-
-/*
- * p 46: IN_RESYNC_PEND && AA-RELEASE.request
- *	arg is uu
- */
-static void
-sscop_insync_release_req(struct sscop *sscop, struct sscop_msg *uu)
-{
-	SET_UU(uu_end, uu);
-
-	sscop->vt_cc = 1;
-	send_end(sscop, 0, sscop->uu_end);
-	TIMER_RESTART(sscop, cc);
-	sscop_set_state(sscop, SSCOP_OUT_DIS_PEND);
-}
-
-/*
- * p 46: IN_RESYNC_PEND && ENDAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_insync_endak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'F', 0);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 46: IN_RESYNC_PEND && BGREJ PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_insync_bgrej(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'D', 0);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 46: IN_RESYNC_PEND && END PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_insync_end(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	(void)MBUF_STRIP32(msg->m);
-
-	send_endak(sscop);
-	AAL_UU_SIGNAL(sscop, SSCOP_RELEASE_indication,
-		msg, pdu.sscop_pl, (u_int)pdu.sscop_s);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 47: IN_RESYNC_PEND && ER PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_insync_er(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'L', 0);
-}
-
-/*
- * p 47: IN_RESYNC_PEND && BGN PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_insync_bgn(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		MAAL_ERROR(sscop, 'B', 0);
-		SSCOP_MSG_FREE(msg);
-		return;
-	}
-	(void)MBUF_STRIP32(msg->m);
-
-	sscop->vt_ms = pdu.sscop_ns;
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 0);
-	AAL_UU_SIGNAL(sscop, SSCOP_ESTABLISH_indication, msg, pdu.sscop_pl, 0);
-
-	sscop_set_state(sscop, SSCOP_IN_PEND);
-}
-
-/*
- * p 47: IN_RESYNC_PEND && SD PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_insync_sd(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'A', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 47: IN_RESYNC_PEND && POLL PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_insync_poll(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'G', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 47: IN_RESYNC_PEND && STAT PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_insync_stat(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'H', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 47: IN_RESYNC_PEND && USTAT PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_insync_ustat(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'I', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 48: IN_RESYNC_PEND && BGAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_insync_bgak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'C', 0);
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 48: IN_RESYNC_PEND && ERAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_insync_erak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'M', 0);
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 48: IN_RESYNC_PEND && RS PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_insync_rs(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		SSCOP_MSG_FREE(msg);
-		return;
-	}
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'J', 0);
-}
-
-/*
- * p 48: IN_RESYNC_PEND && RSAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_insync_rsak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'K', 0);
-	SSCOP_MSG_FREE(msg);
-}
-
-
-/*
- * p 49: OUT_REC_PEND && AA-DATA.request
- *	arg is message (queued).
- */
-static void
-sscop_outrec_userdata(struct sscop *sscop, struct sscop_msg *msg)
-{
-	if(!sscop->clear_buffers) {
-		MSGQ_APPEND(&sscop->xq, msg);
-		sscop_signal(sscop, SIG_PDU_Q, msg);
-	} else {
-		SSCOP_MSG_FREE(msg);
-	}
-}
-
-/*
- * p 49: OUT_REC_PEND && BGAK PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_outrec_bgak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'C', 0);
-
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 49: OUT_REC_PEND && ERAK PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_outrec_erak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	TIMER_STOP(sscop, cc);
-	sscop->vt_ms = pdu.sscop_ns;
-	m_deliver_data(sscop);
-
-	AAL_SIG(sscop, SSCOP_RECOVER_indication);
-
-	sscop_set_state(sscop, SSCOP_REC_PEND);
-
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 49: OUT_REC_PEND && END PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_outrec_end(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	(void)MBUF_STRIP32(msg->m);
-
-	TIMER_STOP(sscop, cc);
-	send_endak(sscop);
-	AAL_UU_SIGNAL(sscop, SSCOP_RELEASE_indication,
-		msg, pdu.sscop_pl, (u_int)pdu.sscop_s);
-
-	MSGQ_CLEAR(&sscop->rbuf);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 49: OUT_REC_PEND && ENDAK PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_outrec_endak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'F', 0);
-	TIMER_STOP(sscop, cc);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	MSGQ_CLEAR(&sscop->rbuf);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 49: OUT_REC_PEND && BGREJ PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_outrec_bgrej(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'D', 0);
-	TIMER_STOP(sscop, cc);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	MSGQ_CLEAR(&sscop->rbuf);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 50: OUT_REC_PEND && TIMER CC expiry
- *	no arg.
- */
-static void
-sscop_outrec_cc(struct sscop *sscop, struct sscop_msg *unused __unused)
-{
-	if(sscop->vt_cc >= sscop->maxcc) {
-		MAAL_ERROR(sscop, 'O', 0);
-		FREE_UU(uu_end);
-		send_end(sscop, 1, NULL);
-		AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-		MSGQ_CLEAR(&sscop->rbuf);
-		sscop_set_state(sscop, SSCOP_IDLE);
-	} else {
-		sscop->vt_cc++;
-		send_er(sscop);
-		TIMER_RESTART(sscop, cc);
-	}
-}
-
-/*
- * p 50: OUT_REC_PEND && SSCOP_RELEASE_request
- *	arg is UU
- */
-static void
-sscop_outrec_release_req(struct sscop *sscop, struct sscop_msg *uu)
-{
-	SET_UU(uu_end, uu);
-
-	TIMER_STOP(sscop, cc);
-	sscop->vt_cc = 1;
-	send_end(sscop, 0, sscop->uu_end);
-	MSGQ_CLEAR(&sscop->rbuf);
-	TIMER_RESTART(sscop, cc);
-
-	sscop_set_state(sscop, SSCOP_OUT_DIS_PEND);
-}
-
-/*
- * p 51: OUT_REC_PEND && AA-RESYNC.request
- *	arg is uu
- */
-static void
-sscop_outrec_sync_req(struct sscop *sscop, struct sscop_msg *uu)
-{
-	SET_UU(uu_rs, uu);
-
-	TIMER_STOP(sscop, cc);
-	sscop->vt_cc = 1;
-	sscop->vt_sq++;
-	m_initialize_mr(sscop);
-	send_rs(sscop, 0, sscop->uu_rs);
-	m_clear_transmitter(sscop);
-	MSGQ_CLEAR(&sscop->rbuf);
-	TIMER_RESTART(sscop, cc);
-}
-
-/*
- * p 51: OUT_REC_PEND && BGN PDU
- *	arg is pdu (freed).
- *	no uui
- */
-static void
-sscop_outrec_bgn(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		MAAL_ERROR(sscop, 'B', 0);
-		SSCOP_MSG_FREE(msg);
-	} else {
-		(void)MBUF_STRIP32(msg->m);
-
-		TIMER_STOP(sscop, cc);
-		sscop->vt_ms = pdu.sscop_ns;
-		AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 0);
-		AAL_UU_SIGNAL(sscop, SSCOP_ESTABLISH_indication,
-			msg, pdu.sscop_pl, 0);
-		MSGQ_CLEAR(&sscop->rbuf);
-
-		sscop_set_state(sscop, SSCOP_IN_PEND);
-	}
-}
-
-/*
- * p 51: OUT_REC_PEND && ER PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_outrec_er(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		MAAL_ERROR(sscop, 'L', 0);
-	} else {
-		TIMER_STOP(sscop, cc);
-		sscop->vt_ms = pdu.sscop_ns;
-		m_initialize_mr(sscop);
-		send_erak(sscop);
-		m_deliver_data(sscop);
-
-		AAL_SIG(sscop, SSCOP_RECOVER_indication);
-
-		sscop_set_state(sscop, SSCOP_REC_PEND);
-	}
-
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 52: OUT_REC_PEND && SD PDU queued
- *	no arg.
- */
-static void
-sscop_outrec_pduq(struct sscop *sscop, struct sscop_msg *msg)
-{
-	sscop_save_signal(sscop, SIG_PDU_Q, msg);
-}
-
-/*
- * p 52: OUT_REC_PEND && RSAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_outrec_rsak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'K', 0);
-}
-
-/*
- * p 52: OUT_REC_PEND && RS PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_outrec_rs(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		SSCOP_MSG_FREE(msg);
-		MAAL_ERROR(sscop, 'J', 0);
-		return;
-	}
-	(void)MBUF_STRIP32(msg->m);
-
-	TIMER_STOP(sscop, cc);
-	sscop->vt_ms = pdu.sscop_ns;
-	AAL_UU_SIGNAL(sscop, SSCOP_RESYNC_indication, msg, pdu.sscop_pl, 0);
-	MSGQ_CLEAR(&sscop->rbuf);
-	sscop_set_state(sscop, SSCOP_IN_RESYNC_PEND);
-}
-
-/*
- * p 53: REC_PEND && BGAK PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_rec_bgak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'C', 0);
-
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 53: REC_PEND && END PDU
- *	arg is pdu (freed)
- *	no uui
- */
-static void
-sscop_rec_end(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	(void)MBUF_STRIP32(msg->m);
-
-	send_endak(sscop);
-	AAL_UU_SIGNAL(sscop, SSCOP_RELEASE_indication,
-		msg, pdu.sscop_pl, (u_int)pdu.sscop_s);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 53: REC_PEND && ENDAK PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_rec_endak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'F', 0);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	sscop_set_state(sscop, SSCOP_IDLE);
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 53: REC_PEND && BGREJ PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_rec_bgrej(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'D', 0);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	sscop_set_state(sscop, SSCOP_IDLE);
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 54: REC_PEND && RELEASE
- *	arg is UU
- */
-static void
-sscop_rec_release_req(struct sscop *sscop, struct sscop_msg *uu)
-{
-	SET_UU(uu_end, uu);
-
-	sscop->vt_cc = 1;
-	send_end(sscop, 0, sscop->uu_end);
-	TIMER_RESTART(sscop, cc);
-
-	sscop_set_state(sscop, SSCOP_OUT_DIS_PEND);
-}
-
-/*
- * p 54: REC_PEND && RSAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_rec_rsak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'K', 0);
-	SSCOP_MSG_FREE(msg);
-}
-
-
-/*
- * p 54: REC_PEND && RS PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_rec_rs(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		SSCOP_MSG_FREE(msg);
-		MAAL_ERROR(sscop, 'J', 0);
-		return;
-	}
-	(void)MBUF_STRIP32(msg->m);
-
-	sscop->vt_ms = pdu.sscop_ns;
-	AAL_UU_SIGNAL(sscop, SSCOP_RESYNC_indication, msg, pdu.sscop_pl, 0);
-
-	sscop_set_state(sscop, SSCOP_IN_RESYNC_PEND);
-}
-
-/*
- * p 54: REC_PEND && RECOVER response
- *	no arg
- */
-static void
-sscop_rec_recover(struct sscop *sscop, struct sscop_msg *unused __unused)
-{
-	if(!sscop->clear_buffers) {
-		MSGQ_CLEAR(&sscop->xbuf);
-	}
-	m_initialize_state(sscop);
-	m_set_data_xfer_timers(sscop);
-
-	sscop_set_state(sscop, SSCOP_READY);
-}
-
-/*
- * p 54: REC_PEND && RESYNC request
- *	arg is uu
- */
-static void
-sscop_rec_sync_req(struct sscop *sscop, struct sscop_msg *uu)
-{
-	SET_UU(uu_rs, uu);
-
-	m_clear_transmitter(sscop);
-	sscop->vt_cc = 1;
-	sscop->vt_sq++;
-	m_initialize_mr(sscop);
-	send_rs(sscop, 0, sscop->uu_rs);
-	TIMER_RESTART(sscop, cc);
-
-	sscop_set_state(sscop, SSCOP_OUT_RESYNC_PEND);
-}
-
-/*
- * p 55: REC_PEND && SD PDU queued
- *	no arg
- */
-static void
-sscop_rec_pduq(struct sscop *sscop, struct sscop_msg *msg)
-{
-	sscop_save_signal(sscop, SIG_PDU_Q, msg);
-}
-
-/*
- * p 55: REC_PEND && ER PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_rec_er(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		send_erak(sscop);
-	} else {
-		MAAL_ERROR(sscop, 'L', 0);
-	}
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 55: REC_PEND && BGN PDU
- *	arg is pdu (freed)
- *	no uui
- */
-static void
-sscop_rec_bgn(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		MAAL_ERROR(sscop, 'B', 0);
-		SSCOP_MSG_FREE(msg);
-		return;
-	}
-	(void)MBUF_STRIP32(msg->m);
-
-	sscop->vt_ms = pdu.sscop_ns;
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 0);
-	AAL_UU_SIGNAL(sscop, SSCOP_ESTABLISH_indication, msg, pdu.sscop_pl, 0);
-
-	sscop_set_state(sscop, SSCOP_IN_PEND);
-}
-
-/*
- * p 55: REC_PEND && STAT PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_rec_stat(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'H', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	sscop_set_state(sscop, SSCOP_IDLE);
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 55: REC_PEND && USTAT PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_rec_ustat(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'I', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	sscop_set_state(sscop, SSCOP_IDLE);
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 56: IN_REC_PEND && AA-RECOVER.response
- *	no arg
- */
-static void
-sscop_inrec_recover(struct sscop *sscop, struct sscop_msg *unused __unused)
-{
-	if(!sscop->clear_buffers) {
-		MSGQ_CLEAR(&sscop->xbuf);
-	}
-	m_initialize_mr(sscop);
-	send_erak(sscop);
-	m_initialize_state(sscop);
-	m_set_data_xfer_timers(sscop);
-
-	sscop_set_state(sscop, SSCOP_READY);
-}
-
-/*
- * p 56: IN_REC_PEND && SD PDU queued
- *	no arg
- */
-static void
-sscop_inrec_pduq(struct sscop *sscop, struct sscop_msg *msg)
-{
-	sscop_save_signal(sscop, SIG_PDU_Q, msg);
-}
-
-/*
- * p 56: IN_REC_PEND && AA-RELEASE.request
- *	arg is UU
- */
-static void
-sscop_inrec_release_req(struct sscop *sscop, struct sscop_msg *uu)
-{
-	SET_UU(uu_end, uu);
-
-	sscop->vt_cc = 1;
-	send_end(sscop, 0, sscop->uu_end);
-	TIMER_RESTART(sscop, cc);
-
-	sscop_set_state(sscop, SSCOP_OUT_DIS_PEND);
-}
-
-/*
- * p 56: IN_REC_PEND && END PDU
- *	arg is pdu (freed).
- *	no uui
- */
-static void
-sscop_inrec_end(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	(void)MBUF_STRIP32(msg->m);
-
-	send_endak(sscop);
-	AAL_UU_SIGNAL(sscop, SSCOP_RELEASE_indication,
-		msg, pdu.sscop_pl, (u_int)pdu.sscop_s);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 56: IN_REC_PEND && RESYNC_REQ
- */
-static void
-sscop_inrec_sync_req(struct sscop *sscop, struct sscop_msg *uu)
-{
-	SET_UU(uu_rs, uu);
-
-	m_clear_transmitter(sscop);
-	sscop->vt_cc = 1;
-	sscop->vt_sq++;
-	m_initialize_mr(sscop);
-	send_rs(sscop, 0, sscop->uu_rs);
-	TIMER_RESTART(sscop, cc);
-
-	sscop_set_state(sscop, SSCOP_OUT_RESYNC_PEND);
-}
-
-
-/*
- * p 57: IN_REC_PEND && ENDAK PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_inrec_endak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'F', 0);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	SSCOP_MSG_FREE(msg);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 57: IN_REC_PEND && BGREJ PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_inrec_bgrej(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'D', 0);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	SSCOP_MSG_FREE(msg);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 57: IN_REC_PEND && USTAT PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_inrec_ustat(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'I', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	SSCOP_MSG_FREE(msg);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 57: IN_REC_PEND && STAT PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_inrec_stat(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'H', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	SSCOP_MSG_FREE(msg);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 57: IN_REC_PEND && POLL PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_inrec_poll(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'G', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	SSCOP_MSG_FREE(msg);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 57: IN_REC_PEND && SD PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_inrec_sd(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'A', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	SSCOP_MSG_FREE(msg);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 58: IN_REC_PEND && RSAK PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_inrec_rsak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	SSCOP_MSG_FREE(msg);
-	MAAL_ERROR(sscop, 'K', 0);
-}
-
-/*
- * p 58: IN_REC_PEND && RS PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_inrec_rs(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		SSCOP_MSG_FREE(msg);
-		MAAL_ERROR(sscop, 'J', 0);
-		return;
-	}
-	(void)MBUF_STRIP32(msg->m);
-
-	sscop->vt_ms = pdu.sscop_ns;
-	AAL_UU_SIGNAL(sscop, SSCOP_RESYNC_indication, msg, pdu.sscop_pl, 0);
-
-	sscop_set_state(sscop, SSCOP_IN_RESYNC_PEND);
-}
-
-/*
- * p 59: IN_REC_PEND && ER PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_inrec_er(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(!m_detect_retransmission(sscop, msg)) {
-		MAAL_ERROR(sscop, 'L', 0);
-	}
-
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 59: IN_REC_PEND && BGN PDU
- *	arg is pdu (freed).
- *	no uui
- */
-static void
-sscop_inrec_bgn(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		MAAL_ERROR(sscop, 'B', 0);
-		SSCOP_MSG_FREE(msg);
-		return;
-	}
-	(void)MBUF_STRIP32(msg->m);
-
-	sscop->vt_ms = pdu.sscop_ns;
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 0);
-	AAL_UU_SIGNAL(sscop, SSCOP_ESTABLISH_indication, msg, pdu.sscop_pl, 0);
-
-	sscop_set_state(sscop, SSCOP_IN_PEND);
-}
-
-/*
- * p 59: IN_REC_PEND && BGAK PDU
- *	arg is pdu (freed)
- *	no uui
- */
-static void
-sscop_inrec_bgak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'C', 0);
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 59: IN_REC_PEND && ERAK PDU
- *	arg is pdu (freed)
- *	no uui
- */
-static void
-sscop_inrec_erak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MAAL_ERROR(sscop, 'M', 0);
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 60: READY && RESYNC request
- *	arg is UU
- */
-static void
-sscop_ready_sync_req(struct sscop *sscop, struct sscop_msg *uu)
-{
-	SET_UU(uu_rs, uu);
-
-	m_reset_data_xfer_timers(sscop);
-	sscop->vt_cc = 1;
-	sscop->vt_sq++;
-	m_initialize_mr(sscop);
-	send_rs(sscop, 0, sscop->uu_rs);
-	m_release_buffers(sscop);
-	TIMER_RESTART(sscop, cc);
-
-	sscop_set_state(sscop, SSCOP_OUT_RESYNC_PEND);
-}
-
-
-/*
- * p 60: READY && AA-RELEASE.request
- *	arg is uu.
- */
-static void
-sscop_ready_release_req(struct sscop *sscop, struct sscop_msg *uu)
-{
-	SET_UU(uu_end, uu);
-
-	m_reset_data_xfer_timers(sscop);
-	sscop->vt_cc = 1;
-	send_end(sscop, 0, sscop->uu_end);
-	m_prepare_retrieval(sscop);
-	TIMER_RESTART(sscop, cc);
-
-	sscop_set_state(sscop, SSCOP_OUT_DIS_PEND);
-}
-
-/*
- * p 61: READY && ER PDU
- *	arg is pdu (freed).
- */
-static void
-sscop_ready_er(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		TIMER_RESTART(sscop, nr);
-		send_erak(sscop);
-	} else {
-		m_reset_data_xfer_timers(sscop);
-		sscop->vt_ms = pdu.sscop_ns;
-		m_prepare_recovery(sscop);
-		m_deliver_data(sscop);
-
-		AAL_SIG(sscop, SSCOP_RECOVER_indication);
-
-		sscop_set_state(sscop, SSCOP_IN_REC_PEND);
-	}
-
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 61: READY && BGN PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_ready_bgn(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		TIMER_RESTART(sscop, nr);
-		send_bgak(sscop, sscop->uu_bgak);
-		SSCOP_MSG_FREE(msg);
-		return;
-	}
-	(void)MBUF_STRIP32(msg->m);
-
-	m_reset_data_xfer_timers(sscop);
-	sscop->vt_ms = pdu.sscop_ns;
-
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 0);
-	AAL_UU_SIGNAL(sscop, SSCOP_ESTABLISH_indication, msg, pdu.sscop_pl, 0);
-
-	m_prepare_retrieval(sscop);
-
-	sscop_set_state(sscop, SSCOP_IN_PEND);
-}
-
-/*
- * p 62: READY && ENDAK PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_ready_endak(struct sscop *sscop, struct sscop_msg *msg)
-{
-	m_reset_data_xfer_timers(sscop);
-	MAAL_ERROR(sscop, 'F', 0);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	m_prepare_retrieval(sscop);
-	SSCOP_MSG_FREE(msg);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 62: READY && BGREJ PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_ready_bgrej(struct sscop *sscop, struct sscop_msg *msg)
-{
-	m_reset_data_xfer_timers(sscop);
-	MAAL_ERROR(sscop, 'D', 0);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	m_prepare_retrieval(sscop);
-	SSCOP_MSG_FREE(msg);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 62: READY && RS PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_ready_rs(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	if(m_detect_retransmission(sscop, msg)) {
-		SSCOP_MSG_FREE(msg);
-		TIMER_RESTART(sscop, nr);
-		send_rsak(sscop);
-		return;
-	}
-	(void)MBUF_STRIP32(msg->m);
-
-	m_reset_data_xfer_timers(sscop);
-	sscop->vt_ms = pdu.sscop_ns;
-	AAL_UU_SIGNAL(sscop, SSCOP_RESYNC_indication, msg, pdu.sscop_pl, 0);
-	m_prepare_retrieval(sscop);
-
-	sscop_set_state(sscop, SSCOP_IN_RESYNC_PEND);
-}
-
-/*
- * p 62: READY && END PDU
- *	arg is pdu (freed)
- */
-static void
-sscop_ready_end(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	(void)MBUF_STRIP32(msg->m);
-
-	m_reset_data_xfer_timers(sscop);
-	send_endak(sscop);
-	AAL_UU_SIGNAL(sscop, SSCOP_RELEASE_indication,
-		msg, pdu.sscop_pl, (u_int)pdu.sscop_s);
-	m_prepare_retrieval(sscop);
-
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 63: READY && POLL expiry
- */
-static void
-sscop_ready_tpoll(struct sscop *sscop, struct sscop_msg *unused __unused)
-{
-	sscop->vt_ps++;
-	send_poll(sscop);
-	sscop->vt_pd = 0;
-	m_set_poll_timer(sscop);
-}
-
-/*
- * p 63: READY && KEEP_ALIVE expiry
- */
-static void
-sscop_ready_tka(struct sscop *sscop, struct sscop_msg *unused __unused)
-{
-	sscop->vt_ps++;
-	send_poll(sscop);
-	sscop->vt_pd = 0;
-	m_set_poll_timer(sscop);
-}
-
-/*
- * p 63: READY && IDLE expiry
- */
-static void
-sscop_ready_tidle(struct sscop *sscop, struct sscop_msg *unused __unused)
-{
-	TIMER_RESTART(sscop, nr);
-	sscop->vt_ps++;
-	send_poll(sscop);
-	sscop->vt_pd = 0;
-	m_set_poll_timer(sscop);
-}
-
-/*
- * p 63: READY && NO_RESPONSE expiry
- *	no arg
- */
-static void
-sscop_ready_nr(struct sscop *sscop, struct sscop_msg *unused __unused)
-{
-	m_reset_data_xfer_timers(sscop);
-	MAAL_ERROR(sscop, 'P', 0);
-	FREE_UU(uu_end);
-	send_end(sscop, 1, NULL);
-	AAL_DATA(sscop, SSCOP_RELEASE_indication, NULL, 1);
-	m_prepare_retrieval(sscop);
-	sscop_set_state(sscop, SSCOP_IDLE);
-}
-
-/*
- * p 63: READY && AA-DATA.request
- *	arg is message (queued).
- */
-static void
-sscop_ready_userdata(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MSGQ_APPEND(&sscop->xq, msg);
-
-	sscop_signal(sscop, SIG_PDU_Q, msg);
-}
-
-/*
- * p 64: READY && SD PDU queued up
- *	arg is unused.
- */
-static void
-sscop_ready_pduq(struct sscop *sscop, struct sscop_msg *unused __unused)
-{
-	struct sscop_msg *msg;
-
-	if(sscop->rxq != 0) {
-		TAILQ_FOREACH(msg, &sscop->xbuf, link)
-			if(msg->rexmit)
-				break;
-		ASSERT(msg != NULL);
-		msg->rexmit = 0;
-		sscop->rxq--;
-		send_sd(sscop, msg->m, msg->seqno);
-		msg->poll_seqno = sscop->vt_ps;
-		if(sscop->poll_after_rex && sscop->rxq == 0)
-			goto poll;			/* -> A */
-		else
-			goto maybe_poll;		/* -> B */
-
-	}
-	if(MSGQ_EMPTY(&sscop->xq))
-		return;
-
-	if(sscop->vt_s >= sscop->vt_ms) {
-		/* Send windows closed */
-		TIMER_STOP(sscop, idle);
-		TIMER_RESTART(sscop, nr);
-		goto poll;			/* -> A */
-
-	} else {
-		msg = MSGQ_GET(&sscop->xq);
-		msg->seqno = sscop->vt_s;
-		send_sd(sscop, msg->m, msg->seqno);
-		msg->poll_seqno = sscop->vt_ps;
-		sscop->vt_s++;
-		MSGQ_APPEND(&sscop->xbuf, msg);
-		goto maybe_poll;		/* -> B */
-	}
-
-	/*
-	 * p 65: Poll handling
-	 */
-  maybe_poll:					/* label B */
-	sscop->vt_pd++;
-	if(TIMER_ISACT(sscop, poll)) {
-		if(sscop->vt_pd < sscop->maxpd)
-			return;
-	} else {
-		 if(TIMER_ISACT(sscop, idle)) {
-			TIMER_STOP(sscop, idle);
-			TIMER_RESTART(sscop, nr);
-		} else {
-			TIMER_STOP(sscop, ka);
-		}
-		if(sscop->vt_pd < sscop->maxpd) {
-			TIMER_RESTART(sscop, poll);
-			return;
-		}
-	}
-  poll:						/* label A */
-	sscop->vt_ps++;
-	send_poll(sscop);
-	sscop->vt_pd = 0;
-	TIMER_RESTART(sscop, poll);
-}
-
-/*
- * p 67: common recovery start
- */
-static void
-sscop_recover(struct sscop *sscop)
-{
-	sscop->vt_cc = 1;
-	sscop->vt_sq++;
-
-	m_initialize_mr(sscop);
-	send_er(sscop);
-	m_prepare_recovery(sscop);
-
-	TIMER_RESTART(sscop, cc);
-
-	sscop_set_state(sscop, SSCOP_OUT_REC_PEND);
-}
-
-/*
- * p 66: READY && SD PDU
- *	arg is received message.
- */
-static void
-sscop_ready_sd(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-	u_int sn;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	msg->seqno = pdu.sscop_ns;
-
-	/* Fix padding */
-	MBUF_UNPAD(msg->m, pdu.sscop_pl);
-
-	if(msg->seqno >= sscop->vr_mr) {
-		/* message outside window */
-		if(sscop->vr_h < sscop->vr_mr) {
-			send_ustat(sscop, sscop->vr_h, sscop->vr_mr, -1);
-			sscop->vr_h = sscop->vr_mr;
-		}
-		SSCOP_MSG_FREE(msg);
-		return;
-	}
-
-	if(msg->seqno == sscop->vr_r) {
-		if(msg->seqno == sscop->vr_h) {
-			sscop->vr_r = msg->seqno + 1;
-			sscop->vr_h = msg->seqno + 1;
-
-			AAL_DATA(sscop, SSCOP_DATA_indication,
-				msg->m, msg->seqno);
-			msg->m = NULL;
-			SSCOP_MSG_FREE(msg);
-
-			return;
-		}
-		for(;;) {
-			AAL_DATA(sscop, SSCOP_DATA_indication,
-				msg->m, msg->seqno);
-			msg->m = NULL;
-			SSCOP_MSG_FREE(msg);
-
-			sscop->vr_r++;
-			if((msg = MSGQ_PEEK(&sscop->rbuf)) == NULL)
-				break;
-			sn = msg->seqno;
-			ASSERT(sn >= sscop->vr_r);
-			if(sn != sscop->vr_r)
-				break;
-			msg = MSGQ_GET(&sscop->rbuf);
-		}
-		return;
-	}
-
-	/* Messages were lost */
-
-	/* XXX Flow control */
-	if(msg->seqno == sscop->vr_h) {
-		QINSERT(&sscop->rbuf, msg);
-		sscop->vr_h++;
-		return;
-	}
-	if(sscop->vr_h < msg->seqno) {
-		QINSERT(&sscop->rbuf, msg);
-		send_ustat(sscop, sscop->vr_h, msg->seqno, -1);
-		sscop->vr_h = msg->seqno + 1;
-		return;
-	}
-
-	if(QFIND(&sscop->rbuf, msg->seqno) == NULL) {
-		QINSERT(&sscop->rbuf, msg);
-		return;
-	}
-
-	/* error: start recovery */
-	SSCOP_MSG_FREE(msg);
-	m_reset_data_xfer_timers(sscop);
-	MAAL_ERROR(sscop, 'Q', 0);
-	sscop_recover(sscop);
-}
-
-/*
- * p 67: READY && POLL PDU
- */
-static void
-sscop_ready_poll(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-	union seqno seqno;
-	u_int sn, nps;
-	struct SSCOP_MBUF_T *m;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	seqno.sscop_null = MBUF_STRIP32(msg->m);
-
-	if((u_int)pdu.sscop_ns < sscop->vr_h) {
-		SSCOP_MSG_FREE(msg);
-		m_reset_data_xfer_timers(sscop);
-		MAAL_ERROR(sscop, 'Q', 0);
-		sscop_recover(sscop);
-		return;
-	}
-	nps = seqno.sscop_n;
-
-	if((u_int)pdu.sscop_ns > sscop->vr_mr)
-		sscop->vr_h = sscop->vr_mr;
-	else
-		sscop->vr_h = pdu.sscop_ns;
-
-	SSCOP_MSG_FREE(msg);
-
-	/* build stat pdu */
-	if((m = MBUF_ALLOC(sscop->maxstat * 4 + 12)) == NULL) {
-		FAILURE("sscop: cannot allocate STAT");
-		return;
-	}
-	sn = sscop->vr_r;
-
-	while(sn != sscop->vr_h) {
-		/* loop through burst we already have */
-		for(;;) {
-			if(sn >= sscop->vr_h) {
-				seqno.sscop_null = 0;
-				seqno.sscop_n = sn;
-				MBUF_APPEND32(m, seqno.sscop_null);
-				goto out;
-			}
-			if(QFIND(&sscop->rbuf, sn) == NULL)
-				break;
-			sn++;
-		}
-
-		/* start of a hole */
-		seqno.sscop_null = 0;
-		seqno.sscop_n = sn;
-		MBUF_APPEND32(m, seqno.sscop_null);
-		if(MBUF_LEN(m)/4 >= sscop->maxstat) {
-			send_stat(sscop, nps, m);
-			if((m = MBUF_ALLOC(sscop->maxstat * 4 + 12)) == NULL) {
-				FAILURE("sscop: cannot allocate STAT");
-				return;
-			}
-			seqno.sscop_null = 0;
-			seqno.sscop_n = sn;
-			MBUF_APPEND32(m, seqno.sscop_null);
-		}
-		do {
-			sn++;
-		} while(sn < sscop->vr_h && !QFIND(&sscop->rbuf, sn));
-		seqno.sscop_null = 0;
-		seqno.sscop_n = sn;
-		MBUF_APPEND32(m, seqno.sscop_null);
-	}
-  out:
-	send_stat(sscop, nps, m);
-}
-
-/*
- * p 69: READY && USTAT PDU
- *	arg is msg (freed)
- */
-static void
-sscop_ready_ustat(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-	union seqno nmr, sq1, sq2;
-	u_int cnt;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	nmr.sscop_null = MBUF_STRIP32(msg->m);
-	sq2.sscop_null = MBUF_STRIP32(msg->m);
-	sq1.sscop_null = MBUF_STRIP32(msg->m);
-
-	SSCOP_MSG_FREE(msg);
-
-	cnt = sq1.sscop_n - sq2.sscop_n;
-
-	if((u_int)pdu.sscop_ns < sscop->vt_a || (u_int)pdu.sscop_ns >= sscop->vt_s) {
-		VERBERR(sscop, SSCOP_DBG_ERR, (sscop, sscop->aarg,
-		    "USTAT: N(R) outside VT(A)...VT(S)-1: N(R)=%u VT(A)=%u "
-		    "VT(S)=%u", (u_int)pdu.sscop_ns, sscop->vt_a, sscop->vt_s));
-		goto err_f;
-	}
-
-	/* Acknowledge all messages between VT(A) and N(R)-1. N(R) is the new
-	 * next in sequence-SD-number of the receiver and means, it has all
-	 * messages below N(R). Remove all message below N(R) from the
-	 * transmission buffer. It may already be removed because of an
-	 * earlier selective ACK in a STAT message.
-	 */
-	while((msg = MSGQ_PEEK(&sscop->xbuf)) != NULL && msg->seqno < (u_int)pdu.sscop_ns) {
-		ASSERT(msg->seqno >= sscop->vt_a);
-		MSGQ_REMOVE(&sscop->xbuf, msg);
-		SSCOP_MSG_FREE(msg);
-	}
-
-	/* Update the in-sequence acknowledge and the send window */
-	sscop->vt_a = pdu.sscop_ns;
-	sscop->vt_ms = nmr.sscop_n;
-
-	/* check, that the range of requested re-transmissions is between
-	 * the in-sequence-ack and the highest up-to-now transmitted SD
-	 */
-	if(sq1.sscop_n >= sq2.sscop_n
-	    || (u_int)sq1.sscop_n < sscop->vt_a
-	    || (u_int)sq2.sscop_n >= sscop->vt_s) {
-		VERBERR(sscop, SSCOP_DBG_ERR, (sscop, sscop->aarg,
-		    "USTAT: seq1 or seq2 outside VT(A)...VT(S)-1 or seq1>=seq2:"
-		    " seq1=%u seq2=%u VT(A)=%u VT(S)=%u",
-		    sq1.sscop_n, sq2.sscop_n, sscop->vt_a, sscop->vt_s));
-		goto err_f;
-	}
-
-	/*
-	 * Retransmit all messages from seq1 to seq2-1
-	 */
-	do {
-		/*
-		 * The message may not be in the transmit buffer if it was
-		 * already acked by a STAT. This means, the receiver is
-		 * confused.
-		 */
-		if((msg = QFIND(&sscop->xbuf, sq1.sscop_n)) == NULL) {
-			VERBERR(sscop, SSCOP_DBG_ERR, (sscop, sscop->aarg,
-			    "USTAT: message %u not found in xmit buffer",
-			    sq1.sscop_n));
-			goto err_f;
-		}
-
-		/*
-		 * If it is not yet in the re-transmission queue, put it there
-		 */
-		if(!msg->rexmit) {
-			msg->rexmit = 1;
-			sscop->rxq++;
-			sscop_signal(sscop, SIG_PDU_Q, msg);
-		}
-		sq1.sscop_n++;
-	} while(sq1.sscop_n != sq2.sscop_n);
-
-	/*
-	 * report the re-transmission to the management
-	 */
-	MAAL_ERROR(sscop, 'V', cnt);
-	return;
-
-  err_f:
-	m_reset_data_xfer_timers(sscop);
-	MAAL_ERROR(sscop, 'T', 0);
-	sscop_recover(sscop);
-}
-
-/*
- * p 70: READY && STAT PDU
- *	arg is msg (freed).
- */
-static void
-sscop_ready_stat(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-	union seqno nps, nmr;
-	u_int len, seq1, seq2, cnt;
-	struct sscop_msg *m;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-	nmr.sscop_null = MBUF_STRIP32(msg->m);
-	nps.sscop_null = MBUF_STRIP32(msg->m);
-
-	len = MBUF_LEN(msg->m) / 4;
-
-	if((u_int)nps.sscop_n < sscop->vt_pa
-	    || (u_int)nps.sscop_n > sscop->vt_ps) {
-		SSCOP_MSG_FREE(msg);
-		m_reset_data_xfer_timers(sscop);
-		MAAL_ERROR(sscop, 'R', 0);
-		sscop_recover(sscop);
-		return;
-	}
-
-	if((u_int)pdu.sscop_ns < sscop->vt_a
-	    || (u_int)pdu.sscop_ns > sscop->vt_s) {
-		/*
-		 * The in-sequence acknowledge, i.e. the receivers's next
-		 * expected in-sequence msg is outside the window between
-		 * the transmitters in-sequence ack and highest seqno -
-		 * the receiver seems to be confused.
-		 */
-		VERBERR(sscop, SSCOP_DBG_ERR, (sscop, sscop->aarg,
-		    "STAT: N(R) outside VT(A)...VT(S)-1: N(R)=%u VT(A)=%u "
-		    "VT(S)=%u", (u_int)pdu.sscop_ns, sscop->vt_a, sscop->vt_s));
-  err_H:
-		SSCOP_MSG_FREE(msg);
-		m_reset_data_xfer_timers(sscop);
-		MAAL_ERROR(sscop, 'S', 0);
-		sscop_recover(sscop);
-		return;
-	}
-
-	/* Acknowledge all messages between VT(A) and N(R)-1. N(R) is the new
-	 * next in sequence-SD-number of the receiver and means, it has all
-	 * messages below N(R). Remove all message below N(R) from the
-	 * transmission buffer. It may already be removed because of an
-	 * earlier selective ACK in a STAT message.
-	 */
-	while((m = MSGQ_PEEK(&sscop->xbuf)) != NULL
-	    && m->seqno < (u_int)pdu.sscop_ns) {
-		ASSERT(m->seqno >= sscop->vt_a);
-		MSGQ_REMOVE(&sscop->xbuf, m);
-		SSCOP_MSG_FREE(m);
-	}
-
-	/*
-	 * Update in-sequence ack, poll-ack and send window.
-	 */
-	sscop->vt_a = pdu.sscop_ns;
-	sscop->vt_pa = nps.sscop_n;
-	sscop->vt_ms = nmr.sscop_n;
-
-	cnt = 0;
-	if(len > 1) {
-		seq1 = MBUF_GET32(msg->m);
-		len--;
-		if(seq1 >= sscop->vt_s) {
-			VERBERR(sscop, SSCOP_DBG_ERR, (sscop, sscop->aarg,
-			    "STAT: seq1 >= VT(S): seq1=%u VT(S)=%u",
-			    seq1, sscop->vt_s));
-			goto err_H;
-		}
-
-		for(;;) {
-			seq2 = MBUF_GET32(msg->m);
-			len--;
-			if(seq1 >= seq2 || seq2 > sscop->vt_s) {
-				VERBERR(sscop, SSCOP_DBG_ERR, (sscop,
-				    sscop->aarg, "STAT: seq1 >= seq2 or "
-				    "seq2 > VT(S): seq1=%u seq2=%u VT(S)=%u",
-				    seq1, seq2, sscop->vt_s));
-				goto err_H;
-			}
-
-			do {
-				/*
-				 * The receiver requests the re-transmission
-				 * of some message, but has acknowledged it
-				 * already in an earlier STAT (it isn't in the
-				 * transmitt buffer anymore).
-				 */
-				if((m = QFIND(&sscop->xbuf, seq1)) == NULL) {
-					VERBERR(sscop, SSCOP_DBG_ERR,
-					    (sscop, sscop->aarg, "STAT: message"
-					    " %u not found in xmit buffer",
-					    seq1));
-					goto err_H;
-				}
-				if(m->poll_seqno < (u_int)nps.sscop_n
-				    && (u_int)nps.sscop_n <= sscop->vt_ps)
-					if(!m->rexmit) {
-						m->rexmit = 1;
-						sscop->rxq++;
-						cnt++;
-						sscop_signal(sscop, SIG_PDU_Q, msg);
-					}
-			} while(++seq1 < seq2);
-
-			if(len == 0)
-				break;
-
-			seq2 = MBUF_GET32(msg->m);
-			len--;
-
-			if(seq1 >= seq2 || seq2 > sscop->vt_s) {
-				VERBERR(sscop, SSCOP_DBG_ERR, (sscop,
-				    sscop->aarg, "STAT: seq1 >= seq2 or "
-				    "seq2 > VT(S): seq1=%u seq2=%u VT(S)=%u",
-				    seq1, seq2, sscop->vt_s));
-				goto err_H;
-			}
-
-			/* OK now the sucessful transmitted messages. Note, that
-			 * some messages may already be out of the buffer because
-			 * of earlier STATS */
-			do {
-				if(sscop->clear_buffers) {
-					if((m = QFIND(&sscop->xbuf, seq1)) != NULL) {
-						MSGQ_REMOVE(&sscop->xbuf, m);
-						SSCOP_MSG_FREE(m);
-					}
-				}
-			} while(++seq1 != seq2);
-
-			if(len == 0)
-				break;
-		}
-		MAAL_ERROR(sscop, 'V', cnt);
-	}
-	SSCOP_MSG_FREE(msg);
-
-	/* label L: */
-	if(sscop->vt_s >= sscop->vt_ms) {
-		/*
-		 * The receiver has closed the window: report to management
-		 */
-		if(sscop->credit) {
-			sscop->credit = 0;
-			MAAL_ERROR(sscop, 'W', 0);
-		}
-	} else if(!sscop->credit) {
-		/*
-		 * The window was forcefully closed above, but
-		 * now re-opened. Report to management.
-		 */
-		sscop->credit = 1;
-		MAAL_ERROR(sscop, 'X', 0);
-	}
-
-	if(TIMER_ISACT(sscop, poll)) {
-		TIMER_RESTART(sscop, nr);
-	} else if(!TIMER_ISACT(sscop, idle)) {
-		TIMER_STOP(sscop, ka);
-		TIMER_STOP(sscop, nr);
-		TIMER_RESTART(sscop, idle);
-	}
-}
-
-/*
- * P. 73: any state & UDATA_REQUEST
- *	arg is pdu (queued)
- */
-static void
-sscop_udata_req(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MSGQ_APPEND(&sscop->uxq, msg);
-	sscop_signal(sscop, SIG_UPDU_Q, msg);
-}
-
-/*
- * P. 73: any state & MDATA_REQUEST
- *	arg is pdu (queued)
- */
-static void
-sscop_mdata_req(struct sscop *sscop, struct sscop_msg *msg)
-{
-	MSGQ_APPEND(&sscop->mxq, msg);
-	sscop_signal(sscop, SIG_MPDU_Q, msg);
-}
-
-/*
- * P. 74: any state & UDATA queued
- *	no arg.
- */
-static void
-sscop_upduq(struct sscop *sscop, struct sscop_msg *unused __unused)
-{
-	struct sscop_msg *msg;
-
-	if(sscop->ll_busy)
-		return;
-	while((msg = MSGQ_GET(&sscop->uxq)) != NULL) {
-		send_ud(sscop, msg->m);
-		msg->m = NULL;
-		SSCOP_MSG_FREE(msg);
-	}
-}
-
-/*
- * P. 74: any state & MDATA queued
- *	no arg.
- */
-static void
-sscop_mpduq(struct sscop *sscop, struct sscop_msg *unused __unused)
-{
-	struct sscop_msg *msg;
-
-	if(sscop->ll_busy)
-		return;
-	while((msg = MSGQ_GET(&sscop->mxq)) != NULL) {
-		send_md(sscop, msg->m);
-		msg->m = NULL;
-		SSCOP_MSG_FREE(msg);
-	}
-}
-
-/*
- * p 73: MD PDU
- *	arg is PDU
- */
-static void
-sscop_md(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	MBUF_UNPAD(msg->m, pdu.sscop_pl);
-
-	MAAL_DATA(sscop, msg->m);
-	msg->m = NULL;
-	SSCOP_MSG_FREE(msg);
-}
-
-/*
- * p 73: UD PDU
- *	arg is PDU
- */
-static void
-sscop_ud(struct sscop *sscop, struct sscop_msg *msg)
-{
-	union pdu pdu;
-
-	pdu.sscop_null = MBUF_STRIP32(msg->m);
-
-	MBUF_UNPAD(msg->m, pdu.sscop_pl);
-
-	AAL_DATA(sscop, SSCOP_UDATA_indication, msg->m, 0);
-	msg->m = NULL;
-	SSCOP_MSG_FREE(msg);
-}
-
-
-/*
- * p 33: IDLE & RETRIEVE
- * p 39: IN_PEND & RETRIEVE
- * p 42: OUT_DIS_PEND & RETRIEVE
- * p 48: IN_RESYNC_PEND & RETRIEVE
- * p 53: REC_PEND & RETRIEVE
- * p 58: IN_REC_PEND & RETRIEVE
- */
-static void
-sscop_retrieve(struct sscop *sscop, struct sscop_msg *msg)
-{
-	m_data_retrieval(sscop, msg->rexmit);
-	SSCOP_MSG_FREE(msg);
-}
-
-/************************************************************/
-/*
- * GENERAL EVENT HANDLING
- */
-
-/*
- * State/event matrix.
- *
- * Entries marked with Z are not specified in Q.2110, but are added for
- * the sake of stability.
- */
-static struct {
-	void	(*func)(struct sscop *, struct sscop_msg *);
-	int	(*cond)(struct sscop *);
-} state_matrix[SSCOP_NSTATES][SIG_NUM] = {
-	/* SSCOP_IDLE */ {
-		/* SIG_BGN */		{ sscop_idle_bgn, NULL },
-		/* SIG_BGAK */		{ sscop_idle_bgak, NULL },
-		/* SIG_END */		{ sscop_idle_end, NULL },
-		/* SIG_ENDAK */		{ sscop_ignore_pdu, NULL },
-		/* SIG_RS */		{ sscop_idle_rs, NULL },
-		/* SIG_RSAK */		{ sscop_idle_rsak, NULL },
-		/* SIG_BGREJ */		{ sscop_idle_bgrej, NULL },
-		/* SIG_SD */		{ sscop_idle_sd, NULL },
-		/* SIG_ER */		{ sscop_idle_er, NULL },
-		/* SIG_POLL */		{ sscop_idle_poll, NULL },
-		/* SIG_STAT */		{ sscop_idle_stat, NULL },
-		/* SIG_USTAT */		{ sscop_idle_ustat, NULL },
-		/* SIG_UD */		{ sscop_ud, NULL },
-		/* SIG_MD */		{ sscop_md, NULL },
-		/* SIG_ERAK */		{ sscop_idle_erak, NULL },
-		/* SIG_T_CC */		{ NULL, NULL },
-		/* SIG_T_POLL */	{ NULL, NULL },
-		/* SIG_T_KA */		{ NULL, NULL },
-		/* SIG_T_NR */		{ NULL, NULL },
-		/* SIG_T_IDLE */	{ NULL, NULL },
-		/* SIG_PDU_Q */		{ sscop_flush_pduq, NULL },
-		/* SIG_USER_DATA */	{ NULL, NULL },
-		/* SIG_ESTAB_REQ */	{ sscop_idle_establish_req, NULL },
-		/* SIG_ESTAB_RESP */	{ NULL, NULL },
-		/* SIG_RELEASE_REQ */	{ NULL, NULL },
-		/* SIG_RECOVER */	{ NULL, NULL },
-		/* SIG_SYNC_REQ */	{ NULL, NULL },
-		/* SIG_SYNC_RESP */	{ NULL, NULL },
-		/* SIG_UDATA */		{ sscop_udata_req, NULL },
-		/* SIG_MDATA */		{ sscop_mdata_req, NULL },
-		/* SIG_UPDU_Q */	{ sscop_upduq, NULL },
-		/* SIG_MPDU_Q */	{ sscop_mpduq, NULL },
-		/* SIG_RETRIEVE */	{ sscop_retrieve, NULL },
-	},
-	/* SSCOP_OUT_PEND */ {
-		/* SIG_BGN */		{ sscop_outpend_bgn, NULL },
-		/* SIG_BGAK */		{ sscop_outpend_bgak, NULL },
-		/* SIG_END */		{ sscop_ignore_pdu, NULL },
-		/* SIG_ENDAK */		{ sscop_ignore_pdu, NULL },
-		/* SIG_RS */		{ sscop_ignore_pdu, NULL },
-		/* SIG_RSAK */		{ sscop_ignore_pdu, NULL },
-		/* SIG_BGREJ */		{ sscop_outpend_bgrej, NULL },
-		/* SIG_SD */		{ sscop_ignore_pdu, NULL },
-		/* SIG_ER */		{ sscop_ignore_pdu, NULL },
-		/* SIG_POLL */		{ sscop_ignore_pdu, NULL },
-		/* SIG_STAT */		{ sscop_ignore_pdu, NULL },
-		/* SIG_USTAT */		{ sscop_ignore_pdu, NULL },
-		/* SIG_UD */		{ sscop_ud, NULL },
-		/* SIG_MD */		{ sscop_md, NULL },
-		/* SIG_ERAK */		{ sscop_ignore_pdu, NULL },
-		/* SIG_T_CC */		{ sscop_outpend_tcc, NULL },
-		/* SIG_T_POLL */	{ NULL, NULL },
-		/* SIG_T_KA */		{ NULL, NULL },
-		/* SIG_T_NR */		{ NULL, NULL },
-		/* SIG_T_IDLE */	{ NULL, NULL },
-		/* SIG_PDU_Q */		{ sscop_flush_pduq, NULL },
-		/* SIG_USER_DATA */	{ NULL, NULL },
-		/* SIG_ESTAB_REQ */	{ NULL, NULL },
-		/* SIG_ESTAB_RESP */	{ NULL, NULL },
-		/* SIG_RELEASE_REQ */	{ sscop_outpend_release_req, NULL },
-		/* SIG_RECOVER */	{ NULL, NULL },
-		/* SIG_SYNC_REQ */	{ NULL, NULL },
-		/* SIG_SYNC_RESP */	{ NULL, NULL },
-		/* SIG_UDATA */		{ sscop_udata_req, NULL },
-		/* SIG_MDATA */		{ sscop_mdata_req, NULL },
-		/* SIG_UPDU_Q */	{ sscop_upduq, NULL },
-		/* SIG_MPDU_Q */	{ sscop_mpduq, NULL },
-		/* SIG_RETRIEVE */	{ NULL, NULL },
-	},
-	/* SSCOP_IN_PEND */ {
-		/* SIG_BGN */		{ sscop_inpend_bgn, NULL },
-		/* SIG_BGAK */		{ sscop_inpend_bgak, NULL },
-		/* SIG_END */		{ sscop_inpend_end, NULL },
-		/* SIG_ENDAK */		{ sscop_inpend_endak, NULL },
-		/* SIG_RS */		{ sscop_inpend_rs, NULL },
-		/* SIG_RSAK */		{ sscop_inpend_rsak, NULL },
-		/* SIG_BGREJ */		{ sscop_inpend_bgrej, NULL },
-		/* SIG_SD */		{ sscop_inpend_sd, NULL },
-		/* SIG_ER */		{ sscop_inpend_er, NULL },
-		/* SIG_POLL */		{ sscop_inpend_poll, NULL },
-		/* SIG_STAT */		{ sscop_inpend_stat, NULL },
-		/* SIG_USTAT */		{ sscop_inpend_ustat, NULL },
-		/* SIG_UD */		{ sscop_ud, NULL },
-		/* SIG_MD */		{ sscop_md, NULL },
-		/* SIG_ERAK */		{ sscop_inpend_erak, NULL },
-		/* SIG_T_CC */		{ NULL, NULL },
-		/* SIG_T_POLL */	{ NULL, NULL },
-		/* SIG_T_KA */		{ NULL, NULL },
-		/* SIG_T_NR */		{ NULL, NULL },
-		/* SIG_T_IDLE */	{ NULL, NULL },
-		/* SIG_PDU_Q */		{ sscop_flush_pduq, NULL },
-		/* SIG_USER_DATA */	{ NULL, NULL },
-		/* SIG_ESTAB_REQ */	{ NULL, NULL },
-		/* SIG_ESTAB_RESP */	{ sscop_inpend_establish_resp, NULL },
-		/* SIG_RELEASE_REQ */	{ sscop_inpend_release_req, NULL },
-		/* SIG_RECOVER */	{ NULL, NULL },
-		/* SIG_SYNC_REQ */	{ NULL, NULL },
-		/* SIG_SYNC_RESP */	{ NULL, NULL },
-		/* SIG_UDATA */		{ sscop_udata_req, NULL },
-		/* SIG_MDATA */		{ sscop_mdata_req, NULL },
-		/* SIG_UPDU_Q */	{ sscop_upduq, NULL },
-		/* SIG_MPDU_Q */	{ sscop_mpduq, NULL },
-		/* SIG_RETRIEVE */	{ sscop_retrieve, NULL },
-	},
-	/* SSCOP_OUT_DIS_PEND */ {
-		/* SIG_BGN */		{ sscop_outdis_bgn, NULL },
-		/* SIG_BGAK */		{ sscop_ignore_pdu, NULL },
-		/* SIG_END */		{ sscop_outdis_end, NULL },
-		/* SIG_ENDAK */		{ sscop_outdis_endak, NULL },
-		/* SIG_RS */		{ sscop_ignore_pdu, NULL },
-		/* SIG_RSAK */		{ sscop_ignore_pdu, NULL },
-		/* SIG_BGREJ */		{ sscop_outdis_endak, NULL },
-		/* SIG_SD */		{ sscop_ignore_pdu, NULL },
-		/* SIG_ER */		{ sscop_ignore_pdu, NULL },
-		/* SIG_POLL */		{ sscop_ignore_pdu, NULL },
-		/* SIG_STAT */		{ sscop_ignore_pdu, NULL },
-		/* SIG_USTAT */		{ sscop_ignore_pdu, NULL },
-		/* SIG_UD */		{ sscop_ud, NULL },
-		/* SIG_MD */		{ sscop_md, NULL },
-		/* SIG_ERAK */		{ sscop_ignore_pdu, NULL },
-		/* SIG_T_CC */		{ sscop_outdis_cc, NULL },
-		/* SIG_T_POLL */	{ NULL, NULL },
-		/* SIG_T_KA */		{ NULL, NULL },
-		/* SIG_T_NR */		{ NULL, NULL },
-		/* SIG_T_IDLE */	{ NULL, NULL },
-		/* SIG_PDU_Q */		{ sscop_flush_pduq, NULL },
-		/* SIG_USER_DATA */	{ NULL, NULL },
-		/* SIG_ESTAB_REQ */	{ sscop_outdis_establish_req, NULL },
-		/* SIG_ESTAB_RESP */	{ NULL, NULL },
-		/* SIG_RELEASE_REQ */	{ NULL, NULL },
-		/* SIG_RECOVER */	{ NULL, NULL },
-		/* SIG_SYNC_REQ */	{ NULL, NULL },
-		/* SIG_SYNC_RESP */	{ NULL, NULL },
-		/* SIG_UDATA */		{ sscop_udata_req, NULL },
-		/* SIG_MDATA */		{ sscop_mdata_req, NULL },
-		/* SIG_UPDU_Q */	{ sscop_upduq, NULL },
-		/* SIG_MPDU_Q */	{ sscop_mpduq, NULL },
-		/* SIG_RETRIEVE */	{ sscop_retrieve, NULL },
-	},
-	/* SSCOP_OUT_RESYNC_PEND */ {
-		/* SIG_BGN */		{ sscop_outsync_bgn, NULL },
-		/* SIG_BGAK */		{ sscop_ignore_pdu, NULL },
-		/* SIG_END */		{ sscop_outsync_end, NULL },
-		/* SIG_ENDAK */		{ sscop_outsync_endak, NULL },
-		/* SIG_RS */		{ sscop_outsync_rs, NULL },
-		/* SIG_RSAK */		{ sscop_outsync_rsak, NULL },
-		/* SIG_BGREJ */		{ sscop_outsync_bgrej, NULL },
-		/* SIG_SD */		{ sscop_ignore_pdu, NULL },
-		/* SIG_ER */		{ sscop_ignore_pdu, NULL },
-		/* SIG_POLL */		{ sscop_ignore_pdu, NULL },
-		/* SIG_STAT */		{ sscop_ignore_pdu, NULL },
-		/* SIG_USTAT */		{ sscop_ignore_pdu, NULL },
-		/* SIG_UD */		{ sscop_ud, NULL },
-		/* SIG_MD */		{ sscop_md, NULL },
-		/* SIG_ERAK */		{ sscop_ignore_pdu, NULL },
-		/* SIG_T_CC */		{ sscop_outsync_cc, NULL },
-		/* SIG_T_POLL */	{ NULL, NULL },
-		/* SIG_T_KA */		{ NULL, NULL },
-		/* SIG_T_NR */		{ NULL, NULL },
-		/* SIG_T_IDLE */	{ NULL, NULL },
-		/* SIG_PDU_Q */		{ sscop_flush_pduq, NULL },
-		/* SIG_USER_DATA */	{ NULL, NULL },
-		/* SIG_ESTAB_REQ */	{ NULL, NULL },
-		/* SIG_ESTAB_RESP */	{ NULL, NULL },
-		/* SIG_RELEASE_REQ */	{ sscop_outsync_release_req, NULL },
-		/* SIG_RECOVER */	{ NULL, NULL },
-		/* SIG_SYNC_REQ */	{ NULL, NULL },
-		/* SIG_SYNC_RESP */	{ NULL, NULL },
-		/* SIG_UDATA */		{ sscop_udata_req, NULL },
-		/* SIG_MDATA */		{ sscop_mdata_req, NULL },
-		/* SIG_UPDU_Q */	{ sscop_upduq, NULL },
-		/* SIG_MPDU_Q */	{ sscop_mpduq, NULL },
-		/* SIG_RETRIEVE */	{ NULL, NULL },
-	},
-	/* SSCOP_IN_RESYNC_PEND */ {
-		/* SIG_BGN */		{ sscop_insync_bgn, NULL },
-		/* SIG_BGAK */		{ sscop_insync_bgak, NULL },
-		/* SIG_END */		{ sscop_insync_end, NULL },
-		/* SIG_ENDAK */		{ sscop_insync_endak, NULL },
-		/* SIG_RS */		{ sscop_insync_rs, NULL },
-		/* SIG_RSAK */		{ sscop_insync_rsak, NULL },
-		/* SIG_BGREJ */		{ sscop_insync_bgrej, NULL },
-		/* SIG_SD */		{ sscop_insync_sd, NULL },
-		/* SIG_ER */		{ sscop_insync_er, NULL },
-		/* SIG_POLL */		{ sscop_insync_poll, NULL },
-		/* SIG_STAT */		{ sscop_insync_stat, NULL },
-		/* SIG_USTAT */		{ sscop_insync_ustat, NULL },
-		/* SIG_UD */		{ sscop_ud, NULL },
-		/* SIG_MD */		{ sscop_md, NULL },
-		/* SIG_ERAK */		{ sscop_insync_erak, NULL },
-		/* SIG_T_CC */		{ NULL, NULL },
-		/* SIG_T_POLL */	{ NULL, NULL },
-		/* SIG_T_KA */		{ NULL, NULL },
-		/* SIG_T_NR */		{ NULL, NULL },
-		/* SIG_T_IDLE */	{ NULL, NULL },
-		/* SIG_PDU_Q */		{ sscop_flush_pduq, NULL },
-		/* SIG_USER_DATA */	{ NULL, NULL },
-		/* SIG_ESTAB_REQ */	{ NULL, NULL },
-		/* SIG_ESTAB_RESP */	{ NULL, NULL },
-		/* SIG_RELEASE_REQ */	{ sscop_insync_release_req, NULL },
-		/* SIG_RECOVER */	{ NULL, NULL },
-		/* SIG_SYNC_REQ */	{ NULL, NULL },
-		/* SIG_SYNC_RESP */	{ sscop_insync_sync_resp, NULL },
-		/* SIG_UDATA */		{ sscop_udata_req, NULL },
-		/* SIG_MDATA */		{ sscop_mdata_req, NULL },
-		/* SIG_UPDU_Q */	{ sscop_upduq, NULL },
-		/* SIG_MPDU_Q */	{ sscop_mpduq, NULL },
-		/* SIG_RETRIEVE */	{ sscop_retrieve, NULL },
-	},
-	/* SSCOP_OUT_REC_PEND */ {
-		/* SIG_BGN */		{ sscop_outrec_bgn, NULL },
-		/* SIG_BGAK */		{ sscop_outrec_bgak, NULL },
-		/* SIG_END */		{ sscop_outrec_end, NULL },
-		/* SIG_ENDAK */		{ sscop_outrec_endak, NULL },
-		/* SIG_RS */		{ sscop_outrec_rs, NULL },
-		/* SIG_RSAK */		{ sscop_outrec_rsak, NULL },
-		/* SIG_BGREJ */		{ sscop_outrec_bgrej, NULL },
-		/* SIG_SD */		{ sscop_ignore_pdu, NULL },
-		/* SIG_ER */		{ sscop_outrec_er, NULL },
-		/* SIG_POLL */		{ sscop_ignore_pdu, NULL },
-		/* SIG_STAT */		{ sscop_ignore_pdu, NULL },
-		/* SIG_USTAT */		{ sscop_ignore_pdu, NULL },
-		/* SIG_UD */		{ sscop_ud, NULL },
-		/* SIG_MD */		{ sscop_md, NULL },
-		/* SIG_ERAK */		{ sscop_outrec_erak, NULL },
-		/* SIG_T_CC */		{ sscop_outrec_cc, NULL },
-		/* SIG_T_POLL */	{ NULL, NULL },
-		/* SIG_T_KA */		{ NULL, NULL },
-		/* SIG_T_NR */		{ NULL, NULL },
-		/* SIG_T_IDLE */	{ NULL, NULL },
-		/* SIG_PDU_Q */		{ sscop_outrec_pduq, NULL },
-		/* SIG_USER_DATA */	{ sscop_outrec_userdata, NULL },
-		/* SIG_ESTAB_REQ */	{ NULL, NULL },
-		/* SIG_ESTAB_RESP */	{ NULL, NULL },
-		/* SIG_RELEASE_REQ */	{ sscop_outrec_release_req, NULL },
-		/* SIG_RECOVER */	{ NULL, NULL },
-		/* SIG_SYNC_REQ */	{ sscop_outrec_sync_req, NULL },
-		/* SIG_SYNC_RESP */	{ NULL, NULL },
-		/* SIG_UDATA */		{ sscop_udata_req, NULL },
-		/* SIG_MDATA */		{ sscop_mdata_req, NULL },
-		/* SIG_UPDU_Q */	{ sscop_upduq, NULL },
-		/* SIG_MPDU_Q */	{ sscop_mpduq, NULL },
-		/* SIG_RETRIEVE */	{ NULL, NULL },
-	},
-	/* SSCOP_REC_PEND */ {
-		/* SIG_BGN */		{ sscop_rec_bgn, NULL },
-		/* SIG_BGAK */		{ sscop_rec_bgak, NULL },
-		/* SIG_END */		{ sscop_rec_end, NULL },
-		/* SIG_ENDAK */		{ sscop_rec_endak, NULL },
-		/* SIG_RS */		{ sscop_rec_rs, NULL },
-		/* SIG_RSAK */		{ sscop_rec_rsak, NULL },
-		/* SIG_BGREJ */		{ sscop_rec_bgrej, NULL },
-		/* SIG_SD */		{ sscop_ignore_pdu, NULL },
-		/* SIG_ER */		{ sscop_rec_er, NULL },
-		/* SIG_POLL */		{ sscop_ignore_pdu, NULL },
-		/* SIG_STAT */		{ sscop_rec_stat, NULL },
-		/* SIG_USTAT */		{ sscop_rec_ustat, NULL },
-		/* SIG_UD */		{ sscop_ud, NULL },
-		/* SIG_MD */		{ sscop_md, NULL },
-		/* SIG_ERAK */		{ sscop_ignore_pdu, NULL },
-		/* SIG_T_CC */		{ NULL, NULL },
-		/* SIG_T_POLL */	{ NULL, NULL },
-		/* SIG_T_KA */		{ NULL, NULL },
-		/* SIG_T_NR */		{ NULL, NULL },
-		/* SIG_T_IDLE */	{ NULL, NULL },
-		/* SIG_PDU_Q */		{ sscop_rec_pduq, NULL },
-		/* SIG_USER_DATA */	{ NULL, NULL },
-		/* SIG_ESTAB_REQ */	{ NULL, NULL },
-		/* SIG_ESTAB_RESP */	{ NULL, NULL },
-		/* SIG_RELEASE_REQ */	{ sscop_rec_release_req, NULL },
-		/* SIG_RECOVER */	{ sscop_rec_recover, NULL },
-		/* SIG_SYNC_REQ */	{ sscop_rec_sync_req, NULL },
-		/* SIG_SYNC_RESP */	{ NULL, NULL },
-		/* SIG_UDATA */		{ sscop_udata_req, NULL },
-		/* SIG_MDATA */		{ sscop_mdata_req, NULL },
-		/* SIG_UPDU_Q */	{ sscop_upduq, NULL },
-		/* SIG_MPDU_Q */	{ sscop_mpduq, NULL },
-		/* SIG_RETRIEVE */	{ sscop_retrieve, NULL },
-	},
-	/* SSCOP_IN_REC_PEND */ {
-		/* SIG_BGN */		{ sscop_inrec_bgn, NULL },
-		/* SIG_BGAK */		{ sscop_inrec_bgak, NULL },
-		/* SIG_END */		{ sscop_inrec_end, NULL },
-		/* SIG_ENDAK */		{ sscop_inrec_endak, NULL },
-		/* SIG_RS */		{ sscop_inrec_rs, NULL },
-		/* SIG_RSAK */		{ sscop_inrec_rsak, NULL },
-		/* SIG_BGREJ */		{ sscop_inrec_bgrej, NULL },
-		/* SIG_SD */		{ sscop_inrec_sd, NULL },
-		/* SIG_ER */		{ sscop_inrec_er, NULL },
-		/* SIG_POLL */		{ sscop_inrec_poll, NULL },
-		/* SIG_STAT */		{ sscop_inrec_stat, NULL },
-		/* SIG_USTAT */		{ sscop_inrec_ustat, NULL },
-		/* SIG_UD */		{ sscop_ud, NULL },
-		/* SIG_MD */		{ sscop_md, NULL },
-		/* SIG_ERAK */		{ sscop_inrec_erak, NULL },
-		/* SIG_T_CC */		{ NULL, NULL },
-		/* SIG_T_POLL */	{ NULL, NULL },
-		/* SIG_T_KA */		{ NULL, NULL },
-		/* SIG_T_NR */		{ NULL, NULL },
-		/* SIG_T_IDLE */	{ NULL, NULL },
-		/* SIG_PDU_Q */		{ sscop_inrec_pduq, NULL },
-		/* SIG_USER_DATA */	{ NULL, NULL },
-		/* SIG_ESTAB_REQ */	{ NULL, NULL },
-		/* SIG_ESTAB_RESP */	{ NULL, NULL },
-		/* SIG_RELEASE_REQ */	{ sscop_inrec_release_req, NULL },
-		/* SIG_RECOVER */	{ sscop_inrec_recover, NULL },
-		/* SIG_SYNC_REQ */	{ sscop_inrec_sync_req, NULL },
-		/* SIG_SYNC_RESP */	{ NULL, NULL },
-		/* SIG_UDATA */		{ sscop_udata_req, NULL },
-		/* SIG_MDATA */		{ sscop_mdata_req, NULL },
-		/* SIG_UPDU_Q */	{ sscop_upduq, NULL },
-		/* SIG_MPDU_Q */	{ sscop_mpduq, NULL },
-		/* SIG_RETRIEVE */	{ sscop_retrieve, NULL },
-	},
-	/* SSCOP_READY */ {
-		/* SIG_BGN */		{ sscop_ready_bgn, NULL },
-		/* SIG_BGAK */		{ sscop_ignore_pdu, NULL },
-		/* SIG_END */		{ sscop_ready_end, NULL },
-		/* SIG_ENDAK */		{ sscop_ready_endak, NULL },
-		/* SIG_RS */		{ sscop_ready_rs, NULL },
-		/* SIG_RSAK */		{ sscop_ignore_pdu, NULL },
-		/* SIG_BGREJ */		{ sscop_ready_bgrej, NULL },
-		/* SIG_SD */		{ sscop_ready_sd, NULL },
-		/* SIG_ER */		{ sscop_ready_er, NULL },
-		/* SIG_POLL */		{ sscop_ready_poll, NULL },
-		/* SIG_STAT */		{ sscop_ready_stat, NULL },
-		/* SIG_USTAT */		{ sscop_ready_ustat, NULL },
-		/* SIG_UD */		{ sscop_ud, NULL },
-		/* SIG_MD */		{ sscop_md, NULL },
-		/* SIG_ERAK */		{ sscop_ignore_pdu, NULL },
-		/* SIG_T_CC */		{ NULL, NULL },
-		/* SIG_T_POLL */	{ sscop_ready_tpoll, NULL },
-		/* SIG_T_KA */		{ sscop_ready_tka, NULL },
-		/* SIG_T_NR */		{ sscop_ready_nr, NULL },
-		/* SIG_T_IDLE */	{ sscop_ready_tidle, NULL },
-		/* SIG_PDU_Q */		{ sscop_ready_pduq, c_ready_pduq },
-		/* SIG_USER_DATA */	{ sscop_ready_userdata, NULL },
-		/* SIG_ESTAB_REQ */	{ NULL, NULL },
-		/* SIG_ESTAB_RESP */	{ NULL, NULL },
-		/* SIG_RELEASE_REQ */	{ sscop_ready_release_req, NULL },
-		/* SIG_RECOVER */	{ NULL, NULL },
-		/* SIG_SYNC_REQ */	{ sscop_ready_sync_req, NULL },
-		/* SIG_SYNC_RESP */	{ NULL, NULL },
-		/* SIG_UDATA */		{ sscop_udata_req, NULL },
-		/* SIG_MDATA */		{ sscop_mdata_req, NULL },
-		/* SIG_UPDU_Q */	{ sscop_upduq, NULL },
-		/* SIG_MPDU_Q */	{ sscop_mpduq, NULL },
-		/* SIG_RETRIEVE */	{ NULL, NULL },
-	}
-};
-
-/*
- * Try to execute a signal. It is executed if
- *   - it is illegal (in this case it is effectively ignored)
- *   - it has no condition
- *   - its condition is true
- * If it has a condition and that is false, the function does nothing and
- * returns 0.
- * If the signal gets executed, the signal function is responsible to release
- * the message (if any).
- */
-static int
-sig_exec(struct sscop *sscop, u_int sig, struct sscop_msg *msg)
-{
-	void (*func)(struct sscop *, struct sscop_msg *);
-	int (*cond)(struct sscop *);
-
-	func = state_matrix[sscop->state][sig].func;
-	cond = state_matrix[sscop->state][sig].cond;
-
-	if(func == NULL) {
-		VERBOSE(sscop, SSCOP_DBG_BUG, (sscop, sscop->aarg,
-		    "no handler for %s in state %s - ignored",
-		    events[sig], states[sscop->state]));
-		SSCOP_MSG_FREE(msg);
-		return 1;
-	}
-	if(cond == NULL || (*cond)(sscop)) {
-		VERBOSE(sscop, SSCOP_DBG_EXEC, (sscop, sscop->aarg,
-		    "executing %s in %s", events[sig],
-		    states[sscop->state]));
-		(*func)(sscop, msg);
-		return 1;
-	}
-	VERBOSE(sscop, SSCOP_DBG_EXEC, (sscop, sscop->aarg,
-	    "delaying %s in %s", events[sig],
-	    states[sscop->state]));
-
-	return 0;
-}
-
-/*
- * Deliver a signal to the given sscop
- * If it is delivered from inside a signal handler - queue it. If not,
- * execute it. After execution loop through the queue and execute all
- * pending signals. Signals, that cannot be executed because of entry
- * conditions are skipped.
- */
-static void
-sscop_signal(struct sscop *sscop, u_int sig, struct sscop_msg *msg)
-{
-	struct sscop_sig *s;
-
-	VERBOSE(sscop, SSCOP_DBG_INSIG, (sscop, sscop->aarg,
-	    "got signal %s in state %s%s", events[sig],
-	    states[sscop->state], sscop->in_sig ? " -- queuing" : ""));
-
-	SIG_ALLOC(s);
-	if(s == NULL) {
-		FAILURE("sscop: cannot allocate signal");
-		SSCOP_MSG_FREE(msg);
-		return;
-	}
-	s->sig = sig;
-	s->msg = msg;
-	SIGQ_APPEND(&sscop->sigs, s);
-
-	if(!sscop->in_sig)
-		handle_sigs(sscop);
-}
-
-/*
- * Loop through the signal queue until we can't execute any signals.
- */
-static void
-handle_sigs(struct sscop *sscop)
-{
-	struct sscop_sig *s;
-	sscop_sigq_head_t dsigs, q;
-	int exec;
-
-	sscop->in_sig++;
- 
-	/*
-	 * Copy the current signal queue to the local one and empty
-	 * the signal queue. Then loop through the signals. After one
-	 * pass we have a list of delayed signals because of entry
-	 * conditions and a new list of signals. Merge them. Repeat until
-	 * the signal queue is either empty or contains only delayed signals.
-	 */
-	SIGQ_INIT(&q);
-	SIGQ_INIT(&dsigs);
-	do {
-		exec = 0;
-
-		/*
-		 * Copy signal list and make sscop list empty
-		 */
-		SIGQ_MOVE(&sscop->sigs, &q);
-
-		/*
-		 * Loop through the list
-		 */
-		while((s = SIGQ_GET(&q)) != NULL) {
-			if(sig_exec(sscop, s->sig, s->msg)) {
-				exec = 1;
-				SIG_FREE(s);
-			} else {
-				SIGQ_APPEND(&dsigs, s);
-			}
-		}
-
-		/*
-		 * Merge lists by inserting delayed signals in front of
-		 * the signal list. preserving the order.
-		 */
-		SIGQ_PREPEND(&dsigs, &sscop->sigs);
-	} while(exec);
-	sscop->in_sig--;
-}
-
-/*
- * Save a signal that should be executed only if state changes.
- */
-static void
-sscop_save_signal(struct sscop *sscop, u_int sig, struct sscop_msg *msg)
-{
-	struct sscop_sig *s;
-
-	SIG_ALLOC(s);
-	if(s == NULL) {
-		FAILURE("sscop: cannot allocate signal");
-		SSCOP_MSG_FREE(msg);
-		return;
-	}
-	s->sig = sig;
-	s->msg = msg;
-	SIGQ_APPEND(&sscop->saved_sigs, s);
-}
-
-/*
- * Set a new state. If signals are waiting for a state change - append them to
- * the signal queue, so they get executed.
- */
-static void
-sscop_set_state(struct sscop *sscop, u_int nstate)
-{
-	VERBOSE(sscop, SSCOP_DBG_STATE, (sscop, sscop->aarg,
-	    "changing state from %s to %s",
-	    states[sscop->state], states[nstate]));
-
-	sscop->state = nstate;
-	SIGQ_MOVE(&sscop->saved_sigs, &sscop->sigs);
-}
-
-void
-sscop_setdebug(struct sscop *sscop, u_int n)
-{
-	sscop->debug = n;
-}
-
-u_int
-sscop_getdebug(const struct sscop *sscop)
-{
-	return (sscop->debug);
-}
diff --git a/sys/contrib/ngatm/netnatm/saal/sscfu.h b/sys/contrib/ngatm/netnatm/saal/sscfu.h
deleted file mode 100644
index 3aaa9270d3ff..000000000000
--- a/sys/contrib/ngatm/netnatm/saal/sscfu.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/saal/sscfu.h,v 1.4 2004/07/08 08:22:15 brandt Exp $
- *
- * Public include file for UNI SSCF
- */
-#ifndef _NETNATM_SAAL_SSCFU_H_
-#define _NETNATM_SAAL_SSCFU_H_
-
-#include <sys/types.h>
-#include <netnatm/saal/sscopdef.h>
-#include <netnatm/saal/sscfudef.h>
-
-/*
- * Define how a buffer looks like.
- */
-#ifdef _KERNEL
-#ifdef __FreeBSD__
-#define SSCFU_MBUF_T mbuf
-#endif
-#else
-#define SSCFU_MBUF_T uni_msg
-#endif
-
-struct SSCFU_MBUF_T;
-struct sscfu;
-
-/* functions to be supplied by the SSCOP user */
-struct sscfu_funcs {
-	/* upper (SAAL) interface output */
-	void	(*send_upper)(struct sscfu *, void *, enum saal_sig,
-		    struct SSCFU_MBUF_T *);
-
-	/* lower (SSCOP) interface output */
-	void	(*send_lower)(struct sscfu *, void *, enum sscop_aasig,
-		    struct SSCFU_MBUF_T *, u_int);
-
-	/* function to move the SSCOP window */
-	void	(*window)(struct sscfu *, void *, u_int);
-
-	/* debugging function */
-	void	(*verbose)(struct sscfu *, void *, const char *, ...)
-		    __printflike(3, 4);
-};
-
-/* Function defined by the SSCF-UNI code */
-
-/* allocate and initialize a new SSCF instance */
-struct sscfu *sscfu_create(void *, const struct sscfu_funcs *);
-
-/* destroy an SSCF instance and free all resources */
-void sscfu_destroy(struct sscfu *);
-
-/* reset the SSCF to the released state */
-void sscfu_reset(struct sscfu *);
-
-/* lower input interface (SSCOP signals) */
-void sscfu_input(struct sscfu *, enum sscop_aasig, struct SSCFU_MBUF_T *, u_int);
-
-/* upper input interface (SAAL) */
-int sscfu_saalsig(struct sscfu *, enum saal_sig, struct SSCFU_MBUF_T *);
-
-/* retrieve the current state */
-enum sscfu_state sscfu_getstate(const struct sscfu *);
-
-/* char'ify signals and states */
-const char *sscfu_signame(enum saal_sig);
-const char *sscfu_statename(enum sscfu_state);
-
-/* retrieve the default set of parameters for SSCOP */
-u_int sscfu_getdefparam(struct sscop_param *);
-
-/* get/set debugging flags */
-void sscfu_setdebug(struct sscfu *, u_int);
-u_int sscfu_getdebug(const struct sscfu *);
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/saal/sscfudef.h b/sys/contrib/ngatm/netnatm/saal/sscfudef.h
deleted file mode 100644
index 08882f2a9bc2..000000000000
--- a/sys/contrib/ngatm/netnatm/saal/sscfudef.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/saal/sscfudef.h,v 1.4 2004/07/08 08:22:16 brandt Exp $
- *
- * Definitions of UNI SSCF constants.
- */
-#ifndef _NETNATM_SAAL_SSCFUDEF_H_
-#define _NETNATM_SAAL_SSCFUDEF_H_
-
-/*
- * Signals at the upper boundary of the SSCF.
- */
-enum saal_sig {
-	SAAL_ESTABLISH_request,		/* U -> SAAL: (UU) */
-	SAAL_ESTABLISH_indication,	/* SAAL -> U: (UU) */
-	SAAL_ESTABLISH_confirm,		/* SAAL -> U: (UU) */
-	SAAL_RELEASE_request,		/* U -> SAAL: (UU) */
-	SAAL_RELEASE_confirm,		/* SAAL -> U: */
-	SAAL_RELEASE_indication,	/* SAAL -> U: (UU) */
-	SAAL_DATA_request,		/* U -> SAAL: (DATA) */
-	SAAL_DATA_indication,		/* SAAL -> U: (DATA) */
-	SAAL_UDATA_request,		/* U -> SAAL: (UDATA) */
-	SAAL_UDATA_indication,		/* SAAL -> U: (UDATA) */
-};
-
-/*
- * States of the SSCF
- */
-enum sscfu_state {
-	SSCFU_RELEASED,			/* 1/1 */
-	SSCFU_AWAITING_ESTABLISH,	/* 2/2 */
-	SSCFU_AWAITING_RELEASE,		/* 4/10 */
-	SSCFU_ESTABLISHED,		/* 3/4 */
-	SSCFU_RESYNC,			/* 2/5 */
-};
-
-/*
- * Debugging flags
- */
-enum {
-	SSCFU_DBG_LSIG		= 0x01,
-	SSCFU_DBG_ERR		= 0x02,
-	SSCFU_DBG_STATE		= 0x04,
-	SSCFU_DBG_EXEC		= 0x08,
-};
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/saal/sscfupriv.h b/sys/contrib/ngatm/netnatm/saal/sscfupriv.h
deleted file mode 100644
index b4a1299ac108..000000000000
--- a/sys/contrib/ngatm/netnatm/saal/sscfupriv.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/saal/sscfupriv.h,v 1.3 2003/09/19 12:02:03 hbb Exp $
- *
- * Private SSCF-UNI definitions.
- */
-#ifdef _KERNEL
-#ifdef __FreeBSD__
-#include <netgraph/atm/sscfu/ng_sscfu_cust.h>
-#endif
-#else
-#include "sscfucust.h"
-#endif
-
-/*
- * Structure for signal queueing.
- */
-struct sscfu_sig {
-	sscfu_sigq_link_t link;		/* link to next signal */
-	enum saal_sig	sig;		/* the signal */
-	struct SSCFU_MBUF_T *m;		/* associated message */
-};
-
-struct sscfu {
-	enum sscfu_state	state;		/* SSCF state */
-	const struct sscfu_funcs *funcs;	/* func vector */
-	void			*aarg;		/* user arg */
-	int			inhand;		/* need to queue signals */
-	sscfu_sigq_head_t	sigs;		/* signal queue */
-	u_int			debug;		/* debugging flags */
-};
-
-/*
- * Debugging
- */
-#ifdef SSCFU_DEBUG
-#define VERBOSE(S,M,F)	if ((S)->debug & (M)) (S)->funcs->verbose F
-#else
-#define VERBOSE(S,M,F)
-#endif
diff --git a/sys/contrib/ngatm/netnatm/saal/sscop.h b/sys/contrib/ngatm/netnatm/saal/sscop.h
deleted file mode 100644
index 8574a1581791..000000000000
--- a/sys/contrib/ngatm/netnatm/saal/sscop.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/saal/sscop.h,v 1.4 2004/07/08 08:22:16 brandt Exp $
- *
- * External interface to sscop.
- */
-#ifndef _NETNATM_SAAL_SSCOP_H_
-#define _NETNATM_SAAL_SSCOP_H_
-
-#include <netnatm/saal/sscopdef.h>
-
-/*
- * Define how a buffer looks like.
- */
-#ifdef _KERNEL
-#ifdef __FreeBSD__
-#define SSCOP_MBUF_T mbuf
-#endif
-#else
-#define SSCOP_MBUF_T uni_msg
-#endif
-
-struct SSCOP_MBUF_T;
-struct sscop;
-
-/*
- * Vector for user functions
- */
-struct sscop_funcs {
-	/* management signal from SSCOP */
-	void	(*send_manage)(struct sscop *, void *, enum sscop_maasig,
-		    struct SSCOP_MBUF_T *, u_int, u_int);
-
-	/* AAL signal from SSCOP */
-	void	(*send_upper)(struct sscop *, void *, enum sscop_aasig,
-		    struct SSCOP_MBUF_T *, u_int);
-
-	/* send a PDU to the wire */
-	void	(*send_lower)(struct sscop *, void *,
-		    struct SSCOP_MBUF_T *);
-
-	/* print a message */
-	void	(*verbose)(struct sscop *, void *, const char *, ...)
-		    __printflike(3,4);
-
-#ifndef _KERNEL
-	/* start a timer */
-	void	*(*start_timer)(struct sscop *, void *, u_int,
-		    void (*)(void *));
-
-	/* stop a timer */
-	void	(*stop_timer)(struct sscop *, void *, void *);
-#endif
-};
-
-/* Function defined by the SSCOP code */
-
-/* create a new SSCOP instance and initialize to default values */
-struct sscop *sscop_create(void *, const struct sscop_funcs *);
-
-/* destroy an SSCOP instance */
-void sscop_destroy(struct sscop *);
-
-/* get the current parameters of an SSCOP */
-void sscop_getparam(const struct sscop *, struct sscop_param *);
-
-/* set new parameters in an SSCOP */
-int sscop_setparam(struct sscop *, struct sscop_param *, u_int *);
-
-/* deliver an signal to the SSCOP */
-int sscop_aasig(struct sscop *, enum sscop_aasig, struct SSCOP_MBUF_T *, u_int);
-
-/* deliver an management signal to the SSCOP */
-int sscop_maasig(struct sscop *, enum sscop_maasig, struct SSCOP_MBUF_T *);
-
-/* SSCOP input function */
-void sscop_input(struct sscop *, struct SSCOP_MBUF_T *);
-
-/* Move the window by a given number of messages. Return the new window */
-u_int sscop_window(struct sscop *, u_int);
-
-/* declare the lower layer busy or not busy */
-u_int sscop_setbusy(struct sscop *, int);
-
-/* retrieve the state */
-enum sscop_state sscop_getstate(const struct sscop *);
-
-/* map signals to strings */
-const char *sscop_msigname(enum sscop_maasig);
-const char *sscop_signame(enum sscop_aasig);
-const char *sscop_statename(enum sscop_state);
-
-/* set/get debugging state */
-void sscop_setdebug(struct sscop *, u_int);
-u_int sscop_getdebug(const struct sscop *);
-
-/* reset the instance */
-void sscop_reset(struct sscop *);
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/saal/sscopdef.h b/sys/contrib/ngatm/netnatm/saal/sscopdef.h
deleted file mode 100644
index ec6716461c34..000000000000
--- a/sys/contrib/ngatm/netnatm/saal/sscopdef.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/saal/sscopdef.h,v 1.4 2004/07/08 08:22:17 brandt Exp $
- *
- * Definitions of SSCOP constants and parameter blocks. This is seen by
- * the outside world.
- */
-#ifndef _NETNATM_SAAL_SSCOPDEF_H_
-#define _NETNATM_SAAL_SSCOPDEF_H_
-
-#include <sys/types.h>
-#ifdef _KERNEL
-#include <sys/stdint.h>
-#else
-#include <stdint.h>
-#endif
-
-/*
- * AA-interface signals
- */
-enum sscop_aasig {
-	SSCOP_ESTABLISH_request,	/* <- UU, BR */
-	SSCOP_ESTABLISH_indication,	/* -> UU */
-	SSCOP_ESTABLISH_response,	/* <- UU, BR */
-	SSCOP_ESTABLISH_confirm,	/* -> UU */
-
-	SSCOP_RELEASE_request,		/* <- UU */
-	SSCOP_RELEASE_indication,	/* -> UU, SRC */
-	SSCOP_RELEASE_confirm,		/* -> */
-
-	SSCOP_DATA_request,		/* <- MU */
-	SSCOP_DATA_indication,		/* -> MU, SN */
-
-	SSCOP_UDATA_request,		/* <- MU */
-	SSCOP_UDATA_indication,		/* -> MU */
-
-	SSCOP_RECOVER_indication,	/* -> */
-	SSCOP_RECOVER_response,		/* <- */
-
-	SSCOP_RESYNC_request,		/* <- UU */
-	SSCOP_RESYNC_indication,	/* -> UU */
-	SSCOP_RESYNC_response,		/* <- */
-	SSCOP_RESYNC_confirm,		/* -> */
-
-	SSCOP_RETRIEVE_request,		/* <- RN */
-	SSCOP_RETRIEVE_indication,	/* -> MU */
-	SSCOP_RETRIEVE_COMPL_indication,/* -> */
-};
-
-enum sscop_maasig {
-	SSCOP_MDATA_request,		/* <- MU */
-	SSCOP_MDATA_indication,		/* -> MU */
-	SSCOP_MERROR_indication,	/* -> CODE, CNT */
-};
-
-/*
- * Values for retrieval. Numbers in SSCOP are 24bit, so
- * we can use the large values
- */
-enum {
-	SSCOP_MAXSEQNO		= 0xffffff,
-
-	SSCOP_RETRIEVE_UNKNOWN	= SSCOP_MAXSEQNO + 1,
-	SSCOP_RETRIEVE_TOTAL	= SSCOP_MAXSEQNO + 2,
-};
-
-/*
- * SSCOP states
- */
-enum sscop_state {
-	SSCOP_IDLE,		/* initial state */
-	SSCOP_OUT_PEND,		/* outgoing connection pending */
-	SSCOP_IN_PEND,		/* incoming connection pending */
-	SSCOP_OUT_DIS_PEND,	/* outgoing disconnect pending */
-	SSCOP_OUT_RESYNC_PEND,	/* outgoing resynchronisation pending */
-	SSCOP_IN_RESYNC_PEND,	/* incoming resynchronisation pending */
-	SSCOP_OUT_REC_PEND,	/* outgoing recovery pending */
-	SSCOP_REC_PEND,		/* recovery response pending */
-	SSCOP_IN_REC_PEND,	/* incoming recovery pending */
-	SSCOP_READY,		/* data transfer ready */
-};
-#define SSCOP_NSTATES 10
-
-struct sscop_param {
-	uint32_t	timer_cc;	/* timer_cc in msec */
-	uint32_t	timer_poll;	/* timer_poll im msec */
-	uint32_t	timer_keep_alive;/* timer_keep_alive in msec */
-	uint32_t	timer_no_response;/*timer_no_response in msec */
-	uint32_t	timer_idle;	/* timer_idle in msec */
-	uint32_t	maxk;		/* maximum user data in bytes */
-	uint32_t	maxj;		/* maximum u-u info in bytes */
-	uint32_t	maxcc;		/* max. retransmissions for control packets */
-	uint32_t	maxpd;		/* max. vt(pd) before sending poll */
-	uint32_t	maxstat;	/* max. number of elements in stat list */
-	uint32_t	mr;		/* initial window */
-	uint32_t	flags;		/* flags */
-};
-enum {
-	SSCOP_ROBUST 	= 0x0001,	/* atmf/97-0216 robustness */
-	SSCOP_POLLREX	= 0x0002,	/* send POLL after retransmit */
-};
-
-enum {
-	SSCOP_SET_TCC		= 0x0001,
-	SSCOP_SET_TPOLL		= 0x0002,
-	SSCOP_SET_TKA		= 0x0004,
-	SSCOP_SET_TNR		= 0x0008,
-	SSCOP_SET_TIDLE		= 0x0010,
-	SSCOP_SET_MAXK		= 0x0020,
-	SSCOP_SET_MAXJ		= 0x0040,
-	SSCOP_SET_MAXCC		= 0x0080,
-	SSCOP_SET_MAXPD		= 0x0100,
-	SSCOP_SET_MAXSTAT	= 0x0200,
-	SSCOP_SET_MR		= 0x0400,
-	SSCOP_SET_ROBUST	= 0x0800,
-	SSCOP_SET_POLLREX	= 0x1000,
-
-	SSCOP_SET_ALLMASK	= 0x1fff,
-};
-
-enum {
-	SSCOP_DBG_USIG	= 0x0001,
-	SSCOP_DBG_TIMER	= 0x0002,
-	SSCOP_DBG_BUG	= 0x0004,
-	SSCOP_DBG_INSIG	= 0x0008,
-	SSCOP_DBG_STATE	= 0x0010,
-	SSCOP_DBG_PDU	= 0x0020,
-	SSCOP_DBG_ERR	= 0x0040,
-	SSCOP_DBG_EXEC	= 0x0080,
-	SSCOP_DBG_FLOW	= 0x0100,
-};
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/saal/sscoppriv.h b/sys/contrib/ngatm/netnatm/saal/sscoppriv.h
deleted file mode 100644
index e2b055530b1f..000000000000
--- a/sys/contrib/ngatm/netnatm/saal/sscoppriv.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/saal/sscoppriv.h,v 1.4 2004/07/08 08:22:17 brandt Exp $
- *
- * Private SSCOP definitions.
- *
- */
-#ifdef _KERNEL
-#ifdef __FreeBSD__
-#include <netgraph/atm/sscop/ng_sscop_cust.h>
-#endif
-#else	/* !_KERNEL */
-#include "sscopcust.h"
-#endif
-
-/* Argh. BSDi */
-#ifndef _BYTE_ORDER
-#ifndef BYTE_ORDER
-#error "_BYTE_ORDER not defined"
-#endif
-#define _BYTE_ORDER	BYTE_ORDER
-#define _LITTLE_ENDIAN	LITTLE_ENDIAN
-#define	_BIG_ENDIAN	BIG_ENDIAN
-#endif
-
-/*
- * PDU trailer
- */
-union pdu {
-  u_int			sscop_null;
-  struct {
-#if _BYTE_ORDER == _BIG_ENDIAN
-	u_int		pl : 2;		/* pad length */
-	u_int		: 1;		/* reserved field */
-	u_int		s : 1;		/* source */
-	u_int		type : 4;	/* PDU type */
-	u_int		ns : 24;	/* sequence number */
-#else
-	u_int		ns : 24;	/* sequence number */
-	u_int		type : 4;	/* PDU type */
-	u_int		s : 1;		/* source */
-	u_int		: 1;		/* reserved field */
-	u_int		pl : 2;		/* pad length */
-#endif
-  } ss;
-};
-#define sscop_pl	ss.pl
-#define sscop_s		ss.s
-#define sscop_type	ss.type
-#define sscop_ns	ss.ns
-
-/*
- * seqno list entry format
- */
-union seqno {
-  u_int			sscop_null;
-  struct {
-#if _BYTE_ORDER == _BIG_ENDIAN
-	u_int		: 8;		/* pad */
-	u_int		n : 24;		/* seqno */
-#else
-	u_int		n : 24;		/* seqno */
-	u_int		: 8;		/* pad */
-#endif
-  } ss;
-};
-#define sscop_n	ss.n
-
-/*
- * Begin pdu
- */
-union bgn {
-  u_int			sscop_null;
-  struct {
-#if _BYTE_ORDER == _BIG_ENDIAN
-	u_int	: 24;			/* reserved */
-	u_int	bgns : 8;		/* VT_MR */
-#else
-	u_int	bgns : 8;		/* VT_MR */
-	u_int	: 24;			/* reserved */
-#endif
-  } ss;
-};
-#define sscop_bgns	ss.bgns
-
-/*
- * pdu types
- */
-enum pdu_type {
-	PDU_BGN		= 0x1,	/* request initialization */
-	PDU_BGAK	= 0x2,	/* request acknowledgement */
-	PDU_END		= 0x3,	/* disconnect command */
-	PDU_ENDAK	= 0x4,	/* disconnect acknowledgement */
-	PDU_RS		= 0x5,	/* resynchronisation command */
-	PDU_RSAK	= 0x6,	/* resynchronisation acknowledgement */
-	PDU_BGREJ	= 0x7,	/* connection reject */
-	PDU_SD		= 0x8,	/* sequenced connection-mode data */
-	PDU_ER		= 0x9,	/* recovery command */
-	PDU_POLL	= 0xa,	/* xmit state info with req. for recv state */
-	PDU_STAT	= 0xb,	/* solicited receiver state info */
-	PDU_USTAT	= 0xc,	/* unsolicited receiver state info */
-	PDU_UD		= 0xd,	/* unumbered user data */
-	PDU_MD		= 0xe,	/* unumbered management data */
-	PDU_ERAK	= 0xf,	/* recovery acknowledgement */
-};
-
-
-/*
- * These are all signals, that are used by SSCOP. Don't change the order or
- * number without also changing the associated tables.
- */
-enum sscop_sigtype {
-	/* received PDU's */
-	SIG_BGN,		/* request initialization */
-	SIG_BGAK,		/* request acknowledgement */
-	SIG_END,		/* disconnect command */
-	SIG_ENDAK,		/* disconnect acknowledgement */
-	SIG_RS,			/* resynchronisation command */
-	SIG_RSAK,		/* resynchronisation acknowledgement */
-	SIG_BGREJ,		/* connection reject */
-	SIG_SD,			/* sequenced connection-mode data */
-	SIG_ER,			/* recovery command */
-	SIG_POLL,		/* xmitter state info with req for recv state */
-	SIG_STAT,		/* solicited receiver state info */
-	SIG_USTAT,		/* unsolicited receiver state info */
-	SIG_UD,			/* unumbered user data */
-	SIG_MD,			/* unumbered management data */
-	SIG_ERAK,		/* recovery acknoledgement */
-
-	/* timer expiry */
-	SIG_T_CC,		/* CC timer */
-	SIG_T_POLL,		/* POLL timer */
-	SIG_T_KA,		/* KEEP ALIVE timer */
-	SIG_T_NR,		/* NO RESPONSE timer */
-	SIG_T_IDLE,		/* IDLE timer */
-
-	/* user originated signals */
-	SIG_PDU_Q,		/* PDU enqueued pseudosignal */
-	SIG_USER_DATA,		/* user data request */
-	SIG_ESTAB_REQ,		/* establish connection request */
-	SIG_ESTAB_RESP,		/* establish connection response */
-	SIG_RELEASE_REQ,	/* release connection request */
-	SIG_RECOVER,		/* automatic recover response */
-	SIG_SYNC_REQ,		/* resynchronisation request */
-	SIG_SYNC_RESP,		/* resynchronisation response */
-	SIG_UDATA,		/* UDATA request */
-	SIG_MDATA,		/* MDATA request */
-	SIG_UPDU_Q,		/* UDATA PDU enqueued pseudosignal */
-	SIG_MPDU_Q,		/* MDATA PDU enqueued pseudosignal */
-	SIG_RETRIEVE,		/* RETRIEVE */
-
-	/* number of signals */
-	SIG_NUM
-};
-
-/*
- * This is a message as contained in a sscop message queue. It holds a pointer
- * to the real message.
- */
-struct sscop_msg {
-	sscop_msgq_link_t link;
-	u_int		seqno;		/* seq no */
-	u_int		poll_seqno;	/* poll seqno (for messages in xmit buffer) */
-	u_int		rexmit;		/* in retransmission queue? */
-	struct SSCOP_MBUF_T *m;		/* the message */
-};
-
-/*
- * This structure is used to hold signals in the signal queue
- */
-struct sscop_sig {
-	sscop_sigq_link_t link;		/* next signal */
-	enum sscop_sigtype sig;		/* THE signal */
-	struct sscop_msg *msg;		/* signal argument (message) */
-};
-
-/*
- * This structure holds the entire sscop state
- */
-struct sscop {
-	enum sscop_state state;	/* current state */
-	const struct sscop_funcs *funcs;
-
-	/* send state */
-	u_int	vt_s;		/* seqno for next pdu first time transmitted */
-	u_int	vt_ps;		/* current poll seqno */
-	u_int	vt_a;		/* next expected in-sequence sd pdu */
-	u_int	vt_pa;		/* poll seqno of next stat pdu */
-	u_int	vt_ms;		/* maximum allowed send sd seqno */
-	u_int	vt_pd;		/* poll data state */
-	u_int	vt_cc;		/* connection control state */
-	u_int	vt_sq;		/* transmitter connection sequence */
-
-	/* receive state */
-	u_int	vr_r;		/* receive state */
-	u_int	vr_h;		/* highes expected state */
-	u_int	vr_mr;		/* maximum acceptable */
-	u_int	vr_sq;		/* receiver connection state */
-
-	/* timers */
-	sscop_timer_t t_cc;	/* timer_CC */
-	sscop_timer_t t_nr;	/* timer_NO_RESPONSE */
-	sscop_timer_t t_ka;	/* timer KEEP_ALIVE */
-	sscop_timer_t t_poll;	/* timer_POLL */
-	sscop_timer_t t_idle;	/* idle timer */
-
-	/* maximum values */
-	u_int	maxj;		/* maximum uu-info */
-	u_int	maxk;		/* maximum info */
-	u_int	maxcc;		/* maximum number of bgn, end, er and rs */
-	u_int	maxpd;		/* maximum value of vt_pd */
-	u_int	maxstat;	/* maximum length of list */
-	u_int	timercc;	/* connection control timer */
-	u_int	timerka;	/* keep alive timer */
-	u_int	timernr;	/* no response timer */
-	u_int	timerpoll;	/* polling */
-	u_int	timeridle;	/* idle timer */
-	u_int	robustness;	/* atmf/97-0216 robustness enhancement */
-	u_int	poll_after_rex;	/* optional POLL after re-transmission */
-	u_int	mr;		/* initial window */
-
-	/*
-	 * buffers and queues.
-	 * All expect the xq hold SD PDUs.
-	 */
-	sscop_msgq_head_t xq;	/* xmit queue (input from user before xmit) */
-	sscop_msgq_head_t uxq;	/* UD xmit queue */
-	sscop_msgq_head_t mxq;	/* MD xmit queue */
-	sscop_msgq_head_t xbuf;	/* transmission buffer (SD PDUs transmitted) */
-	int	rxq;		/* number of PDUs in retransmission queue */
-	sscop_msgq_head_t rbuf;	/* receive buffer (SD PDUs) */
-	int	last_end_src;	/* source field from last xmitted end pdu */
-	int	clear_buffers;	/* flag */
-	int	credit;		/* send window not closed */
-	u_int	ll_busy;	/* lower layer busy */
-	u_int	rs_mr;		/* N(MR) in last RS PDU */
-	u_int	rs_sq;		/* N(SQ) in last RS PDU */
-	struct SSCOP_MBUF_T *uu_bgn;	/* last UU data */
-	struct SSCOP_MBUF_T *uu_bgak;	/*  ... */
-	struct SSCOP_MBUF_T *uu_bgrej;	/*  ... */
-	struct SSCOP_MBUF_T *uu_end;	/*  ... */
-	struct SSCOP_MBUF_T *uu_rs;	/*  ... */
-
-	/* signal queues */
-	sscop_sigq_head_t	sigs;		/* saved signals */
-	sscop_sigq_head_t	saved_sigs;	/* saved signals */
-	int	in_sig;		/* in signal handler */
-
-	/* debugging */
-	u_int		debug;
-
-	/* AA interface */
-	void		*aarg;
-};
-
-
-/*
- * Default values for SSCOP
- */
-enum {
-	MAXK		= 4096,
-	MAXMAXK		= 65528,
-	MAXJ		= 4096,
-	MAXMAXJ		= 65524,
-	MAXCC		= 4,
-	MAXSTAT		= 67,
-	MAXPD		= 25,
-	MAXMR		= 128,		/* ??? */
-	TIMERCC		= 1000,
-	TIMERKA		= 2000,
-	TIMERNR		= 7000,
-	TIMERPOLL	= 750,
-	TIMERIDLE	= 15000,
-};
-
-/*
- * Sequence number arithmetic
- */
-#define SEQNO_DIFF(A,B)  (((A) < (B)) ? ((A) + (1<<24) - (B)) : ((A) - (B)))
-
-/*
- * Debugging
- */
-#ifdef SSCOP_DEBUG
-#define VERBOSE(S,M,F)	if ((S)->debug & (M)) (S)->funcs->verbose F
-#define VERBERR(S,M,F)	if ((S)->debug & (M)) (S)->funcs->verbose F
-#define ISVERBOSE(S,M)	((S)->debug & (M))
-#else
-#define VERBOSE(S,M,F)
-#define VERBERR(S,M,F)
-#define ISVERBOSE(S,M)	(0)
-#endif
diff --git a/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk b/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk
deleted file mode 100644
index be61925c977a..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/genmsgcpyc.awk
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Copyright (c) 2001-2003
-# Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-# 	All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# Author: Hartmut Brandt <harti@freebsd.org>
-# 
-# $Begemot: libunimsg/netnatm/sig/genmsgcpyc.awk,v 1.4 2004/07/08 08:22:18 brandt Exp $
-#
-# Generate copy functions for messages
-#
-function begin() {
-}
-
-function first_entry() {
-	print "/* This file was created automatically"
-	print " * Source file: " id
-	print " * $FreeBSD$"
-	print " */"
-	print ""
-	print "#include <netnatm/msg/unistruct.h>"
-	print "#include <netnatm/sig/unimsgcpy.h>"
-}
-
-function end() {
-}
-
-function start_message() {
-}
-
-function end_message() {
-	print ""
-	print "void"
-	print "copy_msg_" msg "(struct uni_" msg " *src, struct uni_" msg " *dst)"
-	print "{"
-	for(i = 0; i < cnt; i++) {
-		if(ienum[i] != "-") {
-			print "\tu_int s, d;"
-			print ""
-			break
-		}
-	}
-	for(i = 0; i < cnt; i++) {
-		ie = iename[i]
-		if(ierep[i]) {
-			print "\tif(IE_ISGOOD(src->" ie "_repeat))"
-			print "\t\tdst->" ie "_repeat = src->" ie "_repeat;"
-		}
-		if(ienum[i] != "-") {
-			print "\tfor(s = d = 0; s < "ienum[i]"; s++)"
-			print "\t\tif(IE_ISGOOD(src->"ie"[s]))"
-			print "\t\t\tdst->"ie"[d++] = src->"ie"[s];"
-		} else {
-			print "\tif(IE_ISGOOD(src->"ie"))"
-			print "\t\tdst->"ie" = src->"ie";"
-		}
-	}
-	print "}"
-}
diff --git a/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk b/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk
deleted file mode 100644
index f9b44f2b168d..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/genmsgcpyh.awk
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2001-2003
-# Fraunhofer Institute for Open Communication Systems (FhG Fokus).
-# 	All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# Author: Hartmut Brandt <harti@freebsd.org>
-# 
-# $Begemot: libunimsg/netnatm/sig/genmsgcpyh.awk,v 1.4 2004/07/08 08:22:19 brandt Exp $
-#
-# Generate copy functions for messages
-#
-function begin() {
-}
-
-function first_entry() {
-	print "/* This file was created automatically"
-	print " * Source file: " id
-	print " * $FreeBSD$"
-	print " */"
-	print ""
-}
-
-function end() {
-}
-
-function start_message() {
-}
-
-function end_message() {
-	print ""
-	print "void"
-	print "copy_msg_" msg "(struct uni_" msg " *src, struct uni_" msg " *dst);"
-	print ""
-}
diff --git a/sys/contrib/ngatm/netnatm/sig/sig_call.c b/sys/contrib/ngatm/netnatm/sig/sig_call.c
deleted file mode 100644
index d2e3b7f9af2e..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/sig_call.c
+++ /dev/null
@@ -1,4310 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/sig/sig_call.c,v 1.65 2004/08/05 07:11:00 brandt Exp $
- *
- * Call instance handling
- *
- * Note:
- *	In all functions that handle messages from the user or from
- *	the SAAL, commit memory allocation always at the begin of the
- *	function. If allocation fails, ignore saal messages and
- *	respond with an error to user messages.
- */
-
-#include <netnatm/unimsg.h>
-#include <netnatm/saal/sscfudef.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#include <netnatm/sig/uni.h>
-
-#include <netnatm/sig/unipriv.h>
-#include <netnatm/sig/unimkmsg.h>
-#include <netnatm/sig/unimsgcpy.h>
-
-static enum call_state state_compat(struct call *, enum uni_callstate);
-static void respond_drop_party_ack(struct call *, struct uni_ie_epref *, u_int);
-
-
-#define DEF_PRIV_SIG(NAME, FROM)	[SIG##NAME] =	"SIG"#NAME,
-static const char *const call_sigs[] = {
-	DEF_CALL_SIGS
-};
-#undef DEF_PRIV_SIG
-
-TIMER_FUNC_CALL(t308, t308_func)
-TIMER_FUNC_CALL(t303, t303_func)
-TIMER_FUNC_CALL(t301, t301_func)
-TIMER_FUNC_CALL(t310, t310_func)
-TIMER_FUNC_CALL(t313, t313_func)
-TIMER_FUNC_CALL(t322, t322_func)
-
-const struct callstates callstates[] = {
-	[CALLST_NULL] =	{ "NU0",	UNI_CALLSTATE_U0 },
-	[CALLST_U1] =	{ "U1",		UNI_CALLSTATE_U1 },
-	[CALLST_U3] =	{ "U3",		UNI_CALLSTATE_U3 },
-	[CALLST_U4] =	{ "U4",		UNI_CALLSTATE_U4 },
-	[CALLST_U6] =	{ "U6",		UNI_CALLSTATE_U6 },
-	[CALLST_U7] =	{ "U7",		UNI_CALLSTATE_U7 },
-	[CALLST_U8] =	{ "U8",		UNI_CALLSTATE_U8 },
-	[CALLST_U9] =	{ "U9",		UNI_CALLSTATE_U9 },
-	[CALLST_U10] =	{ "U10",	UNI_CALLSTATE_U10 },
-	[CALLST_U11] =	{ "U11",	UNI_CALLSTATE_U11 },
-	[CALLST_U12] =	{ "U12",	UNI_CALLSTATE_U12 },
-	[CALLST_N1] =	{ "N1",		UNI_CALLSTATE_N1 },
-	[CALLST_N3] =	{ "N3",		UNI_CALLSTATE_N3 },
-	[CALLST_N4] =	{ "N4",		UNI_CALLSTATE_N4 },
-	[CALLST_N6] =	{ "N6",		UNI_CALLSTATE_N6 },
-	[CALLST_N7] =	{ "N7",		UNI_CALLSTATE_N7 },
-	[CALLST_N8] =	{ "N8",		UNI_CALLSTATE_N8 },
-	[CALLST_N9] =	{ "N9",		UNI_CALLSTATE_N9 },
-	[CALLST_N10] =	{ "N10",	UNI_CALLSTATE_N10 },
-	[CALLST_N11] =	{ "N11",	UNI_CALLSTATE_N11 },
-	[CALLST_N12] =	{ "N12",	UNI_CALLSTATE_N12 },
-};
-
-static void unx_send_add_party_rej(struct call *c, struct uni_all *u);
-
-static __inline void
-set_call_state(struct call *c, enum call_state state)
-{
-	ASSERT(state == CALLST_NULL ||
-	    (c->uni->proto == UNIPROTO_UNI40U &&
-	     (state >= CALLST_U1 && state <= CALLST_U12)) ||
-	    (c->uni->proto == UNIPROTO_UNI40N &&
-	     (state >= CALLST_N1 && state <= CALLST_N12)),
-	    ("setting wrong callstate for proto %u: %u", c->uni->proto, state));
-
-	if (c->cstate != state) {
-		VERBOSE(c->uni, UNI_FAC_CALL, 1, "call %d/%d %s -> %s",
-		    c->cref, c->mine, callstates[c->cstate].name,
-		    callstates[state].name);
-		c->cstate = state;
-	}
-}
-
-static enum uni_callstate
-map_callstate(enum call_state state)
-{
-	return (callstates[state].ext);
-}
-
-/*
- * Find the call. Assume, that the cref is one of a message just received.
- * That is, if the call reference flag is 0 it is his call, if it is 1 it
- * is my call.
- */
-struct call *
-uni_find_call(struct uni *uni, struct uni_cref *cref)
-{
-	struct call *c;
-
-	TAILQ_FOREACH(c, &uni->calls, link)
-		if (c->cref == cref->cref && (!c->mine == !cref->flag))
-			return (c);
-	return (NULL);
-}
-struct call *
-uni_find_callx(struct uni *uni, u_int cref, u_int mine)
-{
-	struct call *c;
-
-	TAILQ_FOREACH(c, &uni->calls, link)
-		if (c->cref == cref && !c->mine == !mine)
-			return (c);
-	return (NULL);
-}
-
-/*
- * Create a new call instance. The type must be set by the caller.
- */
-struct call *
-uni_create_call(struct uni *uni, u_int cref, u_int mine, uint32_t cookie)
-{
-	struct call *c;
-	struct uniapi_call_created *ind;
-	struct uni_msg *api;
-
-	if ((c = CALL_ALLOC()) == NULL)
-		return (NULL);
-
-	if ((ind = ALLOC_API(struct uniapi_call_created, api)) == NULL) {
-		CALL_FREE(c);
-		return (NULL);
-	}
-	ind->cref.cref = cref;
-	ind->cref.flag = mine;
-
-	c->uni = uni;
-	c->type = CALL_NULL;
-	c->cref = cref;
-	c->mine = mine;
-	c->cstate = CALLST_NULL;
-	TAILQ_INIT(&c->parties);
-
-	TIMER_INIT_CALL(c, t301);
-	TIMER_INIT_CALL(c, t303);
-	TIMER_INIT_CALL(c, t308);
-	TIMER_INIT_CALL(c, t310);
-	TIMER_INIT_CALL(c, t313);
-	TIMER_INIT_CALL(c, t322);
-
-	TAILQ_INSERT_HEAD(&uni->calls, c, link);
-
-	uni->funcs->uni_output(uni, uni->arg, UNIAPI_CALL_CREATED, cookie, api);
-
-	VERBOSE(c->uni, UNI_FAC_CALL, 1, "created call %u/%s",
-	    c->cref, c->mine ? "mine" : "his");
-
-	return (c);
-}
-
-struct call *
-uni_create_new_call(struct uni *uni, uint32_t cookie)
-{
-	struct call *c;
-	uint32_t old = uni->cref_alloc++;
-
-  again:
-	if (uni->cref_alloc == (1 << 23))
-		uni->cref_alloc = 1;
-	if (uni->cref_alloc == old)
-		return (NULL);	/* all crefs exhausted!!! */
-	TAILQ_FOREACH(c, &uni->calls, link)
-		if (c->mine && c->cref == uni->cref_alloc) {
-			uni->cref_alloc++;
-			goto again;
-		}
-	return (uni_create_call(uni, uni->cref_alloc, 1, cookie));
-}
-
-/*
- * Assume timers are all stopped. Memory is not actually freed unless
- * the reference count drops to 0.
- * This function is assumed to remove the call from the parent UNI's 
- * call queue.
- */
-void
-uni_destroy_call(struct call *c, int really)
-{
-	struct uniapi_call_destroyed *ind;
-	struct uni_msg *api;
-	struct party *p;
-
-	VERBOSE(c->uni, UNI_FAC_CALL, 1, "destroying call %u/%s",
-	    c->cref, c->mine ? "mine" : "his");
-
-	TIMER_DESTROY_CALL(c, t301);
-	TIMER_DESTROY_CALL(c, t303);
-	TIMER_DESTROY_CALL(c, t308);
-	TIMER_DESTROY_CALL(c, t310);
-	TIMER_DESTROY_CALL(c, t313);
-	TIMER_DESTROY_CALL(c, t322);
-	TAILQ_REMOVE(&c->uni->calls, c, link);
-
-	uni_delsig(c->uni, SIG_CALL, c, NULL);
-
-	while ((p = TAILQ_FIRST(&c->parties)) != NULL) {
-		TAILQ_REMOVE(&c->parties, p, link);
-		uni_destroy_party(p, really);
-	}
-
-	if (!really) {
-		ind = ALLOC_API(struct uniapi_call_destroyed, api);
-		if (ind != NULL) {
-			ind->cref.cref = c->cref;
-			ind->cref.flag = c->mine;
-
-			uni_enq_coord(c->uni, SIGO_CALL_DESTROYED, 0, api);
-		}
-
-		uni_enq_call(c, SIGC_CALL_DELETE, 0, NULL, NULL);
-		return;
-	}
-
-	CALL_FREE(c);
-}
-
-static void
-allocate_epref(struct call *c, struct uni_ie_epref *epref)
-{
-	struct party *p;
-	uint32_t old = c->epref_alloc++;
-
-  again:
-	if (c->epref_alloc == (1 << 15))
-		c->epref_alloc = 0;
-	if (c->epref_alloc == old)
-		return;		/* all crefs exhausted!!! */
-	TAILQ_FOREACH(p, &c->parties, link)
-		if (p->epref == c->epref_alloc) {
-			c->epref_alloc++;
-			goto again;
-		}
-	IE_SETPRESENT(*epref);
-	epref->flag = 0;
-	epref->epref = c->epref_alloc;
-
-	epref->h.coding = UNI_CODING_ITU;
-	epref->h.act = UNI_IEACT_DEFAULT;
-}
-
-static void
-reset_all_timers(struct call *c)
-{
-	TIMER_STOP_CALL(c, t301);
-	TIMER_STOP_CALL(c, t303);
-	TIMER_STOP_CALL(c, t308);
-	TIMER_STOP_CALL(c, t310);
-	TIMER_STOP_CALL(c, t313);
-	TIMER_STOP_CALL(c, t322);
-}
-
-/*
- * Initiate call clearing because of a problem. This is label D in 
- * the SDLs and is called from many places.
- * The call must have constructed the cause IE in struct call.
- *
- * Q.2971:Call-Control-U 27/39
- * Q.2971:Call-Control-N 28/39
- *
- * Memory problems are handled differently here: we simply ignore them
- * by not sending messages or user indications. Because of T308 we
- * may be lucky to send the message in a second run.
- *
- * It is assumed, that the cause for the release is constructed by
- * the calling function in uni->cause.
- */
-static void
-clear_callD(struct call *c)
-{
-	struct uni_msg *api;
-	struct uniapi_release_indication *ind;
-	struct party *p;
-	struct uni_all *rel;
-
-	/*
-	 * Send indication to API
-	 */
-	if ((ind = ALLOC_API(struct uniapi_release_indication, api)) != NULL) {
-		ind->release.hdr.cref.cref = c->cref;
-		ind->release.hdr.cref.flag = c->mine;
-		ind->release.hdr.act = UNI_MSGACT_DEFAULT;
-		ind->release.cause[0] = c->uni->cause;
-
-		c->uni->funcs->uni_output(c->uni, c->uni->arg,
-		    UNIAPI_RELEASE_indication, 0, api);
-	}
-
-	reset_all_timers(c);
-
-	if (c->type == CALL_LEAF || c->type == CALL_ROOT) {
-		TAILQ_FOREACH(p, &c->parties, link) {
-			uni_enq_party(p, SIGP_RELEASE_request, 0, NULL, NULL);
-		}
-	}
-
-	memset(&c->msg_release, 0, sizeof(c->msg_release));
-	c->msg_release.cause[0] = c->uni->cause;
-
-	if ((rel = UNI_ALLOC()) != NULL) {
-		rel->u.release = c->msg_release;
-		MK_MSG_ORIG(rel, UNI_RELEASE, c->cref, !c->mine);
-		(void)uni_send_output(rel, c->uni);
-		UNI_FREE(rel);
-	}
-
-	TIMER_START_CALL(c, t308, c->uni->timer308);
-	c->cnt308 = 0;
-
-	if (c->uni->proto == UNIPROTO_UNI40N)
-		set_call_state(c, CALLST_N12);
-	else
-		set_call_state(c, CALLST_U11);
-}
-
-
-/**********************************************************************/
-/*
- * SETUP message in state NULL
- *
- * Q.2971:Call-Control-U 4/39
- * Q.2971:Call-Control-N 4/39
- */
-static void
-un0_setup(struct call *c, struct uni_msg *m, struct uni_all *u,
-    enum call_state new_state)
-{
-	struct uni_all *resp;
-	struct party *p;
-	struct uniapi_setup_indication *ind;
-	struct uni_msg *api;
-	enum verify v;
-
-	if ((ind = ALLOC_API(struct uniapi_setup_indication, api)) == NULL) {
-  clear:
-		uni_destroy_call(c, 0);
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		return;
-	}
-
-	/*
-	 * Analyze message
-	 */
-	(void)uni_decode_body(m, u, &c->uni->cx);
-	MANDATE_IE(c->uni, u->u.setup.bearer, UNI_IE_BEARER);
-	MANDATE_IE(c->uni, u->u.setup.traffic, UNI_IE_TRAFFIC);
-	MANDATE_IE(c->uni, u->u.setup.called, UNI_IE_CALLED);
-
-	/*
-	 * UNI4.0: 9.1.1.2 Notes 2/3
-	 */
-	if (!IE_ISPRESENT(u->u.setup.qos))
-		MANDATE_IE(c->uni, u->u.setup.exqos, UNI_IE_EXQOS);
-	if (!IE_ISPRESENT(u->u.setup.exqos))
-		MANDATE_IE(c->uni, u->u.setup.qos, UNI_IE_QOS);
-
-	/*
-	 * Q.2971
-	 */
-	if (IE_ISGOOD(u->u.setup.bearer) &&
-	    u->u.setup.bearer.cfg == UNI_BEARER_MP) {
-		if (IE_ISGOOD(u->u.setup.epref) &&
-		   u->u.setup.epref.flag == 1) {
-			IE_SETERROR(u->u.setup.epref);
-			(void)UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
-			    u->u.setup.epref.h.act, UNI_IERR_BAD);
-		}
-		uni_mandate_epref(c->uni, &u->u.setup.epref);
-	}
-
-	v = uni_verify(c->uni, u->u.hdr.act);
-	switch (v) {
-
-	  case VFY_RAI:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    UNI_CALLSTATE_U0, NULL, 0);
-		/* FALLTHRU */
-	  case VFY_I:
-		uni_msg_destroy(api);
-		goto clear;
-
-	  case VFY_RAIM:
-	  case VFY_CLR:
-		if ((resp = UNI_ALLOC()) != NULL) {
-			MK_MSG_RESP(resp, UNI_RELEASE_COMPL, &u->u.hdr.cref);
-			uni_vfy_collect_ies(c->uni);
-			resp->u.release_compl.cause[0] = c->uni->cause;
-			uni_send_output(resp, c->uni);
-			UNI_FREE(resp);
-		}
-		uni_msg_destroy(api);
-		goto clear;
-
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(new_state), NULL, 0);
-		/* FALLTHRU */
-	  case VFY_OK:
-		break;
-	}
-
-	if (u->u.setup.bearer.cfg == UNI_BEARER_P2P) {
-		c->type = CALL_P2P;
-
-	} else {
-		c->type = CALL_LEAF;
-		if ((p = uni_create_party(c, &u->u.setup.epref)) == NULL) {
-			uni_msg_destroy(api);
-			goto clear;
-		}
-		uni_enq_party(p, SIGP_SETUP, 0, NULL, NULL);
-	}
-
-	ind->setup.hdr = u->u.hdr;
-	copy_msg_setup(&u->u.setup, &ind->setup);
-	c->uni->funcs->uni_output(c->uni, c->uni->arg,
-	    UNIAPI_SETUP_indication, 0, api);
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-
-	set_call_state(c, new_state);
-}
-
-/*
- * Setup.request from user
- *
- * Q.2971:Call-Control-U 4/39 (U0)
- * Q.2971:Call-Control-N 4/39 (N0)
- */
-static void
-un0_setup_request(struct call *c, struct uni_msg *m, uint32_t cookie,
-    enum call_state new_state)
-{
-	struct uniapi_setup_request *arg =
-	    uni_msg_rptr(m, struct uniapi_setup_request *);
-	struct uni_setup *setup = &arg->setup;
-	struct uni_all *out;
-	struct party *p;
-
-	if (!IE_ISGOOD(setup->bearer)) {
-		uni_msg_destroy(m);
-		uniapi_call_error(c, UNIAPI_ERROR_MISSING_IE, cookie);
-		uni_destroy_call(c, 0);
-		return;
-	}
-	if ((out = UNI_ALLOC()) == NULL) {
-		uni_msg_destroy(m);
-		uniapi_call_error(c, UNIAPI_ERROR_NOMEM, cookie);
-		uni_destroy_call(c, 0);
-		return;
-	}
-
-	c->msg_setup = *setup;
-
-	if (IE_ISGOOD(setup->connid))
-		c->connid = setup->connid;
-
-	if (setup->bearer.cfg == UNI_BEARER_P2P) {
-		c->type = CALL_P2P;
-	} else {
-		c->type = CALL_ROOT;
-
-		/*
-		 * If the user didn't specify a endpoint reference,
-		 * use 0. Use IE_IGNORE accoring to Appendix II Q.2971
-		 */
-		if (!IE_ISPRESENT(c->msg_setup.epref)) {
-			MK_IE_EPREF(c->msg_setup.epref, 0, 0);
-			if (c->uni->proto == UNIPROTO_UNI40N)
-				c->msg_setup.epref.h.act = UNI_IEACT_IGNORE;
-
-		} else if (!IE_ISGOOD(c->msg_setup.epref)) {
-			uni_msg_destroy(m);
-			uniapi_call_error(c, UNIAPI_ERROR_BAD_IE, cookie);
-			uni_destroy_call(c, 0);
-			return;
-		}
-		if ((p = uni_create_partyx(c, 0, 1, cookie)) == NULL) {
-			uni_msg_destroy(m);
-			uniapi_call_error(c, UNIAPI_ERROR_NOMEM, cookie);
-			uni_destroy_call(c, 0);
-			return;
-		}
-		uni_enq_party(p, SIGP_SETUP_request, cookie, NULL, NULL);
-	}
-
-	uni_msg_destroy(m);
-
-	out->u.setup = c->msg_setup;
-	MK_MSG_ORIG(out, UNI_SETUP, c->cref, !c->mine);
-	(void)uni_send_output(out, c->uni);
-	UNI_FREE(out);
-
-	TIMER_START_CALL(c, t303, c->uni->timer303);
-	c->cnt303 = 0;
-
-	set_call_state(c, new_state);
-
-	uniapi_call_error(c, UNIAPI_OK, cookie);
-}
-
-/*
- * CALL PROCEEDING message
- *
- * Q.2971:Call-Control-U 6/39 (in U1)
- * Q.2971:Call-Control-N 11/39 (in N6)
- */
-static void
-u1n6_call_proc(struct call *c, struct uni_msg *m, struct uni_all *u,
-    enum call_state new_state)
-{
-	struct uni_call_proc *cp = &u->u.call_proc;
-	struct uniapi_proceeding_indication *ind;
-	struct uni_msg *api;
-
-	ind = ALLOC_API(struct uniapi_proceeding_indication, api);
-	if (ind == NULL) {
-  ignore:
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		return;
-	}
-	/*
-	 * Analyze message
-	 */
-	(void)uni_decode_body(m, u, &c->uni->cx);
-	if (!IE_ISPRESENT(c->connid) && !IE_ISGOOD(cp->connid))
-		uni_mandate_ie(c->uni, UNI_IE_CONNID);
-
-	/*
-	 * Q.2971: L3MU_01_03 requests us to ignore the message if
-	 * the EPREF is missing.
-	 */
-	if (c->msg_setup.bearer.cfg == UNI_BEARER_MP &&
-	    IE_ISPRESENT(c->msg_setup.epref)) {
-		if (!IE_ISPRESENT(cp->epref))
-			uni_mandate_ie(c->uni, UNI_IE_EPREF);				\
-
-		else if (IE_ISGOOD(cp->epref) &&
-		    (cp->epref.flag != 1 ||
-		     cp->epref.epref != c->msg_setup.epref.epref)) {
-			IE_SETERROR(cp->epref);
-			(void)UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
-			    cp->epref.h.act, UNI_IERR_BAD);
-		}
-	}
-
-	switch (uni_verify(c->uni, u->u.hdr.act)) {
-
-	  case VFY_CLR:
-		uni_vfy_collect_ies(c->uni);
-		clear_callD(c);
-		/* FALLTHRU */
-	  case VFY_I:
-		uni_msg_destroy(api);
-		goto ignore;
-
-	  case VFY_RAIM:
-	  case VFY_RAI:
-	  report:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(c->cstate), NULL, 0);
-		uni_msg_destroy(api);
-		goto ignore;
-
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		if (c->type == CALL_ROOT && !IE_ISGOOD(cp->epref))
-			goto report;
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(new_state), NULL, 0);
-		/* FALLTHRU */
-	  case VFY_OK:
-		break;
-	}
-
-	TIMER_STOP_CALL(c, t303);
-
-	if (IE_ISGOOD(cp->connid))
-		c->connid = cp->connid;
-
-	ind->call_proc.hdr = u->u.hdr;
-	copy_msg_call_proc(cp, &ind->call_proc);
-	c->uni->funcs->uni_output(c->uni, c->uni->arg,
-	    UNIAPI_PROCEEDING_indication, 0, api);
-
-	TIMER_START_CALL(c, t310, c->uni->timer310);
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-
-	set_call_state(c, new_state);
-}
-
-/*
- * T303 tick.
- *
- * Q.2971:Call-Control-U 6/39
- * Q.2971:Call-Control-N 11/39
- */
-static void
-u1n6_t303(struct call *c)
-{
-	struct uni_all *msg;
-	struct uniapi_release_confirm *conf;
-	struct uni_msg *api;
-
-	VERBOSE(c->uni, UNI_FAC_TIMEOUT, 1, "call %u/%s T303 tick %d",
-	    c->cref, c->mine ? "mine" : "his", c->cnt303 + 1);
-
-	if (++c->cnt303 < c->uni->init303) {
-		if ((msg = UNI_ALLOC()) != NULL) {
-			msg->u.setup = c->msg_setup;
-			MK_MSG_ORIG(msg, UNI_SETUP, c->cref, !c->mine);
-			(void)uni_send_output(msg, c->uni);
-			UNI_FREE(msg);
-		}
-		TIMER_START_CALL(c, t303, c->uni->timer303);
-		return;
-	}
-
-	/*
-	 * Send indication to API
-	 */
-	if ((conf = ALLOC_API(struct uniapi_release_confirm, api)) != NULL) {
-		conf->release.hdr.cref.cref = c->cref;
-		conf->release.hdr.cref.flag = c->mine;
-		conf->release.hdr.act = UNI_MSGACT_DEFAULT;
-		MK_IE_CAUSE(conf->release.cause[0], UNI_CAUSE_LOC_USER,
-		    UNI_CAUSE_NO_RESPONSE);
-
-		c->uni->funcs->uni_output(c->uni, c->uni->arg,
-		    UNIAPI_RELEASE_confirm, 0, api);
-	}
-
-	/*
-	 * send to party (there may be only one)
-	 */
-	if (c->type == CALL_ROOT && !TAILQ_EMPTY(&c->parties)) {
-		uni_enq_party(TAILQ_FIRST(&c->parties),
-		    SIGP_RELEASE_confirm, 0, NULL, NULL);
-	}
-	uni_destroy_call(c, 0);
-}
-
-/*
- * T310 (Call Proceeding) timer tick.
- *
- * Q.2971:Call-Control-U 7/39
- * Q.2971:Call-Control-N 17/39
- */
-static void
-u3n9_t310(struct call *c)
-{
-	VERBOSE(c->uni, UNI_FAC_TIMEOUT, 1, "call %u/%s T310 tick",
-	    c->cref, c->mine ? "mine" : "his");
-
-	MK_IE_CAUSE(c->uni->cause, UNI_CAUSE_LOC_USER, UNI_CAUSE_NO_RESPONSE);
-	clear_callD(c);
-}
-
-/*
- * T301 (Alerting) timer tick.
- *
- * Q.2971:Call-Control-U Missing
- * Q.2971:Call-Control-N 14/39
- */
-static void
-u4n7_t301(struct call *c)
-{
-	VERBOSE(c->uni, UNI_FAC_TIMEOUT, 1, "call %u/%s T301 tick",
-	    c->cref, c->mine ? "mine" : "his");
-
-	MK_IE_CAUSE(c->uni->cause, UNI_CAUSE_LOC_USER, UNI_CAUSE_NO_RESP_ALERT);
-	clear_callD(c);
-}
-
-/*
- * ALERTING received
- *
- * Q.2971:Call-Control-U 37/39 (U1)
- * Q.2971:Call-Control-U 7/39 (U3)
- * Q.2971:Call-Control-N 9/39 (N6)
- * Q.2971:Call-Control-N 17/39 (N9)
- *
- * There are two errors in the user side SDL Annex A:
- *
- *   - the resetted timers are swapped (T310 and T303)
- *
- *   - for U1 we should go to C12, not C3 to start T301.
- */
-static void
-unx_alerting(struct call *c, struct uni_msg *m, struct uni_all *u,
-    enum call_state new_state)
-{
-	struct uni_alerting *al = &u->u.alerting;
-	struct uniapi_alerting_indication *ind;
-	struct uni_msg *api;
-
-	ind = ALLOC_API(struct uniapi_alerting_indication, api);
-	if (ind == NULL) {
-  ignore:
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		return;
-	}
-
-	/*
-	 * Analyze message
-	 */
-	(void)uni_decode_body(m, u, &c->uni->cx);
-	if (!IE_ISPRESENT(c->connid) && !IE_ISGOOD(al->connid))
-		uni_mandate_ie(c->uni, UNI_IE_CONNID);
-
-	/*
-	 * Q.2971: L3MU_01_04 requests us to ignore the message if the
-	 * EPREF is missing.
-	 */
-	if (c->msg_setup.bearer.cfg == UNI_BEARER_MP &&
-	    IE_ISPRESENT(c->msg_setup.epref)) {
-		if (!IE_ISPRESENT(al->epref))
-			uni_mandate_ie(c->uni, UNI_IE_EPREF);				\
-
-		else if (IE_ISGOOD(al->epref) &&
-		    (al->epref.flag != 1 ||
-		     al->epref.epref != c->msg_setup.epref.epref)) {
-			IE_SETERROR(al->epref);
-			(void)UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
-			    al->epref.h.act, UNI_IERR_BAD);
-		}
-	}
-
-	switch (uni_verify(c->uni, u->u.hdr.act)) {
-
-	  case VFY_CLR:
-		uni_vfy_collect_ies(c->uni);
-		clear_callD(c);
-	  case VFY_I:
-		uni_msg_destroy(api);
-	  	goto ignore;
-
-	  case VFY_RAIM:
-	  case VFY_RAI:
-	  report:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(c->cstate), NULL, 0);
-		uni_msg_destroy(api);
-	  	goto ignore;
-
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		if (c->type == CALL_ROOT && !IE_ISGOOD(al->epref))
-			goto report;
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(c->cstate), NULL, 0);
-	  case VFY_OK:
-		break;
-	}
-
-	if (c->cstate == CALLST_U1 || c->cstate == CALLST_N6)
-		TIMER_STOP_CALL(c, t303);
-	else if (c->cstate == CALLST_U3 || c->cstate == CALLST_N9)
-		TIMER_STOP_CALL(c, t310);
-
-	if (IE_ISGOOD(al->connid))
-		c->connid = al->connid;
-
-	ind->alerting.hdr = u->u.hdr;
-	copy_msg_alerting(al, &ind->alerting);
-
-	if (c->type == CALL_LEAF || c->type == CALL_ROOT) {
-		uni_enq_party(TAILQ_FIRST(&c->parties), SIGP_ALERTING,
-		    0, NULL, NULL);
-		c->uni->funcs->uni_output(c->uni, c->uni->arg,
-		    UNIAPI_ALERTING_indication, 0, api);
-	} else {
-		c->uni->funcs->uni_output(c->uni, c->uni->arg,
-		    UNIAPI_ALERTING_indication, 0, api);
-		TIMER_START_CALL(c, t301, c->uni->timer301);
-	}
-	UNI_FREE(u);
-	uni_msg_destroy(m);
-
-	set_call_state(c, new_state);
-}
-
-/*
- * Proceeding.request from API
- *
- * Q.2971:Call-Control-U 12/39 (U6)
- * Q.2971:Call-Control-N 6/39 (N1)
- */
-static void
-u6n1_proceeding_request(struct call *c, struct uni_msg *m, uint32_t cookie,
-    enum call_state new_state)
-{
-	struct uni_all *msg;
-	struct uniapi_proceeding_request *arg =
-	    uni_msg_rptr(m, struct uniapi_proceeding_request *);
-
-	if ((msg = UNI_ALLOC()) == NULL) {
-		uni_msg_destroy(m);
-		uniapi_call_error(c, UNIAPI_ERROR_NOMEM, cookie);
-		return;
-	}
-
-	if (IE_ISGOOD(arg->call_proc.connid))
-		c->connid = arg->call_proc.connid;
-
-	msg->u.call_proc = arg->call_proc;
-	MK_MSG_ORIG(msg, UNI_CALL_PROC, c->cref, !c->mine);
-	(void)uni_send_output(msg, c->uni);
-	UNI_FREE(msg);
-
-	set_call_state(c, new_state);
-
-	uni_msg_destroy(m);
-
-	uniapi_call_error(c, UNIAPI_OK, cookie);
-}
-
-/*
- * Alerting.request from API
- *
- * Q.2971:Call-Control-U 13/39 (U6)
- * Q.2971:Call-Control-U 17/39 (U9)
- * Q.2971:Call-Control-N 38/39 (N1)
- * Q.2971:Call-Control-N 7/39  (N3)
- */
-static void
-unx_alerting_request(struct call *c, struct uni_msg *m, uint32_t cookie,
-    enum call_state new_state)
-{
-	struct uni_all *msg;
-	struct uniapi_alerting_request *arg =
-	    uni_msg_rptr(m, struct uniapi_alerting_request *);
-
-	if ((msg = UNI_ALLOC()) == NULL) {
-		uni_msg_destroy(m);
-		uniapi_call_error(c, UNIAPI_ERROR_NOMEM, cookie);
-		return;
-	}
-
-	if (c->type == CALL_ROOT || c->type == CALL_LEAF) {
-		uni_enq_party(TAILQ_FIRST(&c->parties),
-		    SIGP_ALERTING_request, cookie, NULL, NULL);
-	}
-
-	/*
-	 * It's not really clear, what happens, if we send another
-	 * connid in CALL_PROC and ALERTING
-	 */
-	if (!IE_ISGOOD(c->connid) && IE_ISGOOD(arg->alerting.connid))
-		c->connid = arg->alerting.connid;
-
-	msg->u.alerting = arg->alerting;
-	MK_MSG_ORIG(msg, UNI_ALERTING, c->cref, !c->mine);
-	(void)uni_send_output(msg, c->uni);
-	UNI_FREE(msg);
-
-	set_call_state(c, new_state);
-
-	uni_msg_destroy(m);
-
-	uniapi_call_error(c, UNIAPI_OK, cookie);
-}
-
-
-/*
- * Setup.response from API
- *
- * Q.2971:Call-Control-U 13/39	(U6)
- * Q.2971:Call-Control-U 14/39	(U7)
- * Q.2971:Call-Control-U 17/39	(U9)
- * Q.2971:Call-Control-N 39/39  (N1)
- * Q.2971:Call-Control-N 7/39   (N3)
- * Q.2971:Call-Control-N 8/39   (N4)
- */
-static void
-unx_setup_response(struct call *c, struct uni_msg *m, uint32_t cookie,
-    enum call_state new_state)
-{
-	struct uni_all *msg;
-	struct uniapi_setup_response *arg =
-	    uni_msg_rptr(m, struct uniapi_setup_response *);
-	struct party *p;
-
-	if ((msg = UNI_ALLOC()) == NULL) {
-		uni_msg_destroy(m);
-		uniapi_call_error(c, UNIAPI_ERROR_NOMEM, cookie);
-		return;
-	}
-
-	if (!IE_ISGOOD(c->connid) && IE_ISGOOD(arg->connect.connid))
-		c->connid = arg->connect.connid;
-
-	if (IE_ISGOOD(arg->connect.epref)) {
-		p = uni_find_partyx(c, arg->connect.epref.epref,
-		    !arg->connect.epref.flag);
-		if (p == NULL) {
-			uniapi_call_error(c, UNIAPI_ERROR_BAD_PARTY, cookie);
-			UNI_FREE(msg);
-			uni_msg_destroy(m);
-			return;
-		}
-		/* we need to remember that we have sent the CONNECT from this
-		 * party because the CONNECT ACK must move only this party
-		 * into P7 */
-		p->flags |= PARTY_CONNECT;
-
-	} else if (c->type == CALL_LEAF) {
-		/* XXX don't mandate if only one party */
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_PARTY, cookie);
-		UNI_FREE(msg);
-		uni_msg_destroy(m);
-		return;
-	}
-
-	/* inform the parties on the network side */
-	if (c->uni->proto == UNIPROTO_UNI40N && c->type == CALL_LEAF)
-		TAILQ_FOREACH(p, &c->parties, link)
-			uni_enq_party(p, SIGP_SETUP_response, 0, NULL, NULL);
-
-	msg->u.connect = arg->connect;
-	MK_MSG_ORIG(msg, UNI_CONNECT, c->cref, !c->mine);
-	(void)uni_send_output(msg, c->uni);
-	UNI_FREE(msg);
-
-	if (c->uni->proto == UNIPROTO_UNI40U)
-		TIMER_START_CALL(c, t313, c->uni->timer313);
-
-	set_call_state(c, new_state);
-
-	uni_msg_destroy(m);
-
-	uniapi_call_error(c, UNIAPI_OK, cookie);
-}
-
-/*
- * Setup_complete.request
- *
- * Q.2971:Call-Control-N 15/39 (N8)
- */
-static void
-n8_setup_compl_request(struct call *c, struct uni_msg *m, uint32_t cookie,
-    enum call_state new_state)
-{
-	struct uni_all *msg;
-	struct uniapi_setup_complete_request *arg =
-	    uni_msg_rptr(m, struct uniapi_setup_complete_request *);
-	struct party *p;
-
-	if ((msg = UNI_ALLOC()) == NULL) {
-		uni_msg_destroy(m);
-		uniapi_call_error(c, UNIAPI_ERROR_NOMEM, cookie);
-		return;
-	}
-
-	/* inform the parties on the network side */
-	if (c->uni->proto == UNIPROTO_UNI40N &&
-	    (c->type == CALL_LEAF || c->type == CALL_ROOT)) {
-		TAILQ_FOREACH(p, &c->parties, link)
-			uni_enq_party(p, SIGP_SETUP_COMPL_request,
-			    0, NULL, NULL);
-	}
-
-	msg->u.connect_ack = arg->connect_ack;
-	MK_MSG_ORIG(msg, UNI_CONNECT_ACK, c->cref, !c->mine);
-	(void)uni_send_output(msg, c->uni);
-	UNI_FREE(msg);
-
-	set_call_state(c, new_state);
-
-	uni_msg_destroy(m);
-
-	uniapi_call_error(c, UNIAPI_OK, cookie);
-}
-
-/*
- * CONNECT message
- *
- * Q.2971:Call-Control-U 7-8/39  (U3)
- * Q.2971:Call-Control-U 11/39   (U4)
- * Q.2971:Call-Control-U 37/39   (U1)
- * Q.2971:Call-Control-N 9-10/39 (N6)
- * Q.2971:Call-Control-N 14/39   (N7)
- * Q.2971:Call-Control-N 17/39   (N9)
- */
-static void
-unx_connect(struct call *c, struct uni_msg *m, struct uni_all *u,
-    enum call_state new_state)
-{
-	struct uni_connect *co = &u->u.connect;
-	struct uniapi_setup_confirm *conf;
-	struct uni_msg *api;
-	struct uni_all *ack;
-	struct party *p;
-
-	conf = ALLOC_API(struct uniapi_setup_confirm, api);
-	if (conf == NULL) {
-  ignore:
-		UNI_FREE(u);
-		uni_msg_destroy(m);
-		return;
-	}
-	if ((ack = UNI_ALLOC()) == NULL) {
-		uni_msg_destroy(api);
-		goto ignore;
-	}
-
-	/*
-	 * Analyze message
-	 */
-	(void)uni_decode_body(m, u, &c->uni->cx);
-	if (!IE_ISPRESENT(c->connid) && !IE_ISGOOD(co->connid))
-		uni_mandate_ie(c->uni, UNI_IE_CONNID);
-
-	/*
-	 * Q.2971: L3MU_01_05 requires the epref to be present.
-	 */
-	p = NULL;
-	if (c->msg_setup.bearer.cfg == UNI_BEARER_MP) {
-		if (IE_ISPRESENT(c->msg_setup.epref)) {
-			if (!IE_ISPRESENT(co->epref))
-				uni_mandate_ie(c->uni, UNI_IE_EPREF);				\
-
-			if (IE_ISGOOD(co->epref) &&
-			    co->epref.flag != 1) {
-				IE_SETERROR(co->epref);
-				(void)UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
-				    co->epref.h.act, UNI_IERR_BAD);
-			}
-		}
-
-		if (IE_ISGOOD(co->epref)) {
-			p = uni_find_party(c, &co->epref);
-			if (p == NULL) {
-				respond_drop_party_ack(c, &co->epref,
-				    UNI_CAUSE_ENDP_INV);
-				uni_msg_destroy(api);
-				UNI_FREE(ack);
-				goto ignore;
-			}
-		}
-	}
-
-	switch (uni_verify(c->uni, u->u.hdr.act)) {
-
-	  case VFY_CLR:
-		uni_vfy_collect_ies(c->uni);
-		clear_callD(c);
-		/* FALLTHRU */
-	  case VFY_I:
-		uni_msg_destroy(api);
-		UNI_FREE(ack);
-	  	goto ignore;
-
-	  case VFY_RAIM:
-	  case VFY_RAI:
-	  report:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(c->cstate), NULL, 0);
-		uni_msg_destroy(api);
-		UNI_FREE(ack);
-	  	goto ignore;
-
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		if (c->type == CALL_ROOT && !IE_ISGOOD(co->epref))
-			goto report;
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(new_state), NULL, 0);
-		/* FALLTHRU */
-	  case VFY_OK:
-		break;
-	}
-
-	if (IE_ISGOOD(co->connid))
-		c->connid = co->connid;
-
-	if (c->cstate == CALLST_U1 || c->cstate == CALLST_N6)
-		TIMER_STOP_CALL(c, t303);
-	else if (c->cstate == CALLST_U3 || c->cstate == CALLST_N9)
-		TIMER_STOP_CALL(c, t310);
-	else if (c->cstate == CALLST_U4 || c->cstate == CALLST_N7) {
-		if(c->type == CALL_P2P)
-			TIMER_STOP_CALL(c, t301);
-	}
-
-	/*
-	 * This is sent to the party only on the user side and only
-	 * to the one party in the epref (L3MU_05_03).
-	 */
-	if (c->uni->proto == UNIPROTO_UNI40U &&
-	    (c->type == CALL_LEAF || c->type == CALL_ROOT))
-		uni_enq_party(p, SIGP_CONNECT, 0, NULL, NULL);
-
-	conf->connect.hdr = u->u.hdr;
-	copy_msg_connect(co, &conf->connect);
-	c->uni->funcs->uni_output(c->uni, c->uni->arg,
-	    UNIAPI_SETUP_confirm, 0, api);
-
-	if (c->uni->proto == UNIPROTO_UNI40U) {
-		/* this is left to the application on the network side */
-		MK_MSG_ORIG(ack, UNI_CONNECT_ACK, c->cref, !c->mine);
-		(void)uni_send_output(ack, c->uni);
-		UNI_FREE(ack);
-	}
-
-	UNI_FREE(u);
-	uni_msg_destroy(m);
-
-	set_call_state(c, new_state);
-}
-
-/*
- * T313 (Connect) timer tick.
- *
- * Q.2971:Call-Control-U 15/39
- */
-static void
-u8_t313(struct call *c)
-{
-	VERBOSE(c->uni, UNI_FAC_TIMEOUT, 1, "call %u/%s T313 tick",
-	    c->cref, c->mine ? "mine" : "his");
-
-	MK_IE_CAUSE(c->uni->cause, UNI_CAUSE_LOC_USER, UNI_CAUSE_RECOVER);
-	ADD_CAUSE_TIMER(c->uni->cause, "313");
-	clear_callD(c);
-}
-
-/*
- * CONNECT ACKNOWLEDGE message in U8
- *
- * Q.2971:Call-Control-U 15-16/39
- */
-static void
-u8_connect_ack(struct call *c, struct uni_msg *m, struct uni_all *u,
-    enum call_state new_state)
-{
-	struct uniapi_setup_complete_indication *ind;
-	struct uni_msg *api;
-
-	ind = ALLOC_API(struct uniapi_setup_complete_indication, api);
-	if (ind == NULL) {
-  ignore:
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		return;
-	}
-
-	/*
-	 * Analyze message
-	 */
-	(void)uni_decode_body(m, u, &c->uni->cx);
-
-	switch (uni_verify(c->uni, u->u.hdr.act)) {
-
-	  case VFY_CLR:
-		uni_vfy_collect_ies(c->uni);
-		clear_callD(c);
-		/* FALLTHRU */
-	  case VFY_I:
-		uni_msg_destroy(api);
-	  	goto ignore;
-
-	  case VFY_RAIM:
-	  case VFY_RAI:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(c->cstate), NULL, 0);
-		uni_msg_destroy(api);
-	  	goto ignore;
-
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(new_state), NULL, 0);
-		/* FALLTHRU */
-	  case VFY_OK:
-		break;
-	}
-
-	TIMER_STOP_CALL(c, t313);
-
-	if (c->type == CALL_LEAF) {
-		struct party *p;
-
-		TAILQ_FOREACH(p, &c->parties, link) {
-			if (p->flags & PARTY_CONNECT) {
-				uni_enq_party(p, SIGP_CONNECT_ACK,
-				    0, NULL, NULL);
-				break;
-			}
-		}
-	}
-
-	ind->connect_ack.hdr = u->u.hdr;
-	copy_msg_connect_ack(&u->u.connect_ack, &ind->connect_ack);
-	c->uni->funcs->uni_output(c->uni, c->uni->arg,
-	    UNIAPI_SETUP_COMPLETE_indication, 0, api);
-
-	UNI_FREE(u);
-	uni_msg_destroy(m);
-
-	set_call_state(c, new_state);
-}
-
-/*
- * CONNECT ACKNOWLEDGE message in N10
- *
- * Q.2971:Call-Control-N 18/39
- */
-static void
-n10_connect_ack(struct call *c, struct uni_msg *m, struct uni_all *u)
-{
-	/*
-	 * Analyze message
-	 */
-	(void)uni_decode_body(m, u, &c->uni->cx);
-
-	switch (uni_verify(c->uni, u->u.hdr.act)) {
-
-	  case VFY_CLR:
-		uni_vfy_collect_ies(c->uni);
-		clear_callD(c);
-		/* FALLTHRU */
-	  case VFY_I:
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-	  	return;
-
-	  case VFY_RAIM:
-	  case VFY_RAI:
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(c->cstate), NULL, 0);
-		/* FALLTHRU */
-	  case VFY_OK:
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-	  	return;
-	}
-}
-
-/*
- * Release.response in U6 or U12.
- *
- * Q.2971:Call-Control-U 12/39 (U6)
- * Q.2971:Call-Control-U 30/39 (U12)
- * Q.2971:Call-Control-N 6/39  (N1)
- * Q.2971:Call-Control-N 29/39 (N11)
- */
-static void
-unx_release_response(struct call *c, struct uni_msg *m, uint32_t cookie)
-{
-	struct party *p;
-	struct uni_all *msg;
-	struct uniapi_release_response *arg =
-	    uni_msg_rptr(m, struct uniapi_release_response *);
-
-	if ((msg = UNI_ALLOC()) == NULL) {
-		uniapi_call_error(c, UNIAPI_ERROR_NOMEM, cookie);
-		uni_msg_destroy(m);
-		return;
-	}
-
-	if (c->cstate == CALLST_U6 || c->cstate == CALLST_N1) {
-		if (c->type == CALL_ROOT || c->type == CALL_LEAF) {
-			TAILQ_FOREACH(p, &c->parties, link)
-				uni_enq_party(p, SIGP_RELEASE_response,
-				   cookie, NULL, NULL);
-		}
-	}
-	msg->u.release_compl = arg->release_compl;
-	MK_MSG_ORIG(msg, UNI_RELEASE_COMPL, c->cref, !c->mine);
-	(void)uni_send_output(msg, c->uni);
-	UNI_FREE(msg);
-
-	uni_msg_destroy(m);
-
-	uniapi_call_error(c, UNIAPI_OK, cookie);
-
-	uni_destroy_call(c, 0);
-}
-
-/*
- * Got a RELEASE COMPLETE in any state expect U0
- *
- * Q.2971:Call-Control-U 25/39
- * Q.2971:Call-Control-N 26/39
- *
- * This is also called from the restart processes.
- */
-void
-uni_release_compl(struct call *c, struct uni_all *u)
-{
-	struct uni_msg *api;
-	struct uniapi_release_confirm *conf;
-	struct party *p;
-	u_int i, j;
-
-	if ((conf = ALLOC_API(struct uniapi_release_confirm, api)) == NULL)
-		return;
-
-	reset_all_timers(c);
-	if (c->type == CALL_ROOT || c->type == CALL_LEAF) {
-		TAILQ_FOREACH(p, &c->parties, link)
-			uni_enq_party(p, SIGP_RELEASE_COMPL, 0, NULL, NULL);
-		/* YYY optional call reoffering 10.3.3/10.3.4 */
-	}
-	conf->release.hdr = u->u.hdr;
-
-	for (i = j = 0; i < 2; i++)
-		if (IE_ISGOOD(u->u.release_compl.cause[i]))
-			conf->release.cause[j++] = u->u.release_compl.cause[i];
-	for (i = j = 0; i < UNI_NUM_IE_GIT; i++)
-		if (IE_ISGOOD(u->u.release_compl.git[i]))
-			conf->release.git[j++] = u->u.release_compl.git[i];
-	if (IE_ISGOOD(u->u.release_compl.uu))
-		conf->release.uu = u->u.release_compl.uu;
-	if (IE_ISGOOD(u->u.release_compl.crankback))
-		conf->release.crankback = u->u.release_compl.crankback;
-
-	c->uni->funcs->uni_output(c->uni, c->uni->arg,
-	    UNIAPI_RELEASE_confirm, 0, api);
-
-	uni_destroy_call(c, 0);
-}
-static void
-unx_release_compl(struct call *c, struct uni_msg *m, struct uni_all *u)
-{
-
-	(void)uni_decode_body(m, u, &c->uni->cx);
-	(void)uni_verify(c->uni, u->u.hdr.act);	/* no point :-) */
-
-	uni_release_compl(c, u);
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-
-/*
- * Got a RELEASE COMPLETE in any state expect U0 and U11
- *
- * Q.2971:Call-Control-U 25/39
- * Q.2971:Call-Control-N 26/39
- */
-static void
-unx_release(struct call *c, struct uni_msg *m, struct uni_all *u,
-    enum call_state new_state)
-{
-	struct uniapi_release_indication *ind;
-	struct uni_msg *api;
-
-	if ((ind = ALLOC_API(struct uniapi_release_indication, api)) == NULL) {
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		return;
-	}
-
-	(void)uni_decode_body(m, u, &c->uni->cx);
-	(void)uni_verify(c->uni, u->u.hdr.act);	/* no point :-) */
-
-	reset_all_timers(c);
-	if (c->type == CALL_ROOT || c->type == CALL_LEAF) {
-		struct party *p;
-
-		TAILQ_FOREACH(p, &c->parties, link)
-			uni_enq_party(p, SIGP_RELEASE, 0, NULL, NULL);
-		/* YYY optional call reoffering 10.3.3/10.3.4 */
-	}
-	if (c->cstate != new_state) {
-		/*
-		 * According to Q.2971 we should send a 2nd
-		 * Release.indication.
-		 * According to Q.2931 the recipte of a RELEASE in U12/N11
-		 * is illegal.
-		 * According to us make it legal, but don't send a 2nd
-		 * indication.
-		 */
-		ind->release.hdr = u->u.hdr;
-		copy_msg_release(&u->u.release, &ind->release);
-
-		c->uni->funcs->uni_output(c->uni, c->uni->arg,
-		    UNIAPI_RELEASE_indication, 0, api);
-	} else
-		uni_msg_destroy(api);
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-
-	set_call_state(c, new_state);
-}
-
-/*
- * Got RELEASE in U11 or N12
- *
- * Q.2971:Call-Control-U 28/39
- * Q.2971:Call-Control-N 30/39
- */
-static void
-u11n12_release(struct call *c, struct uni_msg *m, struct uni_all *u)
-{
-	struct uniapi_release_confirm *conf;
-	struct uni_msg *api;
-
-	if ((conf = ALLOC_API(struct uniapi_release_confirm, api)) == NULL) {
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		return;
-	}
-
-	(void)uni_decode_body(m, u, &c->uni->cx);
-	(void)uni_verify(c->uni, u->u.hdr.act);	/* no point :-) */
-
-	TIMER_STOP_CALL(c, t308);
-
-	conf->release.hdr = u->u.hdr;
-	copy_msg_release(&u->u.release, &conf->release);
-
-	c->uni->funcs->uni_output(c->uni, c->uni->arg,
-	    UNIAPI_RELEASE_confirm, 0, api);
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-
-	uni_destroy_call(c, 0);
-}
-
-/*
- * NOTIFY message
- *
- * Q.2971:Call-Control-U 18/39
- * Q.2971:Call-Control-N 19/39
- */
-static void
-unx_notify(struct call *c, struct uni_msg *m, struct uni_all *u)
-{
-	struct uniapi_notify_indication *ind;
-	struct uni_msg *api;
-	struct party *p = NULL;
-
-	if ((ind = ALLOC_API(struct uniapi_notify_indication, api)) == NULL) {
-  ignore:
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		return;
-	}
-
-	/*
-	 * Analyze message
-	 */
-	(void)uni_decode_body(m, u, &c->uni->cx);
-	MANDATE_IE(c->uni, u->u.notify.notify, UNI_IE_NOTIFY);
-
-	if (IE_ISGOOD(u->u.notify.epref)) {
-		if ((p = uni_find_party(c, &u->u.notify.epref)) == NULL) {
-			respond_drop_party_ack(c, &u->u.notify.epref,
-			    UNI_CAUSE_ENDP_INV);
-			uni_msg_destroy(api);
-			goto ignore;
-		}
-	}
-
-	switch (uni_verify(c->uni, u->u.hdr.act)) {
-
-	  case VFY_CLR:
-		uni_msg_destroy(api);
-		uni_vfy_collect_ies(c->uni);
-		clear_callD(c);
-	  	goto ignore;
-
-	  case VFY_RAIM:
-	  case VFY_RAI:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(c->cstate), &u->u.notify.epref,
-		    p ? p->state : 0);
-		/* FALLTHRU */
-	  case VFY_I:
-		uni_msg_destroy(api);
-	  	goto ignore;
-
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(c->cstate), &u->u.notify.epref,
-		    p ? p->state : 0);
-	  case VFY_OK:
-		/* FALLTHRU */
-	  	break;
-	}
-
-	ind->notify.hdr = u->u.hdr;
-	copy_msg_notify(&u->u.notify, &ind->notify);
-	c->uni->funcs->uni_output(c->uni, c->uni->arg,
-	    UNIAPI_NOTIFY_indication, 0, api);
-
-	UNI_FREE(u);
-	uni_msg_destroy(m);
-}
-
-/*
- * Notify.request from user
- *
- * Q.2971:Call-Control-U 18/39
- * Q.2971:Call-Control-N 19/39
- */
-static void
-unx_notify_request(struct call *c, struct uni_msg *m, uint32_t cookie)
-{
-	struct uni_all *msg;
-	struct uniapi_notify_request *arg =
-	    uni_msg_rptr(m, struct uniapi_notify_request *);
-
-	if ((msg = UNI_ALLOC()) == NULL) {
-		uni_msg_destroy(m);
-		uniapi_call_error(c, UNIAPI_ERROR_NOMEM, cookie);
-		return;
-	}
-
-	msg->u.notify = arg->notify;
-	MK_MSG_ORIG(msg, UNI_NOTIFY, c->cref, !c->mine);
-	(void)uni_send_output(msg, c->uni);
-	UNI_FREE(msg);
-
-	uni_msg_destroy(m);
-
-	uniapi_call_error(c, UNIAPI_OK, cookie);
-}
-
-/**********************************************************************/
-
-/*
- * Release.request from API in any state except U11, U12, N11, N12
- *
- * Q.2971:Call-Control-U 27/39
- * Q.2971:Call-Control-N 28/39
- */
-static void
-unx_release_request(struct call *c, struct uni_msg *m, uint32_t cookie,
-    enum call_state new_state)
-{
-	struct uni_all *msg;
-	struct uniapi_release_request *arg =
-	    uni_msg_rptr(m, struct uniapi_release_request *);
-	struct party *p;
-
-	if ((msg = UNI_ALLOC()) == NULL) {
-		uni_msg_destroy(m);
-		uniapi_call_error(c, UNIAPI_ERROR_NOMEM, cookie);
-		return;
-	}
-
-	reset_all_timers(c);
-
-	if (c->type == CALL_LEAF || c->type == CALL_ROOT) {
-		TAILQ_FOREACH(p, &c->parties, link) {
-			uni_enq_party(p, SIGP_RELEASE_request, cookie,
-			    NULL, NULL);
-		}
-	}
-
-	c->msg_release = arg->release;
-	if (!IE_ISPRESENT(c->msg_release.cause[0]) &&
-	    !IE_ISPRESENT(c->msg_release.cause[1]))
-		MK_IE_CAUSE(c->msg_release.cause[0], UNI_CAUSE_LOC_USER,
-		    UNI_CAUSE_UNSPEC);
-
-	msg->u.release = c->msg_release;
-	MK_MSG_ORIG(msg, UNI_RELEASE, c->cref, !c->mine);
-	(void)uni_send_output(msg, c->uni);
-	UNI_FREE(msg);
-
-	TIMER_START_CALL(c, t308, c->uni->timer308);
-	c->cnt308 = 0;
-
-	set_call_state(c, new_state);
-
-	uni_msg_destroy(m);
-
-	uniapi_call_error(c, UNIAPI_OK, cookie);
-}
-
-/*
- * Message with unknown EPREF - send a drop party according to 9.5.3.2.3a)
- */
-static void
-respond_drop_party_ack(struct call *c, struct uni_ie_epref *epref,
-    u_int cause)
-{
-	struct uni_all *msg;
-
-	if ((msg = UNI_ALLOC()) == NULL)
-		return;
-
-	MK_MSG_ORIG(msg, UNI_DROP_PARTY_ACK, c->cref, !c->mine);
-	MK_IE_EPREF(msg->u.drop_party_ack.epref, epref->epref, !epref->flag);
-	MK_IE_CAUSE(msg->u.drop_party_ack.cause, UNI_CAUSE_LOC_USER, cause);
-	(void)uni_send_output(msg, c->uni);
-	UNI_FREE(msg);
-}
-
-/*
- * T308 (RELEASE) timer
- *
- * Q.2971:Call-Control-U 28/39
- * Q.2971:Call-Control-N 30/39
- */
-static void
-u11n12_t308(struct call *c)
-{
-	struct uni_all *msg;
-	struct uni_msg *api;
-	struct uniapi_release_confirm *conf;
-
-	VERBOSE(c->uni, UNI_FAC_TIMEOUT, 1, "call %u/%s T308 tick %d",
-	    c->cref, c->mine ? "mine" : "his", c->cnt308 + 1);
-
-	if (++c->cnt308 < c->uni->init308) {
-		if ((msg = UNI_ALLOC()) != NULL) {
-			msg->u.release = c->msg_release;
-			MK_MSG_ORIG(msg, UNI_RELEASE, c->cref, !c->mine);
-			if (!IE_ISPRESENT(msg->u.release.cause[1])) {
-				MK_IE_CAUSE(msg->u.release.cause[1],
-				    UNI_CAUSE_LOC_USER, UNI_CAUSE_RECOVER);
-				ADD_CAUSE_TIMER(msg->u.release.cause[1], "308");
-			}
-			(void)uni_send_output(msg, c->uni);
-			UNI_FREE(msg);
-		}
-		TIMER_START_CALL(c, t308, c->uni->timer308);
-		return;
-	}
-
-	/*
-	 * Send indication to API
-	 */
-	if ((conf = ALLOC_API(struct uniapi_release_confirm, api)) != NULL) {
-		conf->release.hdr.cref.cref = c->cref;
-		conf->release.hdr.cref.flag = c->mine;
-		conf->release.hdr.act = UNI_MSGACT_DEFAULT;
-		MK_IE_CAUSE(conf->release.cause[0], UNI_CAUSE_LOC_USER,
-		    UNI_CAUSE_RECOVER);
-		ADD_CAUSE_TIMER(conf->release.cause[0], "308");
-
-		c->uni->funcs->uni_output(c->uni, c->uni->arg,
-		    UNIAPI_RELEASE_confirm, 0, api);
-	}
-
-	uni_destroy_call(c, 0);
-}
-/**********************************************************************/
-
-/*
- * STATUS in U11/U12
- *
- * Q.2971:Call-Control-U 29/39 (U11)
- * Q.2971:Call-Control-U 30/39 (U12)
- * Q.2971:Call-Control-N 29/39 (N11)
- * Q.2971:Call-Control-N 31/39 (N12)
- */
-static void
-un11un12_status(struct call *c, struct uni_msg *m, struct uni_all *u)
-{
-	enum call_state ns;
-	struct uniapi_release_confirm *conf;
-	struct uni_msg *api;
-	struct party *p;
-	struct uniapi_status_indication *stat;
-
-	/*
-	 * Analyze message
-	 */
-	(void)uni_decode_body(m, u, &c->uni->cx);
-	MANDATE_IE(c->uni, u->u.status.callstate, UNI_IE_CALLSTATE);
-	MANDATE_IE(c->uni, u->u.status.cause, UNI_IE_CAUSE);
-
-	ns = c->cstate;
-	if (IE_ISGOOD(u->u.status.callstate) &&
-	    u->u.status.callstate.state == UNI_CALLSTATE_U0)
-		ns = CALLST_NULL;
-
-	p = NULL;
-	if (IE_ISGOOD(u->u.status.epref))
-		p = uni_find_party(c, &u->u.status.epref);
-
-	switch (uni_verify(c->uni, u->u.hdr.act)) {
-
-	  case VFY_CLR:
-		uni_vfy_collect_ies(c->uni);
-		clear_callD(c);
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-	  	return;
-
-	  case VFY_RAIM:
-	  case VFY_RAI:
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(ns), &u->u.status.epref,
-		    p ? p->state : UNI_EPSTATE_NULL);
-	  case VFY_I:
-	  case VFY_OK:
-	  	break;
-	}
-
-	if (ns == c->cstate) {
-		/*
-		 * Inform API
-		 */
-		stat = ALLOC_API(struct uniapi_status_indication, api);
-		if (stat != NULL) {
-			stat->cref = u->u.hdr.cref;
-			stat->my_state = map_callstate(c->cstate);
-			stat->his_state = u->u.status.callstate;
-			stat->his_cause = u->u.status.cause;
-			stat->epref = u->u.status.epref;
-			stat->epstate = u->u.status.epstate;
-			stat->my_cause = 0;
-			c->uni->funcs->uni_output(c->uni, c->uni->arg,
-			    UNIAPI_STATUS_indication, 0, api);
-		}
-
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-
-		return;
-	}
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-
-	/*
-	 * Send indication to API
-	 */
-	if ((conf = ALLOC_API(struct uniapi_release_confirm, api)) != NULL) {
-		conf->release.hdr.cref.cref = c->cref;
-		conf->release.hdr.cref.flag = c->mine;
-		conf->release.hdr.act = UNI_MSGACT_DEFAULT;
-		MK_IE_CAUSE(conf->release.cause[0], UNI_CAUSE_LOC_USER,
-		    UNI_CAUSE_MSG_INCOMP);
-		ADD_CAUSE_MTYPE(conf->release.cause[0], UNI_STATUS);
-
-		c->uni->funcs->uni_output(c->uni, c->uni->arg,
-		    UNIAPI_RELEASE_confirm, 0, api);
-	}
-
-	uni_destroy_call(c, 0);
-}
-
-static int
-status_enq_filter(struct sig *sig, void *arg)
-{
-	return (sig->type == SIG_CALL &&
-	    (struct call *)arg == sig->call &&
-	    sig->sig == SIGC_SEND_STATUS_ENQ);
-}
-
-/*
- * STATUS in any state except U0/U11/U12 N0/N11/N12
- *
- * Q.2971:Call-Control-U 32/39
- * Q.2971:Call-Control-N 33/39
- */
-static void
-unx_status(struct call *c, struct uni_msg *m, struct uni_all *u)
-{
-	struct uniapi_status_indication *stat;
-	struct uniapi_release_confirm *conf;
-	enum call_state ns;
-	struct uni_msg *api;
-	struct party *p;
-
-	/*
-	 * Analyze message
-	 */
-	(void)uni_decode_body(m, u, &c->uni->cx);
-	MANDATE_IE(c->uni, u->u.status.callstate, UNI_IE_CALLSTATE);
-	MANDATE_IE(c->uni, u->u.status.cause, UNI_IE_CAUSE);
-
-	ns = c->cstate;
-	if (IE_ISGOOD(u->u.status.callstate))
-		ns = state_compat(c, u->u.status.callstate.state);
-
-	p = NULL;
-	if (IE_ISGOOD(u->u.status.epref)) {
-		p = uni_find_party(c, &u->u.status.epref);
-		MANDATE_IE(c->uni, u->u.status.epstate, UNI_IE_EPSTATE);
-	}
-
-	switch (uni_verify(c->uni, u->u.hdr.act)) {
-
-	  case VFY_CLR:
-		uni_vfy_collect_ies(c->uni);
-		clear_callD(c);
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-	  	return;
-
-	  case VFY_RAIM:
-	  case VFY_RAI:
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(ns), &u->u.notify.epref,
-		    p ? p->state : UNI_EPSTATE_NULL);
-		/* FALLTHRU */
-	  case VFY_I:
-	  case VFY_OK:
-	  	break;
-	}
-
-	if (u->u.status.callstate.state == UNI_CALLSTATE_U0) {
-		/* release_complete */
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-
-		if (c->type == CALL_LEAF || c->type == CALL_ROOT) {
-			TAILQ_FOREACH(p, &c->parties, link)
-				uni_enq_party(p, SIGP_RELEASE_COMPL,
-				    0, NULL, NULL);
-		}
-		/*
-		 * Send indication to API
-		 */
-		conf = ALLOC_API(struct uniapi_release_confirm, api);
-		if (conf != NULL) {
-			conf->release.hdr.cref.cref = c->cref;
-			conf->release.hdr.cref.flag = c->mine;
-			conf->release.hdr.act = UNI_MSGACT_DEFAULT;
-			MK_IE_CAUSE(conf->release.cause[0], UNI_CAUSE_LOC_USER,
-			    UNI_CAUSE_MSG_INCOMP);
-			ADD_CAUSE_MTYPE(conf->release.cause[0], UNI_STATUS);
-
-			c->uni->funcs->uni_output(c->uni, c->uni->arg,
-			    UNIAPI_RELEASE_confirm, 0, api);
-		}
-		uni_destroy_call(c, 0);
-		return;
-	}
-
-	if (IE_ISGOOD(u->u.status.cause) &&
-	    u->u.status.cause.cause == UNI_CAUSE_STATUS) {
-		c->se_active = 0;
-		TIMER_STOP_CALL(c, t322);
-		uni_undel(c->uni, status_enq_filter, c);
-	}
-
-	/*
-	 * Inform API
-	 */
-	if ((stat = ALLOC_API(struct uniapi_status_indication, api)) != NULL) {
-		stat->cref = u->u.hdr.cref;
-		stat->my_state = map_callstate(c->cstate);
-		stat->his_state = u->u.status.callstate;
-		stat->his_cause = u->u.status.cause;
-		stat->epref = u->u.status.epref;
-		stat->epstate = u->u.status.epstate;
-	}
-
-	if (ns == c->cstate) {
-		/* compatible or recovered */
-		if (p != NULL)
-			uni_enq_party(p, SIGP_STATUS, 0, m, u);
-		else {
-			if (IE_ISGOOD(u->u.status.epref) &&
-			    (!IE_ISGOOD(u->u.status.epstate) ||
-			     u->u.status.epstate.state != UNI_EPSTATE_NULL))
-				respond_drop_party_ack(c, &u->u.status.epref,
-				    UNI_CAUSE_MSG_INCOMP);
-
-			uni_msg_destroy(m);
-			UNI_FREE(u);
-		}
-		if (stat != NULL) {
-			stat->my_cause = 0;
-			c->uni->funcs->uni_output(c->uni, c->uni->arg,
-			    UNIAPI_STATUS_indication, 0, api);
-		}
-
-		return;
-	}
-
-	/* incompatible */
-	if (stat != NULL) {
-		stat->my_cause = UNI_CAUSE_MSG_INCOMP;
-		c->uni->funcs->uni_output(c->uni, c->uni->arg,
-		    UNIAPI_STATUS_indication, 0, api);
-	}
-
-	MK_IE_CAUSE(c->uni->cause, UNI_CAUSE_LOC_USER, UNI_CAUSE_MSG_INCOMP);
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-	
-	clear_callD(c);
-}
-
-/*
- * Enquiry peer status
- *
- * Q.2971:Call-Control-U 31/39
- * Q.2971:Call-Control-N 32/39
- */
-static void
-unx_status_enquiry_request(struct call *c, struct uni_msg *msg, uint32_t cookie)
-{
-	struct uniapi_status_enquiry_request *arg =
-	    uni_msg_rptr(msg, struct uniapi_status_enquiry_request *);
-	struct party *p;
-	struct uni_all *stat;
-
-	if (c->se_active) {
-		/* This case is not handled in the SDLs */
-		uniapi_call_error(c, UNIAPI_ERROR_BUSY, cookie);
-		uni_msg_destroy(msg);
-		return;
-	}
-	if ((c->type == CALL_ROOT || c->type == CALL_LEAF) &&
-	    IE_ISGOOD(arg->epref)) {
-		if ((p = uni_find_partyx(c, arg->epref.epref, !arg->epref.flag))
-		    == NULL) {
-			uniapi_call_error(c, UNIAPI_ERROR_BAD_PARTY, cookie);
-			uni_msg_destroy(msg);
-			return;
-		}
-		uni_msg_destroy(msg);
-		uni_enq_party(p, SIGP_STATUS_ENQUIRY_request, cookie,
-		    NULL, NULL);
-		return;
-	}
-	if ((stat = UNI_ALLOC()) == NULL) {
-		uniapi_call_error(c, UNIAPI_ERROR_NOMEM, cookie);
-		uni_msg_destroy(msg);
-		return;
-	}
-	memset(&c->stat_epref, 0, sizeof(c->stat_epref));
-	MK_MSG_ORIG(stat, UNI_STATUS_ENQ, c->cref, !c->mine);
-	(void)uni_send_output(stat, c->uni);
-	UNI_FREE(stat);
-
-	TIMER_START_CALL(c, t322, c->uni->timer322);
-	c->cnt322 = 0;
-	c->se_active = 1;
-
-	uniapi_call_error(c, UNIAPI_OK, cookie);
-}
-
-/*
- * T322 tick
- *
- * Q.2971:Call-Control-U 34/39
- * Q.2971:Call-Control-N 35/39
- */
-static void
-unx_t322(struct call *c)
-{
-	struct uni_all *stat;
-
-	VERBOSE(c->uni, UNI_FAC_TIMEOUT, 1, "call %u/%s T322 tick %d",
-	    c->cref, c->mine ? "mine" : "his", c->cnt322 + 1);
-
-	if (++c->cnt322 < c->uni->init322) {
-		if ((stat = UNI_ALLOC()) != NULL) {
-			MK_MSG_ORIG(stat, UNI_STATUS_ENQ, c->cref, !c->mine);
-			stat->u.status_enq.epref = c->stat_epref;
-			(void)uni_send_output(stat, c->uni);
-			UNI_FREE(stat);
-		}
-		TIMER_START_CALL(c, t322, c->uni->timer322);
-		return;
-	}
-	c->se_active = 0;
-
-	MK_IE_CAUSE(c->uni->cause, UNI_CAUSE_LOC_USER, UNI_CAUSE_RECOVER);
-	ADD_CAUSE_TIMER(c->uni->cause, "322");
-
-	clear_callD(c);
-}
-
-/*
- * STATUS ENQUIRY message
- *
- * Q.2971:Call-Control-U 31/39
- * Q.2971:Call-Control-N 32/39
- */
-static void
-unx_status_enq(struct call *c, struct uni_msg *m, struct uni_all *u)
-{
-	struct party *p = NULL;
-	u_int epref, flag;
-
-	/*
-	 * Analyze message
-	 */
-	(void)uni_decode_body(m, u, &c->uni->cx);
-
-	switch (uni_verify(c->uni, u->u.hdr.act)) {
-
-	  case VFY_CLR:
-		uni_vfy_collect_ies(c->uni);
-		clear_callD(c);
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-	  	return;
-
-	  case VFY_RAIM:
-	  case VFY_RAI:
-	  case VFY_RAP:
-	  case VFY_RAPU:
-	  case VFY_I:
-	  case VFY_OK:
-	  	break;
-	}
-
-	uni_msg_destroy(m);
-
-	if ((c->type == CALL_ROOT || c->type == CALL_LEAF) &&
-	    IE_ISGOOD(u->u.status_enq.epref)) {
-		p = uni_find_party(c, &u->u.status_enq.epref);
-
-		epref = u->u.status_enq.epref.epref;
-		flag = u->u.status_enq.epref.flag;
-		memset(u, 0, sizeof(*u));
-		MK_IE_EPREF(u->u.status.epref, epref, !flag);
-
-		if (p != NULL)
-			MK_IE_EPSTATE(u->u.status.epstate, p->state);
-		else
-			MK_IE_EPSTATE(u->u.status.epstate, UNI_EPSTATE_NULL);
-	} else
-		memset(u, 0, sizeof(*u));
-
-
-	MK_MSG_ORIG(u, UNI_STATUS, c->cref, !c->mine);
-	MK_IE_CALLSTATE(u->u.status.callstate, map_callstate(c->cstate));
-	MK_IE_CAUSE(u->u.status.cause, UNI_CAUSE_LOC_USER, UNI_CAUSE_STATUS);
-	(void)uni_send_output(u, c->uni);
-	UNI_FREE(u);
-}
-
-/**********************************************************************/
-
-/*
- * Link-release.indication from SAAL in state U10 or N10.
- *
- * Q.2971:Call-Control-U 19/39
- * Q.2971:Call-Control-N 20/39
- */
-static void
-un10_link_release_indication(struct call *c)
-{
-	struct party *p;
-
-	if (c->type == CALL_LEAF || c->type == CALL_ROOT)
-		TAILQ_FOREACH(p, &c->parties, link) {
-			if (p->state != UNI_EPSTATE_ACTIVE)
-				uni_enq_party(p, SIGP_RELEASE_COMPL,
-				    0, NULL, NULL);
-		}
-
-	uni_enq_coord(c->uni, SIGO_LINK_ESTABLISH_request, 0, NULL);
-}
-
-/*
- * Link-release.indication from SAAL in all state except U10 and N10.
- *
- * Q.2971:Call-Control-U 36/39
- * Q.2971:Call-Control-N 37/39
- */
-static void
-unx_link_release_indication(struct call *c)
-{
-	struct uniapi_release_confirm *conf;
-	struct uni_msg *api;
-	struct party *p;
-
-	if (c->type == CALL_LEAF || c->type == CALL_ROOT)
-		TAILQ_FOREACH(p, &c->parties, link)
-			uni_enq_party(p, SIGP_RELEASE_COMPL, 0, NULL, NULL);
-	
-	if ((conf = ALLOC_API(struct uniapi_release_confirm, api)) != NULL) {
-		conf->release.hdr.cref.cref = c->cref;
-		conf->release.hdr.cref.flag = c->mine;
-		conf->release.hdr.act = UNI_MSGACT_DEFAULT;
-		MK_IE_CAUSE(conf->release.cause[0], UNI_CAUSE_LOC_USER,
-		    UNI_CAUSE_DST_OOO);
-
-		c->uni->funcs->uni_output(c->uni, c->uni->arg,
-		    UNIAPI_RELEASE_confirm, 0, api);
-	}
-
-	uni_destroy_call(c, 0);
-}
-
-/*
- * Failed to establish SAAL link. Can happen only in U10 or N10.
- *
- * Q.2971:Call-Control-U 19/39
- * Q.2971:Call-Control-N 20/39
- */
-static void
-un10_link_establish_error_indication(struct call *c)
-{
-	struct party *p;
-	struct uni_msg *api;
-	struct uniapi_release_confirm *conf;
-
-	if (c->type == CALL_LEAF || c->type == CALL_ROOT)
-		TAILQ_FOREACH(p, &c->parties, link)
-			uni_enq_party(p, SIGP_RELEASE_COMPL, 0, NULL, NULL);
-
-	if ((conf = ALLOC_API(struct uniapi_release_confirm, api)) != NULL) {
-		conf->release.hdr.cref.cref = c->cref;
-		conf->release.hdr.cref.flag = c->mine;
-		conf->release.hdr.act = UNI_MSGACT_DEFAULT;
-		MK_IE_CAUSE(conf->release.cause[0], UNI_CAUSE_LOC_USER,
-		    UNI_CAUSE_DST_OOO);
-
-		c->uni->funcs->uni_output(c->uni, c->uni->arg,
-		    UNIAPI_RELEASE_confirm, 0, api);
-	}
-
-	uni_destroy_call(c, 0);
-}
-
-/*
- * Issue a STATUS ENQUIRY of we are not busy
- *
- * Q.2971: Call-Control-U: 34/39
- * Q.2971: Call-Control-N: 34/39
- */
-static void
-call_se(struct call *c)
-{
-	struct uni_all *stat;
-
-	c->cnt322 = 0;
-	if (c->se_active)
-		return;
-
-	memset(&c->stat_epref, 0, sizeof(c->stat_epref));
-	if ((stat = UNI_ALLOC()) != NULL) {
-		MK_MSG_ORIG(stat, UNI_STATUS_ENQ, c->cref, !c->mine);
-		(void)uni_send_output(stat, c->uni);
-		UNI_FREE(stat);
-	}
-
-	TIMER_START_CALL(c, t322, c->uni->timer322);
-	c->se_active = 1;
-}
-
-/*
- * Link-establish.indication in U10
- *
- * Q.2971:Call-Control-U 19-20/39
- * Q.2971:Call-Control-N 20-22/39
- */
-static void
-un10_link_establish_indication(struct call *c)
-{
-	int act = 0;
-	struct party *p;
-
-	if (c->type == CALL_ROOT || c->type == CALL_LEAF) {
-		TAILQ_FOREACH(p, &c->parties, link)
-			if (p->state == UNI_EPSTATE_ACTIVE) {
-				act = 1;
-				uni_enq_party(p, SIGP_STATUS_ENQUIRY_request,
-				    0, NULL, NULL);
-			}
-		if (act)
-			return;
-	}
-	call_se(c);
-}
-
-/*
- * Link-establish.indication in NOT U10/U11/U12 N10/N11/N12
- *
- * Q.2971:Call-Control-U 36/39
- * Q.2971:Call-Control-N 37/39
- */
-static void
-unx_link_establish_indication(struct call *c)
-{
-	call_se(c);
-}
-
-/*
- * Link-establish.confirm in U10 or N10
- *
- * Q.2971:Call-Control-U 19/39
- * Q.2971:Call-Control-N 20/39
- */
-static void
-un10_link_establish_confirm(struct call *c)
-{
-	struct party *p;
-
-	if (c->type == CALL_ROOT || c->type == CALL_LEAF) {
-		TAILQ_FOREACH(p, &c->parties, link)
-			uni_enq_party(p, SIGP_STATUS_ENQUIRY_request,
-			    0, NULL, NULL);
-		return;
-	}
-
-	call_se(c);
-}
-
-/*
- * STATUS ENQ from party
- *
- * Q.2971:Call-Control-U 21/39
- * Q.2971:Call-Control-U 25/39
- */
-static void
-unx_send_party_status_enq(struct call *c, struct uni_all *u)
-{
-	if (c->se_active) {
-		uni_delenq_sig(c->uni, SIG_CALL, c, NULL,
-		    SIGC_SEND_STATUS_ENQ, 0, NULL, u);
-		return;
-	}
-
-	c->stat_epref = u->u.status_enq.epref;
-	(void)uni_send_output(u, c->uni);
-	UNI_FREE(u);
-
-	TIMER_START_CALL(c, t322, c->uni->timer322);
-	c->se_active = 1;
-}
-
-/**********************************************************************/
-
-static void
-make_drop_cause(struct call *c, struct uni_ie_cause *cause)
-{
-
-	if (!IE_ISGOOD(*cause)) {
-		/* 9.5.7.1 paragraph 2 */
-		if (IE_ISPRESENT(*cause))
-			MK_IE_CAUSE(c->uni->cause, UNI_CAUSE_LOC_USER,
-			    UNI_CAUSE_IE_INV);
-		else
-			MK_IE_CAUSE(c->uni->cause, UNI_CAUSE_LOC_USER,
-			    UNI_CAUSE_MANDAT);
-		c->uni->cause.u.ie.len = 1;
-		c->uni->cause.u.ie.ie[0] = UNI_IE_CAUSE;
-		c->uni->cause.h.present |= UNI_CAUSE_IE_P;
-
-	} else if (!IE_ISGOOD(c->uni->cause))
-		c->uni->cause = *cause;
-}
-
-/*
- * Drop-party.indication from Party-Control in any state.
- *
- * Q.2971:Call-Control-U 23/39
- */
-static void
-ux_drop_party_indication(struct call *c, struct uni_msg *api)
-{
-	struct uniapi_drop_party_indication *drop =
-	    uni_msg_rptr(api, struct uniapi_drop_party_indication *);
-
-	if (uni_party_act_count(c, 2) == 0) {
-		if (c->cstate != CALLST_U11) {
-			make_drop_cause(c, &drop->drop.cause);
-			clear_callD(c);
-		}
-		uni_msg_destroy(api);
-		return;
-	}
-	c->uni->funcs->uni_output(c->uni, c->uni->arg,
-	    UNIAPI_DROP_PARTY_indication, 0, api);
-}
-
-/*
- * Drop-party.indication from Party-Control in any state.
- *
- * Q.2971:Call-Control-N 23/39
- */
-static void
-nx_drop_party_indication(struct call *c, struct uni_msg *api)
-{
-	struct uniapi_drop_party_indication *drop =
-	    uni_msg_rptr(api, struct uniapi_drop_party_indication *);
-
-	if (uni_party_act_count(c, 0) == 0) {
-		if (uni_party_act_count(c, 1) == 0) {
-			if (c->cstate != CALLST_U11) {
-				make_drop_cause(c, &drop->drop.cause);
-				clear_callD(c);
-			}
-			uni_msg_destroy(api);
-		} else {
-			c->uni->funcs->uni_output(c->uni, c->uni->arg,
-			    UNIAPI_DROP_PARTY_indication, 0, api);
-			set_call_state(c, CALLST_N7);
-		}
-	} else {
-		c->uni->funcs->uni_output(c->uni, c->uni->arg,
-		    UNIAPI_DROP_PARTY_indication, 0, api);
-	}
-}
-
-/*
- * Drop-party-ack.indication from Party-Control in any state.
- *
- * Q.2971:Call-Control-U 23/39
- */
-static void
-ux_drop_party_ack_indication(struct call *c, struct uni_msg *api)
-{
-	struct uniapi_drop_party_ack_indication *drop =
-	    uni_msg_rptr(api, struct uniapi_drop_party_ack_indication *);
-
-	if (uni_party_act_count(c, 2) == 0) {
-		if (c->cstate != CALLST_U11) {
-			make_drop_cause(c, &drop->drop.cause);
-			clear_callD(c);
-		}
-		uni_msg_destroy(api);
-		return;
-	}
-	c->uni->funcs->uni_output(c->uni, c->uni->arg,
-	    UNIAPI_DROP_PARTY_ACK_indication, 0, api);
-}
-
-/*
- * Drop-party-ack.indication from Party-Control in any state.
- *
- * Q.2971:Call-Control-N 23/39
- */
-static void
-nx_drop_party_ack_indication(struct call *c, struct uni_msg *api)
-{
-	struct uniapi_drop_party_ack_indication *drop =
-	    uni_msg_rptr(api, struct uniapi_drop_party_ack_indication *);
-
-	if (uni_party_act_count(c, 0) == 0) {
-		if (uni_party_act_count(c, 1) == 0) {
-			if (c->cstate != CALLST_U11) {
-				make_drop_cause(c, &drop->drop.cause);
-				clear_callD(c);
-			}
-			uni_msg_destroy(api);
-		} else {
-			c->uni->funcs->uni_output(c->uni, c->uni->arg,
-			    UNIAPI_DROP_PARTY_ACK_indication, 0, api);
-			set_call_state(c, CALLST_N7);
-		}
-	} else {
-		c->uni->funcs->uni_output(c->uni, c->uni->arg,
-		    UNIAPI_DROP_PARTY_ACK_indication, 0, api);
-	}
-}
-
-/*
- * Add-party-rej.indication from Party-Control in any state.
- *
- * Q.2971:Call-Control-U 23/39
- */
-static void
-ux_add_party_rej_indication(struct call *c, struct uni_msg *api)
-{
-	struct uniapi_add_party_rej_indication *rej =
-	    uni_msg_rptr(api, struct uniapi_add_party_rej_indication *);
-
-	if (uni_party_act_count(c, 2) == 0) {
-		if (c->cstate != CALLST_U11) {
-			make_drop_cause(c, &rej->rej.cause);
-			clear_callD(c);
-		}
-		uni_msg_destroy(api);
-		return;
-	}
-	c->uni->funcs->uni_output(c->uni, c->uni->arg,
-	    UNIAPI_ADD_PARTY_REJ_indication, 0, api);
-}
-
-/*
- * Add-party-rej.indication from Party-Control in any state.
- *
- * Q.2971:Call-Control-N 23/39
- */
-static void
-nx_add_party_rej_indication(struct call *c, struct uni_msg *api)
-{
-	struct uniapi_add_party_rej_indication *rej =
-	    uni_msg_rptr(api, struct uniapi_add_party_rej_indication *);
-
-	if (uni_party_act_count(c, 0) == 0) {
-		if (uni_party_act_count(c, 1) == 0) {
-			if (c->cstate != CALLST_U11) {
-				make_drop_cause(c, &rej->rej.cause);
-				clear_callD(c);
-			}
-			uni_msg_destroy(api);
-		} else {
-			c->uni->funcs->uni_output(c->uni, c->uni->arg,
-			    UNIAPI_ADD_PARTY_REJ_indication, 0, api);
-			set_call_state(c, CALLST_N7);
-		}
-	} else {
-		c->uni->funcs->uni_output(c->uni, c->uni->arg,
-		    UNIAPI_ADD_PARTY_REJ_indication, 0, api);
-	}
-}
-
-/*
- * Add-party.request from API in U4 or U10
- *
- * Q.2971:Call-Control-U 9-10/39 (U4)
- * Q.2971:Call-Control-U 21/39 (U10)
- * Q.2971:Call-Control-N 12/39 (N7)
- * Q.2971:Call-Control-N 22/39 (N10)
- */
-static void
-unx_add_party_request(struct call *c, struct uni_msg *msg, uint32_t cookie)
-{
-	struct uniapi_add_party_request *add =
-	    uni_msg_rptr(msg, struct uniapi_add_party_request *);
-	struct party *p;
-
-	if (IE_ISGOOD(add->add.epref)) {
-		if (add->add.epref.flag != 0) {
-			uni_msg_destroy(msg);
-			uniapi_call_error(c, UNIAPI_ERROR_BAD_IE, cookie);
-			return;
-		}
-		p = uni_find_partyx(c, add->add.epref.epref, 1);
-		if (p != NULL) {
-			uni_msg_destroy(msg);
-			uniapi_call_error(c, UNIAPI_ERROR_EPREF_INUSE, cookie);
-			return;
-		}
-	} else if (!IE_ISPRESENT(add->add.epref)) {
-		allocate_epref(c, &add->add.epref);
-		if (!IE_ISPRESENT(add->add.epref)) {
-			uni_msg_destroy(msg);
-			uniapi_call_error(c, UNIAPI_ERROR_EPREF_INUSE, cookie);
-			return;
-		}
-	} else {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_IE, cookie);
-		return;
-	}
-
-	if ((p = uni_create_partyx(c, add->add.epref.epref, 1, cookie)) == NULL) {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_NOMEM, cookie);
-		return;
-	}
-	uni_enq_party(p, SIGP_ADD_PARTY_request, cookie, msg, NULL);
-}
-
-/*
- * Add-party-ack.request from API in U10/N10
- *
- * Q.2971:Call-Control-U 21/39
- * Q.2971:Call-Control-N 22/39
- */
-static void
-un10_add_party_ack_request(struct call *c, struct uni_msg *msg, uint32_t cookie)
-{
-	struct uniapi_add_party_ack_request *ack =
-	    uni_msg_rptr(msg, struct uniapi_add_party_ack_request *);
-	struct party *p;
-
-	if (!IE_ISGOOD(ack->ack.epref)) {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_IE, cookie);
-		return;
-	}
-	if (ack->ack.epref.flag != 1) {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_IE, cookie);
-		return;
-	}
-	if ((p = uni_find_partyx(c, ack->ack.epref.epref, 0)) == NULL) {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_PARTY, cookie);
-		return;
-	}
-
-	uni_enq_party(p, SIGP_ADD_PARTY_ACK_request, cookie, msg, NULL);
-}
-
-/*
- * Party-alerting.request from API in U7/U8/U10
- *
- * Q.2971:Call-Control-U 14/39 U7
- * Q.2971:Call-Control-U 15/39 U8
- * Q.2971:Call-Control-U 21/39 U10
- * Q.2971:Call-Control-N 8/39  N4
- * Q.2971:Call-Control-N 22/39 N10
- */
-static void
-unx_party_alerting_request(struct call *c, struct uni_msg *msg, uint32_t cookie)
-{
-	struct uniapi_party_alerting_request *alert =
-	    uni_msg_rptr(msg, struct uniapi_party_alerting_request *);
-	struct party *p;
-
-	if (!IE_ISGOOD(alert->alert.epref)) {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_IE, cookie);
-		return;
-	}
-	if (alert->alert.epref.flag != 1) {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_IE, cookie);
-		return;
-	}
-	if ((p = uni_find_partyx(c, alert->alert.epref.epref, 0)) == NULL) {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_PARTY, cookie);
-		return;
-	}
-
-	uni_enq_party(p, SIGP_PARTY_ALERTING_request, cookie, msg, NULL);
-}
-
-/*
- * Add-party-rej.request from API in U7/U8/U10/N4/N10
- *
- * Q.2971:Call-Control-U 14/39 U7
- * Q.2971:Call-Control-U 15/39 U8
- * Q.2971:Call-Control-U 21/39 U10
- * Q.2971:Call-Control-N 8/39  N4
- * Q.2971:Call-Control-N 22/39 N10
- */
-static void
-unx_add_party_rej_request(struct call *c, struct uni_msg *msg, uint32_t cookie)
-{
-	struct uniapi_add_party_rej_request *rej =
-	    uni_msg_rptr(msg, struct uniapi_add_party_rej_request *);
-	struct party *p;
-
-	if (!IE_ISGOOD(rej->rej.epref)) {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_IE, cookie);
-		return;
-	}
-	if (rej->rej.epref.flag != 1) {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_IE, cookie);
-		return;
-	}
-	if ((p = uni_find_partyx(c, rej->rej.epref.epref, 0)) == NULL) {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_PARTY, cookie);
-		return;
-	}
-
-	uni_enq_party(p, SIGP_ADD_PARTY_REJ_request, cookie, msg, NULL);
-}
-
-/*
- * Drop-party.request from API in U1-U10
- *
- * Q.2971:Call-Control-U 21/39 U10
- * Q.2971:Call-Control-U 26/39 U1-U9
- * Q.2971:Call-Control-N 22/39 N10
- * Q.2971:Call-Control-N 27/39 N1-N9
- */
-static void
-unx_drop_party_request(struct call *c, struct uni_msg *msg, uint32_t cookie)
-{
-	struct uniapi_drop_party_request *drop =
-	    uni_msg_rptr(msg, struct uniapi_drop_party_request *);
-	struct party *p;
-
-	if (!IE_ISGOOD(drop->drop.epref)) {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_IE, cookie);
-		return;
-	}
-	if ((p = uni_find_partyx(c, drop->drop.epref.epref, !drop->drop.epref.flag)) == NULL) {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_PARTY, cookie);
-		return;
-	}
-
-	uni_enq_party(p, SIGP_DROP_PARTY_request, cookie, msg, NULL);
-}
-
-/*
- * Drop-party-ack.request from API in U1-U10
- *
- * Q.2971:Call-Control-U 21/39 U10
- * Q.2971:Call-Control-U 26/39 U1-U9
- * Q.2971:Call-Control-N 22/39 N10
- * Q.2971:Call-Control-N 27/39 N1-N9
- */
-static void
-unx_drop_party_ack_request(struct call *c, struct uni_msg *msg,
-    uint32_t cookie)
-{
-	struct uniapi_drop_party_ack_request *ack =
-	    uni_msg_rptr(msg, struct uniapi_drop_party_ack_request *);
-	struct party *p;
-
-	if (!IE_ISGOOD(ack->ack.epref)) {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_IE, cookie);
-		return;
-	}
-	if ((p = uni_find_partyx(c, ack->ack.epref.epref, !ack->ack.epref.flag)) == NULL) {
-		uni_msg_destroy(msg);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_PARTY, cookie);
-		return;
-	}
-
-	uni_enq_party(p, SIGP_DROP_PARTY_ACK_request, cookie, msg, NULL);
-}
-
-/*
- * ADD PARTY in U7/U8/U10
- *
- * Q.2971:Call-Control-U 14/39  U7
- * Q.2971:Call-Control-U 15/39  U8
- * Q.2971:Call-Control-U 21/39  U10
- * Q.2971:Call-Control-N 8/39   N4
- * Q.2971:Call-Control-N 21/39  N10
- *
- * Body already decoded
- * XXX check EPREF flag
- */
-static void
-unx_add_party(struct call *c, struct uni_msg *m, struct uni_all *u,
-    int legal)
-{
-	struct uni_all *resp;
-	struct uni_ierr *e1;
-	struct party *p = NULL;
-	enum verify vfy;
-
-	uni_mandate_epref(c->uni, &u->u.add_party.epref);
-	MANDATE_IE(c->uni, u->u.add_party.called, UNI_IE_CALLED);
-
-	/*
-	 * Do part of the verify handish: according to 9.5.7.2 we must send
-	 * an ADD_PARTY_REJ if mandatory IEs are bad or missing instead of
-	 * clearing the call. But we must send a STATUS, if it is the EPREF!
-	 */
-	if (IE_ISGOOD(u->u.add_party.epref)) {
-		c->uni->cause.u.ie.len = 0;
-		FOREACH_ERR(e1, c->uni) {
-			if (e1->err == UNI_IERR_MIS) {
-				MK_IE_CAUSE(c->uni->cause, UNI_CAUSE_LOC_USER,
-				    UNI_CAUSE_MANDAT);
-				goto rej;
-			}
-		}
-		FOREACH_ERR(e1, c->uni) {
-			if (e1->man && e1->ie != UNI_IE_EPREF &&
-			    e1->act == UNI_IEACT_DEFAULT) {
-				MK_IE_CAUSE(c->uni->cause, UNI_CAUSE_LOC_USER,
-				    UNI_CAUSE_IE_INV);
-  rej:
-				uni_vfy_collect_ies(c->uni);
-				if ((resp = UNI_ALLOC()) != NULL) {
-					MK_MSG_RESP(resp, UNI_ADD_PARTY_REJ,
-					   &u->u.hdr.cref);
-					MK_IE_EPREF(resp->u.add_party_rej.epref,
-					    u->u.add_party.epref.epref,
-					    !u->u.add_party.epref.flag);
-					resp->u.add_party_rej.cause =
-					    c->uni->cause;
-
-					unx_send_add_party_rej(c, resp);
-				}
-				goto ignore;
-			}
-		}
-		p = uni_find_partyx(c, u->u.add_party.epref.epref,
-		    u->u.add_party.epref.flag);
-	}
-
-	vfy = uni_verify(c->uni, u->u.hdr.act);
-
-	switch (vfy) {
-
-	  case VFY_CLR:
-		uni_vfy_collect_ies(c->uni);
-		clear_callD(c);
-		goto ignore;
-
-	  case VFY_RAIM:
-	  case VFY_RAI:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(c->cstate), &u->u.add_party.epref,
-		    p ? p->state : UNI_EPSTATE_NULL);
-		/* FALLTHRU */
-	  case VFY_I:
-		goto ignore;
-
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(c->cstate), &u->u.add_party.epref,
-		    UNI_EPSTATE_ADD_RCVD);
-	  case VFY_OK:
-		/* FALLTHRU */
-		break;
-	}
-	if (!legal) {
-		uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-		    &u->u.add_party.epref, -1);
-		return;
-	}
-
-	if (IE_ISGOOD(u->u.add_party.epref) && p == NULL &&
-	    u->u.add_party.epref.flag) {
-		IE_SETERROR(u->u.add_party.epref);
-		(void)UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
-		    u->u.add_party.epref.h.act, UNI_IERR_BAD);
-	}
-
-	if (!IE_ISGOOD(u->u.add_party.epref)) {
-		/* 9.5.3.2.2 */
-		if (vfy == VFY_OK) {
-			MK_IE_CAUSE(c->uni->cause, UNI_CAUSE_LOC_USER,
-			    UNI_CAUSE_IE_INV);
-
-			uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-			    map_callstate(c->cstate), NULL, 0);
-		}
-		goto ignore;
-	}
-
-
-	if (p == NULL && (p = uni_create_party(c, &u->u.add_party.epref))
-	    == NULL)
-		goto ignore;
-
-	uni_enq_party(p, SIGP_ADD_PARTY, 0, m, u);
-	return;
-
-  ignore:
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-
-/*
- * ADD PARTY ACKNOWLEDGE
- *
- * Q.2971:Call-Control-U 21/39 U10
- * Q.2971:Call-Control-N 15/39 N8
- * Q.2971:Call-Control-N 22/39 N10
- */
-static void
-un10n8_add_party_ack(struct call *c, struct uni_msg *m, struct uni_all *u,
-    int legal)
-{
-	struct party *p = NULL;
-
-	if (IE_ISGOOD(u->u.add_party_ack.epref)) {
-		if (u->u.add_party_ack.epref.flag == 0) {
-			IE_SETERROR(u->u.add_party_ack.epref);
-			(void)UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
-			    u->u.add_party_ack.epref.h.act, UNI_IERR_BAD);
-		} else {
-	    		p = uni_find_partyx(c, u->u.add_party_ack.epref.epref, 1);
-			if (p == NULL) {
-				respond_drop_party_ack(c,
-				    &u->u.add_party_ack.epref,
-				    UNI_CAUSE_ENDP_INV);
-				goto ignore;
-			}
-		}
-	}
-	uni_mandate_epref(c->uni, &u->u.add_party_ack.epref);
-
-	switch (uni_verify(c->uni, u->u.hdr.act)) {
-
-	  case VFY_CLR:
-		uni_vfy_collect_ies(c->uni);
-		clear_callD(c);
-		goto ignore;
-
-	  case VFY_RAIM:
-	  case VFY_RAI:
-	  report:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(c->cstate), &u->u.add_party_ack.epref,
-		    p ? p->state : UNI_EPSTATE_NULL);
-	  case VFY_I:
-		goto ignore;
-
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(c->cstate), &u->u.add_party_ack.epref,
-		    p ? UNI_EPSTATE_ACTIVE : UNI_EPSTATE_NULL);
-		if (!IE_ISGOOD(u->u.party_alerting.epref))
-			/* See below */
-			goto ignore;
-		break;
-	  case VFY_OK:
-		if (!IE_ISGOOD(u->u.party_alerting.epref))
-			/* this happens when the EPREF has bad format.
-			 * The rules require us the message to be ignored
-			 * (9.5.3.2.2e) and to report status.
-			 */
-			goto report;
-		break;
-	}
-	if (legal) {
-		/* p is != NULL here */
-		uni_enq_party(p, SIGP_ADD_PARTY_ACK, 0, m, u);
-		return;
-	}
-	if (p == NULL)
-		/* Q.2971 9.5.3.2.3a) */
-		respond_drop_party_ack(c, &u->u.add_party_ack.epref,
-		    UNI_CAUSE_ENDP_INV);
-	else
-		uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-		    &u->u.add_party_ack.epref, p->state);
-
-  ignore:
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-
-/*
- * Make the EPREF action default
- */
-static void
-default_act_epref(struct uni *uni, struct uni_ie_epref *epref)
-{
-	struct uni_ierr *e;
-
-	FOREACH_ERR(e, uni)
-		if (e->ie == UNI_IE_EPREF) {
-			e->act = UNI_IEACT_DEFAULT;
-			break;
-		}
-	epref->h.act = UNI_IEACT_DEFAULT;
-}
-
-/*
- * PARTY ALERTING message
- *
- * Q.2971:Call-Control-U 9/39   U4
- * Q.2971:Call-Control-U 21/39  U10
- * Q.2971:Call-Control-N 12/39  N7
- * Q.2971:Call-Control-N 15/39  N8
- * Q.2971:Call-Control-N 22/39  N10
- */
-static void
-unx_party_alerting(struct call *c, struct uni_msg *m, struct uni_all *u,
-    int legal)
-{
-	struct party *p = NULL;
-
-	if (IE_ISGOOD(u->u.party_alerting.epref)) {
-		if (u->u.party_alerting.epref.flag == 0) {
-			IE_SETERROR(u->u.party_alerting.epref);
-			(void)UNI_SAVE_IERR(&c->uni->cx, UNI_IE_EPREF,
-			    u->u.party_alerting.epref.h.act, UNI_IERR_BAD);
-		} else {
-	    		p = uni_find_partyx(c, u->u.party_alerting.epref.epref, 1);
-			if (p == NULL) {
-				respond_drop_party_ack(c,
-				    &u->u.party_alerting.epref,
-				    UNI_CAUSE_ENDP_INV);
-				goto ignore;
-			}
-		}
-	}
-	uni_mandate_epref(c->uni, &u->u.party_alerting.epref);
-
-	switch (uni_verify(c->uni, u->u.hdr.act)) {
-
-	  case VFY_CLR:
-		uni_vfy_collect_ies(c->uni);
-		clear_callD(c);
-		goto ignore;
-
-	  case VFY_RAIM:
-	  case VFY_RAI:
-	  report:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(c->cstate), &u->u.party_alerting.epref,
-		    p ? p->state : UNI_EPSTATE_NULL);
-	  case VFY_I:
-		goto ignore;
-
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-		    map_callstate(c->cstate), &u->u.party_alerting.epref,
-		    p ? UNI_EPSTATE_ALERT_RCVD : UNI_EPSTATE_NULL);
-		if (!IE_ISGOOD(u->u.party_alerting.epref))
-			/* See below */
-			goto ignore;
-		break;
-
-	  case VFY_OK:
-		if (!IE_ISGOOD(u->u.party_alerting.epref))
-			/* The rules require us the message to be ignored
-			 * (9.5.3.2.2e) and to report status.
-			 */
-			goto report;
-		break;
-	}
-	if (legal) {
-		/* p is != NULL here */
-		uni_enq_party(p, SIGP_PARTY_ALERTING, 0, m, u);
-		return;
-	}
-	if (p == NULL)
-		/* Q.2971 9.5.3.2.3a) */
-		respond_drop_party_ack(c, &u->u.party_alerting.epref,
-		    UNI_CAUSE_ENDP_INV);
-	else
-		uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-		    &u->u.party_alerting.epref, p->state);
-
-  ignore:
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-
-/*
- * Handle a bad/missing cause in a DROP_PARTY_ACK or ADD_PARTY_REJ
- *
- * If the IE is missing or bad and the action is defaulted handle as
- * cause #1 according to 9.5.7.1/2.
- * Otherwise keep the IE.
- */
-static void
-handle_bad_drop_cause(struct call *c, struct uni_ie_cause *cause, int mkcause)
-{
-
-	if (IE_ISGOOD(*cause))
-		return;
-
-	if (!IE_ISPRESENT(*cause)) {
-		/* 9.5.7.1 */
-		/* cannot make cause here because we need the 96 error */
-		uni_vfy_remove_cause(c->uni);
-		return;
-	}
-	if (cause->h.act != UNI_IEACT_DEFAULT)
-		return;
-
-	/* 9.5.7.2 */
-	uni_vfy_remove_cause(c->uni);
-	if (mkcause)
-		MK_IE_CAUSE(*cause, UNI_CAUSE_LOC_USER, UNI_CAUSE_UNSPEC);
-}
-
-/*
- * ADD PARTY REJ from party control
- * Q.2971:Call-Control-U 21/39
- * Q.2971:Call-Control-U 24/39
- */
-static void
-unx_send_add_party_rej(struct call *c, struct uni_all *u)
-{
-
-	if (uni_party_act_count(c, 2) == 0) {
-		if (c->cstate != CALLST_U11 && c->cstate != CALLST_N12) {
-			c->uni->cause = u->u.add_party_rej.cause;
-			clear_callD(c);
-		}
-	} else
-		(void)uni_send_output(u, c->uni);
-	UNI_FREE(u);
-}
-
-/*
- * ADD_PARTY_REJECT in U4/U10
- *
- * Q.2971:Call-Control-U 9/39 U4
- * Q.2971:Call-Control-U 21/39 U10
- * Q.2971:Call-Control-N 12/39 N7
- * Q.2971:Call-Control-N 15/39 N8
- * Q.2971:Call-Control-N 22/39 N10
- */
-static void
-unx_add_party_rej(struct call *c, struct uni_msg *m, struct uni_all *u,
-    int legal)
-{
-	struct uni_add_party_rej *ar = &u->u.add_party_rej;
-	struct party *p;
-
-	if (IE_ISGOOD(ar->epref)) {
-		p = uni_find_partyx(c, ar->epref.epref, ar->epref.flag);
-		if (p == NULL)
-			goto ignore;
-
-		if (legal) {
-			handle_bad_drop_cause(c, &ar->cause, 0);
-			uni_vfy_remove_unknown(c->uni);
-			switch (uni_verify(c->uni, u->u.hdr.act)) {
-
-			  case VFY_CLR:
-				goto clear;
-
-			  case VFY_RAIM:
-			  case VFY_RAI:
-				uni_respond_status_verify(c->uni,
-				    &u->u.hdr.cref, map_callstate(c->cstate),
-				    &ar->epref, p->state);
-			  case VFY_I:
-				goto ignore;
-
-			  case VFY_RAPU:
-				uni_vfy_collect_ies(c->uni);
-				break;
-
-			  case VFY_RAP:
-				uni_respond_status_verify(c->uni,
-				    &u->u.hdr.cref, map_callstate(c->cstate),
-				    &ar->epref, p->state);
-			  case VFY_OK:
-				break;
-			}
-			uni_enq_party(p, SIGP_ADD_PARTY_REJ, 0, m, u);
-			return;
-		}
-		uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-		    &ar->epref, -1);
-		return;
-	}
-
-	/* Q.2971: 9.5.3.2.1 last paragraph
-	 *         9.5.3.2.2 second to last paragraph
-	 * Make the action indicator default.
-	 */
-	default_act_epref(c->uni, &ar->epref);
-	if (!IE_ISPRESENT(ar->epref))
-		uni_mandate_ie(c->uni, UNI_IE_EPREF);
-	(void)uni_verify(c->uni, u->u.hdr.act);
-
-  clear:
-	uni_vfy_collect_ies(c->uni);
-	clear_callD(c);
-
-  ignore:
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-
-/*
- * DROP_PARTY
- *
- * Q.2971:Call-Control-U 26/39 Ux
- * Q.2971:Call-Control-U 21/39 U10
- * Q.2971:Call-Control-N 27/39 Nx
- * Q.2971:Call-Control-N 22/39 N10
- */
-static void
-unx_drop_party(struct call *c, struct uni_msg *m, struct uni_all *u, int legal)
-{
-	struct uni_drop_party *dp = &u->u.drop_party;
-	struct party *p;
-	struct uni_ierr *e;
-
-	if (IE_ISGOOD(dp->epref)) {
-		p = uni_find_partyx(c, dp->epref.epref, dp->epref.flag);
-		if (p == NULL) {
-			respond_drop_party_ack(c, &dp->epref,
-			    UNI_CAUSE_ENDP_INV);
-			goto ignore;
-		}
-		handle_bad_drop_cause(c, &dp->cause, 0);
-		uni_vfy_remove_unknown(c->uni);
-		switch (uni_verify(c->uni, u->u.hdr.act)) {
-
-		  case VFY_CLR:
-			goto clear;
-
-		  case VFY_RAIM:
-		  case VFY_RAI:
-			uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-			    map_callstate(c->cstate),
-			    &u->u.drop_party.epref, p->state);
-		  case VFY_I:
-			goto ignore;
-
-		  case VFY_RAPU:
-			uni_vfy_collect_ies(c->uni);
-			break;
-
-		  case VFY_RAP:
-			uni_respond_status_verify(c->uni, &u->u.hdr.cref,
-			    map_callstate(c->cstate),
-			    &dp->epref, UNI_EPSTATE_DROP_RCVD);
-		  case VFY_OK:
-			break;
-		}
-		if (legal) {
-			uni_enq_party(p, SIGP_DROP_PARTY, 0, m, u);
-			return;
-		}
-		uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP, &dp->epref, -1);
-		goto ignore;
-	}
-
-	/* Q.2971: 9.5.3.2.1 last paragraph
-	 *         9.5.3.2.2 second to last paragraph
-	 * Make the action indicator default.
-	 */
-	FOREACH_ERR(e, c->uni)
-		if (e->ie == UNI_IE_EPREF) {
-			e->act = UNI_IEACT_DEFAULT;
-			break;
-		}
-	dp->epref.h.act = UNI_IEACT_DEFAULT;
-
-	if (!IE_ISPRESENT(dp->epref))
-		uni_mandate_ie(c->uni, UNI_IE_EPREF);
-	(void)uni_verify(c->uni, u->u.hdr.act);
-
-  clear:
-	uni_vfy_collect_ies(c->uni);
-	clear_callD(c);
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-	return;
-
-  ignore:
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-
-/*
- * DROP_PARTY_ACK
- *
- * Q.2971:Call-Control-U 26/39 Ux
- * Q.2971:Call-Control-U 21/39 U10
- * Q.2971:Call-Control-N 27/39 Nx
- * Q.2971:Call-Control-N 22/39 N10
- */
-static void
-unx_drop_party_ack(struct call *c, struct uni_msg *m, struct uni_all *u,
-    int legal)
-{
-	struct party *p;
-	struct uni_drop_party_ack *ack = &u->u.drop_party_ack;
-
-	if (IE_ISGOOD(u->u.drop_party_ack.epref)) {
-		p = uni_find_partyx(c, ack->epref.epref, ack->epref.flag);
-		if (p != NULL) {
-			handle_bad_drop_cause(c, &ack->cause, 1);
-			uni_vfy_remove_unknown(c->uni);
-			switch (uni_verify(c->uni, u->u.hdr.act)) {
-
-			  case VFY_CLR:
-				goto clear;
-
-			  case VFY_RAIM:
-			  case VFY_RAI:
-				uni_respond_status_verify(c->uni,
-				    &u->u.hdr.cref, map_callstate(c->cstate),
-				    &ack->epref, p->state);
-			  case VFY_I:
-				goto ignore;
-
-			  case VFY_RAP:
-				uni_respond_status_verify(c->uni,
-				    &u->u.hdr.cref, map_callstate(c->cstate),
-				    &ack->epref, UNI_EPSTATE_NULL);
-			  case VFY_RAPU:
-			  case VFY_OK:
-				break;
-			}
-			if (legal) {
-				uni_enq_party(p, SIGP_DROP_PARTY_ACK, 0, m, u);
-				return;
-			}
-			uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-			    &ack->epref, -1);
-		}
-		goto ignore;
-	}
-
-	/* Q.2971: 9.5.3.2.1 last paragraph
-	 *         9.5.3.2.2 second to last paragraph
-	 */
-	(void)uni_verify(c->uni, u->u.hdr.act);
-	MK_IE_CAUSE(c->uni->cause, UNI_CAUSE_LOC_USER, UNI_CAUSE_IE_INV);
-
-  clear:
-	uni_vfy_collect_ies(c->uni);
-	clear_callD(c);
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-	return;
-
-  ignore:
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-
-/**********************************************************************/
-
-/*
- * Bad or unrecognized message.
- *
- * Q.2971:Call-Control-U 35/39
- */
-void
-uni_bad_message(struct call *c, struct uni_all *u, u_int cause,
-    struct uni_ie_epref *epref, int ps)
-{
-	struct uni_all *resp;
-	struct party *p;
-
-	if ((u->u.hdr.act == UNI_MSGACT_CLEAR &&
-	    (c->cstate == CALLST_U11 ||
-	     c->cstate == CALLST_U12 ||
-	     c->cstate == CALLST_N11 ||
-	     c->cstate == CALLST_N12)) ||
-	    u->u.hdr.act == UNI_MSGACT_IGNORE)
-		return;
-
-	MK_IE_CAUSE(c->uni->cause, UNI_CAUSE_LOC_USER, cause);
-	ADD_CAUSE_MTYPE(c->uni->cause, u->mtype);
-
-	if (u->u.hdr.act == UNI_MSGACT_CLEAR) {
-		clear_callD(c);
-		return;
-	}
-
-	/*
-	 * Send STATUS
-	 */
-	if ((resp = UNI_ALLOC()) != NULL) {
-		MK_MSG_RESP(resp, UNI_STATUS, &u->u.hdr.cref);
-		MK_IE_CALLSTATE(resp->u.status.callstate,
-		    map_callstate(c->cstate));
-		resp->u.status.cause = c->uni->cause;
-
-		if (epref != NULL && IE_ISGOOD(*epref)) {
-			MK_IE_EPREF(resp->u.status.epref, epref->epref, !epref->flag);
-			if (ps == -1) {
-				p = uni_find_party(c, epref);
-				if (p == NULL)
-					ps = UNI_EPSTATE_NULL;
-				else
-					ps = p->state;
-			}
-			MK_IE_EPSTATE(resp->u.status.epstate, ps);
-		}
-		(void)uni_send_output(resp, c->uni);
-
-		UNI_FREE(resp);
-	}
-}
-
-/**********************************************************************/
-
-/*
- * Unknown message in any state.
- *
- * Q.2971:Call-Control 35/39
- * Q.2971:Call-Control 36/39
- */
-static void
-unx_unknown(struct call *c, struct uni_msg *m, struct uni_all *u)
-{
-	/*
-	 * Unrecognized message. Cannot call verify here, because
-	 * it doesn't know about unrecognized messages.
-	 */
-	if (u->u.hdr.act == UNI_MSGACT_CLEAR) {
-		MK_IE_CAUSE(c->uni->cause, UNI_CAUSE_LOC_USER,
-		    UNI_CAUSE_MTYPE_NIMPL);
-		ADD_CAUSE_MTYPE(c->uni->cause, u->mtype);
-		clear_callD(c);
-	} else if(u->u.hdr.act == UNI_MSGACT_IGNORE) {
-		;
-	} else {
-		(void)uni_decode_body(m, u, &c->uni->cx);
-		uni_bad_message(c, u, UNI_CAUSE_MTYPE_NIMPL,
-		    &u->u.unknown.epref, -1);
-	}
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-/**********************************************************************/
-
-void
-uni_sig_call(struct call *c, enum call_sig sig, uint32_t cookie,
-    struct uni_msg *msg, struct uni_all *u)
-{
-	if (sig >= SIGC_END) {
-		VERBOSE(c->uni, UNI_FAC_ERR, 1,
-		    "Signal %d outside of range to Call-Control", sig);
-		if (msg)
-			uni_msg_destroy(msg);
-		if (u)
-			UNI_FREE(u);
-		return;
-	}
-
-	VERBOSE(c->uni, UNI_FAC_CALL, 1, "Signal %s in state %s of call %u/%s"
-	    "; cookie %u", call_sigs[sig], callstates[c->cstate].name, c->cref,
-	    c->mine ? "mine" : "his", cookie);
-
-	switch (sig) {
-
-	  case SIGC_LINK_RELEASE_indication:
-		if (c->cstate == CALLST_U10 || c->cstate == CALLST_N10)
-			/* Q.2971:Call-Control-U 36/39 */
-			/* Q.2971:Call-Control-N 20/39 */
-			un10_link_release_indication(c);
-		else
-			/* Q.2971:Call-Control-U 36/39 */
-			/* Q.2971:Call-Control-N 37/39 */
-			unx_link_release_indication(c);
-		break;
-
-	  case SIGC_LINK_ESTABLISH_ERROR_indication:
-		if (c->cstate != CALLST_U10 && c->cstate != CALLST_N10) {
-			VERBOSE(c->uni, UNI_FAC_ERR, 1,
-			    "link-establish-error.indication in cs=%s",
-			    callstates[c->cstate].name);
-			break;
-		}
-		/* Q.2971:Call-Control-U 19/39 */
-		/* Q.2971:Call-Control-N 20/39 */
-		un10_link_establish_error_indication(c);
-		break;
-
-	  case SIGC_LINK_ESTABLISH_indication:
-		switch (c->cstate) {
-
-		  case CALLST_U1: case CALLST_N1:
-		  case CALLST_U3: case CALLST_N3:
-		  case CALLST_U4: case CALLST_N4:
-		  case CALLST_U6: case CALLST_N6:
-		  case CALLST_U7: case CALLST_N7:
-		  case CALLST_U8: case CALLST_N8:
-		  case CALLST_U9: case CALLST_N9:
-			/* Q.2971:Call-Control-U 36/39 */
-			/* Q.2971:Call-Control-N 37/39 */
-			unx_link_establish_indication(c);
-			break;
-
-		  case CALLST_U10: case CALLST_N10:
-			/* Q.2971:Call-Control-U 19/39 */
-			/* Q.2971:Call-Control-N 20/39 */
-			un10_link_establish_indication(c);
-			break;
-
-		  case CALLST_U11: case CALLST_N11:
-		  case CALLST_U12: case CALLST_N12:
-			/* Q.2971:Call-Control-U 36/39 */
-			/* Q.2971:Call-Control-N 37/39 */
-			break;
-
-		  default:
-			VERBOSE(c->uni, UNI_FAC_ERR, 1,
-			    "link-establish.indication in cs=%s",
-			    callstates[c->cstate].name);
-		}
-		break;
-
-	  case SIGC_LINK_ESTABLISH_confirm:
-		if (c->cstate != CALLST_U10 && c->cstate != CALLST_N10) {
-			VERBOSE(c->uni, UNI_FAC_ERR, 1,
-			    "link-establish.confirm in cs=%s",
-			    callstates[c->cstate].name);
-			break;
-		}
-		/* Q.2971:Call-Control-U 19/39 */
-		/* Q.2971:Call-Control-N 20/39 */
-		un10_link_establish_confirm(c);
-		break;
-
-	  case SIGC_UNKNOWN:
-		/* Q.2971:Call-Control 35/39 */
-		/* Q.2971:Call-Control 36/39 */
-		unx_unknown(c, msg, u);
-		break;
-
-	  case SIGC_SETUP:
-		if (c->cstate != CALLST_NULL) {
-			(void)uni_decode_body(msg, u, &c->uni->cx);
-			uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-			    &u->u.setup.epref, -1);
-			goto drop;
-		}
-		if (c->uni->proto == UNIPROTO_UNI40N)
-			/* Q.2971:Call-Control-N 4/39 */
-			un0_setup(c, msg, u, CALLST_N1);
-		else
-			/* Q.2971:Call-Control-U 4/39 */
-			un0_setup(c, msg, u, CALLST_U6);
-		break;
-
-	  case SIGC_CALL_PROC:
-		if (c->cstate == CALLST_U1) {
-			/* Q.2971:Call-Control-U 6/39 */
-			u1n6_call_proc(c, msg, u, CALLST_U3);
-			break;
-		}
-		if (c->cstate == CALLST_N6) {
-			/* Q.2971:Call-Control-N 11/39 */
-			u1n6_call_proc(c, msg, u, CALLST_N9);
-			break;
-		}
-		(void)uni_decode_body(msg, u, &c->uni->cx);
-		uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-		    &u->u.call_proc.epref, -1);
-		goto drop;
-
-	  case SIGC_ALERTING:
-		if (c->cstate == CALLST_U1 || c->cstate == CALLST_U3) {
-			/* Q.2971:Call-Control-U 37/39 (U1) */
-			/* Q.2971:Call-Control-U 7/39 (U3) */
-			unx_alerting(c, msg, u, CALLST_U4);
-			break;
-		}
-		if (c->cstate == CALLST_N6) {
-			/* Q.2971:Call-Control-N 9/39 (N6) */
-			/* Q.2971:Call-Control-N 17/39 (N9) */
-			unx_alerting(c, msg, u, CALLST_N7);
-			break;
-		}
-		(void)uni_decode_body(msg, u, &c->uni->cx);
-		uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-		    &u->u.alerting.epref, -1);
-		goto drop;
-
-	  case SIGC_CONNECT:
-		if (c->cstate == CALLST_U1 || c->cstate == CALLST_U3 ||
-		    c->cstate == CALLST_U4) {
-			/* Q.2971:Call-Control-U 7-8/39  (U3) */
-			/* Q.2971:Call-Control-U 11/39   (U4) */
-			/* Q.2971:Call-Control-U 37/39   (U1) */
-			unx_connect(c, msg, u, CALLST_U10);
-			break;
-		}
-		if (c->cstate == CALLST_N6 || c->cstate == CALLST_N7 ||
-		    c->cstate == CALLST_N9) {
-			/* Q.2971:Call-Control-N 9-10/39 (N6) */
-			/* Q.2971:Call-Control-N 14/39   (N7) */
-			/* Q.2971:Call-Control-N 17/39   (N9) */
-			unx_connect(c, msg, u, CALLST_N8);
-			break;
-		}
-		(void)uni_decode_body(msg, u, &c->uni->cx);
-		uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-		    &u->u.connect.epref, -1);
-		goto drop;
-
-	  case SIGC_CONNECT_ACK:
-		if (c->cstate == CALLST_U8) {
-			/* Q.2971:Call-Control-U 15-16/39 */
-			u8_connect_ack(c, msg, u, CALLST_U10);
-			break;
-		}
-		if (c->cstate == CALLST_N10) {
-			/* Q.2971:Call-Control-N 18/39 */
-			n10_connect_ack(c, msg, u);
-			break;
-		}
-		uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP, NULL, 0);
-		goto drop;
-
-	  case SIGC_RELEASE:
-		switch (c->cstate) {
-
-		  default:
-			uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP, NULL, 0);
-			goto drop;
-
-		  case CALLST_U11:
-		  case CALLST_N12:
-			/* Q.2971:Call-Control-U 28/39 */
-			/* Q.2971:Call-Control-N 30/39 */
-			u11n12_release(c, msg, u);
-			break;
-
-		  case CALLST_U1:
-		  case CALLST_U3:
-		  case CALLST_U4:
-		  case CALLST_U6:
-		  case CALLST_U7:
-		  case CALLST_U8:
-		  case CALLST_U9:
-		  case CALLST_U10:
-		  case CALLST_U12:
-			/* Q.2971:Call-Control-U 25/39 */
-			unx_release(c, msg, u, CALLST_U12);
-			break;
-
-		  case CALLST_N1:
-		  case CALLST_N3:
-		  case CALLST_N4:
-		  case CALLST_N6:
-		  case CALLST_N7:
-		  case CALLST_N8:
-		  case CALLST_N9:
-		  case CALLST_N10:
-		  case CALLST_N11:
-			/* Q.2971:Call-Control-N 26/39 */
-			unx_release(c, msg, u, CALLST_N11);
-			break;
-		}
-		break;
-
-	  case SIGC_RELEASE_COMPL:
-		/* Q.2971:Call-Control-U 25/39 */
-		/* Q.2971:Call-Control-N 26/39 */
-		unx_release_compl(c, msg, u);
-		break;
-
-	  case SIGC_NOTIFY:
-		/* Q.2971:Call-Control-U 18/39 */
-		/* Q.2971:Call-Control-N 19/39 */
-		unx_notify(c, msg, u);
-		break;
-
-	  case SIGC_STATUS:
-		if (c->cstate == CALLST_U11 || c->cstate == CALLST_U12 ||
-		    c->cstate == CALLST_N11 || c->cstate == CALLST_N12) {
-			/* Q.2971:Call-Control-U 29/39 (U11) */
-			/* Q.2971:Call-Control-U 30/39 (U12) */
-			/* Q.2971:Call-Control-N 29/39 (N11) */
-			/* Q.2971:Call-Control-N 31/39 (N12) */
-			un11un12_status(c, msg, u);
-			break;
-		}
-		/* Q.2971:Call-Control-U 32/39 */
-		/* Q.2971:Call-Control-N 33/39 */
-		unx_status(c, msg, u);
-		break;
-
-	  case SIGC_STATUS_ENQ:
-		/* Q.2971:Call-Control-U 31/39 */
-		/* Q.2971:Call-Control-N 32/39 */
-		unx_status_enq(c, msg, u);
-		break;
-
-	  case SIGC_ADD_PARTY:
-		(void)uni_decode_body(msg, u, &c->uni->cx);
-
-		if (c->type != CALL_LEAF && c->type != CALL_ROOT) {
-			uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-			    &u->u.add_party.epref, UNI_EPSTATE_NULL);
-			goto drop;
-		}
-		switch (c->cstate) {
-		  case CALLST_U7:
-		  case CALLST_U8:
-		  case CALLST_U10:
-		  case CALLST_N4:
-		  case CALLST_N10:
-			/* Q.2971:Call-Control-U 14/39  U7 */
-			/* Q.2971:Call-Control-U 15/39  U8 */
-			/* Q.2971:Call-Control-U 21/39  U10 */
-			/* Q.2971:Call-Control-N 8/39   N4 */
-			/* Q.2971:Call-Control-N 21/39  N10 */
-			unx_add_party(c, msg, u, 1);
-			break;
-
-		  default:
-			unx_add_party(c, msg, u, 0);
-			goto drop;
-		}
-		break;
-
-	  case SIGC_PARTY_ALERTING:
-		(void)uni_decode_body(msg, u, &c->uni->cx);
-
-		if (c->type != CALL_ROOT) {
-			uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-			    &u->u.party_alerting.epref, -1);
-			goto drop;
-		}
-		switch (c->cstate) {
-
-		  default:
-			/* Q.2971 9.5.3.2.3a) */
-			unx_party_alerting(c, msg, u, 0);
-			break;
-
-		  case CALLST_U4:
-		  case CALLST_U10:
-			/* Q.2971:Call-Control-U 9/39   U4 */
-			/* Q.2971:Call-Control-U 21/39  U10 */
-			/* Q.2971:Call-Control-N 12/39  N7 */
-			/* Q.2971:Call-Control-N 15/39  N8 */
-			/* Q.2971:Call-Control-N 22/39  N10 */
-			unx_party_alerting(c, msg, u, 1);
-			break;
-		}
-		break;
-
-	  case SIGC_ADD_PARTY_ACK:
-		(void)uni_decode_body(msg, u, &c->uni->cx);
-
-		if (c->type != CALL_ROOT) {
-			uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-			    &u->u.add_party_rej.epref, -1);
-			goto drop;
-		}
-		switch (c->cstate) {
-
-		  case CALLST_U10:
-			/* Q.2971:Call-Control-U 21/39 U10 */
-			/* Q.2971:Call-Control-N 15/39 N8 */
-			/* Q.2971:Call-Control-N 22/39 N10 */
-			un10n8_add_party_ack(c, msg, u, 1);
-			break;
-
-		  default:
-			/* Q.2971 9.5.3.2.3a) */
-			un10n8_add_party_ack(c, msg, u, 0);
-			break;
-		}
-		break;
-
-	  case SIGC_ADD_PARTY_REJ:
-		(void)uni_decode_body(msg, u, &c->uni->cx);
-
-		if (c->type != CALL_ROOT) {
-			uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-			    &u->u.add_party_rej.epref, -1);
-			goto drop;
-		}
-		switch (c->cstate) {
-
-		  case CALLST_U4:
-	     	  case CALLST_U10:
-		  case CALLST_N7:
-		  case CALLST_N8:
-		  case CALLST_N10:
-			/* Q.2971:Call-Control-U 9/39 U4 */
-			/* Q.2971:Call-Control-U 21/39 U10 */
-			/* Q.2971:Call-Control-N 12/39 N7 */
-			/* Q.2971:Call-Control-N 15/39 N8 */
-			/* Q.2971:Call-Control-N 22/39 N10 */
-			unx_add_party_rej(c, msg, u, 1);
-			break;
-
-		  default:
-			/* Q.2971: 9.5.3.2.3b */
-			unx_add_party_rej(c, msg, u, 0);
-			break;
-		}
-		break;
-
-	  case SIGC_DROP_PARTY:
-		(void)uni_decode_body(msg, u, &c->uni->cx);
-
-		if (c->type != CALL_ROOT && c->type != CALL_LEAF) {
-			uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-			    &u->u.drop_party.epref, -1);
-			goto drop;
-		}
-		switch (c->cstate) {
-		  case CALLST_U11:
-		  case CALLST_U12:
-		  case CALLST_N11:
-		  case CALLST_N12:
-			/* Q.2971:Call-Control-U 28/39 U11 */
-			/* Q.2971:Call-Control-U 30/39 U12 */
-			/* Q.2971:Call-Control-N 29/39 N11 */
-			/* Q.2971:Call-Control-N 30/39 N12 */
-			goto drop;
-
-		  case CALLST_NULL:
-			uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-			    &u->u.drop_party.epref, UNI_EPSTATE_NULL);
-			goto drop;
-
-		  case CALLST_U3:
-		  case CALLST_N3:
-			/* L3MU_17_38 */
-			unx_drop_party(c, msg, u, 0);
-			break;
-
-		  case CALLST_U8:
-			if (c->uni->sb_tb) {
-				/* L3MU_06_0[3-6] */
-				unx_drop_party(c, msg, u, 0);
-				break;
-			}
-			/* FALLTHRU */
-
-		  default:
-			/* Q.2971:Call-Control-U 26/39 Ux */
-			/* Q.2971:Call-Control-U 21/39 U10 */
-			/* Q.2971:Call-Control-N 27/39 Nx */
-			/* Q.2971:Call-Control-N 21/39 N10 */
-			unx_drop_party(c, msg, u, 1);
-			break;
-		}
-		break;
-
-	  case SIGC_DROP_PARTY_ACK:
-		(void)uni_decode_body(msg, u, &c->uni->cx);
-
-		if (c->type != CALL_ROOT && c->type != CALL_LEAF) {
-			uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-			    &u->u.drop_party_ack.epref, -1);
-			goto drop;
-		}
-		switch (c->cstate) {
-
-		  case CALLST_U11:
-		  case CALLST_U12:
-			/* Q.2971:Call-Control-U 28/39 U11 */
-			/* Q.2971:Call-Control-U 30/39 U12 */
-			/* Q.2971:Call-Control-N 29/39 N11 */
-			/* Q.2971:Call-Control-N 30/39 N12 */
-			goto drop;
-
-		  case CALLST_NULL:
-			uni_bad_message(c, u, UNI_CAUSE_MSG_INCOMP,
-			    &u->u.drop_party.epref, UNI_EPSTATE_NULL);
-			goto drop;
-
-		  case CALLST_U4:
-		  case CALLST_N4:
-		  case CALLST_U7:
-		  case CALLST_N7:
-		  case CALLST_U8:
-		  case CALLST_N8:
-		  case CALLST_U10:
-		  case CALLST_N10:
-			/* Q.2971:Call-Control-U 26/39 Ux */
-			/* Q.2971:Call-Control-U 21/39 U10 */
-			/* Q.2971:Call-Control-N 27/39 Nx */
-			/* Q.2971:Call-Control-N 22/39 N10 */
-			unx_drop_party_ack(c, msg, u, 1);
-			break;
-
-		  default:
-			/* Q.2971 10.5 4th paragraph */
-			unx_drop_party_ack(c, msg, u, 0);
-			break;
-		}
-		break;
-
-	  case SIGC_COBISETUP:	/* XXX */
-		unx_unknown(c, msg, u);
-		break;
-
-	  /*
-	   * User signals
-	   */
-	  case SIGC_SETUP_request:
-		if (c->cstate == CALLST_NULL) {
-			/* Q.2971:Call-Control-U 4/39 (U0) */
-			/* Q.2971:Call-Control-N 4/39 (N0) */
-			if (c->uni->proto == UNIPROTO_UNI40N)
-				un0_setup_request(c, msg, cookie, CALLST_N6);
-			else
-				un0_setup_request(c, msg, cookie, CALLST_U1);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1, "setup.request in cs=%s",
-		    callstates[c->cstate].name);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_CALLSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGC_SETUP_response:
-		if (c->cstate == CALLST_U6 || c->cstate == CALLST_U9 ||
-		    c->cstate == CALLST_U7) {
-			/* Q.2971:Call-Control-U 13/39	(U6) */
-			/* Q.2971:Call-Control-U 14/39	(U7) */
-			/* Q.2971:Call-Control-U 17/39	(U9) */
-			unx_setup_response(c, msg, cookie, CALLST_U8);
-			break;
-		}
-		if (c->cstate == CALLST_N1 || c->cstate == CALLST_N3 ||
-		    c->cstate == CALLST_N4) {
-			/* Q.2971:Call-Control-N 39/39  (N1) */
-			/* Q.2971:Call-Control-N 7/39   (N3) */
-			/* Q.2971:Call-Control-N 8/39   (N4) */
-			unx_setup_response(c, msg, cookie, CALLST_N10);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1, "setup.response in cs=%s",
-		    callstates[c->cstate].name);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_CALLSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGC_SETUP_COMPLETE_request:
-		if (c->cstate == CALLST_N8) {
-			/* Q.2971:Call-Control-N 15/39 (N8) */
-			n8_setup_compl_request(c, msg, cookie, CALLST_N10);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1, "setup_compl.request in cs=%s",
-		    callstates[c->cstate].name);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_CALLSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGC_PROCEEDING_request:
-		if (c->cstate == CALLST_U6) {
-			/* Q.2971:Call-Control-U 12/39 (U6) */
-			u6n1_proceeding_request(c, msg, cookie, CALLST_U9);
-			break;
-		}
-		if (c->cstate == CALLST_N1) {
-			/* Q.2971:Call-Control-N 6/39 (N1) */
-			u6n1_proceeding_request(c, msg, cookie, CALLST_N3);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1, "proceeding.request in cs=%s",
-		    callstates[c->cstate].name);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_CALLSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGC_ALERTING_request:
-		if (c->cstate == CALLST_U6 || c->cstate == CALLST_U9) {
-			/* Q.2971:Call-Control-U 13/39 (U6) */
-			/* Q.2971:Call-Control-U 17/39 (U9) */
-			unx_alerting_request(c, msg, cookie, CALLST_U7);
-			break;
-		}
-		if (c->cstate == CALLST_N1 || c->cstate == CALLST_N3) {
-			/* Q.2971:Call-Control-N 38/39 (N1) */
-			/* Q.2971:Call-Control-N 7/39  (N3) */
-			unx_alerting_request(c, msg, cookie, CALLST_N4);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1, "alerting.request in cs=%s",
-		    callstates[c->cstate].name);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_CALLSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGC_RELEASE_request:
-		switch (c->cstate) {
-
-		  case CALLST_U1:
-		  case CALLST_U3:
-		  case CALLST_U4:
-		  case CALLST_U6:
-		  case CALLST_U7:
-		  case CALLST_U8:
-		  case CALLST_U9:
-		  case CALLST_U10:
-			/* Q.2971:Call-Control-U 27/39 */
-			unx_release_request(c, msg, cookie, CALLST_U11);
-			break;
-
-		  case CALLST_N1:
-		  case CALLST_N3:
-		  case CALLST_N4:
-		  case CALLST_N6:
-		  case CALLST_N7:
-		  case CALLST_N8:
-		  case CALLST_N9:
-		  case CALLST_N10:
-			/* Q.2971:Call-Control-N 28/39 */
-			unx_release_request(c, msg, cookie, CALLST_N12);
-			break;
-
-		  case CALLST_U11:
-		  case CALLST_U12:
-		  case CALLST_N11:
-		  case CALLST_N12:
-		  case CALLST_NULL:
-			VERBOSE(c->uni, UNI_FAC_ERR, 1,
-			    "release.request in cs=%s",
-			    callstates[c->cstate].name);
-			uniapi_call_error(c, UNIAPI_ERROR_BAD_CALLSTATE,
-			    cookie);
-			uni_msg_destroy(msg);
-			break;
-		}
-		break;
-
-	  case SIGC_RELEASE_response:
-		if (c->cstate == CALLST_U6 || c->cstate == CALLST_U12 ||
-		    c->cstate == CALLST_N1 || c->cstate == CALLST_N11) {
-			/* Q.2971:Call-Control-U 12/39 (U6) */
-			/* Q.2971:Call-Control-U 30/39 (U12) */
-			/* Q.2971:Call-Control-N 6/39  (N1) */
-			/* Q.2971:Call-Control-N 29/39 (N11) */
-			unx_release_response(c, msg, cookie);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1, "release.response in cs=%s",
-		    callstates[c->cstate].name);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_CALLSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGC_NOTIFY_request:
-		/* Q.2971:Call-Control-U 18/39 */
-		/* Q.2971:Call-Control-N 19/39 */
-		unx_notify_request(c, msg, cookie);
-		break;
-
-	  case SIGC_STATUS_ENQUIRY_request:
-		/* Q.2971:Call-Control-U 31/39 */
-		/* Q.2971:Call-Control-N 32/39 */
-		unx_status_enquiry_request(c, msg, cookie);
-		break;
-
-	  case SIGC_ADD_PARTY_request:
-		if (c->cstate == CALLST_U4 || c->cstate == CALLST_U10 ||
-		    c->cstate == CALLST_N7 || c->cstate == CALLST_N10) {
-			/* Q.2971:Call-Control-U 9-10/39 (U4) */
-			/* Q.2971:Call-Control-U 21/39 (U10) */
-			/* Q.2971:Call-Control-N 12/39 (N7) */
-			/* Q.2971:Call-Control-N 22/39 (N10) */
-			unx_add_party_request(c, msg, cookie);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1, "add-party.request in cs=%s",
-		    callstates[c->cstate].name);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_CALLSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGC_PARTY_ALERTING_request:
-		if (c->cstate == CALLST_U7 || c->cstate == CALLST_U8 ||
-		    c->cstate == CALLST_U10 ||
-		    c->cstate == CALLST_N4 || c->cstate == CALLST_N10) {
-			/* Q.2971:Call-Control-U 14/39 U7 */
-			/* Q.2971:Call-Control-U 15/39 U8 */
-			/* Q.2971:Call-Control-U 21/39 U10 */
-			/* Q.2971:Call-Control-N 8/39  N4 */
-			/* Q.2971:Call-Control-N 22/39 N10 */
-			unx_party_alerting_request(c, msg, cookie);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1,
-		    "party-alerting.request in cs=%s",
-		    callstates[c->cstate].name);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_CALLSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGC_ADD_PARTY_ACK_request:
-		if (c->cstate == CALLST_U10 || c->cstate == CALLST_N10) {
-			/* Q.2971:Call-Control-U 21/39 (U10) */
-			/* Q.2971:Call-Control-N 22/39 (N10)*/
-			un10_add_party_ack_request(c, msg, cookie);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1,
-		    "add-party-ack.request in cs=%s",
-		    callstates[c->cstate].name);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_CALLSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGC_ADD_PARTY_REJ_request:
-		if (c->cstate == CALLST_U7 || c->cstate == CALLST_U8 ||
-		    c->cstate == CALLST_U10 ||
-		    c->cstate == CALLST_N4 || c->cstate == CALLST_N10) {
-			/* Q.2971:Call-Control-U 14/39 U7 */
-			/* Q.2971:Call-Control-U 15/39 U8 */
-			/* Q.2971:Call-Control-U 21/39 U10 */
-			/* Q.2971:Call-Control-N 8/39  N4 */
-			/* Q.2971:Call-Control-N 22/39 N10 */
-			unx_add_party_rej_request(c, msg, cookie);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1,
-		    "add-party-rej.request in cs=%s",
-		    callstates[c->cstate].name);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_CALLSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGC_DROP_PARTY_request:
-		if (c->cstate != CALLST_U11 && c->cstate != CALLST_U12 &&
-		    c->cstate != CALLST_N11 && c->cstate != CALLST_N12 &&
-		    c->cstate != CALLST_NULL) {
-			/* Q.2971:Call-Control-U 21/39 U10 */
-			/* Q.2971:Call-Control-U 26/39 U1-U9 */
-			/* Q.2971:Call-Control-N 22/39 N10 */
-			/* Q.2971:Call-Control-N 27/39 N1-N9 */
-			unx_drop_party_request(c, msg, cookie);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1, "drop-party.request in cs=%s",
-		    callstates[c->cstate].name);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_CALLSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGC_DROP_PARTY_ACK_request:
-		if (c->cstate != CALLST_U11 && c->cstate != CALLST_U12 &&
-		    c->cstate != CALLST_N11 && c->cstate != CALLST_N12 &&
-		    c->cstate != CALLST_NULL) {
-			/* Q.2971:Call-Control-U 21/39 U10 */
-			/* Q.2971:Call-Control-U 26/39 U1-U9 */
-			/* Q.2971:Call-Control-N 22/39 N10 */
-			/* Q.2971:Call-Control-N 27/39 N1-N9 */
-			unx_drop_party_ack_request(c, msg, cookie);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1,
-		    "drop-party-ack.request in cs=%s",
-		    callstates[c->cstate].name);
-		uniapi_call_error(c, UNIAPI_ERROR_BAD_CALLSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGC_ABORT_CALL_request:
-	    {
-		struct uni *uni = c->uni;
-
-		uni_destroy_call(c, 0);
-		uniapi_uni_error(uni, UNIAPI_OK, cookie, UNI_CALLSTATE_U0);
-		break;
-	    }
-
-	  /*
-	   * Timers
-	   */
-	  case SIGC_T301:
-		if (c->cstate == CALLST_U4 || c->cstate == CALLST_N7) {
-			/* Q.2971:Call-Control-U Missing */
-			/* Q.2971:Call-Control-N 14/39 */
-			u4n7_t301(c);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1, "T301 in cs=%s",
-		    callstates[c->cstate].name);
-		break;
-
-	  case SIGC_T303:
-		if (c->cstate == CALLST_U1 || c->cstate == CALLST_N6) {
-			/* Q.2971:Call-Control-U 6/39 */
-			/* Q.2971:Call-Control-N 11/39 */
-			u1n6_t303(c);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1, "T303 in cs=%s",
-		    callstates[c->cstate].name);
-		break;
-
-	  case SIGC_T308:
-		if (c->cstate == CALLST_U11 || c->cstate == CALLST_N12) {
-			/* Q.2971:Call-Control-U 28/39 */
-			/* Q.2971:Call-Control-N 30/39 */
-			u11n12_t308(c);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1, "T308 in cs=%s",
-		    callstates[c->cstate].name);
-		break;
-
-	  case SIGC_T310:
-		if (c->cstate == CALLST_U3 || c->cstate == CALLST_N9) {
-			/* Q.2971:Call-Control-U 7/39 */
-			/* Q.2971:Call-Control-N 17/39 */
-			u3n9_t310(c);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1, "T310 in cs=%s",
-		    callstates[c->cstate].name);
-		break;
-
-	  case SIGC_T313:
-		if (c->cstate == CALLST_U8) {
-			/* Q.2971:Call-Control-U 15/39 */
-			u8_t313(c);
-			break;
-		}
-		VERBOSE(c->uni, UNI_FAC_ERR, 1, "T313 in cs=%s",
-		    callstates[c->cstate].name);
-		break;
-
-	  case SIGC_T322:
-		/* Q.2971:Call-Control-U 34/39 */
-		/* Q.2971:Call-Control-N 35/39 */
-		unx_t322(c);
-		break;
-
-	  case SIGC_CALL_DELETE:
-		CALL_FREE(c);
-		break;
-
-	  /*
-	   * Party-Control
-	   */
-	  case SIGC_DROP_PARTY_indication:
-		if (c->uni->proto == UNIPROTO_UNI40U)
-			/* Q.2971:Call-Control-U 23/39 */
-			ux_drop_party_indication(c, msg);
-		else
-			/* Q.2971:Call-Control-N 23/39 */
-			nx_drop_party_indication(c, msg);
-		break;
-
-	  case SIGC_DROP_PARTY_ACK_indication:
-		if (c->uni->proto == UNIPROTO_UNI40U)
-			/* Q.2971:Call-Control-U 23/39 */
-			ux_drop_party_ack_indication(c, msg);
-		else
-			/* Q.2971:Call-Control-N 23/39 */
-			nx_drop_party_ack_indication(c, msg);
-		break;
-
-	  case SIGC_ADD_PARTY_REJ_indication:
-		if (c->uni->proto == UNIPROTO_UNI40U)
-			/* Q.2971:Call-Control-U 23/39 */
-			ux_add_party_rej_indication(c, msg);
-		else
-			/* Q.2971:Call-Control-N 23/39 */
-			nx_add_party_rej_indication(c, msg);
-		break;
-
-
-	  case SIGC_SEND_DROP_PARTY:
-		/* Q.2971:Call-Control-U 21/39 */
-		/* Q.2971:Call-Control-U 25/39 */
-		if (uni_party_act_count(c, 2) != 0)
-			(void)uni_send_output(u, c->uni);
-		else if(c->cstate != CALLST_U11) {
-			c->uni->cause = u->u.drop_party.cause;
-			clear_callD(c);
-		}
-		UNI_FREE(u);
-		break;
-
-	  case SIGC_SEND_DROP_PARTY_ACK:
-		/* Q.2971:Call-Control-U 21/39 */
-		/* Q.2971:Call-Control-U 25/39 */
-		if (uni_party_act_count(c, 2) != 0)
-			(void)uni_send_output(u, c->uni);
-		else if (c->cstate != CALLST_U11) {
-			c->uni->cause = u->u.drop_party_ack.cause;
-			clear_callD(c);
-		}
-		UNI_FREE(u);
-		break;
-
-	  case SIGC_SEND_ADD_PARTY_REJ:
-		/* Q.2971:Call-Control-U 21/39 */
-		/* Q.2971:Call-Control-U 24/39 */
-		unx_send_add_party_rej(c, u);
-		break;
-
-	  case SIGC_SEND_STATUS_ENQ:
-		/* Q.2971:Call-Control-U 21/39 */
-		/* Q.2971:Call-Control-U 25/39 */
-		unx_send_party_status_enq(c, u);
-		break;
-
-	  case SIGC_PARTY_DESTROYED:
-		c->uni->funcs->uni_output(c->uni, c->uni->arg,
-		    UNIAPI_PARTY_DESTROYED, cookie, msg);
-		break;
-
-	  case SIGC_END:
-		break;
-	}
-
-	return;
-
-  drop:
-	/*
-	 * This is for SAAL message signals that should be dropped.
-	 */
-	uni_msg_destroy(msg);
-	UNI_FREE(u);
-}
-
-/**********************************************************************/
-
-/*
- * Timeout functions
- */
-static void
-t308_func(struct call *c)
-{
-	uni_enq_call(c, SIGC_T308, 0, NULL, NULL);
-}
-static void
-t303_func(struct call *c)
-{
-	uni_enq_call(c, SIGC_T303, 0, NULL, NULL);
-}
-static void
-t301_func(struct call *c)
-{
-	uni_enq_call(c, SIGC_T301, 0, NULL, NULL);
-}
-static void
-t310_func(struct call *c)
-{
-	uni_enq_call(c, SIGC_T310, 0, NULL, NULL);
-}
-static void
-t313_func(struct call *c)
-{
-	uni_enq_call(c, SIGC_T313, 0, NULL, NULL);
-}
-
-static void
-t322_func(struct call *c)
-{
-	uni_enq_call(c, SIGC_T322, 0, NULL, NULL);
-}
-
-/**********************************************************************/
-
-/*
- * Check whether the peer state is compatible with our state.
- * Return the new callstate we should go to (either U0 or the current
- * state).
- * None of the state is U0 here. My state is not U11 or U12.
- *
- * Well, this turns out to be not so easy: the status enquiry could have
- * been sent before we changed into the current state - the status will
- * report a previous state without anything been lost.
- *
- * Incoming states are incompatible with outgoing states. Everything is ok.
- */
-static enum call_state
-state_compat(struct call *c, enum uni_callstate peer)
-{
-	if ((c->cstate == CALLST_U1 ||
-	     c->cstate == CALLST_U3 ||
-	     c->cstate == CALLST_U4) &&
-	   (peer == UNI_CALLSTATE_N6 ||
-	    peer == UNI_CALLSTATE_N7 ||
-	    peer == UNI_CALLSTATE_N8 ||
-	    peer == UNI_CALLSTATE_N9))
-		return (CALLST_NULL);
-
-	if ((c->cstate == CALLST_N6 ||
-	     c->cstate == CALLST_N7 ||
-	     c->cstate == CALLST_N8 ||
-	     c->cstate == CALLST_N9) &&
-	    (peer == UNI_CALLSTATE_U1 ||
-	     peer == UNI_CALLSTATE_U3 ||
-	     peer == UNI_CALLSTATE_U4))
-		return (CALLST_NULL);
-
-	if ((peer == UNI_CALLSTATE_N1 ||
-	     peer == UNI_CALLSTATE_N3 ||
-	     peer == UNI_CALLSTATE_N4) &&
-	   (c->cstate == CALLST_U6 ||
-	    c->cstate == CALLST_U7 ||
-	    c->cstate == CALLST_U8 ||
-	    c->cstate == CALLST_N9))
-		return (CALLST_NULL);
-
-	if ((peer == UNI_CALLSTATE_U6 ||
-	     peer == UNI_CALLSTATE_U7 ||
-	     peer == UNI_CALLSTATE_U8 ||
-	     peer == UNI_CALLSTATE_U9) &&
-	   (c->cstate == CALLST_N1 ||
-	    c->cstate == CALLST_N3 ||
-	    c->cstate == CALLST_N4))
-		return (CALLST_NULL);
-
-	return (c->cstate);
-}
diff --git a/sys/contrib/ngatm/netnatm/sig/sig_coord.c b/sys/contrib/ngatm/netnatm/sig/sig_coord.c
deleted file mode 100644
index 6a688302f053..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/sig_coord.c
+++ /dev/null
@@ -1,1171 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/sig/sig_coord.c,v 1.12 2004/08/05 07:11:01 brandt Exp $
- *
- * Coordinator
- */
-
-#include <netnatm/unimsg.h>
-#include <netnatm/saal/sscfudef.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#include <netnatm/sig/uni.h>
-
-#include <netnatm/sig/unipriv.h>
-#include <netnatm/sig/unimkmsg.h>
-
-#define STR(S) [S] = #S
-static const char *const cunames[] = {
-	STR(CU_STAT0),
-	STR(CU_STAT1),
-	STR(CU_STAT2),
-	STR(CU_STAT3),
-};
-
-#define DEF_PRIV_SIG(NAME, FROM)	[SIG##NAME] =	"SIG"#NAME,
-static const char *const coord_sigs[] = {
-	DEF_COORD_SIGS
-};
-#undef DEF_PRIV_SIG
-
-static void sig_all_calls(struct uni *, u_int sig);
-static void set_custat(struct uni *, enum cu_stat);
-
-static void input_dummy(struct uni *uni, struct uni_msg *m, struct uni_all *u);
-static void input_global(struct uni *uni, struct uni_msg *m, struct uni_all *u);
-static void input_unknown(struct uni *uni, struct uni_msg *m, struct uni_all *u);
-static void input_cobi(struct call *c, struct uni_msg *m, struct uni_all *u);
-static void input_call(struct call *c, struct uni_msg *m, struct uni_all *u);
-
-TIMER_FUNC_UNI(t309, t309_func)
-
-/*
- * All those 'bogus signal' printouts are not specified in the SDLs.
- */
-
-
-/*
- * SAAL-ESTABLISH.indication
- *
- * This means either a resynchronisation or error-recovery or
- * an incoming SSCOP connection.
- */
-static void
-coord_saal_establish_indication(struct uni *uni)
-{
-	switch (uni->custat) {
-
-	  case CU_STAT0:	/* Q.2931:Coord-U 4/10 */
-	  case CU_STAT3:	/* Q.2931:Coord-U 5/10 */
-		sig_all_calls(uni, SIGC_LINK_ESTABLISH_indication);
-		set_custat(uni, CU_STAT3);
-		break;
-
-	  case CU_STAT1:
-	  case CU_STAT2:
-		VERBOSE0(uni, UNI_FAC_COORD,
-		    "signal saal_establish.indication in CU%u", uni->custat);
-		break;
-
-	  default:
-		ASSERT(0, ("CU_STAT*"));
-	}
-}
-
-/*
- * SAAL-ESTABLISH.confirm
- */
-static void
-coord_saal_establish_confirm(struct uni *uni)
-{
-	switch (uni->custat) {
-
-	  case CU_STAT0:
-	  case CU_STAT2:
-		VERBOSE0(uni, UNI_FAC_COORD,
-		    "signal saal_establish.confirm in CU%u", uni->custat);
-		break;
-
-	  case CU_STAT1:
-		/*
-		 * Q.2931:Co-ord-U 4/10
-		 */
-		TIMER_STOP_UNI(uni, t309);
-		sig_all_calls(uni, SIGC_LINK_ESTABLISH_confirm);
-		uni->funcs->uni_output(uni, uni->arg,
-		    UNIAPI_LINK_ESTABLISH_confirm, 0, NULL);
-		set_custat(uni, CU_STAT3);
-		break;
-
-	  case CU_STAT3:
-		/*
-		 * Q.2931:Coord-U 5/10
-		 */
-		sig_all_calls(uni, SIGC_LINK_ESTABLISH_confirm);
-		uni->funcs->uni_output(uni, uni->arg,
-		    UNIAPI_LINK_ESTABLISH_confirm, 0, NULL);
-		break;
-
-	  default:
-		ASSERT(0, ("CU_STAT*"));
-	}
-}
-
-/*
- * SAAL-RELEASE.confirm
- */
-static void
-coord_saal_release_confirm(struct uni *uni)
-{
-	switch (uni->custat) {
-
-	  case CU_STAT0:
-	  case CU_STAT1:
-	  case CU_STAT3:
-		VERBOSE0(uni, UNI_FAC_COORD,
-		    "signal saal_release.confirm in CU%u", uni->custat);
-		break;
-
-	  case CU_STAT2:
-		/*
-		 * Q.2931:Coord-U 5/10
-		 */
-		uni->funcs->uni_output(uni, uni->arg,
-		    UNIAPI_LINK_RELEASE_confirm, 0, NULL);
-		set_custat(uni, CU_STAT0);
-		break;
-
-	  default:
-		ASSERT(0, ("CU_STAT*"));
-	}
-}
-
-/*
- * SAAL failure.
- */
-static void
-coord_saal_release_indication(struct uni *uni)
-{
-	switch (uni->custat) {
-
-	  case CU_STAT0:
-	  case CU_STAT2:
-		VERBOSE0(uni, UNI_FAC_COORD,
-		    "signal saal_release.indication in CU%u", uni->custat);
-		break;
-
-	  case CU_STAT1:
-	  case CU_STAT3:
-		/*
-		 * Q.2931:Coord-U 4/10
-		 * Q.2931:Coord-U 5/10
-		 */
-		sig_all_calls(uni, SIGC_LINK_RELEASE_indication);
-		set_custat(uni, CU_STAT0);
-		break;
-
-	  default:
-		ASSERT(0, ("CU_STAT*"));
-	}
-}
-
-/*
- * Link-establish.request from USER. This can also come from
- * a call instance. In this case 'cookie' is zero.
- */
-static void
-coord_link_establish_request(struct uni *uni, uint32_t cookie)
-{
-	switch (uni->custat) {
-
-	  case CU_STAT0:
-		/*
-		 * Q.2931:Coord-U 4/10
-		 */
-		uni->funcs->saal_output(uni, uni->arg,
-		    SAAL_ESTABLISH_request, NULL);
-		if (!TIMER_ISACT(uni, t309))
-			TIMER_START_UNI(uni, t309, uni->timer309);
-		set_custat(uni, CU_STAT1);
-		if (cookie)
-			uniapi_uni_error(uni, UNIAPI_OK, cookie, 0);
-		break;
-
-	  case CU_STAT1:
-		/*
-		 * Q.2931:Coord-U 4/10
-		 * This is probably missing from the delay field.
-		 */
-		uni_delenq_coord(uni, SIGO_LINK_ESTABLISH_request,
-		    cookie, NULL);
-		break;
-
-	  case CU_STAT2:
-		uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALLSTATE, cookie, 0);
-		if (cookie == 0)
-			VERBOSE0(uni, UNI_FAC_COORD,
-			    "signal link-establish.request in CU%u",
-			    uni->custat);
-		break;
-
-	  case CU_STAT3:
-		/*
-		 * Q.2931:Coord-U 5/10
-		 */
-		uni->funcs->uni_output(uni, uni->arg,
-		    UNIAPI_LINK_ESTABLISH_confirm, 0, NULL);
-		uniapi_uni_error(uni, UNIAPI_OK, cookie, 0);
-		break;
-
-	  default:
-		ASSERT(0, ("CU_STAT*"));
-	}
-}
-
-/*
- * Link-release.request from user
- */
-static void
-coord_link_release_request(struct uni *uni, u_int cookie)
-{
-	switch (uni->custat) {
-
-	  case CU_STAT0:
-	  case CU_STAT1:
-	  case CU_STAT2:
-		uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALLSTATE, cookie, 0);
-		break;
-
-	  case CU_STAT3:
-		/*
-		 * Q.2931:Coord-U 5/10
-		 */
-		uni->funcs->saal_output(uni, uni->arg,
-		    SAAL_RELEASE_request, NULL);
-		set_custat(uni, CU_STAT2);
-		uniapi_uni_error(uni, UNIAPI_OK, cookie, 0);
-		break;
-
-	  default:
-		ASSERT(0, ("CU_STAT*"));
-	}
-}
-
-/*
- * T309 timeout signal
- */
-static void
-coord_t309(struct uni *uni)
-{
-	switch (uni->custat) {
-
-	  case CU_STAT0:
-	  case CU_STAT1:
-		/*
-		 * Q.2931:Coord-U 4/10
-		 */
-		sig_all_calls(uni, SIGC_LINK_ESTABLISH_ERROR_indication);
-		set_custat(uni, CU_STAT0);
-		/* this is not in the SDLs, but how will the call control
-		 * know, that starting the LINK has failed otherwise? */
-		uni->funcs->uni_output(uni, uni->arg,
-		    UNIAPI_LINK_RELEASE_confirm, 0, NULL);
-		break;
-
-	  case CU_STAT2:
-	  case CU_STAT3:
-		VERBOSE0(uni, UNI_FAC_COORD,
-		    "signal T309 in CU%u", uni->custat);
-		break;
-
-	  default:
-		ASSERT(0, ("CU_STAT*"));
-	}
-}
-
-/*
- * Message from SAAL
- */
-static void
-coord_saal_data_indication(struct uni *uni, struct uni_msg *m)
-{
-	struct uni_all *u;
-	struct call *c;
-
-	memset(&uni->cause, 0, sizeof(uni->cause));
-	if ((u = UNI_ALLOC()) == NULL) {
-		uni_msg_destroy(m);
-		return;
-	}
-	if (uni_decode_head(m, u, &uni->cx)) {
-		VERBOSE(uni, UNI_FAC_COORD, 2, "bogus message - ignored");
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		return;
-	}
-	if (u->u.hdr.cref.cref == CREF_DUMMY) {
-		if (uni->cx.q2932) {
-			input_dummy(uni, m, u);
-		} else {
-			VERBOSE(uni, UNI_FAC_COORD, 2, "dummy cref - ignored");
-			UNI_FREE(u);
-			uni_msg_destroy(m);
-		}
-		return;
-	}
-
-	if (u->u.hdr.cref.cref == CREF_GLOBAL)
-		input_global(uni, m, u);
-	else if ((c = uni_find_call(uni, &u->u.hdr.cref)) == NULL)
-		input_unknown(uni, m, u);
-	else if (c->type == CALL_COBI)
-		input_cobi(c, m, u);
-	else
-		input_call(c, m, u);
-}
-
-/*
- * Message with global call reference
- *
- * Q.2931:Coord-U (X) 7/10
- */
-static void
-input_global(struct uni *uni, struct uni_msg *m, struct uni_all *u)
-{
-	VERBOSE(uni, UNI_FAC_COORD, 2, "GLOB MTYPE = %x", u->mtype);
-
-	switch (u->mtype) {
-
-	  default:
-		/*
-		 * Q.2931:Coord-U 7/10
-		 * Q.2931: 5.6.3.2e
-		 * Amd4:   29e
-		 */
-		uni_respond_status(uni, &u->u.hdr.cref,
-		    u->u.hdr.cref.flag ? uni->glob_start : uni->glob_respond,
-		    UNI_CAUSE_CREF_INV);
-		break;
-
-	  case UNI_RESTART:
-		if (u->u.hdr.cref.flag) {
-			/*
-			 * Q.2931:Coord-U 7/10 (5.6.3.2h)
-			 */
-			uni_respond_status(uni, &u->u.hdr.cref,
-			    uni->glob_start, UNI_CAUSE_CREF_INV);
-			break;
-		}
-		uni_enq_resp(uni, SIGR_RESTART, 0, m, u);
-		return;
-
-	  case UNI_RESTART_ACK:
-		if (!u->u.hdr.cref.flag) {
-			/*
-			 * Q.2931:Coord-U 7/10 (5.6.3.2h)
-			 * Note, that the SDL diagram contains an error.
-			 * The error with the 'YES' label should go to the
-			 * box below 'OTHER'.
-			 */
-			uni_respond_status(uni, &u->u.hdr.cref,
-			    uni->glob_respond, UNI_CAUSE_CREF_INV);
-			break;
-		}
-		uni_enq_start(uni, SIGS_RESTART_ACK, 0, m, u);
-		return;
-
-	  case UNI_STATUS:
-		if (u->u.hdr.cref.flag)
-			uni_enq_start(uni, SIGS_STATUS, 0, m, u);
-		else
-			uni_enq_resp(uni, SIGR_STATUS, 0, m, u);
-		return;
-	}
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-
-/*
- * Q.2931:Coord-U 8/10
- *
- * Message for an unknown call reference
- */
-static void
-input_unknown(struct uni *uni, struct uni_msg *m, struct uni_all *u)
-{
-	struct uni_all *resp;
-	struct call *c;
-	u_int cause = UNI_CAUSE_CREF_INV;
-
-	VERBOSE(uni, UNI_FAC_COORD, 2, "UNKNOWN MTYPE = %x", u->mtype);
-
-	switch (u->mtype) {
-
-	  default:
-		/*
-		 * This message type is entirly unknown
-		 *
-		 * 5.6.4 and 5.7.1 are only when the call is not in the
-		 * NULL state. This means, 5.6.3.2a takes over.
-		 */
-		break;
-
-	  case UNI_SETUP:
-		if (u->u.hdr.cref.flag)
-			/*
-			 * 5.6.3.2c
-			 */
-			goto drop;
-		if ((c = uni_create_call(uni, u->u.hdr.cref.cref, 0, 0)) != NULL) {
-			uni_enq_call(c, SIGC_SETUP, 0, m, u);
-			return;
-		}
-		goto drop;
-
-	  case UNI_RELEASE_COMPL:
-		/*
-		 * 5.6.3.2c
-		 */
-		goto drop;
-
-	  case UNI_STATUS:
-		/*
-		 * 5.6.12
-		 *
-		 * The SDLs don't use the verify procedure and don't
-		 * handle the case of an invalid callstate - we
-		 * ignore the message, if the callstate is not good.
-		 */
-		(void)uni_decode_body(m, u, &uni->cx);
-		if (!IE_ISGOOD(u->u.status.callstate))
-			goto drop;
-		if (u->u.status.callstate.state == UNI_CALLSTATE_U0)
-			goto drop;
-		cause = UNI_CAUSE_MSG_INCOMP;
-		break;
-
-	  case UNI_STATUS_ENQ:
-		if ((resp = UNI_ALLOC()) == NULL)
-			goto drop;
-
-		(void)uni_decode_body(m, u, &uni->cx);
-		MK_MSG_RESP(resp, UNI_STATUS, &u->u.hdr.cref);
-		MK_IE_CALLSTATE(resp->u.status.callstate, UNI_CALLSTATE_U0);
-		MK_IE_CAUSE(resp->u.status.cause, UNI_CAUSE_LOC_USER,
-		    UNI_CAUSE_STATUS);
-
-		if (IE_ISGOOD(u->u.status_enq.epref)) {
-			/* reflect epref as required by L3MU_PO */
-			resp->u.status.epref = u->u.status_enq.epref;
-			MK_IE_EPREF(resp->u.status.epref,
-			    u->u.status_enq.epref.epref,
-			    !u->u.status_enq.epref.flag);
-			MK_IE_EPSTATE(resp->u.status.epstate, UNI_EPSTATE_NULL);
-		}
-
-		(void)uni_send_output(resp, uni);
-
-		UNI_FREE(resp);
-		goto drop;
-
-	  case UNI_COBISETUP:
-		if (u->u.hdr.cref.flag)
-			/*
-			 * 5.6.3.2c (probably)
-			 */
-			goto drop;
-		if ((c = uni_create_call(uni, u->u.hdr.cref.cref, 0, 0)) != NULL) {
-			uni_enq_call(c, SIGC_COBISETUP, 0, m, u);
-			return;
-		}
-		goto drop;
-	}
-
-	/*
-	 * 5.6.3.2a)
-	 *
-	 * Respond with a RELEASE COMPLETE
-	 */
-	if ((resp = UNI_ALLOC()) == NULL)
-		goto drop;
-
-	MK_MSG_RESP(resp, UNI_RELEASE_COMPL, &u->u.hdr.cref);
-	MK_IE_CAUSE(resp->u.release_compl.cause[0], UNI_CAUSE_LOC_USER, cause);
-	if (uni_diag(cause, UNI_CODING_ITU) == UNI_DIAG_MTYPE)
-		ADD_CAUSE_MTYPE(resp->u.release_compl.cause[0], u->mtype);
-
-	(void)uni_send_output(resp, uni);
-
-	UNI_FREE(resp);
-
-  drop:
-	UNI_FREE(u);
-	uni_msg_destroy(m);
-}
-
-static void
-input_cobi(struct call *c __unused, struct uni_msg *m, struct uni_all *u)
-{
-	/* XXX */
-	UNI_FREE(u);
-	uni_msg_destroy(m);
-}
-
-static void
-input_dummy(struct uni *uni __unused, struct uni_msg *m, struct uni_all *u)
-{
-	/* XXX */
-	UNI_FREE(u);
-	uni_msg_destroy(m);
-}
-
-static void
-input_call(struct call *c, struct uni_msg *m, struct uni_all *u)
-{
-	VERBOSE(c->uni, UNI_FAC_COORD, 2, "CALL MTYPE = %x %d/%s", 
-		u->mtype, c->cref, c->mine ? "mine":"his");
-
-	switch (u->mtype) {
-
-	  case UNI_SETUP:
-		/*
-		 * Ignored
-		 */
-		break;
-
-	  case UNI_CALL_PROC:
-		uni_enq_call(c, SIGC_CALL_PROC, 0, m, u);
-		return;
-
-	  case UNI_ALERTING:
-		uni_enq_call(c, SIGC_ALERTING, 0, m, u);
-		return;
-
-	  case UNI_RELEASE:
-		uni_enq_call(c, SIGC_RELEASE, 0, m, u);
-		return;
-
-	  case UNI_RELEASE_COMPL:
-		uni_enq_call(c, SIGC_RELEASE_COMPL, 0, m, u);
-		return;
-
-	  case UNI_CONNECT:
-		uni_enq_call(c, SIGC_CONNECT, 0, m, u);
-		return;
-
-	  case UNI_CONNECT_ACK:
-		uni_enq_call(c, SIGC_CONNECT_ACK, 0, m, u);
-		return;
-
-	  case UNI_NOTIFY:
-		uni_enq_call(c, SIGC_NOTIFY, 0, m, u);
-		return;
-
-	  case UNI_STATUS:
-		uni_enq_call(c, SIGC_STATUS, 0, m, u);
-		return;
-
-	  case UNI_STATUS_ENQ:
-		uni_enq_call(c, SIGC_STATUS_ENQ, 0, m, u);
-		return;
-
-	  case UNI_ADD_PARTY:
-		uni_enq_call(c, SIGC_ADD_PARTY, 0, m, u);
-		return;
-
-	  case UNI_PARTY_ALERTING:
-		uni_enq_call(c, SIGC_PARTY_ALERTING, 0, m, u);
-		return;
-
-	  case UNI_ADD_PARTY_ACK:
-		uni_enq_call(c, SIGC_ADD_PARTY_ACK, 0, m, u);
-		return;
-
-	  case UNI_ADD_PARTY_REJ:
-		uni_enq_call(c, SIGC_ADD_PARTY_REJ, 0, m, u);
-		return;
-
-	  case UNI_DROP_PARTY:
-		uni_enq_call(c, SIGC_DROP_PARTY, 0, m, u);
-		return;
-
-	  case UNI_DROP_PARTY_ACK:
-		uni_enq_call(c, SIGC_DROP_PARTY_ACK, 0, m, u);
-		return;
-
-	  default:
-		uni_enq_call(c, SIGC_UNKNOWN, 0, m, u);
-		return;
-	}
-	UNI_FREE(u);
-	uni_msg_destroy(m);
-}
-
-
-/*
- * This macro tries to implement the delaying behaviour for
- * message from the API when we are in the Awaiting-Establish state.
- * In this state, the message is delayed. If we drop back to CU 0,
- * everything gets unqueued and errors are returned for all that stuff.
- * If we progess to CUSTAT2 we process the requests.
- */
-#define COMMON_DELAY(SIG, COOKIE)					\
-		if (uni->custat == CU_STAT0 || uni->custat == CU_STAT2) {\
-			uniapi_uni_error(uni, UNIAPI_ERROR_BADCU,	\
-			    COOKIE, 0);					\
-			break;						\
-		}							\
-		if (uni->custat == CU_STAT1) {				\
-			uni_delenq_coord(uni, SIG, COOKIE, msg);	\
-			break;						\
-		}
-
-/*
- * Signal handler of the coordinator
- */
-void
-uni_sig_coord(struct uni *uni, enum coord_sig sig, uint32_t cookie,
-    struct uni_msg *msg)
-{
-	struct call *c;
-
-	if (sig >= SIGO_END) {
-		VERBOSE(uni, UNI_FAC_ERR, 1, "Signal %d outside of range to "
-		    "Coord", sig);
-		if (msg)
-			uni_msg_destroy(msg);
-		return;
-	}
-
-	VERBOSE(uni, UNI_FAC_COORD, 1, "Signal %s in state %s",
-	    coord_sigs[sig], cunames[uni->custat]);
-
-	switch (sig) {
-
-	  case SIGO_END:
-		break;
-
-	  case SIGO_DATA:	/* delayed output */
-		if (uni->custat == CU_STAT0 || uni->custat == CU_STAT1)
-			break;	/* drop */
-		if (uni->custat == CU_STAT1)
-			uni_delenq_coord(uni, SIGO_DATA, cookie, msg);/* ??? */
-		else
-			uni->funcs->saal_output(uni, uni->arg,
-			    SAAL_DATA_request, msg);
-		msg = NULL;
-		break;
-
-	  /*
-	   * SAAL signals
-	   */
-	  case SIGO_SAAL_ESTABLISH_indication:
-		coord_saal_establish_indication(uni);
-		break;
-
-	  case SIGO_SAAL_ESTABLISH_confirm:
-		coord_saal_establish_confirm(uni);
-		break;
-
-	  case SIGO_SAAL_RELEASE_confirm:
-		coord_saal_release_confirm(uni);
-		break;
-
-	  case SIGO_SAAL_RELEASE_indication:
-		coord_saal_release_indication(uni);
-		break;
-
-	  case SIGO_SAAL_DATA_indication:
-		coord_saal_data_indication(uni, msg);
-		msg = NULL;
-		break;
-
-	  case SIGO_SAAL_UDATA_indication:
-		VERBOSE0(uni, UNI_FAC_ERR, "SAAL_UDATA_indication");
-		break;
-
-	  /*
-	   * Signals from USER
-	   */
-	  case SIGO_LINK_ESTABLISH_request:
-		coord_link_establish_request(uni, cookie);
-		break;
-
-	  case SIGO_LINK_RELEASE_request:
-		coord_link_release_request(uni, cookie);
-		break;
-
-	  case SIGO_RESET_request:
-		uni_enq_start(uni, SIGS_RESET_request, cookie, msg, NULL);
-		msg = NULL;
-		if (uni->custat == CU_STAT0) {
-			uni->funcs->saal_output(uni, uni->arg,
-			    SAAL_ESTABLISH_request, NULL);
-			if (!TIMER_ISACT(uni, t309))
-				TIMER_START_UNI(uni, t309, uni->timer309);
-			set_custat(uni, CU_STAT1);
-		}
-		break;
-
-	  case SIGO_RESET_ERROR_response:
-		COMMON_DELAY(SIGO_RESET_ERROR_response, cookie);
-		uni_enq_resp(uni, SIGR_RESET_ERROR_response, cookie, msg, NULL);
-		msg = NULL;
-		break;
-
-	  case SIGO_RESET_response:
-		COMMON_DELAY(SIGO_RESET_response, cookie);
-		uni_enq_resp(uni, SIGR_RESET_response, cookie, msg, NULL);
-		msg = NULL;
-		break;
-
-	  case SIGO_SETUP_request:
-		if ((c = uni_create_new_call(uni, cookie)) != NULL) {
-			uni_enq_call(c, SIGC_SETUP_request, cookie, msg, NULL);
-			msg = NULL;
-			if (uni->custat == CU_STAT0) {
-				uni->funcs->saal_output(uni, uni->arg,
-				    SAAL_ESTABLISH_request, NULL);
-				if (!TIMER_ISACT(uni, t309))
-					TIMER_START_UNI(uni, t309, uni->timer309);
-				set_custat(uni, CU_STAT1);
-			}
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_NOMEM, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-
-	  case SIGO_PROCEEDING_request:
-	    {
-		struct uniapi_proceeding_request *arg =
-		    uni_msg_rptr(msg, struct uniapi_proceeding_request *);
-
-		COMMON_DELAY(SIGO_PROCEEDING_request, cookie);
-		if ((c = uni_find_call(uni, &arg->call_proc.hdr.cref)) != NULL) {
-			uni_enq_call(c, SIGC_PROCEEDING_request, cookie, msg, NULL);
-			msg = NULL;
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  case SIGO_ALERTING_request:
-	    {
-		struct uniapi_alerting_request *arg =
-		    uni_msg_rptr(msg, struct uniapi_alerting_request *);
-
-		COMMON_DELAY(SIGO_ALERTING_request, cookie);
-		if ((c = uni_find_call(uni, &arg->alerting.hdr.cref)) != NULL) {
-			uni_enq_call(c, SIGC_ALERTING_request, cookie, msg, NULL);
-			msg = NULL;
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  case SIGO_SETUP_response:
-	    {
-		struct uniapi_setup_response *arg =
-		    uni_msg_rptr(msg, struct uniapi_setup_response *);
-
-		COMMON_DELAY(SIGO_SETUP_response, cookie);
-		if ((c = uni_find_call(uni, &arg->connect.hdr.cref)) != NULL) {
-			uni_enq_call(c, SIGC_SETUP_response, cookie, msg, NULL);
-			msg = NULL;
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  case SIGO_SETUP_COMPLETE_request:
-	    {
-		struct uniapi_setup_complete_request *arg =
-		    uni_msg_rptr(msg, struct uniapi_setup_complete_request *);
-
-		COMMON_DELAY(SIGO_SETUP_COMPLETE_request, cookie);
-		if ((c = uni_find_call(uni, &arg->connect_ack.hdr.cref)) != NULL) {
-			uni_enq_call(c, SIGC_SETUP_COMPLETE_request,
-			    cookie, msg, NULL);
-			msg = NULL;
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  case SIGO_RELEASE_request:
-	    {
-		struct uniapi_release_request *arg =
-		    uni_msg_rptr(msg, struct uniapi_release_request *);
-
-		COMMON_DELAY(SIGO_RELEASE_request, cookie);
-		if ((c = uni_find_call(uni, &arg->release.hdr.cref)) != NULL) {
-			uni_enq_call(c, SIGC_RELEASE_request, cookie, msg, NULL);
-			msg = NULL;
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  case SIGO_RELEASE_response:
-	    {
-		struct uniapi_release_response *arg =
-		    uni_msg_rptr(msg, struct uniapi_release_response *);
-
-		COMMON_DELAY(SIGO_RELEASE_response, cookie);
-		if ((c = uni_find_call(uni, &arg->release_compl.hdr.cref)) != NULL) {
-			uni_enq_call(c, SIGC_RELEASE_response, cookie, msg, NULL);
-			msg = NULL;
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  case SIGO_NOTIFY_request:
-	    {
-		struct uniapi_notify_request *arg =
-		    uni_msg_rptr(msg, struct uniapi_notify_request *);
-
-		COMMON_DELAY(SIGO_NOTIFY_request, cookie);
-		if ((c = uni_find_call(uni, &arg->notify.hdr.cref)) != NULL) {
-			uni_enq_call(c, SIGC_NOTIFY_request, cookie, msg, NULL);
-			msg = NULL;
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  case SIGO_STATUS_ENQUIRY_request:
-	    {
-		struct uniapi_status_enquiry_request *arg =
-		    uni_msg_rptr(msg, struct uniapi_status_enquiry_request *);
-
-		COMMON_DELAY(SIGO_STATUS_ENQUIRY_request, cookie);
-		if ((c = uni_find_call(uni, &arg->cref)) != NULL) {
-			uni_enq_call(c, SIGC_STATUS_ENQUIRY_request, cookie, msg, NULL);
-			msg = NULL;
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  case SIGO_ADD_PARTY_request:
-	    {
-		struct uniapi_add_party_request *arg =
-		    uni_msg_rptr(msg, struct uniapi_add_party_request *);
-
-		COMMON_DELAY(SIGO_ADD_PARTY_request, cookie);
-		if ((c = uni_find_call(uni, &arg->add.hdr.cref)) != NULL) {
-			if (c->type != CALL_ROOT) {
-				uniapi_call_error(c, UNIAPI_ERROR_BAD_CTYPE,
-				    cookie);
-				break;
-			}
-			uni_enq_call(c, SIGC_ADD_PARTY_request, cookie, msg, NULL);
-			msg = NULL;
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  case SIGO_PARTY_ALERTING_request:
-	    {
-		struct uniapi_party_alerting_request *arg =
-		    uni_msg_rptr(msg, struct uniapi_party_alerting_request *);
-
-		COMMON_DELAY(SIGO_PARTY_ALERTING_request, cookie);
-		if ((c = uni_find_call(uni, &arg->alert.hdr.cref)) != NULL) {
-			if (c->type != CALL_LEAF) {
-				uniapi_call_error(c, UNIAPI_ERROR_BAD_CTYPE,
-				    cookie);
-				break;
-			}
-			uni_enq_call(c, SIGC_PARTY_ALERTING_request, cookie, msg, NULL);
-			msg = NULL;
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  case SIGO_ADD_PARTY_ACK_request:
-	    {
-		struct uniapi_add_party_ack_request *arg =
-		    uni_msg_rptr(msg, struct uniapi_add_party_ack_request *);
-
-		COMMON_DELAY(SIGO_ADD_PARTY_ACK_request, cookie);
-		if ((c = uni_find_call(uni, &arg->ack.hdr.cref)) != NULL) {
-			if (c->type != CALL_LEAF) {
-				uniapi_call_error(c, UNIAPI_ERROR_BAD_CTYPE,
-				    cookie);
-				break;
-			}
-			uni_enq_call(c, SIGC_ADD_PARTY_ACK_request, cookie, msg, NULL);
-			msg = NULL;
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  case SIGO_ADD_PARTY_REJ_request:
-	    {
-		struct uniapi_add_party_rej_request *arg =
-		    uni_msg_rptr(msg, struct uniapi_add_party_rej_request *);
-
-		COMMON_DELAY(SIGO_ADD_PARTY_REJ_request, cookie);
-		if ((c = uni_find_call(uni, &arg->rej.hdr.cref)) != NULL) {
-			if (c->type != CALL_LEAF) {
-				uniapi_call_error(c, UNIAPI_ERROR_BAD_CTYPE,
-				    cookie);
-				break;
-			}
-			uni_enq_call(c, SIGC_ADD_PARTY_REJ_request, cookie, msg, NULL);
-			msg = NULL;
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  case SIGO_DROP_PARTY_request:
-	    {
-		struct uniapi_drop_party_request *arg =
-		    uni_msg_rptr(msg, struct uniapi_drop_party_request *);
-
-		COMMON_DELAY(SIGO_DROP_PARTY_request, cookie);
-		if ((c = uni_find_call(uni, &arg->drop.hdr.cref)) != NULL) {
-			if (c->type != CALL_ROOT && c->type != CALL_LEAF) {
-				uniapi_call_error(c, UNIAPI_ERROR_BAD_CTYPE,
-				    cookie);
-				break;
-			}
-			uni_enq_call(c, SIGC_DROP_PARTY_request, cookie, msg, NULL);
-			msg = NULL;
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  case SIGO_DROP_PARTY_ACK_request:
-	    {
-		struct uniapi_drop_party_ack_request *arg =
-		    uni_msg_rptr(msg, struct uniapi_drop_party_ack_request *);
-
-		COMMON_DELAY(SIGO_DROP_PARTY_ACK_request, cookie);
-		if ((c = uni_find_call(uni, &arg->ack.hdr.cref)) != NULL) {
-			if (c->type != CALL_ROOT && c->type != CALL_LEAF) {
-				uniapi_call_error(c, UNIAPI_ERROR_BAD_CTYPE,
-				    cookie);
-				break;
-			}
-			uni_enq_call(c, SIGC_DROP_PARTY_ACK_request, cookie, msg, NULL);
-			msg = NULL;
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  case SIGO_ABORT_CALL_request:
-	    {
-		struct uniapi_abort_call_request *arg = 
-		    uni_msg_rptr(msg, struct uniapi_abort_call_request *);
-
-		if ((c = uni_find_call(uni, &arg->cref)) != NULL) {
-			uni_enq_call(c, SIGC_ABORT_CALL_request, cookie, NULL, NULL);
-		} else {
-			uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALL, cookie,
-			    UNI_CALLSTATE_U0);
-		}
-		break;
-	    }
-
-	  /*
-	   * Call-Control
-	   */
-	  case SIGO_CALL_DESTROYED:
-		uni->funcs->uni_output(uni, uni->arg,
-		    UNIAPI_CALL_DESTROYED, 0, msg);
-		msg = NULL;
-		break;
-
-	  /*
-	   * ResetRespond
-	   */
-	  case SIGO_RESET_indication:
-		uni->funcs->uni_output(uni, uni->arg,
-		    UNIAPI_RESET_indication, 0, msg);
-		msg = NULL;
-		break;
-
-	  /*
-	   * Timeouts
-	   */
-	  case SIGO_T309:
-		coord_t309(uni);
-		break;
-
-	}
-	if (msg != NULL)
-		uni_msg_destroy(msg);
-}
-
-/*
- * Send a signal to all call instances
- */
-static void
-sig_all_calls(struct uni *uni, u_int sig)
-{
-	struct call *call;
-
-	TAILQ_FOREACH(call, &uni->calls, link)
-		uni_enq_call(call, sig, 0, NULL, NULL);
-}
-
-/*
- * Set a new coordinator state - this moves all delayed coordinator
- * signals from the delayed queue to the signal queue.
- */
-static int
-cufilt(struct sig *s, void *arg __unused)
-{
-	return (s->type == SIG_COORD);
-}
-
-static void
-set_custat(struct uni *uni, enum cu_stat nstate)
-{
-	if (uni->custat != nstate) {
-		uni->custat = nstate;
-		uni_undel(uni, cufilt, NULL);
-	}
-}
-
-/*
- * T309 timeout function
- */
-static void
-t309_func(struct uni *uni)
-{
-	uni_enq_coord(uni, SIGO_T309, 0, NULL);
-}
-
-/*
- * Respond with a status message
- */
-void
-uni_respond_status(struct uni *uni, struct uni_cref *cref,
-    enum uni_callstate cs, enum uni_cause c1)
-{
-	struct uni_all *resp;
-
-	if ((resp = UNI_ALLOC()) == NULL)
-		return;
-
-	MK_MSG_RESP(resp, UNI_STATUS, cref);
-	MK_IE_CALLSTATE(resp->u.status.callstate, cs);
-	MK_IE_CAUSE(resp->u.status.cause, UNI_CAUSE_LOC_USER, c1);
-
-	(void)uni_send_output(resp, uni);
-
-	UNI_FREE(resp);
-}
-
-/*
- * Respond with a status message
- */
-void
-uni_respond_status_mtype(struct uni *uni, struct uni_cref *cref,
-    enum uni_callstate cs, enum uni_cause c1, u_int mtype)
-{
-	struct uni_all *resp;
-
-	if((resp = UNI_ALLOC()) == NULL)
-		return;
-
-	MK_MSG_RESP(resp, UNI_STATUS, cref);
-	MK_IE_CALLSTATE(resp->u.status.callstate, cs);
-	MK_IE_CAUSE(resp->u.status.cause, UNI_CAUSE_LOC_USER, c1);
-	ADD_CAUSE_MTYPE(resp->u.status.cause, mtype);
-
-	(void)uni_send_output(resp, uni);
-
-	UNI_FREE(resp);
-}
-
-/*
- * Send a message. If we are in CUSTAT1, delay the message if we
- * are in CUSTAT3 send it, else drop it.
- */
-int
-uni_send_output(struct uni_all *u, struct uni *uni)
-{
-	struct uni_msg *m;
-	int err;
-
-	if (uni->custat == CU_STAT0 || uni->custat == CU_STAT2)
-		return (0);
-
-	m = uni_msg_alloc(1024);
-	if ((err = uni_encode(m, u, &uni->cx)) != 0) {
-		VERBOSE0(uni, UNI_FAC_ERR, "uni_encode failed: %08x", err);
-		uni_msg_destroy(m);
-		return (-1);
-	}
-	if (uni->custat == CU_STAT1)
-		uni_delenq_coord(uni, SIGO_DATA, 0, m);
-	else
-		uni->funcs->saal_output(uni, uni->arg, SAAL_DATA_request, m);
-	return (0);
-}
diff --git a/sys/contrib/ngatm/netnatm/sig/sig_party.c b/sys/contrib/ngatm/netnatm/sig/sig_party.c
deleted file mode 100644
index cdb8d25274f2..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/sig_party.c
+++ /dev/null
@@ -1,1353 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/sig/sig_party.c,v 1.18 2004/08/05 07:11:01 brandt Exp $
- *
- * Party instance handling
- */
-
-#include <netnatm/unimsg.h>
-#include <netnatm/saal/sscfudef.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#include <netnatm/sig/uni.h>
-
-#include <netnatm/sig/unipriv.h>
-#include <netnatm/sig/unimkmsg.h>
-#include <netnatm/sig/unimsgcpy.h>
-
-static void drop_partyE(struct party *p);
-static int epstate_compat(struct party *, enum uni_epstate);
-
-#define DEF_PRIV_SIG(NAME, FROM)	[SIG##NAME] =	"SIG"#NAME,
-static const char *const party_sigs[] = {
-	DEF_PARTY_SIGS
-};
-#undef DEF_PRIV_SIG
-
-TIMER_FUNC_PARTY(t397, t397_func)
-TIMER_FUNC_PARTY(t398, t398_func)
-TIMER_FUNC_PARTY(t399, t399_func)
-
-static __inline void
-set_party_state(struct party *p, enum uni_epstate state)
-{
-	if (p->state != state) {
-		VERBOSE(p->call->uni, UNI_FAC_CALL, 1,
-		    "party %u/%u %u/%u PU%u -> PU%u",
-		    p->call->cref, p->call->mine,
-		    p->epref, p->flags & PARTY_MINE, p->state, state);
-		p->state = state;
-	}
-}
-
-/*
- * Create a party with a given endpoint reference.
- * No check is done, that a party with this epref does not alreay exist.
- */
-struct party *
-uni_create_partyx(struct call *c, u_int epref, u_int mine, uint32_t cookie)
-{
-	struct party *p;
-	struct uni_msg *api;
-	struct uniapi_party_created *ind;
-
-	mine = (mine ? PARTY_MINE : 0);
-
-	if ((p = PARTY_ALLOC()) == NULL)
-		return (NULL);
-
-	if ((ind = ALLOC_API(struct uniapi_party_created, api)) == NULL) {
-		PARTY_FREE(p);
-		return (NULL);
-	}
-
-	ind->cref.cref = c->cref;
-	ind->cref.flag = c->mine;
-	MK_IE_EPREF(ind->epref, epref, mine);
-	ind->epref.h.act = UNI_IEACT_DEFAULT;
-
-	p->call = c;
-	p->epref = epref;
-	p->flags = mine;
-	p->state = UNI_EPSTATE_NULL;
-
-	TIMER_INIT_PARTY(p, t397);
-	TIMER_INIT_PARTY(p, t398);
-	TIMER_INIT_PARTY(p, t399);
-
-	TAILQ_INSERT_HEAD(&c->parties, p, link);
-
-	c->uni->funcs->uni_output(c->uni, c->uni->arg,
-	    UNIAPI_PARTY_CREATED, cookie, api);
-
-	VERBOSE(c->uni, UNI_FAC_CALL, 1, "created party %u/%s %u/%s",
-	    p->call->cref, p->call->mine ? "mine" : "his",
-	    p->epref, (p->flags & PARTY_MINE) ? "mine" : "his");
-
-	return (p);
-	
-}
-
-struct party *
-uni_create_party(struct call *c, struct uni_ie_epref *epref)
-{
-	return (uni_create_partyx(c, epref->epref, epref->flag, 0));
-}
-
-struct party *
-uni_find_party(struct call *c, struct uni_ie_epref *epref)
-{
-	struct party *p;
-
-	TAILQ_FOREACH(p, &c->parties, link)
-		if (p->epref == epref->epref &&
-		    (!(p->flags & PARTY_MINE) == !epref->flag))
-			return (p);
-	return (NULL);
-}
-struct party *
-uni_find_partyx(struct call *c, u_int epref, u_int mine)
-{
-	struct party *p;
-
-	TAILQ_FOREACH(p, &c->parties, link)
-		if (p->epref == epref && (!(p->flags & PARTY_MINE) == !mine))
-			return (p);
-	return (NULL);
-}
-
-/*
- * Destroy a party.
- * This function is assumed to remove the party from the parent's call
- * party list.
- */
-void
-uni_destroy_party(struct party *p, int really)
-{
-	struct uni_msg *api;
-	struct uniapi_party_destroyed *ind;
-
-	TIMER_DESTROY_PARTY(p, t397);
-	TIMER_DESTROY_PARTY(p, t398);
-	TIMER_DESTROY_PARTY(p, t399);
-
-	TAILQ_REMOVE(&p->call->parties, p, link);
-
-	uni_delsig(p->call->uni, SIG_PARTY, p->call, p);
-
-	if (!really) {
-		ind = ALLOC_API(struct uniapi_party_destroyed, api);
-		if (ind != NULL) {
-			ind->cref.cref = p->call->cref;
-			ind->cref.flag = p->call->mine;
-			ind->epref.epref = p->epref;
-			ind->epref.flag = p->flags & PARTY_MINE;
-			ind->epref.h.act = UNI_IEACT_DEFAULT;
-			IE_SETPRESENT(ind->epref);
-
-			uni_enq_call(p->call, SIGC_PARTY_DESTROYED, 0, api, NULL);
-		}
-
-		uni_enq_party(p, SIGP_PARTY_DELETE, 0, NULL, NULL);
-		return;
-	}
-	PARTY_FREE(p);
-}
-
-/*
- * Count number of parties in active states.
- * If the argument is 0 only ACTIVE parties are counter
- * If the argument is 1 only parties in establishing states are counted
- * If the argument is 2 both are counted.
- */
-u_int
-uni_party_act_count(struct call *c, int kind)
-{
-	struct party *p;
-	u_int cnt;
-
-	cnt = 0;
-	TAILQ_FOREACH(p, &c->parties, link) {
-		switch (p->state) {
-
-		  case UNI_EPSTATE_ACTIVE:
-			if (kind == 0 || kind == 2)
-				cnt++;
-			break;
-
-		  case UNI_EPSTATE_ALERT_RCVD:
-		  case UNI_EPSTATE_ADD_INIT:
-		  case UNI_EPSTATE_ALERT_DLVD:
-		  case UNI_EPSTATE_ADD_RCVD:
-			if (kind == 1 || kind == 2)
-				cnt++;
-			break;
-
-		  default:
-			break;
-		}
-	}
-	return (cnt);
-}
-
-static void
-stop_all_party_timers(struct party *p)
-{
-	TIMER_STOP_PARTY(p, t397);
-	TIMER_STOP_PARTY(p, t398);
-	TIMER_STOP_PARTY(p, t399);
-}
-/************************************************************/
-
-/*
- * Add-party.request
- *
- * Q.2971:Party-control-U 3 (PU0)
- * Q.2971:Party-control-N 3 (PN0)
- */
-static void
-pun0_add_party_request(struct party *p, struct uni_msg *api, uint32_t cookie)
-{
-	struct uni_all *add;
-	struct uniapi_add_party_request *req =
-	    uni_msg_rptr(api, struct uniapi_add_party_request *);
-
-	if ((add = UNI_ALLOC()) == NULL) {
-		uni_msg_destroy(api);
-		uniapi_party_error(p, UNIAPI_ERROR_NOMEM, cookie);
-		return;
-	}
-
-	add->u.add_party = req->add;
-	MK_MSG_ORIG(add, UNI_ADD_PARTY, p->call->cref, !p->call->mine);
-	uni_send_output(add, p->call->uni);
-	UNI_FREE(add);
-
-	TIMER_START_PARTY(p, t399, p->call->uni->timer399);
-
-	set_party_state(p, UNI_EPSTATE_ADD_INIT);
-
-	uni_msg_destroy(api);
-	uniapi_party_error(p, UNIAPI_OK, cookie);
-}
-
-/*
- * Add-party-ack.request
- *
- * Q.2971:Party-Control-U 6 PU2
- * Q.2971:Party-Control-U 7 PU3
- * Q.2971:Party-Control-N 6 PN2
- * Q.2971:Party-Control-N 7 PN3
- */
-static void
-punx_add_party_ack_request(struct party *p, struct uni_msg *m, uint32_t cookie)
-{
-	struct uni_all *ack;
-	struct uniapi_add_party_ack_request *req =
-	    uni_msg_rptr(m, struct uniapi_add_party_ack_request *);
-
-	if ((ack = UNI_ALLOC()) == NULL) {
-		uniapi_party_error(p, UNIAPI_ERROR_NOMEM, cookie);
-		uni_msg_destroy(m);
-		return;
-	}
-	ack->u.add_party_ack = req->ack;
-	MK_MSG_ORIG(ack, UNI_ADD_PARTY_ACK, p->call->cref, !p->call->mine);
-	uni_send_output(ack, p->call->uni);
-	UNI_FREE(ack);
-
-	set_party_state(p, UNI_EPSTATE_ACTIVE);
-
-	uni_msg_destroy(m);
-	uniapi_party_error(p, UNIAPI_OK, cookie);
-}
-
-/*
- * Add-party-rej.request
- *
- * Q.2971:Party-Control-U 6 PU2
- * Q.2971:Party-Control-N 6 PN2
- */
-static void
-pun2_add_party_rej_request(struct party *p, struct uni_msg *m, uint32_t cookie)
-{
-	struct uni_all *rej;
-	struct uniapi_add_party_rej_request *req =
-	    uni_msg_rptr(m, struct uniapi_add_party_rej_request *);
-
-	if ((rej = UNI_ALLOC()) == NULL) {
-		uniapi_party_error(p, UNIAPI_ERROR_NOMEM, cookie);
-		uni_msg_destroy(m);
-		return;
-	}
-
-	stop_all_party_timers(p);
-
-	rej->u.add_party_rej = req->rej;
-	MK_MSG_ORIG(rej, UNI_ADD_PARTY_REJ, p->call->cref, !p->call->mine);
-	uni_enq_call(p->call, SIGC_SEND_ADD_PARTY_REJ, cookie, NULL, rej);
-
-	uni_msg_destroy(m);
-	p->state = UNI_EPSTATE_NULL;
-	uniapi_party_error(p, UNIAPI_OK, cookie);
-
-	uni_destroy_party(p, 0);
-}
-
-/*
- * ADD PARTY in PU0, PN0
- *
- * Q.2971:Party-Control-U 3/14 PU0
- */
-static void
-pun0_add_party(struct party *p, struct uni_msg *m, struct uni_all *u)
-{
-	struct uniapi_add_party_indication *ind;
-	struct uni_msg *api;
-
-	ind = ALLOC_API(struct uniapi_add_party_indication, api);
-	if (ind != NULL) {
-		ind->add.hdr = u->u.hdr;
-		copy_msg_add_party(&u->u.add_party, &ind->add);
-		p->call->uni->funcs->uni_output(p->call->uni, p->call->uni->arg,
-		    UNIAPI_ADD_PARTY_indication, 0, api);
-	}
-	set_party_state(p, UNI_EPSTATE_ADD_RCVD);
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-
-/*
- * PARTY-ALERTING.request
- *
- * Q.2971:Party-Control-U 6 (PU2)
- * Q.2971:Party-Control-N 6 (PN2)
- */
-static void
-pun2_party_alerting_request(struct party *p, struct uni_msg *api,
-    uint32_t cookie)
-{
-	struct uni_all *alert;
-	struct uniapi_party_alerting_request *req =
-	    uni_msg_rptr(api, struct uniapi_party_alerting_request *);
-
-	if ((alert = UNI_ALLOC()) == NULL) {
-		uniapi_party_error(p, UNIAPI_ERROR_NOMEM, cookie);
-		uni_msg_destroy(api);
-		return;
-	}
-	alert->u.party_alerting = req->alert;
-	MK_MSG_ORIG(alert, UNI_PARTY_ALERTING,
-	     p->call->cref, !p->call->mine);
-	uni_send_output(alert, p->call->uni);
-	UNI_FREE(alert);
-
-	set_party_state(p, UNI_EPSTATE_ALERT_DLVD);
-
-	uni_msg_destroy(api);
-	uniapi_party_error(p, UNIAPI_OK, cookie);
-}
-
-/*
- * PARTY-ALERTING in state PU1/PN1
- *
- * Q.2971:Party-Control-U 14
- * Q.2971:Party-Control-N 5
- */
-static void
-pun1_party_alerting(struct party *p, struct uni_msg *m, struct uni_all *u)
-{
-	struct uniapi_party_alerting_indication *ind;
-	struct uni_msg *api;
-
-	ind = ALLOC_API(struct uniapi_party_alerting_indication, api);
-	if (ind == NULL) {
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		return;
-	}
-	TIMER_STOP_PARTY(p, t399);
-
-	ind->alert.hdr = u->u.hdr;
-	copy_msg_party_alerting(&u->u.party_alerting, &ind->alert);
-
-	p->call->uni->funcs->uni_output(p->call->uni, p->call->uni->arg,
-	    UNIAPI_PARTY_ALERTING_indication, 0, api);
-
-	TIMER_START_PARTY(p, t397, p->call->uni->timer397);
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-
-	set_party_state(p, UNI_EPSTATE_ALERT_RCVD);
-}
-
-/*
- * ADD-PARTY-ACK
- *
- * Q.2971:Party-Control-U 4 (PU1)
- * Q.2971:Party-Control-U 7 (PU4)
- * Q.2971:Party-Control-N 4 (PN1)
- * Q.2971:Party-Control-N 7 (PN4)
- */
-static void
-pun1pun4_add_party_ack(struct party *p, struct uni_msg *m, struct uni_all *u)
-{
-	struct uniapi_add_party_ack_indication *ind;
-	struct uni_msg *api;
-
-	ind = ALLOC_API(struct uniapi_add_party_ack_indication, api);
-	if (ind == NULL) {
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		return;
-	}
-
-	if (p->state == UNI_EPSTATE_ADD_INIT)
-		TIMER_STOP_PARTY(p, t399);
-	else
-		TIMER_STOP_PARTY(p, t397);
-
-	ind->ack.hdr = u->u.hdr;
-	copy_msg_add_party_ack(&u->u.add_party_ack, &ind->ack);
-
-	p->call->uni->funcs->uni_output(p->call->uni, p->call->uni->arg,
-	    UNIAPI_ADD_PARTY_ACK_indication, 0, api);
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-
-	set_party_state(p, UNI_EPSTATE_ACTIVE);
-}
-
-/*
- * ADD-PARTY-REJECT
- *
- * Q.2971:Party-Control-U 4 (PU1)
- * Q.2971:Party-Control-N 4 (PN1)
- */
-static void
-pun1_add_party_rej(struct party *p, struct uni_msg *m, struct uni_all *u)
-{
-	struct uniapi_add_party_rej_indication *ind;
-	struct uni_msg *api;
-
-	ind = ALLOC_API(struct uniapi_add_party_rej_indication, api);
-	if (ind == NULL) {
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		return;
-	}
-
-	TIMER_STOP_PARTY(p, t399);
-
-	ind->rej.hdr = u->u.hdr;
-	copy_msg_add_party_rej(&u->u.add_party_rej, &ind->rej);
-	uni_enq_call(p->call, SIGC_ADD_PARTY_REJ_indication, 0, api, NULL);
-
-	uni_destroy_party(p, 0);
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-
-/*
- * ADD-PARTY-REJECT
- *
- * Q.2971:Party-Control-U 10 (PU5)
- * Q.2971:Party-Control-N 10 (PN5)
- */
-static void
-pun5_add_party_rej(struct party *p, struct uni_msg *m, struct uni_all *u)
-{
-	struct uniapi_drop_party_ack_indication *ind;
-	struct uni_msg *api;
-
-	ind = ALLOC_API(struct uniapi_drop_party_ack_indication, api);
-	if (ind == NULL) {
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		return;
-	}
-
-	ind->drop.hdr = u->u.hdr;
-	COPY_FROM_ADD_REJ(u, &ind->drop);
-	if (IE_ISGOOD(u->u.add_party_rej.crankback))
-		ind->crankback = u->u.add_party_rej.crankback;
-	uni_enq_call(p->call, SIGC_DROP_PARTY_ACK_indication, 0, api, NULL);
-
-	TIMER_STOP_PARTY(p, t398);
-
-	uni_destroy_party(p, 0);
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-
-/*
- * DROP-PARTY-ACKNOWLEDGE
- *
- * Q.2971:Party-Control-U 8
- * Q.2971:Party-Control-N 8
- *
- * Message already verified in Call-Control!
- */
-static void
-punx_drop_party_ack(struct party *p, struct uni_msg *m, struct uni_all *u)
-{
-	struct uniapi_drop_party_ack_indication *ind;
-	struct uni_msg *api;
-
-	stop_all_party_timers(p);
-
-	ind = ALLOC_API(struct uniapi_drop_party_ack_indication, api);
-	if (ind != NULL) {
-		ind->drop.hdr = u->u.hdr;
-		COPY_FROM_DROP_ACK(u, &ind->drop);
-		uni_enq_call(p->call, SIGC_DROP_PARTY_ACK_indication,
-		    0, api, NULL);
-	}
-
-	uni_destroy_party(p, 0);
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-
-/*
- * DROP PARTY message in any state except PU5/PN5
- *
- * Q.2971:Party-Control-U 9
- * Q.2971:Party-Control-N 9
- */
-static void
-punx_drop_party(struct party *p, struct uni_msg *m, struct uni_all *u)
-{
-	struct uniapi_drop_party_indication *ind;
-	struct uni_msg *api;
-
-	ind = ALLOC_API(struct uniapi_drop_party_indication, api);
-	if (ind == NULL) {
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		return;
-	}
-
-	ind->drop.hdr = u->u.hdr;
-	copy_msg_drop_party(&u->u.drop_party, &ind->drop);
-
-	/* need the cause even if it is bad */
-	if (IE_ISERROR(u->u.drop_party.cause))
-		ind->drop.cause = u->u.drop_party.cause;
-
-	ind->my_cause = p->call->uni->cause;
-
-	uni_enq_call(p->call, SIGC_DROP_PARTY_indication, 0, api, NULL);
-
-	TIMER_STOP_PARTY(p, t397);
-	TIMER_STOP_PARTY(p, t399);
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-
-	set_party_state(p, UNI_EPSTATE_DROP_RCVD);
-}
-
-/*
- * DROP PARTY message in state PU5/PN5
- *
- * Q.2971:Party-Control-U 10
- * Q.2971:Party-Control-N 10
- */
-static void
-pun5_drop_party(struct party *p, struct uni_msg *m, struct uni_all *u)
-{
-	struct uniapi_drop_party_ack_indication *ind;
-	struct uni_msg *api;
-
-	ind = ALLOC_API(struct uniapi_drop_party_ack_indication, api);
-	if (ind == NULL) {
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		return;
-	}
-
-	ind->drop.hdr = u->u.hdr;
-	copy_msg_drop_party(&u->u.drop_party, &ind->drop);
-
-	/* need the cause even if it is bad */
-	if (IE_ISERROR(u->u.drop_party.cause))
-		ind->drop.cause = u->u.drop_party.cause;
-
-	uni_enq_call(p->call, SIGC_DROP_PARTY_ACK_indication, 0, api, NULL);
-
-	TIMER_STOP_PARTY(p, t398);
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-
-	set_party_state(p, UNI_EPSTATE_DROP_RCVD);
-
-	uni_destroy_party(p, 0);
-}
-
-/************************************************************/
-
-/*
- * T399
- *
- * Q.2971:Party-Control-U 4 (PU1)
- * Q.2971:Party-Control-N 4 (PN1)
- */
-static void
-pun1_t399(struct party *p)
-{
-	if (p->call->uni->proto == UNIPROTO_UNI40N) {
-		MK_IE_CAUSE(p->call->uni->cause, UNI_CAUSE_LOC_USER,
-		    UNI_CAUSE_NO_RESPONSE);
-	} else {
-		MK_IE_CAUSE(p->call->uni->cause, UNI_CAUSE_LOC_USER,
-		    UNI_CAUSE_RECOVER);
-		ADD_CAUSE_TIMER(p->call->uni->cause, "399");
-	}
-
-	drop_partyE(p);
-}
-
-/*
- * T398
- *
- * Q.2971:Party-Control-U 10 (PU5)
- * Q.2971:Party-Control-N 10 (PN5)
- */
-static void
-pun5_t398(struct party *p)
-{
-	struct uniapi_drop_party_ack_indication *ind;
-	struct uni_all *drop;
-	struct uni_msg *api;
-
-	MK_IE_CAUSE(p->call->uni->cause,
-	    UNI_CAUSE_LOC_USER, UNI_CAUSE_RECOVER);
-	ADD_CAUSE_TIMER(p->call->uni->cause, "398");
-	/*
-	 * Send indication to API
-	 */
-	ind = ALLOC_API(struct uniapi_drop_party_ack_indication, api);
-	if (ind != NULL) {
-		ind->drop.hdr.cref.cref = p->call->cref;
-		ind->drop.hdr.cref.flag = p->call->mine;
-		ind->drop.hdr.act = UNI_MSGACT_DEFAULT;
-		MK_IE_EPREF(ind->drop.epref, p->epref, p->flags & PARTY_MINE);
-		ind->drop.cause = p->call->uni->cause;
-		uni_enq_call(p->call, SIGC_DROP_PARTY_ACK_indication,
-		    0, api, NULL);
-	}
-
-	/*
-	 * Send DROP PARTY ACK
-	 */
-	if ((drop = UNI_ALLOC()) != NULL) {
-		MK_MSG_ORIG(drop, UNI_DROP_PARTY_ACK,
-		    p->call->cref, !p->call->mine);
-		MK_IE_EPREF(drop->u.drop_party_ack.epref,
-		    p->epref, !(p->flags & PARTY_MINE));
-		drop->u.drop_party_ack.cause = p->call->uni->cause;
-		uni_enq_call(p->call, SIGC_SEND_DROP_PARTY_ACK, 0, NULL, drop);
-	}
-
-	uni_destroy_party(p, 0);
-}
-
-/*
- * T397
- *
- * Q.2971:Party-Control-U 7 (PU4)
- * Q.2971:Party-Control-N 7 (PN4)
- */
-static void
-pun4_t397(struct party *p)
-{
-	MK_IE_CAUSE(p->call->uni->cause, UNI_CAUSE_LOC_USER,
-	    UNI_CAUSE_RECOVER);
-	ADD_CAUSE_TIMER(p->call->uni->cause, "397");
-
-	drop_partyE(p);
-}
-
-/************************************************************/
-
-/*
- * Drop a party because of an error condition.
- * This is label E on page Party-Control-U 8/14.
- *
- * It is assumed, that the caller has constructed the cause in
- * p->call->uni->cause.
- */
-static void
-drop_partyE(struct party *p)
-{
-	struct uni_msg *api;
-	struct uniapi_drop_party_indication *ind;
-	struct uni_all *drop;
-
-	/*
-	 * Send indication to API
-	 */
-	if ((ind = ALLOC_API(struct uniapi_drop_party_indication, api)) != NULL) {
-		ind->drop.hdr.cref.cref = p->call->cref;
-		ind->drop.hdr.cref.flag = p->call->mine;
-		ind->drop.hdr.act = UNI_MSGACT_DEFAULT;
-		MK_IE_EPREF(ind->drop.epref, p->epref, p->flags & PARTY_MINE);
-		ind->drop.cause = p->call->uni->cause;
-		uni_enq_call(p->call, SIGC_DROP_PARTY_indication, 0, api, NULL);
-	}
-	TIMER_STOP_PARTY(p, t399);
-	TIMER_STOP_PARTY(p, t397);
-	TIMER_START_PARTY(p, t398, p->call->uni->timer398);
-
-	if ((drop = UNI_ALLOC()) != NULL) {
-		drop->u.drop_party.cause = p->call->uni->cause;
-		MK_MSG_ORIG(drop, UNI_DROP_PARTY, p->call->cref, !p->call->mine);
-		MK_IE_EPREF(drop->u.drop_party.epref, p->epref,
-		    !(p->flags & PARTY_MINE));
-		uni_enq_call(p->call, SIGC_SEND_DROP_PARTY, 0, NULL, drop);
-	}
-
-	set_party_state(p, UNI_EPSTATE_DROP_INIT);
-}
-
-/*
- * Drop party request in Px1, Px3, Px4 or Px7
- *
- * Q.2971:Party-Control-U 8
- * Q.2971:Party-Control-N 8
- */
-static void
-punx_drop_party_request(struct party *p, struct uni_msg *api, uint32_t cookie)
-{
-	struct uniapi_drop_party_request *req =
-	    uni_msg_rptr(api, struct uniapi_drop_party_request *);
-	struct uni_all *drop;
-
-	if ((drop = UNI_ALLOC()) == NULL) {
-		uniapi_party_error(p, UNIAPI_ERROR_NOMEM, cookie);
-		uni_msg_destroy(api);
-		return;
-	}
-
-	TIMER_STOP_PARTY(p, t399);
-	TIMER_STOP_PARTY(p, t397);
-	TIMER_START_PARTY(p, t398, p->call->uni->timer398);
-
-	drop->u.drop_party = req->drop;
-	MK_MSG_ORIG(drop, UNI_DROP_PARTY, p->call->cref, !p->call->mine);
-	uni_enq_call(p->call, SIGC_SEND_DROP_PARTY, cookie, NULL, drop);
-
-	set_party_state(p, UNI_EPSTATE_DROP_INIT);
-
-	uni_msg_destroy(api);
-	uniapi_party_error(p, UNIAPI_OK, cookie);
-}
-
-/*
- * Drop-party-ack.request in Px6
- *
- * Q.2971:Party-Control-U 9
- * Q.2971:Party-Control-N 9
- */
-static void
-pun6_drop_party_ack_request(struct party *p, struct uni_msg *api, uint32_t cookie)
-{
-	struct uniapi_drop_party_ack_request *req =
-	    uni_msg_rptr(api, struct uniapi_drop_party_ack_request *);
-	struct uni_all *ack;
-
-	if ((ack = UNI_ALLOC()) == NULL) {
-		uni_msg_destroy(api);
-		uniapi_party_error(p, UNIAPI_ERROR_NOMEM, cookie);
-		return;
-	}
-	ack->u.drop_party_ack = req->ack;
-	MK_MSG_ORIG(ack, UNI_DROP_PARTY_ACK, p->call->cref, !p->call->mine);
-	uni_enq_call(p->call, SIGC_SEND_DROP_PARTY_ACK, cookie, NULL, ack);
-
-	stop_all_party_timers(p);
-
-	uni_msg_destroy(api);
-	uniapi_party_error(p, UNIAPI_OK, cookie);
-
-	uni_destroy_party(p, 0);
-}
-/************************************************************/
-/*
- * Party status enquiry request from API or call-control
- *
- * Q.2971:Party-Control-U 12
- * Q.2971:Party-Control-N 12
- */
-static void
-punx_status_enquiry_request(struct party *p, uint32_t cookie)
-{
-	struct uni_all *enq;
-
-	if((enq = UNI_ALLOC()) == NULL) {
-		uniapi_party_error(p, UNIAPI_ERROR_NOMEM, cookie);
-		return;
-	}
-	MK_IE_EPREF(enq->u.status_enq.epref, p->epref,
-	    !(p->flags & PARTY_MINE));
-	MK_MSG_ORIG(enq, UNI_STATUS_ENQ, p->call->cref, !p->call->mine);
-	uni_enq_call(p->call, SIGC_SEND_STATUS_ENQ, cookie, NULL, enq);
-
-	uniapi_party_error(p, UNIAPI_OK, cookie);
-}
-
-/*
- * STATUS in any state except PU5/PN5
- *
- * Q.2971:Party-Control-U 12
- * Q.2971:Party-Control-N 12
- */
-static void
-punx_status(struct party *p, struct uni_msg *m, struct uni_all *u)
-{
-	struct uniapi_drop_party_ack_indication *ind;
-	struct uni_msg *api;
-
-	if (u->u.status.epstate.state == UNI_EPSTATE_NULL) {
-		/* should not happend */
-		ind = ALLOC_API(struct uniapi_drop_party_ack_indication, api);
-		if (ind != NULL) {
-			ind->drop.hdr = u->u.hdr;
-			ind->drop.cause = u->u.status.cause;
-			ind->drop.epref = u->u.status.epref;
-			uni_enq_call(p->call, SIGC_DROP_PARTY_ACK_indication,
-			    0, api, NULL);
-		}
-		stop_all_party_timers(p);
-
-		uni_destroy_party(p, 0);
-	} else {
-		if (epstate_compat(p, u->u.status.epstate.state)) {
-			if(u->u.status.cause.cause == UNI_CAUSE_MANDAT ||
-			   u->u.status.cause.cause == UNI_CAUSE_MTYPE_NIMPL ||
-			   u->u.status.cause.cause == UNI_CAUSE_IE_NIMPL ||
-			   u->u.status.cause.cause == UNI_CAUSE_IE_INV) {
-				MK_IE_CAUSE(p->call->uni->cause,
-				    UNI_CAUSE_LOC_USER,
-				    UNI_CAUSE_UNSPEC);
-				drop_partyE(p);
-			}
-		} else {
-			MK_IE_CAUSE(p->call->uni->cause,
-			    UNI_CAUSE_LOC_USER,
-			    UNI_CAUSE_MSG_INCOMP);
-			drop_partyE(p);
-		}
-	}
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-
-/*
- * STATUS in PU5/PN5
- *
- * Q.2971:Party-Control-U 10
- * Q.2971:Party-Control-N 10
- */
-static void
-pun5_status(struct party *p, struct uni_msg *m, struct uni_all *u)
-{
-	struct uniapi_drop_party_ack_indication *ind;
-	struct uni_msg *api;
-
-	if (u->u.status.epstate.state == UNI_EPSTATE_NULL) {
-		ind = ALLOC_API(struct uniapi_drop_party_ack_indication, api);
-		if (ind != NULL) {
-			ind->drop.hdr = u->u.hdr;
-			ind->drop.cause = u->u.status.cause;
-			ind->drop.epref = u->u.status.epref;
-			uni_enq_call(p->call, SIGC_DROP_PARTY_ACK_indication,
-			    0, api, NULL);
-		}
-		TIMER_STOP_PARTY(p, t398);
-
-		uni_destroy_party(p, 0);
-	}
-
-	uni_msg_destroy(m);
-	UNI_FREE(u);
-}
-
-/************************************************************/
-
-void
-uni_sig_party(struct party *p, enum party_sig sig, uint32_t cookie,
-    struct uni_msg *msg, struct uni_all *u)
-{
-	if (sig >= SIGP_END) {
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "Signal %d outside of range to Party-Control", sig);
-		if (msg)
-			uni_msg_destroy(msg);
-		if (u)
-			UNI_FREE(u);
-		return;
-	}
-	VERBOSE(p->call->uni, UNI_FAC_CALL, 1,
-	    "Signal %s in state %u of party %u/%s (call %u/%s in state %s)"
-	    "; cookie %u", party_sigs[sig], p->state, p->epref,
-	    (p->flags & PARTY_MINE) ? "mine" : "his", p->call->cref,
-	    p->call->mine ? "mine" : "his", callstates[p->call->cstate].name,
-	    cookie);
-
-	switch (sig) {
-
-	  case SIGP_PARTY_DELETE:
-		PARTY_FREE(p);
-		break;
-
-	  /*
-	   * Messages
-	   */
-	  case SIGP_SETUP:
-		if (p->state == UNI_EPSTATE_NULL) {
-			/* Q.2971:Call-Control-U 3/13 */
-			/* Q.2971:Call-Control-N 3/13 */
-			set_party_state(p, UNI_EPSTATE_ADD_RCVD);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "SETUP in ps=%u", p->state);
-		break;
-
-	  case SIGP_ALERTING:
-		if (p->state == UNI_EPSTATE_ADD_INIT) {
-			/* Q.2971:Call-Control-U 14 */
-			/* Q.2971:Call-Control-N 5 */
-			TIMER_START_PARTY(p, t397, p->call->uni->timer397);
-			set_party_state(p, UNI_EPSTATE_ALERT_RCVD);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "ALERTING in ps=%u", p->state);
-		break;
-
-	  case SIGP_CONNECT:
-		if (p->state == UNI_EPSTATE_ADD_INIT) {
-			/* Q.2971:Call-Control-U 4/13 */
-			TIMER_STOP_PARTY(p, t399);
-			set_party_state(p, UNI_EPSTATE_ACTIVE);
-			break;
-		}
-		if (p->state == UNI_EPSTATE_ALERT_RCVD) {
-			/* Q.2971:Call-Control-U 7/13 */
-			TIMER_STOP_PARTY(p, t397);
-			set_party_state(p, UNI_EPSTATE_ACTIVE);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "CONNECT in ps=%u", p->state);
-		break;
-
-	  case SIGP_CONNECT_ACK:
-		if (p->state == UNI_EPSTATE_ADD_RCVD ||
-		    p->state == UNI_EPSTATE_ALERT_DLVD) {
-			/* Q.2971:Call-Control-U 6/13 */
-			/* Q.2971:Call-Control-U 7/13 */
-			p->flags &= ~PARTY_CONNECT;
-			set_party_state(p, UNI_EPSTATE_ACTIVE);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "CONNECT in ps=%u", p->state);
-		break;
-
-	  case SIGP_RELEASE:
-		if (p->state == UNI_EPSTATE_DROP_INIT) {
-			/* Q.2971:Party-Control-U 10/14 */
-			/* Q.2971:Party-Control-N 10/14 */
-			TIMER_STOP_PARTY(p, t398);
-			uni_destroy_party(p, 0);
-			break;
-		}
-		/* Q.2971:Party-Control-U 11/14 */
-		/* Q.2971:Party-Control-N 11/14 */
-		TIMER_STOP_PARTY(p, t397);
-		TIMER_STOP_PARTY(p, t399);
-		uni_destroy_party(p, 0);
-		break;
-
-	  case SIGP_RELEASE_COMPL:
-		/* Q.2971:Party-Control-U 11/14 */
-		/* Q.2971:Party-Control-N 11/14 */
-		stop_all_party_timers(p);
-		uni_destroy_party(p, 0);
-		break;
-
-	  case SIGP_RELEASE_confirm:
-		/* not in the SDLs */
-		stop_all_party_timers(p);
-		uni_destroy_party(p, 0);
-		break;
-
-	  case SIGP_RELEASE_request:
-		if (p->state == UNI_EPSTATE_DROP_INIT) {
-			/* Q.2971:Party-Control-U 10 */
-			/* Q.2971:Party-Control-N 10 */
-			uni_destroy_party(p, 0);
-			break;
-		}
-		/* Q.2971:Party-Control-U 11 */
-		/* Q.2971:Party-Control-N 11 */
-		TIMER_STOP_PARTY(p, t397);
-		TIMER_STOP_PARTY(p, t399);
-		uni_destroy_party(p, 0);
-		break;
-
-	  case SIGP_RELEASE_response:
-		/* Q.2971:Party-Control-U 11 */
-		/* Q.2971:Party-Control-N 11 */
-		stop_all_party_timers(p);
-		uni_destroy_party(p, 0);
-		break;
-
-	  case SIGP_ADD_PARTY:
-		if (p->state == UNI_EPSTATE_NULL) {
-			/* Q.2971:Party-Control-U 3 PU0 */
-			/* Q.2971:Party-Control-N 3 PN0 */
-			pun0_add_party(p, msg, u);
-			break;
-		}
-		if (p->state == UNI_EPSTATE_ADD_RCVD) {
-			/* Q.2971:Party-Control-U 6 PU2 */
-			/* Q.2971:Party-Control-N 6 PN2 */
-			uni_msg_destroy(msg);
-			UNI_FREE(u);
-			break;
-		}
-		uni_bad_message(p->call, u, UNI_CAUSE_MSG_INCOMP,
-		    &u->u.add_party.epref, p->state);
-		uni_msg_destroy(msg);
-		UNI_FREE(u);
-		break;
-
-	  case SIGP_PARTY_ALERTING:
-		if (p->state == UNI_EPSTATE_ADD_INIT) {
-			/* Q.2971:Party-Control-U 14 */
-			/* Q.2971:Party-Control-N 5 */
-			pun1_party_alerting(p, msg, u);
-			break;
-		}
-		uni_bad_message(p->call, u, UNI_CAUSE_MSG_INCOMP,
-		    &u->u.party_alerting.epref, p->state);
-		uni_msg_destroy(msg);
-		UNI_FREE(u);
-		break;
-
-	  case SIGP_ADD_PARTY_ACK:
-		if (p->state == UNI_EPSTATE_ADD_INIT ||
-		    p->state == UNI_EPSTATE_ALERT_RCVD) {
-			/* Q.2971:Party-Control-U 4 (PU1) */
-			/* Q.2971:Party-Control-U 7 (PU4) */
-			/* Q.2971:Party-Control-N 4 (PN1) */
-			/* Q.2971:Party-Control-N 7 (PN4) */
-			pun1pun4_add_party_ack(p, msg, u);
-			break;
-		}
-		uni_bad_message(p->call, u, UNI_CAUSE_MSG_INCOMP,
-		    &u->u.add_party_ack.epref, p->state);
-		uni_msg_destroy(msg);
-		UNI_FREE(u);
-		break;
-
-	  case SIGP_ADD_PARTY_REJ:
-		if (p->state == UNI_EPSTATE_ADD_INIT) {
-			/* Q.2971:Party-Control-U 4 (PU1) */
-			/* Q.2971:Party-Control-N 4 (PN1) */
-			pun1_add_party_rej(p, msg, u);
-			break;
-		}
-		if (p->state == UNI_EPSTATE_DROP_INIT) {
-			/* Q.2971:Party-Control-U 10 (PU5) */
-			/* Q.2971:Party-Control-N 10 (PN5) */
-			pun5_add_party_rej(p, msg, u);
-			break;
-		}
-		uni_bad_message(p->call, u, UNI_CAUSE_MSG_INCOMP,
-		    &u->u.add_party_rej.epref, p->state);
-		uni_msg_destroy(msg);
-		UNI_FREE(u);
-		break;
-
-	  case SIGP_DROP_PARTY_ACK:
-		/* Q.2971:Party-Control-U 8 */
-		/* Q.2971:Party-Control-N 8 */
-		punx_drop_party_ack(p, msg, u);
-		break;
-
-	  case SIGP_DROP_PARTY:
-		if (p->state == UNI_EPSTATE_DROP_INIT)
-			/* Q.2971:Party-Control-U 10 */
-			/* Q.2971:Party-Control-N 10 */
-			pun5_drop_party(p, msg, u);
-		else
-			/* Q.2971:Party-Control-U 9 */
-			/* Q.2971:Party-Control-N 9 */
-			punx_drop_party(p, msg, u);
-		break;
-
-	  case SIGP_STATUS:
-		if (p->state == UNI_EPSTATE_DROP_INIT)
-			/* Q.2971:Party-Control-U 10 */
-			/* Q.2971:Party-Control-N 10 */
-			pun5_status(p, msg, u);
-		else
-			/* Q.2971:Party-Control-U 12 */
-			/* Q.2971:Party-Control-N 12 */
-			punx_status(p, msg, u);
-		break;
-
-	  /*
-	   * User
-	   */
-	  case SIGP_SETUP_request:
-		if (p->state == UNI_EPSTATE_NULL) {
-			/* Q.2971:Party-Control-U 3 */
-			/* Q.2971:Party-Control-N 3 */
-			set_party_state(p, UNI_EPSTATE_ADD_INIT);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "SETUP.request in ps=%u", p->state);
-		uniapi_party_error(p, UNIAPI_ERROR_BAD_EPSTATE, cookie);
-		break;
-
-	  case SIGP_SETUP_response:
-		if (p->state == UNI_EPSTATE_ADD_RCVD ||
-		    p->state == UNI_EPSTATE_ALERT_DLVD) {
-			/* Q.2971:Party-Control-N 6 (PN2) */
-			/* Q.2971:Party-Control-N 7 (PN3) */
-			set_party_state(p, UNI_EPSTATE_ACTIVE);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "SETUP.response in ps=%u", p->state);
-		uniapi_party_error(p, UNIAPI_ERROR_BAD_EPSTATE, cookie);
-		break;
-
-	  case SIGP_SETUP_COMPL_request:
-		if (p->state == UNI_EPSTATE_ADD_INIT) {
-			/* Q.2971:Party-Control-N 4 */
-			TIMER_STOP_PARTY(p, t399);
-			set_party_state(p, UNI_EPSTATE_ACTIVE);
-			break;
-		}
-		if (p->state == UNI_EPSTATE_ALERT_RCVD) {
-			/* Q.2971:Party-Control-N 7 */
-			TIMER_STOP_PARTY(p, t397);
-			set_party_state(p, UNI_EPSTATE_ACTIVE);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "SETUP_COMPL.request in ps=%u", p->state);
-		uniapi_party_error(p, UNIAPI_ERROR_BAD_EPSTATE, cookie);
-		break;
-
-	  case SIGP_ADD_PARTY_request:
-		if (p->state == UNI_EPSTATE_NULL) {
-			/* Q.2971:Party-control-U 3 (PU0) */
-			/* Q.2971:Party-control-N 3 (PN0) */
-			pun0_add_party_request(p, msg, cookie);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "Add-party.request in ps=%u", p->state);
-		uniapi_party_error(p, UNIAPI_ERROR_BAD_EPSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGP_ALERTING_request:
-		/* Q.2971:Party-Control-U 6 (PU2) */
-		/* Q.2971:Party-Control-N 6 (PN2) */
-		set_party_state(p, UNI_EPSTATE_ALERT_DLVD);
-		break;
-
-	  case SIGP_PARTY_ALERTING_request:
-		if (p->state == UNI_EPSTATE_ADD_RCVD) {
-			/* Q.2971:Party-Control-U 6 (PU2) */
-			/* Q.2971:Party-Control-N 6 (PN2) */
-			pun2_party_alerting_request(p, msg, cookie);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "Party-alerting.request in ps=%u", p->state);
-		uniapi_party_error(p, UNIAPI_ERROR_BAD_EPSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGP_ADD_PARTY_ACK_request:
-		if (p->state == UNI_EPSTATE_ADD_RCVD ||
-		    p->state == UNI_EPSTATE_ALERT_DLVD) {
-			/* Q.2971:Party-Control-U 6 PU2 */
-			/* Q.2971:Party-Control-U 7 PU3 */
-			/* Q.2971:Party-Control-N 6 PN2 */
-			/* Q.2971:Party-Control-N 7 PN3 */
-			punx_add_party_ack_request(p, msg, cookie);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "Add-party-ack.request in ps=%u", p->state);
-		uniapi_party_error(p, UNIAPI_ERROR_BAD_EPSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGP_ADD_PARTY_REJ_request:
-		if (p->state == UNI_EPSTATE_ADD_RCVD) {
-			/* Q.2971:Party-Control-U 6 PU2 */
-			/* Q.2971:Party-Control-N 6 PN2 */
-			pun2_add_party_rej_request(p, msg, cookie);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "Add-party-rej.request in ps=%u", p->state);
-		uniapi_party_error(p, UNIAPI_ERROR_BAD_EPSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGP_DROP_PARTY_request:
-		if (p->state == UNI_EPSTATE_ADD_INIT ||
-		    p->state == UNI_EPSTATE_ALERT_DLVD ||
-		    p->state == UNI_EPSTATE_ALERT_RCVD ||
-		    p->state == UNI_EPSTATE_ACTIVE) {
-			/* Q.2971:Party-Control-U 8 */
-			/* Q.2971:Party-Control-N 8 */
-			punx_drop_party_request(p, msg, cookie);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "Drop-party.request in ps=%u", p->state);
-		uniapi_party_error(p, UNIAPI_ERROR_BAD_EPSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGP_DROP_PARTY_ACK_request:
-		if (p->state == UNI_EPSTATE_DROP_RCVD) {
-			/* Q.2971:Party-Control-U 9 */
-			/* Q.2971:Party-Control-N 9 */
-			pun6_drop_party_ack_request(p, msg, cookie);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "Drop-party-ack.request in ps=%u", p->state);
-		uniapi_party_error(p, UNIAPI_ERROR_BAD_EPSTATE, cookie);
-		uni_msg_destroy(msg);
-		break;
-
-	  case SIGP_STATUS_ENQUIRY_request:
-		/* Q.2971:Party-Control-U 12 */
-		/* Q.2971:Party-Control-N 12 */
-		punx_status_enquiry_request(p, cookie);
-		break;
-
-	  /*
-	   * Timers
-	   */
-	  case SIGP_T397:
-		if (p->state == UNI_EPSTATE_ALERT_RCVD) {
-			/* Q.2971:Party-Control-U 7 (PU4) */
-			/* Q.2971:Party-Control-N 7 (PN4) */
-			pun4_t397(p);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "T397 in ps=%u", p->state);
-		break;
-
-	  case SIGP_T398:
-		if (p->state == UNI_EPSTATE_DROP_INIT) {
-			/* Q.2971:Party-Control-U 10 (PU5) */
-			/* Q.2971:Party-Control-N 10 (PN5) */
-			pun5_t398(p);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "T398 in ps=%u", p->state);
-		break;
-
-	  case SIGP_T399:
-		if (p->state == UNI_EPSTATE_ADD_INIT) {
-			/* Q.2971:Party-Control-U 4 (PU1) */
-			/* Q.2971:Party-Control-N 4 (PN1) */
-			pun1_t399(p);
-			break;
-		}
-		VERBOSE(p->call->uni, UNI_FAC_ERR, 1,
-		    "T399 in ps=%u", p->state);
-		break;
-
-	  case SIGP_END:
-		break;
-	}
-}
-
-static void
-t397_func(struct party *p)
-{
-	uni_enq_party(p, SIGP_T397, 0, NULL, NULL);
-}
-static void
-t398_func(struct party *p)
-{
-	uni_enq_party(p, SIGP_T398, 0, NULL, NULL);
-}
-static void
-t399_func(struct party *p)
-{
-	uni_enq_party(p, SIGP_T399, 0, NULL, NULL);
-}
-
-static int
-epstate_compat(struct party *p, enum uni_epstate state)
-{
-	if (p->state == UNI_EPSTATE_ADD_INIT ||
-	    p->state == UNI_EPSTATE_ALERT_RCVD)
-		if (state == UNI_EPSTATE_ADD_INIT ||
-		    state == UNI_EPSTATE_ALERT_RCVD)
-			return (0);
-	if (p->state == UNI_EPSTATE_ADD_RCVD ||
-	    p->state == UNI_EPSTATE_ALERT_DLVD)
-		if (state == UNI_EPSTATE_ADD_RCVD ||
-		    state == UNI_EPSTATE_ALERT_DLVD)
-			return (0);
-	return (1);
-}
diff --git a/sys/contrib/ngatm/netnatm/sig/sig_print.c b/sys/contrib/ngatm/netnatm/sig/sig_print.c
deleted file mode 100644
index af996128e7ea..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/sig_print.c
+++ /dev/null
@@ -1,622 +0,0 @@
-/*
- * Copyright (c) 2002-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *         Kendy Kutzner <kutzner@fokus.fraunhofer.de>
- *
- * $Begemot: libunimsg/netnatm/sig/sig_print.c,v 1.6 2004/08/05 07:11:02 brandt Exp $
- */
-
-#include <sys/types.h>
-#ifdef _KERNEL
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/libkern.h>
-#include <machine/stdarg.h>
-#else
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#endif
-
-#include <netnatm/saal/sscfu.h>
-#include <netnatm/msg/uni_hdr.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#include <netnatm/msg/uniprint.h>
-#include <netnatm/sig/uni.h>
-#include <netnatm/sig/unisig.h>
-#include <netnatm/sig/unidef.h>
-
-const char * 
-uni_strerr(u_int err)
-{
-	static const char *const errstr[] = {
-#define DEF(NAME, VAL, STR) [UNIAPI_##NAME] = STR,
-UNIAPI_DEF_ERRORS(DEF)
-#undef DEF
-	};
-	static char buf[100];
-
-	if (err >= sizeof(errstr)/sizeof(errstr[0]) || errstr[err] == NULL) {
-		sprintf(buf, "Unknown error %u", err);
-		return (buf);
-	}
-	return (errstr[err]);
-}
-
-#define D(M) [M] = #M
-static const char *const msgs[] = {
-	D(UNIAPI_ERROR),
-	D(UNIAPI_CALL_CREATED),
-	D(UNIAPI_CALL_DESTROYED),
-	D(UNIAPI_PARTY_CREATED),
-	D(UNIAPI_PARTY_DESTROYED),
-	D(UNIAPI_LINK_ESTABLISH_request),
-	D(UNIAPI_LINK_ESTABLISH_confirm),
-	D(UNIAPI_LINK_RELEASE_request),
-	D(UNIAPI_LINK_RELEASE_confirm),
-	D(UNIAPI_RESET_request),
-	D(UNIAPI_RESET_confirm),
-	D(UNIAPI_RESET_indication),
-	D(UNIAPI_RESET_ERROR_indication),
-	D(UNIAPI_RESET_response),
-	D(UNIAPI_RESET_ERROR_response),
-	D(UNIAPI_RESET_STATUS_indication),
-	D(UNIAPI_SETUP_request),
-	D(UNIAPI_SETUP_indication),
-	D(UNIAPI_SETUP_response),
-	D(UNIAPI_SETUP_confirm),
-	D(UNIAPI_SETUP_COMPLETE_indication),
-	D(UNIAPI_SETUP_COMPLETE_request),
-	D(UNIAPI_ALERTING_request),
-	D(UNIAPI_ALERTING_indication),
-	D(UNIAPI_PROCEEDING_request),
-	D(UNIAPI_PROCEEDING_indication),
-	D(UNIAPI_RELEASE_request),
-	D(UNIAPI_RELEASE_indication),
-	D(UNIAPI_RELEASE_response),
-	D(UNIAPI_RELEASE_confirm),
-	D(UNIAPI_NOTIFY_request),
-	D(UNIAPI_NOTIFY_indication),
-	D(UNIAPI_STATUS_indication),
-	D(UNIAPI_STATUS_ENQUIRY_request),
-	D(UNIAPI_ADD_PARTY_request),
-	D(UNIAPI_ADD_PARTY_indication),
-	D(UNIAPI_PARTY_ALERTING_request),
-	D(UNIAPI_PARTY_ALERTING_indication),
-	D(UNIAPI_ADD_PARTY_ACK_request),
-	D(UNIAPI_ADD_PARTY_ACK_indication),
-	D(UNIAPI_ADD_PARTY_REJ_request),
-	D(UNIAPI_ADD_PARTY_REJ_indication),
-	D(UNIAPI_DROP_PARTY_request),
-	D(UNIAPI_DROP_PARTY_indication),
-	D(UNIAPI_DROP_PARTY_ACK_request),
-	D(UNIAPI_DROP_PARTY_ACK_indication),
-	D(UNIAPI_ABORT_CALL_request),
-};
-#undef D
-
-void
-uni_print_api(char *buf, size_t bufsiz, u_int type, u_int cookie,
-    const void *msg, struct unicx *cx)
-{
-	int old_dont_init = cx->dont_init;
-
-	uni_print_init(buf, bufsiz, cx);
-	cx->dont_init = 1;
-
-	if (type >= sizeof(msgs) / sizeof(msgs[0]) || msgs[type] == NULL) {
-		uni_print_flag("UNIAPI_UNKNOWN", cx);
-		uni_print_entry(cx, "sig", "%u", type);
-		uni_print_entry(cx, "cookie", "%u", cookie);
-		goto out;
-	}
-
-	uni_print_flag(msgs[type], cx);
-	uni_print_entry(cx, "cookie", "%u", cookie);
-	cx->indent++;
-
-	switch (type) {
-
-	  case UNIAPI_ERROR:
-	    {
-		const struct uniapi_error *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_entry(cx, "reason", "%s", uni_strerr(api->reason));
-		uni_print_entry(cx, "state", "U%u", api->state);
-		break;
-	    }
-
-	  case UNIAPI_CALL_CREATED:
-	    {
-		const struct uniapi_call_created *api = msg;
-
-		uni_print_cref(NULL, 0, &api->cref, cx);
-		break;
-	    }
-
-	  case UNIAPI_CALL_DESTROYED:
-	    {
-		const struct uniapi_call_destroyed *api = msg;
-
-		uni_print_cref(NULL, 0, &api->cref, cx);
-		break;
-	    }
-
-	  case UNIAPI_PARTY_CREATED:
-	    {
-		const struct uniapi_party_created *api = msg;
-
-		uni_print_cref(NULL, 0, &api->cref, cx);
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_EPREF,
-		    (const union uni_ieall *)&api->epref, cx);
-		break;
-	    }
-
-	  case UNIAPI_PARTY_DESTROYED:
-	    {
-		const struct uniapi_party_destroyed *api = msg;
-
-		uni_print_cref(NULL, 0, &api->cref, cx);
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_EPREF,
-		    (const union uni_ieall *)&api->epref, cx);
-		break;
-	    }
-
-	  case UNIAPI_LINK_ESTABLISH_request:
-	  case UNIAPI_LINK_ESTABLISH_confirm:
-	  case UNIAPI_LINK_RELEASE_request:
-	  case UNIAPI_LINK_RELEASE_confirm:
-		break;
-
-	  case UNIAPI_RESET_request:
-	    {
-		const struct uniapi_reset_request *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_RESTART,
-		    (const union uni_ieall *)&api->restart, cx);
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_CONNID,
-		    (const union uni_ieall *)&api->restart, cx);
-		break;
-	    }
-
-	  case UNIAPI_RESET_confirm:
-	    {
-		const struct uniapi_reset_confirm *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_RESTART,
-		    (const union uni_ieall *)&api->restart, cx);
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_CONNID,
-		    (const union uni_ieall *)&api->restart, cx);
-		break;
-	    }
-
-	  case UNIAPI_RESET_indication:
-	    {
-		const struct uniapi_reset_indication *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_RESTART,
-		    (const union uni_ieall *)&api->restart, cx);
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_CONNID,
-		    (const union uni_ieall *)&api->restart, cx);
-		break;
-	    }
-
-	  case UNIAPI_RESET_ERROR_indication:
-	    {
-		const struct uniapi_reset_error_indication *api = msg;
-		static const struct uni_print_tbl reason[] = {
-#define DEF(NAME, VALUE, STR) { STR, VALUE },
-			UNIAPI_DEF_RESET_ERRORS(DEF)
-#undef DEF
-			{ NULL, 0 }
-		};
-		static const struct uni_print_tbl source[] = {
-			{ "start", 0 },
-			{ "respond", 1 },
-			{ NULL, 0 }
-		};
-
-		uni_print_eol(cx);
-		uni_print_tbl("source", api->source, source, cx);
-		uni_print_tbl("reason", api->reason, reason, cx);
-		break;
-	    }
-
-	  case UNIAPI_RESET_response:
-	    {
-		const struct uniapi_reset_response *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_RESTART,
-		    (const union uni_ieall *)&api->restart, cx);
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_CONNID,
-		    (const union uni_ieall *)&api->restart, cx);
-		break;
-	    }
-
-	  case UNIAPI_RESET_ERROR_response:
-	    {
-		const struct uniapi_reset_error_response *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_CAUSE,
-		    (const union uni_ieall *)&api->cause, cx);
-		break;
-	    }
-
-	  case UNIAPI_RESET_STATUS_indication:
-	    {
-		const struct uniapi_reset_status_indication *api = msg;
-
-		uni_print_cref(NULL, 0, &api->cref, cx);
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_CALLSTATE,
-		    (const union uni_ieall *)&api->callstate, cx);
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_CAUSE,
-		    (const union uni_ieall *)&api->cause, cx);
-		break;
-	    }
-
-	  case UNIAPI_SETUP_request:
-	    {
-		const struct uniapi_setup_request *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_SETUP,
-		    (const union uni_msgall *)&api->setup, cx);
-		break;
-	    }
-
-	  case UNIAPI_SETUP_indication:
-	    {
-		const struct uniapi_setup_indication *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_SETUP,
-		    (const union uni_msgall *)&api->setup, cx);
-		break;
-	    }
-
-	  case UNIAPI_SETUP_response:
-	    {
-		const struct uniapi_setup_response *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_CONNECT,
-		    (const union uni_msgall *)&api->connect, cx);
-		break;
-	    }
-
-	  case UNIAPI_SETUP_confirm:
-	    {
-		const struct uniapi_setup_confirm *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_CONNECT,
-		    (const union uni_msgall *)&api->connect, cx);
-		break;
-	    }
-
-	  case UNIAPI_SETUP_COMPLETE_indication:
-	    {
-		const struct uniapi_setup_complete_indication *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_CONNECT_ACK,
-		    (const union uni_msgall *)&api->connect_ack, cx);
-		break;
-	    }
-
-	  case UNIAPI_SETUP_COMPLETE_request:
-	    {
-		const struct uniapi_setup_complete_request *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_CONNECT_ACK,
-		    (const union uni_msgall *)&api->connect_ack, cx);
-		break;
-	    }
-
-	  case UNIAPI_ALERTING_request:
-	    {
-		const struct uniapi_alerting_request *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_ALERTING,
-		    (const union uni_msgall *)&api->alerting, cx);
-		break;
-	    }
-
-	  case UNIAPI_ALERTING_indication:
-	    {
-		const struct uniapi_alerting_indication *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_ALERTING,
-		    (const union uni_msgall *)&api->alerting, cx);
-		break;
-	    }
-
-	  case UNIAPI_PROCEEDING_request:
-	    {
-		const struct uniapi_proceeding_request *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_CALL_PROC,
-		    (const union uni_msgall *)&api->call_proc, cx);
-		break;
-	    }
-
-	  case UNIAPI_PROCEEDING_indication:
-	    {
-		const struct uniapi_proceeding_indication *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_CALL_PROC,
-		    (const union uni_msgall *)&api->call_proc, cx);
-		break;
-	    }
-
-	  case UNIAPI_RELEASE_request:
-	    {
-		const struct uniapi_release_request *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_RELEASE,
-		    (const union uni_msgall *)&api->release, cx);
-		break;
-	    }
-
-	  case UNIAPI_RELEASE_indication:
-	    {
-		const struct uniapi_release_indication *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_RELEASE,
-		    (const union uni_msgall *)&api->release, cx);
-		break;
-	    }
-
-	  case UNIAPI_RELEASE_response:
-	    {
-		const struct uniapi_release_response *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_RELEASE_COMPL,
-		    (const union uni_msgall *)&api->release_compl, cx);
-		break;
-	    }
-	  case UNIAPI_RELEASE_confirm:
-	    {
-		const struct uniapi_release_confirm *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_RELEASE,
-		    (const union uni_msgall *)&api->release, cx);
-		break;
-	    }
-
-	  case UNIAPI_NOTIFY_request:
-	    {
-		const struct uniapi_notify_request *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_NOTIFY,
-		    (const union uni_msgall *)&api->notify, cx);
-		break;
-	    }
-
-	  case UNIAPI_NOTIFY_indication:
-	    {
-		const struct uniapi_notify_indication *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_NOTIFY,
-		    (const union uni_msgall *)&api->notify, cx);
-		break;
-	    }
-
-	  case UNIAPI_STATUS_indication:
-	    {
-		const struct uniapi_status_indication *api = msg;
-
-		uni_print_cref(NULL, 0, &api->cref, cx);
-		uni_print_eol(cx);
-		uni_print_entry(cx, "my_state", "U%u", api->my_state);
-		uni_print_entry(cx, "my_cause", "%s",
-		    uni_ie_cause2str(UNI_CODING_ITU, api->my_cause));
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_CALLSTATE,
-		    (const union uni_ieall *)&api->his_state, cx);
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_CAUSE,
-		    (const union uni_ieall *)&api->his_cause, cx);
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_EPREF,
-		    (const union uni_ieall *)&api->epref, cx);
-		break;
-	    }
-
-	  case UNIAPI_STATUS_ENQUIRY_request:
-	    {
-		const struct uniapi_status_enquiry_request *api = msg;
-
-		uni_print_cref(NULL, 0, &api->cref, cx);
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_EPREF,
-		    (const union uni_ieall *)&api->epref, cx);
-		break;
-	    }
-
-	  case UNIAPI_ADD_PARTY_request:
-	    {
-		const struct uniapi_add_party_request *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_ADD_PARTY,
-		    (const union uni_msgall *)&api->add, cx);
-		break;
-	    }
-
-	  case UNIAPI_ADD_PARTY_indication:
-	    {
-		const struct uniapi_add_party_indication *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_ADD_PARTY,
-		    (const union uni_msgall *)&api->add, cx);
-		break;
-	    }
-
-	  case UNIAPI_PARTY_ALERTING_request:
-	    {
-		const struct uniapi_party_alerting_request *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_PARTY_ALERTING,
-		    (const union uni_msgall *)&api->alert, cx);
-		break;
-	    }
-
-	  case UNIAPI_PARTY_ALERTING_indication:
-	    {
-		const struct uniapi_party_alerting_indication *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_PARTY_ALERTING,
-		    (const union uni_msgall *)&api->alert, cx);
-		break;
-	    }
-
-	  case UNIAPI_ADD_PARTY_ACK_request:
-	    {
-		const struct uniapi_add_party_ack_request *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_ADD_PARTY_ACK,
-		    (const union uni_msgall *)&api->ack, cx);
-		break;
-	    }
-
-	  case UNIAPI_ADD_PARTY_ACK_indication:
-	    {
-		const struct uniapi_add_party_ack_indication *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_ADD_PARTY_ACK,
-		    (const union uni_msgall *)&api->ack, cx);
-		break;
-	    }
-
-	  case UNIAPI_ADD_PARTY_REJ_request:
-	    {
-		const struct uniapi_add_party_rej_request *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_ADD_PARTY_REJ,
-		    (const union uni_msgall *)&api->rej, cx);
-		break;
-	    }
-
-	  case UNIAPI_ADD_PARTY_REJ_indication:
-	    {
-		const struct uniapi_add_party_rej_indication *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_ADD_PARTY_REJ,
-		    (const union uni_msgall *)&api->rej, cx);
-		break;
-	    }
-
-	  case UNIAPI_DROP_PARTY_request:
-	    {
-		const struct uniapi_drop_party_request *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_DROP_PARTY,
-		    (const union uni_msgall *)&api->drop, cx);
-		break;
-	    }
-
-	  case UNIAPI_DROP_PARTY_indication:
-	    {
-		const struct uniapi_drop_party_indication *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_DROP_PARTY,
-		    (const union uni_msgall *)&api->drop, cx);
-		break;
-	    }
-
-	  case UNIAPI_DROP_PARTY_ACK_request:
-	    {
-		const struct uniapi_drop_party_ack_request *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_DROP_PARTY_ACK,
-		    (const union uni_msgall *)&api->ack, cx);
-		break;
-	    }
-
-	  case UNIAPI_DROP_PARTY_ACK_indication:
-	    {
-		const struct uniapi_drop_party_ack_indication *api = msg;
-
-		uni_print_eol(cx);
-		uni_print_msg(NULL, 0, UNI_DROP_PARTY,
-		    (const union uni_msgall *)&api->drop, cx);
-		uni_print_eol(cx);
-		uni_print_ie(NULL, 0, UNI_IE_CRANKBACK,
-		    (const union uni_ieall *)&api->crankback, cx);
-		break;
-	    }
-
-	  case UNIAPI_ABORT_CALL_request:
-	    {
-		const struct uniapi_abort_call_request *api = msg;
-
-		uni_print_cref(NULL, 0, &api->cref, cx);
-		break;
-	    }
-	}
-
-  out:
-	cx->dont_init = old_dont_init;
-}
diff --git a/sys/contrib/ngatm/netnatm/sig/sig_reset.c b/sys/contrib/ngatm/netnatm/sig/sig_reset.c
deleted file mode 100644
index 469b9f762a6e..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/sig_reset.c
+++ /dev/null
@@ -1,827 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Begemot: libunimsg/netnatm/sig/sig_reset.c,v 1.11 2004/08/05 07:11:03 brandt Exp $
- *
- * Reset-start and reset-respond
- */
-
-#include <netnatm/unimsg.h>
-#include <netnatm/saal/sscfudef.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#include <netnatm/sig/uni.h>
-
-#include <netnatm/sig/unipriv.h>
-#include <netnatm/sig/unimkmsg.h>
-
-static void response_restart(struct uni *, struct uni_msg *, struct uni_all *);
-static void response_status(struct uni *, struct uni_msg *, struct uni_all *);
-
-static void response_t317(struct uni *);
-
-static void response_error(struct uni *, struct uniapi_reset_error_response *,
-    uint32_t cookie);
-static void response_response(struct uni *, struct uniapi_reset_response *,
-    uint32_t);
-
-static void start_request(struct uni *, struct uniapi_reset_request *,
-    uint32_t);
-
-static void start_t316(struct uni *);
-
-static void start_restart_ack(struct uni *, struct uni_msg *, struct uni_all *);
-static void start_status(struct uni *, struct uni_msg *, struct uni_all *);
-
-static int restart_forward(struct uni *, const struct uni_all *);
-
-#define DEF_PRIV_SIG(NAME, FROM)	[SIG##NAME] =	"SIG"#NAME,
-static const char *const start_sigs[] = {
-	DEF_START_SIGS
-};
-#undef DEF_PRIV_SIG
-
-#define DEF_PRIV_SIG(NAME, FROM)	[SIG##NAME] =	"SIG"#NAME,
-static const char *const respond_sigs[] = {
-	DEF_RESPOND_SIGS
-};
-#undef DEF_PRIV_SIG
-
-TIMER_FUNC_UNI(t317, t317_func)
-TIMER_FUNC_UNI(t316, t316_func)
-
-/*
- * Reset-Start process.
- */
-void
-uni_sig_start(struct uni *uni, u_int sig, uint32_t cookie,
-    struct uni_msg *m, struct uni_all *u)
-{
-	if (sig >= SIGS_END) {
-		VERBOSE(uni, UNI_FAC_ERR, 1, "Signal %d outside of range to "
-		    "Reset-Start", sig);
-		if (m)
-			uni_msg_destroy(m);
-		if (u)
-			UNI_FREE(u);
-		return;
-	}
-
-	VERBOSE(uni, UNI_FAC_RESTART, 1,
-	    "Signal %s in state %u of Reset-Start; cookie %u",
-	    start_sigs[sig], uni->glob_start, cookie);
-
-	switch (sig) {
-
-	/*
-	 * User requests
-	 */
-	  case SIGS_RESET_request:
-		start_request(uni,
-		    uni_msg_rptr(m, struct uniapi_reset_request *), cookie);
-		uni_msg_destroy(m);
-		break;
-
-	/*
-	 * Timers
-	 */
-	  case SIGS_T316:
-		start_t316(uni);
-		break;
-
-	/*
-	 * SAAL
-	 */
-	  case SIGS_RESTART_ACK:
-		start_restart_ack(uni, m, u);
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		break;
-
-	  case SIGS_STATUS:
-		start_status(uni, m, u);
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		break;
-
-	  case SIGS_END:
-		break;
-	}
-}
-
-/*
- * Reset-request from USER.
- *
- * Q.2931:Reset-Start 1/2
- */
-static void
-start_request(struct uni *uni, struct uniapi_reset_request *req, uint32_t cookie)
-{
-	struct uni_all *resp;
-	int err;
-
-	if (uni->glob_start != UNI_CALLSTATE_REST0) {
-		uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALLSTATE, cookie, 0);
-		return;
-	}
-
-	if ((resp = UNI_ALLOC()) == NULL) {
-		uniapi_uni_error(uni, UNIAPI_ERROR_NOMEM, cookie, 0);
-		return;
-	}
-
-	MK_MSG_ORIG(resp, UNI_RESTART, 0, 0);
-	resp->u.restart.restart = req->restart;
-	resp->u.restart.connid = req->connid;
-
-	if (restart_forward(uni, resp))
-		return;
-
-	uni->connid_start = req->connid;
-	uni->restart_start = req->restart;
-
-	if ((err = uni_send_output(resp, uni)) != 0)
-		uniapi_uni_error(uni, UNIAPI_ERROR_ENCODING, cookie, 0);
-	UNI_FREE(resp);
-	if (err)
-		return;
-
-	uni->cnt316 = 0;
-	TIMER_START_UNI(uni, t316, uni->timer316);
-	uni->glob_start = UNI_CALLSTATE_REST1;
-
-	VERBOSE(uni, UNI_FAC_RESTART, 1, "Reset-Start state := 1");
-
-
-	uniapi_uni_error(uni, UNIAPI_OK, cookie, 0);
-}
-
-/*
- * T316 timeout function
- */
-static void
-t316_func(struct uni *uni)
-{
-	uni_enq_start(uni, SIGS_T316, 0, NULL, NULL);
-}
-
-/*
- * Q.2931:Reset-Start 1/2
- */
-static void
-start_t316(struct uni *uni)
-{
-	if (uni->glob_start != UNI_CALLSTATE_REST1) {
-		VERBOSE0(uni, UNI_FAC_ERR, "T316 in state %d",
-		    uni->glob_start);
-		return;
-	}
-
-	if (++uni->cnt316 == uni->init316) {
-		struct uni_msg *app;
-		struct uniapi_reset_error_indication *resp;
-
-		VERBOSE(uni, UNI_FAC_RESTART, 1, "Reset-Start error");
-
-		resp = ALLOC_API(struct uniapi_reset_error_indication, app);
-		if (resp != NULL) {
-			resp->source = 0;
-			resp->reason = UNIAPI_RESET_ERROR_NO_RESPONSE,
-
-			uni->funcs->uni_output(uni, uni->arg,
-			    UNIAPI_RESET_ERROR_indication, 0, app);
-		}
-
-		uni->glob_start = UNI_CALLSTATE_REST0;
-		VERBOSE(uni, UNI_FAC_RESTART, 1, "Reset-Start state := 0");
-	} else {
-		struct uni_all *resp;
-
-		if ((resp = UNI_ALLOC()) == NULL)
-			return;
-
-		MK_MSG_ORIG(resp, UNI_RESTART, 0, 0);
-		resp->u.restart.restart = uni->restart_start;
-		resp->u.restart.connid = uni->connid_start;
-
-		(void)uni_send_output(resp, uni);
-
-		UNI_FREE(resp);
-
-		TIMER_START_UNI(uni, t316, uni->timer316);
-	}
-}
-
-/*
- * Got RESTART_ACK.
- */
-static void
-start_restart_ack(struct uni *uni, struct uni_msg *m, struct uni_all *u)
-{
-	enum uni_callstate new_state;
-	struct uniapi_reset_confirm *conf;
-	struct uni_msg *app;
-
-	if (uni->glob_start == UNI_CALLSTATE_REST0) {
-		uni_respond_status_mtype(uni, &u->u.hdr.cref, uni->glob_start,
-		    UNI_CAUSE_MSG_INCOMP, UNI_RESTART_ACK);
-		return;
-	}
-
-	if (uni->glob_start != UNI_CALLSTATE_REST1) {
-		ASSERT(0, ("bad global call state in Reset-Start"));
-		return;
-	}
-
-	/*
-	 * If body decoding fails, this is because IEs are wrong.
-	 */
-	(void)uni_decode_body(m, u, &uni->cx);
-	MANDATE_IE(uni, u->u.restart_ack.restart, UNI_IE_RESTART);
-
-	if (IE_ISGOOD(u->u.restart_ack.restart)) {
-		/*
-		 * Q.2931: 5.5.2.2
-		 */
-		if (u->u.restart_ack.restart.rclass == UNI_RESTART_ALL &&
-		    IE_ISGOOD(u->u.restart_ack.connid)) {
-			(void)UNI_SAVE_IERR(&uni->cx, UNI_IE_CONNID,
-			    u->u.restart_ack.connid.h.act,
-			    UNI_IERR_UNK);
-		} else if ((u->u.restart_ack.restart.rclass == UNI_RESTART_PATH ||
-			    u->u.restart_ack.restart.rclass == UNI_RESTART_CHANNEL)) {
-			MANDATE_IE(uni, u->u.restart_ack.connid, UNI_IE_CONNID);
-		}
-	}
-	/*
-	 * Compare the information elements now, because
-	 * we may need the new callstate for the status message
-	 * below.
-	 */
-	new_state = UNI_CALLSTATE_REST1;
-
-	if (IE_ISGOOD(u->u.restart_ack.restart) &&
-	    IE_ISGOOD(uni->restart_start) &&
-	    u->u.restart_ack.restart.rclass == uni->restart_start.rclass &&
-	    !IE_ISGOOD(u->u.restart_ack.connid) == !IE_ISGOOD(uni->connid_start) &&
-	    (!IE_ISGOOD(uni->connid_start) ||
-	       (u->u.restart_ack.connid.vpci == uni->connid_start.vpci &&
-	        u->u.restart_ack.connid.vci == uni->connid_start.vci)))
-		new_state = UNI_CALLSTATE_REST0;
-
-	switch (uni_verify(uni, u->u.hdr.act)) {
-	  case VFY_RAIM:
-	  case VFY_RAI:
-		uni_respond_status_verify(uni, &u->u.hdr.cref,
-		    UNI_CALLSTATE_REST1, NULL, 0);
-	  case VFY_I:
-		return;
-
-	  case VFY_CLR:
-		uni->glob_start = UNI_CALLSTATE_REST0;
-		VERBOSE(uni, UNI_FAC_RESTART, 1,
-		    "Reset-Start state := 0");
-		return;
-
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		uni_respond_status_verify(uni, &u->u.hdr.cref,
-		    new_state, NULL, 0);
-	  case VFY_OK:
-		break;
-	}
-
-	if (new_state == UNI_CALLSTATE_REST1)
-		/*
-		 * Q.2931: 5.5.1.2/2
-		 */
-		return;
-
-	/*
-	 * Build restart.confirm signal for application
-	 */
-	if (!IE_ISGOOD(u->u.restart_ack.connid))
-		u->u.restart.connid.h.present = 0;
-
-
-	if ((conf = ALLOC_API(struct uniapi_reset_confirm, app)) == NULL)
-		return;
-	conf->restart = u->u.restart.restart;
-	conf->connid = u->u.restart.connid;
-
-	TIMER_STOP_UNI(uni, t316);
-
-	uni->funcs->uni_output(uni, uni->arg, UNIAPI_RESET_confirm, 0, app);
-
-	uni->glob_start = UNI_CALLSTATE_REST0;
-	VERBOSE(uni, UNI_FAC_RESTART, 1, "Reset-Start state := 0");
-}
-
-/*
- * Reset-Start got a STATUS message.
- *
- * Q.2931: Reset-Start 2/2
- *
- * In Q.2931 only CALLSTATE_REST1 is allowed, this seems silly and to contradict
- * 5.6.12. So allow it in any state.
- *
- * The following states are considered compatible:
- *
- *  Sender   Receiver(we)
- *  ------   --------
- *  Rest0     Rest0	this is the normal state OK!
- *  Rest2     Rest0	this may be the result of no answer from the API
- *			on the remote end and the us finally timing out. ERROR!
- *  Rest2     Rest1	this is normal. OK!
- *  Rest0     Rest1	RESTART_ACK was probably lost. OK!
- *
- * All others are wrong.
- */
-static void
-start_status(struct uni *uni, struct uni_msg *m, struct uni_all *u)
-{
-	(void)uni_decode_body(m, u, &uni->cx);
-	MANDATE_IE(uni, u->u.status.callstate, UNI_IE_CALLSTATE);
-	MANDATE_IE(uni, u->u.status.cause, UNI_IE_CAUSE);
-	switch (uni_verify(uni, u->u.hdr.act)) {
-	  case VFY_CLR:
-		uni->glob_start = UNI_CALLSTATE_REST0;
-		VERBOSE(uni, UNI_FAC_RESTART, 1, "Reset-Start state := 0");
-		return;
-
-	  case VFY_RAIM:
-	  case VFY_RAI:
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		uni_respond_status_verify(uni, &u->u.hdr.cref, uni->glob_start,
-		    NULL, 0);
-	  case VFY_I:
-	  case VFY_OK:
-		break;
-	}
-	if (!IE_ISGOOD(u->u.status.callstate)) {
-		/*
-		 * As a result of the strange handling above, we must
-		 * process a STATUS with an invalid or missing callstate!
-		 */
-		return;
-	}
-	if ((u->u.status.callstate.state == UNI_CALLSTATE_REST0 &&
-	     uni->glob_start == UNI_CALLSTATE_REST0) ||
-	    (u->u.status.callstate.state == UNI_CALLSTATE_REST0 &&
-	     uni->glob_start == UNI_CALLSTATE_REST1) ||
-	    (u->u.status.callstate.state == UNI_CALLSTATE_REST2 &&
-	     uni->glob_start == UNI_CALLSTATE_REST1)) {
-		/*
-		 * Implementation dependend procedure:
-		 * Inform the API
-		 */
-		struct uniapi_reset_status_indication *resp;
-		struct uni_msg *app;
-
-		resp = ALLOC_API(struct uniapi_reset_status_indication, app);
-		if (resp == NULL)
-			return;
-		resp->cref = u->u.hdr.cref;
-		resp->callstate = u->u.status.callstate;
-		if (IE_ISGOOD(u->u.status.cause))
-			resp->cause = u->u.status.cause;
-
-		uni->funcs->uni_output(uni, uni->arg,
-		    UNIAPI_RESET_STATUS_indication, 0, app);
-		
-	} else {
-		struct uniapi_reset_error_indication *resp;
-		struct uni_msg *app;
-
-		resp = ALLOC_API(struct uniapi_reset_error_indication, app);
-		if (resp != NULL) {
-			resp->source = 0;
-			resp->reason = UNIAPI_RESET_ERROR_PEER_INCOMP_STATE,
-
-			uni->funcs->uni_output(uni, uni->arg,
-			    UNIAPI_RESET_ERROR_indication, 0, app);
-		}
-	}
-}
-
-/************************************************************/
-/*
- * Reset-Respond process.
- */
-void
-uni_sig_respond(struct uni *uni, u_int sig, uint32_t cookie,
-    struct uni_msg *m, struct uni_all *u)
-{
-	if (sig >= SIGR_END) {
-		VERBOSE(uni, UNI_FAC_ERR, 1, "Signal %d outside of range to "
-		    "Reset-Respond", sig);
-		if (m)
-			uni_msg_destroy(m);
-		if (u)
-			UNI_FREE(u);
-		return;
-	}
-
-	VERBOSE(uni, UNI_FAC_RESTART, 1,
-	    "Signal %s in state %u of Reset-Respond; cookie %u",
-	    respond_sigs[sig], uni->glob_respond, cookie);
-
-	switch (sig) {
-
-	/*
-	 * SAAL
-	 */
-	  case SIGR_RESTART:
-		response_restart(uni, m, u);
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		break;
-
-	  case SIGR_STATUS:
-		response_status(uni, m, u);
-		uni_msg_destroy(m);
-		UNI_FREE(u);
-		break;
-
-	/*
-	 * User
-	 */
-	  case SIGR_RESET_ERROR_response:
-		response_error(uni,
-		    uni_msg_rptr(m, struct uniapi_reset_error_response *),
-		    cookie);
-		uni_msg_destroy(m);
-		break;
-
-	  case SIGR_RESET_response:
-		response_response(uni,
-		    uni_msg_rptr(m, struct uniapi_reset_response *), cookie);
-		uni_msg_destroy(m);
-		break;
-
-	/*
-	 * Timers
-	 */
-	  case SIGR_T317:
-		response_t317(uni);
-		return;
-
-	  case SIGR_END:
-		break;
-	}
-}
-
-/*
- * Send a RELEASE_COMPLETE to all affected calls as per
- * F.2.3(3)
- */
-static int
-restart_forward(struct uni *uni, const struct uni_all *u)
-{
-	struct call *c;
-	struct uni_all *resp;
-
-	if ((resp = UNI_ALLOC()) == NULL)
-		return (-1);
-
-	TAILQ_FOREACH(c, &uni->calls, link) {
-		if (u->u.restart.restart.rclass == UNI_RESTART_ALL ||
-		    (IE_ISPRESENT(c->connid) &&
-		    u->u.restart.connid.vpci == c->connid.vpci &&
-		    (u->u.restart.restart.rclass == UNI_RESTART_PATH ||
-		    u->u.restart.connid.vci == c->connid.vci))) {
-			MK_MSG_ORIG(resp, UNI_RELEASE_COMPL, c->cref, c->mine);
-			uni_release_compl(c, resp);
-		}
-	}
-
-	UNI_FREE(resp);
-	return (0);
-}
-
-/*
- * Respond process got a restart message.
- * Doesn't free the messages.
- */
-static void
-response_restart(struct uni *uni, struct uni_msg *m, struct uni_all *u)
-{
-	struct uni_msg *app;
-	struct uniapi_reset_indication *ind;
-
-	if (uni->glob_respond == UNI_CALLSTATE_REST0) {
-		/*
-		 * If body decoding fails, this is because IEs are wrong.
-		 */
-		(void)uni_decode_body(m, u, &uni->cx);
-		MANDATE_IE(uni, u->u.restart.restart, UNI_IE_RESTART);
-		if (IE_ISGOOD(u->u.restart.restart)) {
-			/*
-			 * Q.2931: 5.5.2.2
-			 */
-			if (u->u.restart.restart.rclass == UNI_RESTART_ALL &&
-			   IE_ISGOOD(u->u.restart.connid)) {
-				(void)UNI_SAVE_IERR(&uni->cx, UNI_IE_CONNID,
-				    u->u.restart.connid.h.act,
-				    UNI_IERR_UNK);
-			} else if ((u->u.restart.restart.rclass == UNI_RESTART_PATH ||
-				   u->u.restart.restart.rclass == UNI_RESTART_CHANNEL)) {
-				MANDATE_IE(uni, u->u.restart.connid, UNI_IE_CONNID);
-			}
-		}
-		switch (uni_verify(uni, u->u.hdr.act)) {
-		  case VFY_RAIM:
-		  case VFY_RAI:
-			uni_respond_status_verify(uni, &u->u.hdr.cref,
-			    UNI_CALLSTATE_REST0, NULL, 0);
-		  case VFY_CLR:
-		  case VFY_I:
-			return;
-
-		  case VFY_RAP:
-		  case VFY_RAPU:
-			uni_respond_status_verify(uni, &u->u.hdr.cref,
-			    UNI_CALLSTATE_REST2, NULL, 0);
-		  case VFY_OK:
-			break;
-		}
-		if (!IE_ISGOOD(u->u.restart.connid))
-			u->u.restart.connid.h.present = 0;
-
-		/*
-		 * Send a RELEASE_COMPLETE to all affected calls as per
-		 * F.2.3(3)
-		 */
-		if (restart_forward(uni, u))
-			return;
-
-		/*
-		 * Build restart signal for application
-		 */
-		if ((ind = ALLOC_API(struct uniapi_reset_indication, app)) == NULL)
-			return;
-
-		ind->restart = u->u.restart.restart;
-		ind->connid = u->u.restart.connid;
-
-		uni_enq_coord(uni, SIGO_RESET_indication, 0, app);
-
-		TIMER_START_UNI(uni, t317, uni->timer317);
-		uni->glob_respond = UNI_CALLSTATE_REST2;
-
-		VERBOSE(uni, UNI_FAC_RESTART, 1, "Reset-Respond state := 2");
-
-
-	} else if (uni->glob_respond == UNI_CALLSTATE_REST2) {
-		/*
-		 * No need to decode the message. It is unexpected in this
-		 * state so return a status.
-		 */
-		uni_respond_status_mtype(uni, &u->u.hdr.cref, uni->glob_respond,
-		    UNI_CAUSE_MSG_INCOMP, UNI_RESTART);
-
-
-	} else
-		ASSERT(0, ("bad global call state in responder"));
-}
-
-static void
-response_t317(struct uni *uni)
-{
-	struct uniapi_reset_error_indication *resp;
-	struct uni_msg *app;
-
-	if (uni->glob_respond != UNI_CALLSTATE_REST2) {
-		VERBOSE0(uni, UNI_FAC_ERR, "T317 in state %d",
-		    uni->glob_respond);
-		return;
-	}
-
-	VERBOSE(uni, UNI_FAC_RESTART, 1, "Reset-Respond error");
-
-	if ((resp = ALLOC_API(struct uniapi_reset_error_indication, app)) != NULL) {
-		resp->source = 1;
-		resp->reason = UNIAPI_RESET_ERROR_NO_CONFIRM;
-
-		uni->funcs->uni_output(uni, uni->arg,
-		    UNIAPI_RESET_ERROR_indication, 0, app);
-	}
-
-	uni->glob_respond = UNI_CALLSTATE_REST0;
-	VERBOSE(uni, UNI_FAC_RESTART, 1, "Reset-Respond state := 0");
-}
-
-/*
- * Error response from USER
- */
-static void
-response_error(struct uni *uni, struct uniapi_reset_error_response *c,
-    uint32_t cookie)
-{
-	struct uni_all *resp;
-
-	if (uni->glob_respond != UNI_CALLSTATE_REST2) {
-		uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALLSTATE, cookie, 0);
-		return;
-	}
-
-	if ((resp = UNI_ALLOC()) == NULL) {
-		uniapi_uni_error(uni, UNIAPI_ERROR_NOMEM, cookie, 0);
-		return;
-	}
-
-	MK_MSG_ORIG(resp, UNI_STATUS, 0, 1);
-	MK_IE_CALLSTATE(resp->u.status.callstate, UNI_CALLSTATE_REST2);
-
-	if (IE_ISGOOD(c->cause))
-		resp->u.status.cause = c->cause;
-	else {
-		MK_IE_CAUSE(resp->u.status.cause, UNI_CAUSE_LOC_USER,
-		    UNI_CAUSE_CHANNEL_NEX);
-		if (IE_ISGOOD(uni->connid_respond))
-			ADD_CAUSE_CHANNID(resp->u.status.cause,
-			    uni->connid_respond.vpci,
-			    uni->connid_respond.vci);
-	}
-
-	if (uni_send_output(resp, uni) != 0) {
-		uniapi_uni_error(uni, UNIAPI_ERROR_ENCODING, cookie, 0);
-		UNI_FREE(resp);
-		return;
-	}
-
-	uniapi_uni_error(uni, UNIAPI_OK, cookie, 0);
-}
-
-/*
- * Reset-response from user.
- */
-static void
-response_response(struct uni *uni, struct uniapi_reset_response *arg,
-    uint32_t cookie)
-{
-	struct uni_all *resp;
-
-	if (uni->glob_respond != UNI_CALLSTATE_REST2) {
-		uniapi_uni_error(uni, UNIAPI_ERROR_BAD_CALLSTATE, cookie, 0);
-		return;
-	}
-
-	if (!IE_ISGOOD(arg->restart)) {
-		uniapi_uni_error(uni, UNIAPI_ERROR_MISSING_IE, cookie, 0);
-		return;
-	}
-
-	if ((resp = UNI_ALLOC()) == NULL) {
-		uniapi_uni_error(uni, UNIAPI_ERROR_NOMEM, cookie, 0);
-		return;
-	}
-
-	TIMER_STOP_UNI(uni, t317);
-
-	MK_MSG_ORIG(resp, UNI_RESTART_ACK, 0, 1);
-	resp->u.restart.restart = arg->restart;
-	if (IE_ISGOOD(arg->connid))
-		resp->u.restart.connid = arg->connid;
-
-	if (uni_send_output(resp, uni) != 0) {
-		uniapi_uni_error(uni, UNIAPI_ERROR_ENCODING, cookie, 0);
-		UNI_FREE(resp);
-		return;
-	}
-
-	UNI_FREE(resp);
-
-	uni->glob_respond = UNI_CALLSTATE_REST0;
-	VERBOSE(uni, UNI_FAC_RESTART, 1, "Reset-Respond state := 0");
-
-	uniapi_uni_error(uni, UNIAPI_OK, cookie, 0);
-}
-
-/*
- * Reset-Response got a STATUS message.
- *
- * Q.2931: Reset-Response 2/2
- *
- * In Q.2931 only CALLSTATE_REST2 is allowed, this seems silly and to contradict
- * 5.6.12. So allow it in any state.
- *
- * The following states are considered compatible:
- *
- *  Sender   Receiver
- *  ------   --------
- *  Rest0     Rest0	this is the normal state OK!
- *  Rest0     Rest2	this may be the result of no answer from the API
- *			and the Sender finally timing out. ERROR!
- *  Rest1     Rest2	this is normal. OK!
- *  Rest1     Rest0	RESTART_ACK was probably lost. OK!
- *
- * All others are wrong.
- */
-static void
-response_status(struct uni *uni, struct uni_msg *m, struct uni_all *u)
-{
-	(void)uni_decode_body(m, u, &uni->cx);
-	MANDATE_IE(uni, u->u.status.callstate, UNI_IE_CALLSTATE);
-	MANDATE_IE(uni, u->u.status.cause, UNI_IE_CAUSE);
-	switch (uni_verify(uni, u->u.hdr.act)) {
-	  case VFY_CLR:
-		if (uni->proto == UNIPROTO_UNI40U) {
-			uni->glob_respond = UNI_CALLSTATE_REST0;
-			VERBOSE(uni, UNI_FAC_RESTART, 1,
-			    "Reset-Respond state := 0");
-			return;
-		}
-		break;
-
-	  case VFY_RAIM:
-	  case VFY_RAI:
-	  case VFY_RAP:
-	  case VFY_RAPU:
-		uni_respond_status_verify(uni, &u->u.hdr.cref,
-		    uni->glob_respond, NULL, 0);
-	  case VFY_I:
-	  case VFY_OK:
-		break;
-	}
-	if (!IE_ISGOOD(u->u.status.callstate)) {
-		/*
-		 * As a result of the strange handling above, we must
-		 * process a STATUS with an invalid or missing callstate!
-		 */
-		return;
-	}
-	if ((u->u.status.callstate.state == UNI_CALLSTATE_REST0 &&
-	     uni->glob_respond == UNI_CALLSTATE_REST0) ||
-	    (u->u.status.callstate.state == UNI_CALLSTATE_REST1 &&
-	     uni->glob_respond == UNI_CALLSTATE_REST0) ||
-	    (u->u.status.callstate.state == UNI_CALLSTATE_REST1 &&
-	     uni->glob_respond == UNI_CALLSTATE_REST2)) {
-		/*
-		 * Implementation dependend procedure:
-		 * Inform the API
-		 */
-		struct uniapi_reset_status_indication *resp;
-		struct uni_msg *app;
-
-		resp = ALLOC_API(struct uniapi_reset_status_indication, app);
-		if (resp == NULL)
-			return;
-
-		resp->cref = u->u.hdr.cref;
-		resp->callstate = u->u.status.callstate;
-		if (IE_ISGOOD(u->u.status.cause))
-			resp->cause = u->u.status.cause;
-
-		uni->funcs->uni_output(uni, uni->arg,
-		    UNIAPI_RESET_STATUS_indication, 0, app);
-		
-	} else {
-		struct uniapi_reset_error_indication *resp;
-		struct uni_msg *app;
-
-		resp = ALLOC_API(struct uniapi_reset_error_indication, app);
-		if (resp != NULL) {
-			resp->source = 1;
-			resp->reason = UNIAPI_RESET_ERROR_PEER_INCOMP_STATE,
-
-			uni->funcs->uni_output(uni, uni->arg,
-			    UNIAPI_RESET_ERROR_indication, 0, app);
-		}
-	}
-}
-
-/*
- * T317 timeout function
- */
-static void
-t317_func(struct uni *uni)
-{
-	uni_enq_resp(uni, SIGR_T317, 0, NULL, NULL);
-}
diff --git a/sys/contrib/ngatm/netnatm/sig/sig_uni.c b/sys/contrib/ngatm/netnatm/sig/sig_uni.c
deleted file mode 100644
index e620fa7521c0..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/sig_uni.c
+++ /dev/null
@@ -1,749 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/sig/sig_uni.c,v 1.11 2004/08/05 07:11:03 brandt Exp $
- *
- * Instance handling
- */
-
-#include <netnatm/unimsg.h>
-#include <netnatm/saal/sscopdef.h>
-#include <netnatm/saal/sscfudef.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#include <netnatm/sig/uni.h>
-#include <netnatm/sig/unisig.h>
-
-#include <netnatm/sig/unipriv.h>
-
-#ifdef UNICORE
-UNICORE
-#endif
-
-#define STR(S) [S] = #S
-static const char *custat_names[] = {
-	STR(CU_STAT0),
-	STR(CU_STAT1),
-	STR(CU_STAT2),
-	STR(CU_STAT3),
-};
-static const char *globstat_names[] = {
-	STR(UNI_CALLSTATE_REST0),
-	STR(UNI_CALLSTATE_REST1),
-	STR(UNI_CALLSTATE_REST2),
-};
-
-static const char *sig_names[] = {
-	STR(UNIAPI_ERROR),
-	STR(UNIAPI_CALL_CREATED),
-	STR(UNIAPI_CALL_DESTROYED),
-	STR(UNIAPI_PARTY_CREATED),
-	STR(UNIAPI_PARTY_DESTROYED),
-	STR(UNIAPI_LINK_ESTABLISH_request),
-	STR(UNIAPI_LINK_ESTABLISH_confirm),
-	STR(UNIAPI_LINK_RELEASE_request),
-	STR(UNIAPI_LINK_RELEASE_confirm),
-	STR(UNIAPI_RESET_request),
-	STR(UNIAPI_RESET_confirm),
-	STR(UNIAPI_RESET_indication),
-	STR(UNIAPI_RESET_ERROR_indication),
-	STR(UNIAPI_RESET_response),
-	STR(UNIAPI_RESET_ERROR_response),
-	STR(UNIAPI_RESET_STATUS_indication),
-	STR(UNIAPI_SETUP_request),
-	STR(UNIAPI_SETUP_indication),
-	STR(UNIAPI_SETUP_response),
-	STR(UNIAPI_SETUP_confirm),
-	STR(UNIAPI_SETUP_COMPLETE_indication),
-	STR(UNIAPI_SETUP_COMPLETE_request),
-	STR(UNIAPI_ALERTING_request),
-	STR(UNIAPI_ALERTING_indication),
-	STR(UNIAPI_PROCEEDING_request),
-	STR(UNIAPI_PROCEEDING_indication),
-	STR(UNIAPI_RELEASE_request),
-	STR(UNIAPI_RELEASE_indication),
-	STR(UNIAPI_RELEASE_response),
-	STR(UNIAPI_RELEASE_confirm),
-	STR(UNIAPI_NOTIFY_request),
-	STR(UNIAPI_NOTIFY_indication),
-	STR(UNIAPI_STATUS_indication),
-	STR(UNIAPI_STATUS_ENQUIRY_request),
-	STR(UNIAPI_ADD_PARTY_request),
-	STR(UNIAPI_ADD_PARTY_indication),
-	STR(UNIAPI_PARTY_ALERTING_request),
-	STR(UNIAPI_PARTY_ALERTING_indication),
-	STR(UNIAPI_ADD_PARTY_ACK_request),
-	STR(UNIAPI_ADD_PARTY_ACK_indication),
-	STR(UNIAPI_ADD_PARTY_REJ_request),
-	STR(UNIAPI_ADD_PARTY_REJ_indication),
-	STR(UNIAPI_DROP_PARTY_request),
-	STR(UNIAPI_DROP_PARTY_indication),
-	STR(UNIAPI_DROP_PARTY_ACK_request),
-	STR(UNIAPI_DROP_PARTY_ACK_indication),
-	STR(UNIAPI_ABORT_CALL_request),
-};
-
-static const char *verb_names[] = {
-# define UNI_DEBUG_DEFINE(D) [UNI_FAC_##D] = #D,
-	UNI_DEBUG_FACILITIES
-# undef UNI_DEBUG_DEFINE
-};
-
-const char *
-uni_facname(enum uni_verb fac)
-{
-	static char buf[40];
-
-	if (fac >= UNI_MAXFACILITY) {
-		sprintf(buf, "FAC%u", fac);
-		return (buf);
-	}
-	return (verb_names[fac]);
-}
-
-const char *
-uni_signame(enum uni_sig sig)
-{
-	static char buf[40];
-
-	if (sig >= UNIAPI_MAXSIG) {
-		sprintf(buf, "UNIAPI_SIG%u", sig);
-		return (buf);
-	}
-	return (sig_names[sig]);
-}
-
-struct unicx *
-uni_context(struct uni *uni)
-{
-	return (&uni->cx);
-}
-
-static void
-uni_init(struct uni *uni)
-{
-	uni->working = 0;
-	uni->cref_alloc = 12;
-	uni->custat = CU_STAT0;
-	uni->glob_start = UNI_CALLSTATE_REST0;
-	uni->glob_respond = UNI_CALLSTATE_REST0;
-}
-
-static void
-uni_stop(struct uni *uni)
-{
-	struct call *c;
-
-	while ((c = TAILQ_FIRST(&uni->calls)) != NULL) {
-		TAILQ_REMOVE(&uni->calls, c, link);
-		uni_destroy_call(c, 1);
-	}
-
-	SIGQ_CLEAR(&uni->workq);
-	SIGQ_CLEAR(&uni->delq);
-}
-
-/*
- * INSTANCE HANDLING
- */
-struct uni *
-uni_create(void *arg, const struct uni_funcs *funcs)
-{
-	struct uni *uni;
-
-	if ((uni = INS_ALLOC()) == NULL)
-		return (NULL);
-
-	uni_init(uni);
-
-	uni->funcs = funcs;
-	uni->arg = arg;
-	uni->proto = UNIPROTO_UNI40U;
-	uni->sb_tb = 0;
-	TAILQ_INIT(&uni->workq);
-	TAILQ_INIT(&uni->delq);
-	TIMER_INIT_UNI(uni, t309);
-	uni->timer309 = UNI_T309_DEFAULT;
-	TAILQ_INIT(&uni->calls);
-	uni_initcx(&uni->cx);
-	TIMER_INIT_UNI(uni, t317);
-	TIMER_INIT_UNI(uni, t316);
-
-	uni->timer301 = UNI_T301_DEFAULT;
-	uni->init303 = UNI_T303_CNT_DEFAULT;
-	uni->timer303 = UNI_T303_DEFAULT;
-	uni->init308 = UNI_T308_CNT_DEFAULT;
-	uni->timer308 = UNI_T308_DEFAULT;
-	uni->timer310 = UNI_T310U_DEFAULT;
-	uni->timer313 = UNI_T313_DEFAULT;
-	uni->init316 = UNI_T316_CNT_DEFAULT;
-	uni->timer316 = UNI_T316_DEFAULT;
-	uni->timer317 = UNI_T317_DEFAULT;
-	uni->timer322 = UNI_T322_DEFAULT;
-	uni->init322 = UNI_T322_CNT_DEFAULT;
-	uni->timer397 = UNI_T397_DEFAULT;
-	uni->timer398 = UNI_T398_DEFAULT;
-	uni->timer399 = UNI_T399U_DEFAULT;
-
-	return (uni);
-}
-
-void 
-uni_destroy(struct uni *uni)
-{
-	uni_stop(uni);
-
-	TIMER_DESTROY_UNI(uni, t309);
-	TIMER_DESTROY_UNI(uni, t316);
-	TIMER_DESTROY_UNI(uni, t317);
-
-	INS_FREE(uni);
-}
-
-void
-uni_reset(struct uni *uni)
-{
-	uni_stop(uni);
-	uni_init(uni);
-}
-
-
-/*
- * DISPATCH SSCOP SIGNAL
- */
-void
-uni_saal_input(struct uni *uni, enum saal_sig sig, struct uni_msg *m)
-{
-	switch (sig) {
-
-	  case SAAL_ESTABLISH_indication:
-		if (m != NULL)
-			uni_msg_destroy(m);
-		uni_enq_coord(uni, SIGO_SAAL_ESTABLISH_indication, 0, NULL);
-		break;
-
-	  case SAAL_ESTABLISH_confirm:
-		if (m != NULL)
-			uni_msg_destroy(m);
-		uni_enq_coord(uni, SIGO_SAAL_ESTABLISH_confirm, 0, NULL);
-		break;
-
-	  case SAAL_RELEASE_confirm:
-		if (m != NULL)
-			uni_msg_destroy(m);
-		uni_enq_coord(uni, SIGO_SAAL_RELEASE_confirm, 0, NULL);
-		break;
-
-	  case SAAL_RELEASE_indication:
-		if (m != NULL)
-			uni_msg_destroy(m);
-		uni_enq_coord(uni, SIGO_SAAL_RELEASE_indication, 0, NULL);
-		break;
-
-	  case SAAL_DATA_indication:
-		uni_enq_coord(uni, SIGO_SAAL_DATA_indication, 0, m);
-		break;
-
-	  case SAAL_UDATA_indication:
-		uni_enq_coord(uni, SIGO_SAAL_UDATA_indication, 0, m);
-		break;
-
-	  default:
-		VERBOSE(uni, UNI_FAC_ERR, 1, "bogus saal signal %u", sig);
-		if (m != NULL)
-			uni_msg_destroy(m);
-		break;
-	}
-}
-
-static struct {
-	const char	*name;
-	enum uni_sig	sig;
-	size_t		arglen;
-	u_int		coord_sig;
-	u_int		proto;
-#define UNIU	0x01
-#define UNIN	0x02
-#define PNNI	0x04
-} maptab[] = {
-	{ "LINK-ESTABLISH.request", UNIAPI_LINK_ESTABLISH_request,
-	    0,
-	    SIGO_LINK_ESTABLISH_request, UNIU | UNIN },
-	{ "LINK-RELEASE.request", UNIAPI_LINK_RELEASE_request,
-	    0,
-	    SIGO_LINK_RELEASE_request, UNIU | UNIN },
-
-	{ "RESET.request", UNIAPI_RESET_request,
-	    sizeof(struct uniapi_reset_request),
-	    SIGO_RESET_request, UNIU | UNIN },
-	{ "RESET-ERROR.response", UNIAPI_RESET_ERROR_response,
-	    sizeof(struct uniapi_reset_error_response),
-	    SIGO_RESET_ERROR_response, UNIU | UNIN },
-	{ "RESET.response", UNIAPI_RESET_response,
-	    sizeof(struct uniapi_reset_response),
-	    SIGO_RESET_response, UNIU | UNIN },
-
-	{ "SETUP.request", UNIAPI_SETUP_request,
-	    sizeof(struct uniapi_setup_request),
-	    SIGO_SETUP_request, UNIU | UNIN },
-	{ "SETUP.response", UNIAPI_SETUP_response,
-	    sizeof(struct uniapi_setup_response),
-	    SIGO_SETUP_response, UNIU | UNIN },
-	{ "SETUP-COMPLETE.request", UNIAPI_SETUP_COMPLETE_request,
-	    sizeof(struct uniapi_setup_complete_request),
-	    SIGO_SETUP_COMPLETE_request, UNIN },
-	{ "PROCEEDING.request", UNIAPI_PROCEEDING_request,
-	    sizeof(struct uniapi_proceeding_request),
-	    SIGO_PROCEEDING_request, UNIU | UNIN },
-	{ "ALERTING.request", UNIAPI_ALERTING_request,
-	    sizeof(struct uniapi_alerting_request),
-	    SIGO_ALERTING_request, UNIU | UNIN },
-	{ "RELEASE.request", UNIAPI_RELEASE_request,
-	    sizeof(struct uniapi_release_request),
-	    SIGO_RELEASE_request, UNIU | UNIN },
-	{ "RELEASE.response", UNIAPI_RELEASE_response,
-	    sizeof(struct uniapi_release_response),
-	    SIGO_RELEASE_response, UNIU | UNIN },
-	{ "NOTIFY.request", UNIAPI_NOTIFY_request,
-	    sizeof(struct uniapi_notify_request),
-	    SIGO_NOTIFY_request, UNIU | UNIN },
-	{ "STATUS-ENQUIRY.request", UNIAPI_STATUS_ENQUIRY_request,
-	    sizeof(struct uniapi_status_enquiry_request),
-	    SIGO_STATUS_ENQUIRY_request, UNIU | UNIN },
-
-	{ "ADD-PARTY.request", UNIAPI_ADD_PARTY_request,
-	    sizeof(struct uniapi_add_party_request),
-	    SIGO_ADD_PARTY_request, UNIU | UNIN },
-	{ "ADD-PARTY-ACK.request", UNIAPI_ADD_PARTY_ACK_request,
-	    sizeof(struct uniapi_add_party_ack_request),
-	    SIGO_ADD_PARTY_ACK_request, UNIU | UNIN },
-	{ "ADD-PARTY-REJ.request", UNIAPI_ADD_PARTY_REJ_request,
-	    sizeof(struct uniapi_add_party_rej_request),
-	    SIGO_ADD_PARTY_REJ_request, UNIU | UNIN },
-	{ "PARTY-ALERTING.request", UNIAPI_PARTY_ALERTING_request,
-	    sizeof(struct uniapi_party_alerting_request),
-	    SIGO_PARTY_ALERTING_request, UNIU | UNIN },
-	{ "DROP-PARTY.request", UNIAPI_DROP_PARTY_request,
-	    sizeof(struct uniapi_drop_party_request),
-	    SIGO_DROP_PARTY_request, UNIU | UNIN },
-	{ "DROP-PARTY-ACK.request", UNIAPI_DROP_PARTY_ACK_request,
-	    sizeof(struct uniapi_drop_party_ack_request),
-	    SIGO_DROP_PARTY_ACK_request, UNIU | UNIN },
-
-	{ "ABORT-CALL.request", UNIAPI_ABORT_CALL_request,
-	    sizeof(struct uniapi_abort_call_request),
-	    SIGO_ABORT_CALL_request, UNIU | UNIN },
-
-	{ NULL, 0, 0, 0, 0 }
-};
-
-void
-uni_uni_input(struct uni *uni, enum uni_sig sig, uint32_t cookie,
-    struct uni_msg *m)
-{
-	u_int i;
-
-	for (i = 0; maptab[i].name != NULL; i++) {
-		if (maptab[i].sig == sig) {
-			if (uni->proto == UNIPROTO_UNI40U) {
-				if (!(maptab[i].proto & UNIU))
-					uniapi_uni_error(uni,
-					    UNIAPI_ERROR_BAD_SIGNAL, cookie, 0);
-			} else if(uni->proto == UNIPROTO_UNI40N) {
-				if (!(maptab[i].proto & UNIN))
-					uniapi_uni_error(uni,
-					    UNIAPI_ERROR_BAD_SIGNAL, cookie, 0);
-			} else if(uni->proto == UNIPROTO_PNNI10) {
-				if (!(maptab[i].proto & PNNI))
-					uniapi_uni_error(uni,
-					    UNIAPI_ERROR_BAD_SIGNAL, cookie, 0);
-			} else {
-				uniapi_uni_error(uni,
-				    UNIAPI_ERROR_BAD_SIGNAL, cookie, 0);
-			}
-			if (uni_msg_len(m) != maptab[i].arglen) {
-				VERBOSE(uni, UNI_FAC_ERR, 1, "bogus data in %s"
-				    " (expecting %zu, got %zu)", maptab[i].name,
-				    maptab[i].arglen, uni_msg_len(m));
-				uni_msg_destroy(m);
-				uniapi_uni_error(uni, UNIAPI_ERROR_BAD_ARG,
-				    cookie, 0);
-				return;
-			}
-			if (maptab[i].arglen == 0) {
-				uni_msg_destroy(m);
-				m = NULL;
-			}
-			VERBOSE(uni, UNI_FAC_API, 1, "got signal %s - "
-			    "delivering to Coord", maptab[i].name);
-			uni_enq_coord(uni, maptab[i].coord_sig, cookie, m);
-			return;
-		}
-	}
-	VERBOSE(uni, UNI_FAC_ERR, 1, "bogus uni signal %u", sig);
-	uni_msg_destroy(m);
-	uniapi_uni_error(uni, UNIAPI_ERROR_BAD_SIGNAL, cookie, 0);
-}
-#undef UNIU
-#undef UNIN
-#undef PNNI
-
-/**************************************************************/
-
-void
-uni_work(struct uni *uni)
-{
-	struct sig *s;
-
-	if (uni->working)
-		return;
-	uni->working = 1;
-
-	while ((s = TAILQ_FIRST(&uni->workq)) != NULL) {
-		TAILQ_REMOVE(&uni->workq, s, link);
-		switch (s->type) {
-
-		  case SIG_COORD:
-			uni_sig_coord(uni, s->sig, s->cookie, s->msg);
-			break;
-
-		  case SIG_RESET_START:
-			uni_sig_start(uni, s->sig, s->cookie, s->msg, s->u);
-			break;
-
-		  case SIG_RESET_RESP:
-			uni_sig_respond(uni, s->sig, s->cookie, s->msg, s->u);
-			break;
-
-		  case SIG_CALL:
-			uni_sig_call(s->call, s->sig, s->cookie, s->msg, s->u);
-			break;
-
-		  case SIG_PARTY:
-			uni_sig_party(s->party, s->sig, s->cookie, s->msg, s->u);
-			break;
-
-		  default:
-			ASSERT(0, ("bad signal type"));
-		}
-		SIG_FREE(s);
-	}
-
-	uni->working = 0;
-}
-
-/*
- * Enqueue a signal in the working queue
- */
-void
-uni_enq_sig(struct uni *uni, u_int type, struct call *call,
-    struct party *party, uint32_t sig, uint32_t cookie,
-    struct uni_msg *msg, struct uni_all *u)
-{
-	struct sig *s;
-
-	if ((s = SIG_ALLOC()) != NULL) {
-		s->type = type;
-		s->sig = sig;
-		s->cookie = cookie;
-		s->msg = msg;
-		s->call = call;
-		s->party = party;
-		s->u = u;
-		TAILQ_INSERT_TAIL(&uni->workq, s, link);
-	}
-}
-
-/*
- * Enqueue a signal in the delayed queue
- */
-void
-uni_delenq_sig(struct uni *uni, u_int type, struct call *call,
-    struct party *party, uint32_t sig, uint32_t cookie,
-    struct uni_msg *msg, struct uni_all *u)
-{
-	struct sig *s;
-
-	if ((s = SIG_ALLOC()) != NULL) {
-		s->type = type;
-		s->sig = sig;
-		s->cookie = cookie;
-		s->msg = msg;
-		s->call = call;
-		s->party = party;
-		s->u = u;
-		TAILQ_INSERT_TAIL(&uni->delq, s, link);
-	}
-}
-
-/**************************************************************/
-
-void
-uniapi_uni_error(struct uni *uni, uint32_t reason, uint32_t cookie,
-    uint32_t state)
-{
-	struct uni_msg *resp;
-	struct uniapi_error *err;
-
-	if (cookie == 0)
-		return;
-
-	resp = uni_msg_alloc(sizeof(struct uniapi_error));
-	err = uni_msg_wptr(resp, struct uniapi_error *);
-	resp->b_wptr += sizeof(struct uniapi_error);
-
-	err->reason = reason;
-	err->state = state;
-
-	uni->funcs->uni_output(uni, uni->arg, UNIAPI_ERROR, cookie, resp);
-}
-
-void
-uniapi_call_error(struct call *c, uint32_t reason, uint32_t cookie)
-{
-	uniapi_uni_error(c->uni, reason, cookie, callstates[c->cstate].ext);
-}
-void
-uniapi_party_error(struct party *p, uint32_t reason, uint32_t cookie)
-{
-	uniapi_uni_error(p->call->uni, reason, cookie,
-	    callstates[p->call->cstate].ext);
-}
-
-/**************************************************************/
-void
-uni_status(struct uni *uni, void *arg)
-{
-	uni->funcs->status(uni, uni->arg, arg,
-	    "working: %s\n", uni->working ? "yes" : "no");
-	uni->funcs->status(uni, uni->arg, arg,
-	    "work queue: %sempty\n", TAILQ_EMPTY(&uni->workq)? "" : "not ");
-	uni->funcs->status(uni, uni->arg, arg,
-	    "delayed work queue: %sempty\n",
-	    TAILQ_EMPTY(&uni->delq)? "" : "not ");
-	uni->funcs->status(uni, uni->arg, arg,
-	    "coordinator: %s\n", custat_names[uni->custat]);
-	uni->funcs->status(uni, uni->arg, arg,
-	    "reset-start: %s\n", globstat_names[uni->glob_start]);
-	uni->funcs->status(uni, uni->arg, arg,
-	    "reset-respond: %s\n", globstat_names[uni->glob_respond]);
-}
-
-void
-uni_undel(struct uni *uni, int (*filter)(struct sig *, void *), void *arg)
-{
-	struct sigqueue		newq;
-	struct sig *s, *s1;
-
-	if (TAILQ_EMPTY(&uni->delq))
-		return;
-
-	TAILQ_INIT(&newq);
-
-	s = TAILQ_FIRST(&uni->delq);
-	while (s != NULL) {
-		s1 = TAILQ_NEXT(s, link);
-		if ((*filter)(s, arg)) {
-			TAILQ_REMOVE(&uni->delq, s, link);
-			TAILQ_INSERT_TAIL(&uni->workq, s, link);
-		}
-		s = s1;
-	}
-}
-
-void
-uni_delsig(struct uni *uni, u_int type, struct call *c, struct party *p)
-{
-	struct sig *s, *s1;
-
-	s = TAILQ_FIRST(&uni->workq);
-	while (s != NULL) {
-		s1 = TAILQ_NEXT(s, link);
-		if ((type == SIG_CALL && s->type == SIG_CALL &&
-		    s->call == c) ||
-		    (type == SIG_PARTY && s->type == SIG_PARTY &&
-		    s->call == c && s->party == p)) {
-			TAILQ_REMOVE(&uni->workq, s, link);
-			if (s->msg)
-				uni_msg_destroy(s->msg);
-			if (s->u)
-				UNI_FREE(s->u);
-			SIG_FREE(s);
-		}
-		s = s1;
-	}
-
-	s = TAILQ_FIRST(&uni->delq);
-	while (s != NULL) {
-		s1 = TAILQ_NEXT(s, link);
-		if ((type == SIG_CALL && s->type == SIG_CALL &&
-		    s->call == c) ||
-		    (type == SIG_PARTY && s->type == SIG_PARTY &&
-		    s->call == c && s->party == p)) {
-			TAILQ_REMOVE(&uni->delq, s, link);
-			if (s->msg)
-				uni_msg_destroy(s->msg);
-			if (s->u)
-				UNI_FREE(s->u);
-			SIG_FREE(s);						\
-		}
-		s = s1;
-	}
-}
-
-/**************************************************************/
-
-void
-uni_get_config(const struct uni *uni, struct uni_config *config)
-{
-	config->proto = uni->proto;
-
-	config->popt = 0;
-	if (uni->cx.q2932)
-		config->popt |= UNIPROTO_GFP;
-
-	config->option = 0;
-	if (uni->cx.git_hard)
-		config->option |= UNIOPT_GIT_HARD;
-	if (uni->cx.bearer_hard)
-		config->option |= UNIOPT_BEARER_HARD;
-	if (uni->cx.cause_hard)
-		config->option |= UNIOPT_CAUSE_HARD;
-	if (uni->sb_tb)
-		config->popt |= UNIPROTO_SB_TB;
-
-	config->timer301 = uni->timer301;
-	config->timer303 = uni->timer303;
-	config->init303 = uni->init303;
-	config->timer308 = uni->timer308;
-	config->init308 = uni->init308;
-	config->timer309 = uni->timer309;
-	config->timer310 = uni->timer310;
-	config->timer313 = uni->timer313;
-	config->timer316 = uni->timer316;
-	config->init316 = uni->init316;
-	config->timer317 = uni->timer317;
-	config->timer322 = uni->timer322;
-	config->init322 = uni->init322;
-	config->timer397 = uni->timer397;
-	config->timer398 = uni->timer398;
-	config->timer399 = uni->timer399;
-}
-
-void
-uni_set_config(struct uni *uni, const struct uni_config *config,
-    uint32_t *mask, uint32_t *popt_mask, uint32_t *opt_mask)
-{
-	int idle;
-
-	idle = TAILQ_EMPTY(&uni->calls) &&
-	    TAILQ_EMPTY(&uni->workq) &&
-	    TAILQ_EMPTY(&uni->delq);
-
-	if ((*mask & UNICFG_PROTO) && idle) {
-		switch (config->proto) {
-
-		  case UNIPROTO_UNI40U:
-		  case UNIPROTO_UNI40N:
-		  /* case UNIPROTO_PNNI10: XXX */
-			uni->proto = config->proto;
-			*mask &= ~UNICFG_PROTO;
-			break;
-		}
-	}
-	if (*popt_mask & UNIPROTO_GFP) {
-		if (config->popt & UNIPROTO_GFP) {
-			uni->cx.q2932 = 1;
-			*popt_mask &= ~UNIPROTO_GFP;
-		} else {
-			if (!uni->cx.q2932 || idle) {
-				uni->cx.q2932 = 0;
-				*popt_mask &= ~UNIPROTO_GFP;
-			}
-		}
-	}
-	if (*popt_mask & UNIPROTO_SB_TB) {
-		uni->sb_tb = ((config->popt & UNIPROTO_SB_TB) != 0);
-		*popt_mask &= ~UNIPROTO_SB_TB;
-	}
-	if (*opt_mask & UNIOPT_GIT_HARD) {
-		uni->cx.git_hard = ((config->option & UNIOPT_GIT_HARD) != 0);
-		*opt_mask &= ~UNIOPT_GIT_HARD;
-	}
-	if (*opt_mask & UNIOPT_BEARER_HARD) {
-		uni->cx.bearer_hard = ((config->option & UNIOPT_BEARER_HARD) != 0);
-		*opt_mask &= ~UNIOPT_BEARER_HARD;
-	}
-	if (*opt_mask & UNIOPT_CAUSE_HARD) {
-		uni->cx.cause_hard = ((config->option & UNIOPT_CAUSE_HARD) != 0);
-		*opt_mask &= ~UNIOPT_CAUSE_HARD;
-	}
-
-#define SET_TIMER(NAME,name)						\
-	if (*mask & UNICFG_##NAME) {					\
-		uni->name = config->name;				\
-		*mask &= ~UNICFG_##NAME;				\
-	}
-
-	SET_TIMER(TIMER301, timer301);
-	SET_TIMER(TIMER303, timer303);
-	SET_TIMER(INIT303,  init303);
-	SET_TIMER(TIMER308, timer308);
-	SET_TIMER(INIT308,  init308);
-	SET_TIMER(TIMER309, timer309);
-	SET_TIMER(TIMER310, timer310);
-	SET_TIMER(TIMER313, timer313);
-	SET_TIMER(TIMER316, timer316);
-	SET_TIMER(INIT316,  init316);
-	SET_TIMER(TIMER317, timer317);
-	SET_TIMER(TIMER322, timer322);
-	SET_TIMER(INIT322,  init322);
-	SET_TIMER(TIMER397, timer397);
-	SET_TIMER(TIMER398, timer398);
-	SET_TIMER(TIMER399, timer399);
-
-#undef SET_TIMER
-}
-
-void
-uni_set_debug(struct uni *uni, enum uni_verb fac, u_int level)
-{
-	uni->debug[fac] = level;
-}
-
-u_int
-uni_get_debug(const struct uni *uni, enum uni_verb fac)
-{
-	return (uni->debug[fac]);
-}
-
-u_int
-uni_getcustate(const struct uni *uni)
-{
-	return (uni->custat);
-}
diff --git a/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c b/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c
deleted file mode 100644
index 1653ba7438ec..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/sig_unimsgcpy.c
+++ /dev/null
@@ -1,594 +0,0 @@
-/* This file was created automatically
- * Source file: $Begemot: libunimsg/atm/msg/msg.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
- */
-
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/sig/unimsgcpy.h>
-
-void
-copy_msg_alerting(struct uni_alerting *src, struct uni_alerting *dst)
-{
-	u_int s, d;
-
-	if(IE_ISGOOD(src->connid))
-		dst->connid = src->connid;
-	if(IE_ISGOOD(src->epref))
-		dst->epref = src->epref;
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->uu))
-		dst->uu = src->uu;
-	if(IE_ISGOOD(src->report))
-		dst->report = src->report;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_call_proc(struct uni_call_proc *src, struct uni_call_proc *dst)
-{
-	if(IE_ISGOOD(src->connid))
-		dst->connid = src->connid;
-	if(IE_ISGOOD(src->epref))
-		dst->epref = src->epref;
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_connect(struct uni_connect *src, struct uni_connect *dst)
-{
-	u_int s, d;
-
-	if(IE_ISGOOD(src->aal))
-		dst->aal = src->aal;
-	if(IE_ISGOOD(src->blli))
-		dst->blli = src->blli;
-	if(IE_ISGOOD(src->connid))
-		dst->connid = src->connid;
-	if(IE_ISGOOD(src->epref))
-		dst->epref = src->epref;
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	if(IE_ISGOOD(src->conned))
-		dst->conned = src->conned;
-	if(IE_ISGOOD(src->connedsub))
-		dst->connedsub = src->connedsub;
-	if(IE_ISGOOD(src->eetd))
-		dst->eetd = src->eetd;
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->uu))
-		dst->uu = src->uu;
-	if(IE_ISGOOD(src->traffic))
-		dst->traffic = src->traffic;
-	if(IE_ISGOOD(src->exqos))
-		dst->exqos = src->exqos;
-	if(IE_ISGOOD(src->facility))
-		dst->facility = src->facility;
-	if(IE_ISGOOD(src->abrsetup))
-		dst->abrsetup = src->abrsetup;
-	if(IE_ISGOOD(src->abradd))
-		dst->abradd = src->abradd;
-	if(IE_ISGOOD(src->called_soft))
-		dst->called_soft = src->called_soft;
-	if(IE_ISGOOD(src->report))
-		dst->report = src->report;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_connect_ack(struct uni_connect_ack *src, struct uni_connect_ack *dst)
-{
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_release(struct uni_release *src, struct uni_release *dst)
-{
-	u_int s, d;
-
-	for(s = d = 0; s < 2; s++)
-		if(IE_ISGOOD(src->cause[s]))
-			dst->cause[d++] = src->cause[s];
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->uu))
-		dst->uu = src->uu;
-	if(IE_ISGOOD(src->facility))
-		dst->facility = src->facility;
-	if(IE_ISGOOD(src->crankback))
-		dst->crankback = src->crankback;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_release_compl(struct uni_release_compl *src, struct uni_release_compl *dst)
-{
-	u_int s, d;
-
-	for(s = d = 0; s < 2; s++)
-		if(IE_ISGOOD(src->cause[s]))
-			dst->cause[d++] = src->cause[s];
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->uu))
-		dst->uu = src->uu;
-	if(IE_ISGOOD(src->crankback))
-		dst->crankback = src->crankback;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_setup(struct uni_setup *src, struct uni_setup *dst)
-{
-	u_int s, d;
-
-	if(IE_ISGOOD(src->aal))
-		dst->aal = src->aal;
-	if(IE_ISGOOD(src->traffic))
-		dst->traffic = src->traffic;
-	if(IE_ISGOOD(src->bearer))
-		dst->bearer = src->bearer;
-	if(IE_ISGOOD(src->bhli))
-		dst->bhli = src->bhli;
-	if(IE_ISGOOD(src->blli_repeat))
-		dst->blli_repeat = src->blli_repeat;
-	for(s = d = 0; s < UNI_NUM_IE_BLLI; s++)
-		if(IE_ISGOOD(src->blli[s]))
-			dst->blli[d++] = src->blli[s];
-	if(IE_ISGOOD(src->called))
-		dst->called = src->called;
-	for(s = d = 0; s < UNI_NUM_IE_CALLEDSUB; s++)
-		if(IE_ISGOOD(src->calledsub[s]))
-			dst->calledsub[d++] = src->calledsub[s];
-	if(IE_ISGOOD(src->calling))
-		dst->calling = src->calling;
-	for(s = d = 0; s < UNI_NUM_IE_CALLINGSUB; s++)
-		if(IE_ISGOOD(src->callingsub[s]))
-			dst->callingsub[d++] = src->callingsub[s];
-	if(IE_ISGOOD(src->connid))
-		dst->connid = src->connid;
-	if(IE_ISGOOD(src->qos))
-		dst->qos = src->qos;
-	if(IE_ISGOOD(src->eetd))
-		dst->eetd = src->eetd;
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	if(IE_ISGOOD(src->scompl))
-		dst->scompl = src->scompl;
-	for(s = d = 0; s < UNI_NUM_IE_TNS; s++)
-		if(IE_ISGOOD(src->tns[s]))
-			dst->tns[d++] = src->tns[s];
-	if(IE_ISGOOD(src->epref))
-		dst->epref = src->epref;
-	if(IE_ISGOOD(src->atraffic))
-		dst->atraffic = src->atraffic;
-	if(IE_ISGOOD(src->mintraffic))
-		dst->mintraffic = src->mintraffic;
-	if(IE_ISGOOD(src->uu))
-		dst->uu = src->uu;
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->lij_callid))
-		dst->lij_callid = src->lij_callid;
-	if(IE_ISGOOD(src->lij_param))
-		dst->lij_param = src->lij_param;
-	if(IE_ISGOOD(src->lij_seqno))
-		dst->lij_seqno = src->lij_seqno;
-	if(IE_ISGOOD(src->exqos))
-		dst->exqos = src->exqos;
-	if(IE_ISGOOD(src->abrsetup))
-		dst->abrsetup = src->abrsetup;
-	if(IE_ISGOOD(src->abradd))
-		dst->abradd = src->abradd;
-	if(IE_ISGOOD(src->cscope))
-		dst->cscope = src->cscope;
-	if(IE_ISGOOD(src->calling_soft))
-		dst->calling_soft = src->calling_soft;
-	if(IE_ISGOOD(src->called_soft))
-		dst->called_soft = src->called_soft;
-	if(IE_ISGOOD(src->dtl_repeat))
-		dst->dtl_repeat = src->dtl_repeat;
-	for(s = d = 0; s < UNI_NUM_IE_DTL; s++)
-		if(IE_ISGOOD(src->dtl[s]))
-			dst->dtl[d++] = src->dtl[s];
-	if(IE_ISGOOD(src->report))
-		dst->report = src->report;
-	if(IE_ISGOOD(src->mdcr))
-		dst->mdcr = src->mdcr;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_status(struct uni_status *src, struct uni_status *dst)
-{
-	if(IE_ISGOOD(src->callstate))
-		dst->callstate = src->callstate;
-	if(IE_ISGOOD(src->cause))
-		dst->cause = src->cause;
-	if(IE_ISGOOD(src->epref))
-		dst->epref = src->epref;
-	if(IE_ISGOOD(src->epstate))
-		dst->epstate = src->epstate;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_status_enq(struct uni_status_enq *src, struct uni_status_enq *dst)
-{
-	if(IE_ISGOOD(src->epref))
-		dst->epref = src->epref;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_notify(struct uni_notify *src, struct uni_notify *dst)
-{
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	if(IE_ISGOOD(src->epref))
-		dst->epref = src->epref;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_restart(struct uni_restart *src, struct uni_restart *dst)
-{
-	if(IE_ISGOOD(src->connid))
-		dst->connid = src->connid;
-	if(IE_ISGOOD(src->restart))
-		dst->restart = src->restart;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_restart_ack(struct uni_restart_ack *src, struct uni_restart_ack *dst)
-{
-	if(IE_ISGOOD(src->connid))
-		dst->connid = src->connid;
-	if(IE_ISGOOD(src->restart))
-		dst->restart = src->restart;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_add_party(struct uni_add_party *src, struct uni_add_party *dst)
-{
-	u_int s, d;
-
-	if(IE_ISGOOD(src->aal))
-		dst->aal = src->aal;
-	if(IE_ISGOOD(src->bhli))
-		dst->bhli = src->bhli;
-	if(IE_ISGOOD(src->blli))
-		dst->blli = src->blli;
-	if(IE_ISGOOD(src->called))
-		dst->called = src->called;
-	for(s = d = 0; s < UNI_NUM_IE_CALLEDSUB; s++)
-		if(IE_ISGOOD(src->calledsub[s]))
-			dst->calledsub[d++] = src->calledsub[s];
-	if(IE_ISGOOD(src->calling))
-		dst->calling = src->calling;
-	for(s = d = 0; s < UNI_NUM_IE_CALLINGSUB; s++)
-		if(IE_ISGOOD(src->callingsub[s]))
-			dst->callingsub[d++] = src->callingsub[s];
-	if(IE_ISGOOD(src->scompl))
-		dst->scompl = src->scompl;
-	for(s = d = 0; s < UNI_NUM_IE_TNS; s++)
-		if(IE_ISGOOD(src->tns[s]))
-			dst->tns[d++] = src->tns[s];
-	if(IE_ISGOOD(src->epref))
-		dst->epref = src->epref;
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	if(IE_ISGOOD(src->eetd))
-		dst->eetd = src->eetd;
-	if(IE_ISGOOD(src->uu))
-		dst->uu = src->uu;
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->lij_seqno))
-		dst->lij_seqno = src->lij_seqno;
-	if(IE_ISGOOD(src->calling_soft))
-		dst->calling_soft = src->calling_soft;
-	if(IE_ISGOOD(src->called_soft))
-		dst->called_soft = src->called_soft;
-	if(IE_ISGOOD(src->dtl_repeat))
-		dst->dtl_repeat = src->dtl_repeat;
-	for(s = d = 0; s < UNI_NUM_IE_DTL; s++)
-		if(IE_ISGOOD(src->dtl[s]))
-			dst->dtl[d++] = src->dtl[s];
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_add_party_ack(struct uni_add_party_ack *src, struct uni_add_party_ack *dst)
-{
-	u_int s, d;
-
-	if(IE_ISGOOD(src->epref))
-		dst->epref = src->epref;
-	if(IE_ISGOOD(src->aal))
-		dst->aal = src->aal;
-	if(IE_ISGOOD(src->blli))
-		dst->blli = src->blli;
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	if(IE_ISGOOD(src->eetd))
-		dst->eetd = src->eetd;
-	if(IE_ISGOOD(src->conned))
-		dst->conned = src->conned;
-	if(IE_ISGOOD(src->connedsub))
-		dst->connedsub = src->connedsub;
-	if(IE_ISGOOD(src->uu))
-		dst->uu = src->uu;
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->called_soft))
-		dst->called_soft = src->called_soft;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_party_alerting(struct uni_party_alerting *src, struct uni_party_alerting *dst)
-{
-	u_int s, d;
-
-	if(IE_ISGOOD(src->epref))
-		dst->epref = src->epref;
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	if(IE_ISGOOD(src->uu))
-		dst->uu = src->uu;
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_add_party_rej(struct uni_add_party_rej *src, struct uni_add_party_rej *dst)
-{
-	u_int s, d;
-
-	if(IE_ISGOOD(src->cause))
-		dst->cause = src->cause;
-	if(IE_ISGOOD(src->epref))
-		dst->epref = src->epref;
-	if(IE_ISGOOD(src->uu))
-		dst->uu = src->uu;
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->crankback))
-		dst->crankback = src->crankback;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_drop_party(struct uni_drop_party *src, struct uni_drop_party *dst)
-{
-	u_int s, d;
-
-	if(IE_ISGOOD(src->cause))
-		dst->cause = src->cause;
-	if(IE_ISGOOD(src->epref))
-		dst->epref = src->epref;
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	if(IE_ISGOOD(src->uu))
-		dst->uu = src->uu;
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_drop_party_ack(struct uni_drop_party_ack *src, struct uni_drop_party_ack *dst)
-{
-	u_int s, d;
-
-	if(IE_ISGOOD(src->epref))
-		dst->epref = src->epref;
-	if(IE_ISGOOD(src->cause))
-		dst->cause = src->cause;
-	if(IE_ISGOOD(src->uu))
-		dst->uu = src->uu;
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_leaf_setup_req(struct uni_leaf_setup_req *src, struct uni_leaf_setup_req *dst)
-{
-	u_int s, d;
-
-	for(s = d = 0; s < UNI_NUM_IE_TNS; s++)
-		if(IE_ISGOOD(src->tns[s]))
-			dst->tns[d++] = src->tns[s];
-	if(IE_ISGOOD(src->calling))
-		dst->calling = src->calling;
-	for(s = d = 0; s < UNI_NUM_IE_CALLINGSUB; s++)
-		if(IE_ISGOOD(src->callingsub[s]))
-			dst->callingsub[d++] = src->callingsub[s];
-	if(IE_ISGOOD(src->called))
-		dst->called = src->called;
-	for(s = d = 0; s < UNI_NUM_IE_CALLEDSUB; s++)
-		if(IE_ISGOOD(src->calledsub[s]))
-			dst->calledsub[d++] = src->calledsub[s];
-	if(IE_ISGOOD(src->lij_callid))
-		dst->lij_callid = src->lij_callid;
-	if(IE_ISGOOD(src->lij_seqno))
-		dst->lij_seqno = src->lij_seqno;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_leaf_setup_fail(struct uni_leaf_setup_fail *src, struct uni_leaf_setup_fail *dst)
-{
-	u_int s, d;
-
-	if(IE_ISGOOD(src->cause))
-		dst->cause = src->cause;
-	if(IE_ISGOOD(src->called))
-		dst->called = src->called;
-	if(IE_ISGOOD(src->calledsub))
-		dst->calledsub = src->calledsub;
-	if(IE_ISGOOD(src->lij_seqno))
-		dst->lij_seqno = src->lij_seqno;
-	for(s = d = 0; s < UNI_NUM_IE_TNS; s++)
-		if(IE_ISGOOD(src->tns[s]))
-			dst->tns[d++] = src->tns[s];
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_cobisetup(struct uni_cobisetup *src, struct uni_cobisetup *dst)
-{
-	if(IE_ISGOOD(src->facility))
-		dst->facility = src->facility;
-	if(IE_ISGOOD(src->called))
-		dst->called = src->called;
-	if(IE_ISGOOD(src->calledsub))
-		dst->calledsub = src->calledsub;
-	if(IE_ISGOOD(src->calling))
-		dst->calling = src->calling;
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_facility(struct uni_facility *src, struct uni_facility *dst)
-{
-	if(IE_ISGOOD(src->facility))
-		dst->facility = src->facility;
-	if(IE_ISGOOD(src->called))
-		dst->called = src->called;
-	if(IE_ISGOOD(src->calledsub))
-		dst->calledsub = src->calledsub;
-	if(IE_ISGOOD(src->calling))
-		dst->calling = src->calling;
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_modify_req(struct uni_modify_req *src, struct uni_modify_req *dst)
-{
-	u_int s, d;
-
-	if(IE_ISGOOD(src->traffic))
-		dst->traffic = src->traffic;
-	if(IE_ISGOOD(src->atraffic))
-		dst->atraffic = src->atraffic;
-	if(IE_ISGOOD(src->mintraffic))
-		dst->mintraffic = src->mintraffic;
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_modify_ack(struct uni_modify_ack *src, struct uni_modify_ack *dst)
-{
-	u_int s, d;
-
-	if(IE_ISGOOD(src->report))
-		dst->report = src->report;
-	if(IE_ISGOOD(src->traffic))
-		dst->traffic = src->traffic;
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_modify_rej(struct uni_modify_rej *src, struct uni_modify_rej *dst)
-{
-	u_int s, d;
-
-	if(IE_ISGOOD(src->cause))
-		dst->cause = src->cause;
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_conn_avail(struct uni_conn_avail *src, struct uni_conn_avail *dst)
-{
-	u_int s, d;
-
-	if(IE_ISGOOD(src->notify))
-		dst->notify = src->notify;
-	for(s = d = 0; s < UNI_NUM_IE_GIT; s++)
-		if(IE_ISGOOD(src->git[s]))
-			dst->git[d++] = src->git[s];
-	if(IE_ISGOOD(src->report))
-		dst->report = src->report;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
-
-void
-copy_msg_unknown(struct uni_unknown *src, struct uni_unknown *dst)
-{
-	if(IE_ISGOOD(src->epref))
-		dst->epref = src->epref;
-	if(IE_ISGOOD(src->unrec))
-		dst->unrec = src->unrec;
-}
diff --git a/sys/contrib/ngatm/netnatm/sig/sig_verify.c b/sys/contrib/ngatm/netnatm/sig/sig_verify.c
deleted file mode 100644
index ae78ed8eb50f..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/sig_verify.c
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/sig/sig_verify.c,v 1.19 2004/07/08 08:22:23 brandt Exp $
- *
- * Message verification with explicit action indicators.
- */
-
-#include <netnatm/unimsg.h>
-#include <netnatm/saal/sscfudef.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/msg/unimsglib.h>
-#include <netnatm/sig/uni.h>
-
-#include <netnatm/sig/unipriv.h>
-#include <netnatm/sig/unimkmsg.h>
-
-void
-uni_mandate_ie(struct uni *uni, enum uni_ietype ie)
-{
-	struct uni_ierr *e;
-
-	FOREACH_ERR(e, uni)
-		if (e->ie == ie) {
-			e->man = 1;
-			return;
-		}
-	if (UNI_SAVE_IERR(&uni->cx, ie, UNI_IEACT_DEFAULT, UNI_IERR_MIS))
-		uni->cx.err[uni->cx.errcnt - 1].man = 1;
-}
-
-/*
- * This special handling is required for ADD PARTY, PARTY ALERTING and
- * ADD PARTY ACKNOWLEDGE by Q.2971 9.5.3.2.1.
- * It means, that the EPREF should be handled as mandatory only if
- * no other IEs have explicit action indicators.
- */
-void
-uni_mandate_epref(struct uni *uni, struct uni_ie_epref *epref)
-{
-	struct uni_ierr *e;
-	int maxact;
-
-	if (!IE_ISPRESENT(*epref)) {
-		/*
-		 * 9.5.3.2.1 -- missing endpoint reference
-		 */
-
-		/*
-		 * a) if any unrecognized or IE with error has a CLEAR
-		 *    action indicator, this takes precedence.
-		 * b) if any unrecognized or IE with error has a
-		 *    discard message and report action indicator, this takes
-		 *    precedence.
-		 * c) if any unrecognized or IE with error has a
-		 *    discard message action indicator, this takes
-		 *    precedence.
-		 *
-		 * In any of these cases we must remove the EPREF IE
-		 * if it has CLEAR, otherwise the CLEAR would take over.
-		 */
-		maxact = -1;
-		FOREACH_ERR(e, uni) {
-			if (e->ie == UNI_IE_EPREF)
-				continue;
-			if (e->act == UNI_IEACT_CLEAR)
-				maxact = UNI_IEACT_CLEAR;
-			else if (e->act == UNI_IEACT_MSG_REPORT) {
-				if (maxact == -1 && maxact != UNI_IEACT_CLEAR)
-					maxact = UNI_IEACT_MSG_REPORT;
-			} else if (e->act == UNI_IEACT_MSG_IGNORE) {
-				if (maxact == -1)
-					maxact = UNI_IEACT_MSG_IGNORE;
-			}
-		}
-
-		if (maxact != -1) {
-			/* ok, second pass to remove UNI_IE_EPREF */
-			FOREACH_ERR(e, uni)
-				if (e->ie == UNI_IE_EPREF) {
-					memmove(e, e + 1,
-					    (uni->cx.errcnt - (e - uni->cx.err)
-					    - 1) * sizeof(uni->cx.err[0]));
-					uni->cx.errcnt--;
-					break;
-				}
-			return;
-
-		}
-
-		/*
-		 * d) if nothing of the above, the IE is mandatory
-		 */
-		uni_mandate_ie(uni, UNI_IE_EPREF);
-		return;
-		
-	}
-	if (IE_ISGOOD(*epref))
-		return;
-
-	/*
-	 * It has an error obviously
-	 * 9.5.3.2.2
-	 *
-	 * It turns out, that Q.2931 handling just does the right thing
-	 * if we don't mandate the IE.
-	 */
-	return;
-}
-
-/*
- * Look, what to do with this message. We assume, that the message itself is
- * recognized.
- *
- * This is rather complicated. We must use the information provided in the
- * fields of the context, because IEs with length errors may not be set
- * altogether.
- */
-enum verify
-uni_verify(struct uni *uni, enum uni_msgact msgact)
-{
-	struct uni_ierr *e1;
-
-	if (uni->debug[UNI_FAC_VERIFY] >= 2) {
-		FOREACH_ERR(e1, uni) {
-			VERBOSE(uni, UNI_FAC_VERIFY, 2, "ie=%02x err=%u man=%d"
-			    " act=%u", e1->ie, e1->err, e1->man, e1->act);
-		}
-	}
-
-	/*
-	 * Look for missing mandatory IEs. The action indicator is ignored
-	 * according to 5.6.7.1. If IEs are missing the action is to
-	 * ignore the message and report status for all messages except
-	 * RELEASE, RELEASE_COMPLETE and SETUP. Because we must differentiate
-	 * this RAI from other RAIs in this case, use another return code.
-	 * Note, that mandatory IEs with errors are not handled here.
-	 */
-	FOREACH_ERR(e1, uni) {
-		if (e1->err == UNI_IERR_MIS) {
-			MK_IE_CAUSE(uni->cause, UNI_CAUSE_LOC_USER,
-			    UNI_CAUSE_MANDAT);
-			VERBOSE(uni, UNI_FAC_VERIFY, 1, "RAIM");
-			return (VFY_RAIM);
-		}
-	}
-
-	/*
-	 * When any IE with error specifies a CLR action indicator, this
-	 * takes precedence obviously. There are two cases here:
-	 * unrecognized IEs and IEs with error. So we look through the
-	 * error array twice and send only one STATUS. Unrecognized will
-	 * take precedence.
-	 *
-	 * 5.7.2a)
-	 */
-	FOREACH_ERR(e1, uni) {
-		if (e1->act == UNI_IEACT_CLEAR && e1->err == UNI_IERR_UNK) {
-			MK_IE_CAUSE(uni->cause, UNI_CAUSE_LOC_USER,
-			    UNI_CAUSE_IE_NIMPL);
-			VERBOSE(uni, UNI_FAC_VERIFY, 1, "CLR1");
-			return (VFY_CLR);
-		}
-	}
-
-	FOREACH_ERR(e1, uni) {
-		if (e1->act == UNI_IEACT_CLEAR &&
-		   (e1->err == UNI_IERR_LEN || e1->err == UNI_IERR_BAD ||
-		    e1->err == UNI_IERR_ACC)) {
-			MK_IE_CAUSE(uni->cause, UNI_CAUSE_LOC_USER,
-			    UNI_CAUSE_IE_INV);
-			VERBOSE(uni, UNI_FAC_VERIFY, 1, "CLR2");
-			return (VFY_CLR);
-		}
-	}
-
-	/*
-	 * Now check, whether anybody wants to explicitly ignore the message
-	 * and report status.
-	 *
-	 * 5.7.2a)
-	 */
-	FOREACH_ERR(e1, uni) {
-		if (e1->act == UNI_IEACT_MSG_REPORT && e1->err == UNI_IERR_UNK) {
-			MK_IE_CAUSE(uni->cause, UNI_CAUSE_LOC_USER,
-			    UNI_CAUSE_IE_NIMPL);
-			VERBOSE(uni, UNI_FAC_VERIFY, 1, "RAI");
-			return (VFY_RAI);
-		}
-	}
-
-	FOREACH_ERR(e1, uni) {
-		if (e1->act == UNI_IEACT_MSG_REPORT &&
-		   (e1->err == UNI_IERR_LEN || e1->err == UNI_IERR_BAD ||
-		    e1->err == UNI_IERR_ACC)) {
-			MK_IE_CAUSE(uni->cause, UNI_CAUSE_LOC_USER,
-			    UNI_CAUSE_IE_INV);
-			VERBOSE(uni, UNI_FAC_VERIFY, 1, "RAI");
-			return (VFY_RAI);
-		}
-	}
-
-	/*
-	 * Now look whether some IE wants to explicitely ignore the message
-	 * without any report.
-	 */
-	FOREACH_ERR(e1, uni) {
-		if (e1->act == UNI_IEACT_MSG_IGNORE) {
-			VERBOSE(uni, UNI_FAC_VERIFY, 1, "I1");
-			return (VFY_I);
-		}
-	}
-
-	/*
-	 * At this point we have left only
-	 *  mandatory and non-mandatory IEs with error that want the IE to be
-	 *  ignored or ignored with report or defaulted.
-	 * Because a mandatory IE with errors lead to
-	 * the message beeing ignored, we make this of higher
-	 * precedence, than the rest.
-	 */
-	FOREACH_ERR(e1, uni) {
-		if (e1->man) {
-			MK_IE_CAUSE(uni->cause, UNI_CAUSE_LOC_USER,
-			    UNI_CAUSE_MANDAT);
-			VERBOSE(uni, UNI_FAC_VERIFY, 1, "RAI");
-			return (VFY_RAI);
-		}
-	}
-
-	/*
-	 * Now look for ignoring the IE and reporting. This takes precedence
-	 * over simply ignoring it. We also collect defaulted (non-mandatory)
-	 * IEs.
-	 *
-	 * 5.7.2d) and 5.6.8.1
-	 */
-	FOREACH_ERR(e1, uni) {
-		if ((e1->act == UNI_IEACT_DEFAULT ||
-		     e1->act == UNI_IEACT_REPORT)
-		    && e1->err != UNI_IERR_UNK) {
-			MK_IE_CAUSE(uni->cause, UNI_CAUSE_LOC_USER,
-			    UNI_CAUSE_IE_INV);
-			VERBOSE(uni, UNI_FAC_VERIFY, 1, "RAP");
-			return (VFY_RAP);
-		}
-	}
-
-	FOREACH_ERR(e1, uni) {
-		if ((e1->act == UNI_IEACT_DEFAULT ||
-		     e1->act == UNI_IEACT_REPORT)
-		    && e1->err == UNI_IERR_UNK) {
-			MK_IE_CAUSE(uni->cause, UNI_CAUSE_LOC_USER,
-			    UNI_CAUSE_IE_NIMPL);
-			VERBOSE(uni, UNI_FAC_VERIFY, 1, "RAPU");
-			return (VFY_RAPU);
-		}
-	}
-
-	/*
-	 * This leaves us with IEs, that want to be ignored. Among these may
-	 * be mandatory IEs. If we have an mandatory IEs here in the error
-	 * array, then the message wil not contain enough information and
-	 * must be handled according to 5.8 as either in 5.6.7.1 (this
-	 * means, that mandatory IEs cannot really be ignored) or 5.7.1.
-	 */
-	FOREACH_ERR(e1, uni) {
-		if (e1->man) {
-			MK_IE_CAUSE(uni->cause, UNI_CAUSE_LOC_USER,
-			    UNI_CAUSE_MANDAT);
-			if (msgact == UNI_MSGACT_CLEAR) {
-				VERBOSE(uni, UNI_FAC_VERIFY, 1, "CLR3");
-				return (VFY_CLR);
-			}
-			if (msgact == UNI_MSGACT_IGNORE) {
-				VERBOSE(uni, UNI_FAC_VERIFY, 1, "I2");
-				return (VFY_I);
-			}
-			VERBOSE(uni, UNI_FAC_VERIFY, 1, "RAI");
-			return (VFY_RAI);
-		}
-	}
-
-	/*
-	 * Now only non-mandatory IEs are left, that want to be explicitely
-	 * ignored.
-	 */
-	if (uni->cx.errcnt != 0)
-		MK_IE_CAUSE(uni->cause, UNI_CAUSE_LOC_USER,
-		    UNI_CAUSE_IE_INV);
-
-	VERBOSE(uni, UNI_FAC_VERIFY, 1, "OK");
-	return (VFY_OK);
-}
-
-/*
- * Collect the IE identifiers for some of the known cause codes.
- */
-void
-uni_vfy_collect_ies(struct uni *uni)
-{
-	struct uni_ierr *e;
-
-#define STUFF_IE(IE)						\
-	uni->cause.u.ie.ie[uni->cause.u.ie.len++] = (IE);	\
-	if (uni->cause.u.ie.len == UNI_CAUSE_IE_N)		\
-		break;
-
-	uni->cause.u.ie.len = 0;
-	if (uni->cause.cause == UNI_CAUSE_MANDAT) {
-		FOREACH_ERR(e, uni) {
-			if (e->err == UNI_IERR_MIS || e->man != 0) {
-				STUFF_IE(e->ie);
-			}
-		}
-
-	} else if (uni->cause.cause == UNI_CAUSE_IE_NIMPL) {
-		FOREACH_ERR(e, uni) {
-			if (e->err == UNI_IERR_UNK) {
-				STUFF_IE(e->ie);
-			}
-		}
-
-	} else if (uni->cause.cause == UNI_CAUSE_IE_INV) {
-		FOREACH_ERR(e, uni) {
-			if (e->err == UNI_IERR_LEN ||
-			    e->err == UNI_IERR_BAD ||
-			    e->err == UNI_IERR_ACC) {
-				STUFF_IE(e->ie);
-			}
-		}
-	} else
-		return;
-
-	if (uni->cause.u.ie.len != 0)
-		uni->cause.h.present |= UNI_CAUSE_IE_P;
-}
-
-
-void
-uni_respond_status_verify(struct uni *uni, struct uni_cref *cref,
-    enum uni_callstate cs, struct uni_ie_epref *epref,
-    enum uni_epstate ps)
-{
-	struct uni_all *resp;
-
-	if ((resp = UNI_ALLOC()) == NULL)
-		return;
-
-	uni_vfy_collect_ies(uni);
-
-	MK_MSG_RESP(resp, UNI_STATUS, cref);
-	MK_IE_CALLSTATE(resp->u.status.callstate, cs);
-	resp->u.status.cause = uni->cause;
-	if (epref && IE_ISGOOD(*epref)) {
-		MK_IE_EPREF(resp->u.status.epref, epref->epref, !epref->flag);
-		MK_IE_EPSTATE(resp->u.status.epstate, ps);
-	}
-
-	uni_send_output(resp, uni);
-
-	UNI_FREE(resp);
-}
-
-/*
- * Handling of Q.2971 9.5.8.1:
- */
-void
-uni_vfy_remove_unknown(struct uni *uni)
-{
-	struct uni_ierr *e1, *e0;
-	int flag = 0;
-
-	FOREACH_ERR(e1, uni) {
-		if (e1->err == UNI_IERR_UNK) {
-			if (e1->act == UNI_IEACT_CLEAR ||
-			    e1->act == UNI_IEACT_MSG_IGNORE ||
-			    e1->act == UNI_IEACT_MSG_REPORT)
-				return;
-			if (e1->act == UNI_IEACT_REPORT ||
-			    e1->act == UNI_IEACT_DEFAULT)
-				flag = 1;
-		}
-	}
-	if (flag)
-		return;
-	e0 = e1 = uni->cx.err;
-	while (e1 < uni->cx.err + uni->cx.errcnt) {
-		if (e1->err != UNI_IERR_UNK) {
-			if (e0 != e1)
-				*e0 = *e1;
-			e0++;
-		}
-		e1++;
-	}
-	uni->cx.errcnt = e0 - uni->cx.err;
-}
-
-/*
- * Handling for ADD_PARTY_REJ and DROP_PARTY_ACK with bad cause
- */
-void
-uni_vfy_remove_cause(struct uni *uni)
-{
-	struct uni_ierr *e1, *e0;
-
-	e0 = e1 = uni->cx.err;
-	while (e1 < uni->cx.err + uni->cx.errcnt) {
-		if (e1->ie != UNI_IE_CAUSE) {
-			if (e0 != e1)
-				*e0 = *e1;
-			e0++;
-		}
-		e1++;
-	}
-	uni->cx.errcnt = e0 - uni->cx.err;
-}
diff --git a/sys/contrib/ngatm/netnatm/sig/uni.h b/sys/contrib/ngatm/netnatm/sig/uni.h
deleted file mode 100644
index 5af6c445d187..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/uni.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/sig/uni.h,v 1.5 2004/07/08 08:22:24 brandt Exp $
- *
- * Public UNI interface
- */
-#ifndef _NETNATM_SIG_UNI_H_
-#define _NETNATM_SIG_UNI_H_
-
-#include <netnatm/sig/unidef.h>
-
-struct uni;
-
-/* functions to be supplied by the user */
-struct uni_funcs {
-	/* output to the upper layer */
-	void	(*uni_output)(struct uni *, void *, enum uni_sig,
-		    uint32_t, struct uni_msg *);
-
-	/* output to the SAAL */
-	void	(*saal_output)(struct uni *, void *, enum saal_sig,
-		    struct uni_msg *);
-
-	/* verbosity */
-	void	(*verbose)(struct uni *, void *, enum uni_verb,
-		    const char *, ...) __printflike(4, 5);
-
-	/* function to 'print' status */
-	void	(*status)(struct uni *, void *, void *,
-		    const char *, ...) __printflike(4, 5);
-
-#ifndef _KERNEL
-	/* start a timer */
-	void	*(*start_timer)(struct uni *, void *, u_int,
-		    void (*)(void *), void *);
-
-	/* stop a timer */
-	void	(*stop_timer)(struct uni *, void *, void *);
-#endif
-};
-
-/* create a UNI instance */
-struct uni *uni_create(void *, const struct uni_funcs *);
-
-/* destroy a UNI instance, free all resources */
-void uni_destroy(struct uni *);
-
-/* generate a status report */
-void uni_status(struct uni *, void *);
-
-/* get current instance configuration */
-void uni_get_config(const struct uni *, struct uni_config *);
-
-/* set new instance configuration */
-void uni_set_config(struct uni *, const struct uni_config *,
-	uint32_t *, uint32_t *, uint32_t *);
-
-/* input from the SAAL to the instance */
-void  uni_saal_input(struct uni *, enum saal_sig, struct uni_msg *);
-
-/* input from the upper layer to the instance */
-void uni_uni_input(struct uni *, enum uni_sig, uint32_t, struct uni_msg *);
-
-/* do work on pending signals */
-void uni_work(struct uni *);
-
-/* set debuging level */
-void uni_set_debug(struct uni *, enum uni_verb, u_int level);
-u_int uni_get_debug(const struct uni *, enum uni_verb);
-
-/* reset a UNI instance */
-void uni_reset(struct uni *);
-
-/* states */
-u_int uni_getcustate(const struct uni *);
-
-/* return a reference to the coding/decoding context */
-struct unicx *uni_context(struct uni *);
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/sig/unidef.h b/sys/contrib/ngatm/netnatm/sig/unidef.h
deleted file mode 100644
index 7278db8b91cb..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/unidef.h
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/sig/unidef.h,v 1.9 2004/07/08 08:22:24 brandt Exp $
- *
- * UNI public definitions.
- */
-#ifndef _ATM_SIG_UNIDEF_H_
-#define _ATM_SIG_UNIDEF_H_
-
-#ifdef _KERNEL
-#include <sys/stdint.h>
-#else
-#include <stdint.h>
-#endif
-
-/*
- * Debug facilities
- */
-#define UNI_DEBUG_FACILITIES		\
-	UNI_DEBUG_DEFINE(TIMEOUT)	\
-	UNI_DEBUG_DEFINE(RESTART)	\
-	UNI_DEBUG_DEFINE(SAAL)		\
-	UNI_DEBUG_DEFINE(PARSE)		\
-	UNI_DEBUG_DEFINE(CALL)		\
-	UNI_DEBUG_DEFINE(WARN)		\
-	UNI_DEBUG_DEFINE(COORD)		\
-	UNI_DEBUG_DEFINE(API)		\
-	UNI_DEBUG_DEFINE(MSG)		\
-	UNI_DEBUG_DEFINE(ERR)		\
-	UNI_DEBUG_DEFINE(VERIFY)	\
-
-enum uni_verb {
-#define UNI_DEBUG_DEFINE(D) UNI_FAC_##D,
-	UNI_DEBUG_FACILITIES
-#undef UNI_DEBUG_DEFINE
-
-	UNI_MAXFACILITY,
-};
-
-/*
- * Default timer values and repeat counts
- */
-#define UNI_T301_DEFAULT	180000
-#define UNI_T303_DEFAULT	4000
-#define UNI_T303_CNT_DEFAULT	2
-#define UNI_T308_DEFAULT	30000
-#define UNI_T308_CNT_DEFAULT	2
-#define UNI_T309_DEFAULT	10000
-#define UNI_T310U_DEFAULT	30000
-#define UNI_T310N_DEFAULT	10000
-#define UNI_T313_DEFAULT	4000
-#define UNI_T316_DEFAULT	120000
-#define UNI_T316_CNT_DEFAULT	2
-#define UNI_T317_DEFAULT	90000
-#define UNI_T322_DEFAULT	4000
-#define UNI_T322_CNT_DEFAULT	2
-#define UNI_T397_DEFAULT	UNI_T301_DEFAULT
-#define UNI_T398_DEFAULT	4000
-#define UNI_T399U_DEFAULT	(UNI_T303_DEFAULT + UNI_T310U_DEFAULT)
-#define UNI_T399N_DEFAULT	(UNI_T303_DEFAULT + UNI_T310N_DEFAULT)
-
-/*
- * Protocol support
- */
-enum uni_proto {
-	UNIPROTO_UNI40U,	/* UNI4.0 user side */
-	UNIPROTO_UNI40N,	/* UNI4.0 network side */
-	UNIPROTO_PNNI10,	/* PNNI1.0 */
-};
-enum uni_popt {
-	UNIPROTO_GFP	= 0x0001,	/* enable GFP */
-	UNIPROTO_SB_TB	= 0x0002,	/* Coincident Sb-Tb/Tb */
-
-	UNIPROTO_ALLMASK = 0x0003,
-};
-
-/*
- * Other options
- */
-enum uni_option {
-	UNIOPT_GIT_HARD		= 0x0001,	/* harder check of GIT IE */
-	UNIOPT_BEARER_HARD	= 0x0002,	/* harder check of BEARER IE */
-	UNIOPT_CAUSE_HARD	= 0x0004,	/* harder check of CAUSE IE */
-
-	UNIOPT_ALLMASK		= 0x0007,
-};
-
-/*
- * UNI configuration
- */
-struct uni_config {
-	uint32_t	proto;		/* which protocol */
-	uint32_t	popt;		/* protocol option */
-	uint32_t	option;		/* other options */
-	uint32_t	timer301;	/* T301 */
-	uint32_t	timer303;	/* T303 */
-	uint32_t	init303;	/* T303 retransmission count */
-	uint32_t	timer308;	/* T308 */
-	uint32_t	init308;	/* T308 retransmission count */
-	uint32_t	timer309;	/* T309 */
-	uint32_t	timer310;	/* T310 */
-	uint32_t	timer313;	/* T313 */
-	uint32_t	timer316;	/* T316 */
-	uint32_t	init316;	/* T316 retransmission count */
-	uint32_t	timer317;	/* T317 */
-	uint32_t	timer322;	/* T322 */
-	uint32_t	init322;	/* T322 retransmission count */
-	uint32_t	timer397;	/* T397 */
-	uint32_t	timer398;	/* T398 */
-	uint32_t	timer399;	/* T399 */
-};
-enum uni_config_mask {
-	UNICFG_PROTO	= 0x00000001,
-	UNICFG_TIMER301	= 0x00000002,
-	UNICFG_TIMER303	= 0x00000004,
-	UNICFG_INIT303	= 0x00000008,
-	UNICFG_TIMER308	= 0x00000010,
-	UNICFG_INIT308	= 0x00000020,
-	UNICFG_TIMER309	= 0x00000040,
-	UNICFG_TIMER310	= 0x00000080,
-	UNICFG_TIMER313	= 0x00000100,
-	UNICFG_TIMER316	= 0x00000200,
-	UNICFG_INIT316	= 0x00000400,
-	UNICFG_TIMER317	= 0x00000800,
-	UNICFG_TIMER322	= 0x00001000,
-	UNICFG_INIT322	= 0x00002000,
-	UNICFG_TIMER397	= 0x00004000,
-	UNICFG_TIMER398	= 0x00008000,
-	UNICFG_TIMER399	= 0x00010000,
-
-	UNICFG_ALLMASK	= 0x0001ffff,
-};
-
-/*
- * API signals
- */
-enum uni_sig {
-	UNIAPI_ERROR			= 0,	/* UNI -> API */
-
-	UNIAPI_CALL_CREATED		= 1,	/* UNI -> API */
-	UNIAPI_CALL_DESTROYED		= 2,	/* UNI -> API */
-	UNIAPI_PARTY_CREATED		= 3,	/* UNI -> API */
-	UNIAPI_PARTY_DESTROYED		= 4,	/* UNI -> API */
-
-	UNIAPI_LINK_ESTABLISH_request	= 5,	/* API -> UNI */
-	UNIAPI_LINK_ESTABLISH_confirm	= 6,	/* UNI -> API */
-	UNIAPI_LINK_RELEASE_request	= 7,	/* API -> UNI */
-	UNIAPI_LINK_RELEASE_confirm	= 8,	/* UNI -> API */
-
-	UNIAPI_RESET_request		= 9,	/* API -> UNI */
-	UNIAPI_RESET_confirm		= 10,	/* UNI -> API */
-	UNIAPI_RESET_indication		= 11,	/* UNI -> API */
-	UNIAPI_RESET_ERROR_indication	= 12,	/* UNI -> API */
-	UNIAPI_RESET_response		= 13,	/* API -> UNI */
-	UNIAPI_RESET_ERROR_response	= 14,	/* API -> UNI */
-	UNIAPI_RESET_STATUS_indication	= 15,	/* UNI -> API */
-
-	UNIAPI_SETUP_request		= 16,	/* API -> UNI */
-	UNIAPI_SETUP_indication		= 17,	/* UNI -> API */
-	UNIAPI_SETUP_response		= 18,	/* API -> UNI */
-	UNIAPI_SETUP_confirm		= 19,	/* UNI -> API */
-	UNIAPI_SETUP_COMPLETE_indication= 20,	/* U-UNI -> API */
-	UNIAPI_SETUP_COMPLETE_request	= 46,	/* API -> N-UNI */
-	UNIAPI_ALERTING_request		= 21,	/* API -> UNI */
-	UNIAPI_ALERTING_indication	= 22,	/* UNI -> API */
-	UNIAPI_PROCEEDING_request	= 23,	/* API -> UNI */
-	UNIAPI_PROCEEDING_indication	= 24,	/* UNI -> API */
-	UNIAPI_RELEASE_request		= 25,	/* API -> UNI */
-	UNIAPI_RELEASE_indication	= 26,	/* UNI -> API */
-	UNIAPI_RELEASE_response		= 27,	/* API -> UNI */
-	UNIAPI_RELEASE_confirm		= 28,	/* UNI -> API */
-	UNIAPI_NOTIFY_request		= 29,	/* API -> UNI */
-	UNIAPI_NOTIFY_indication	= 30,	/* UNI -> API */
-	UNIAPI_STATUS_indication	= 31,	/* UNI -> API */
-	UNIAPI_STATUS_ENQUIRY_request	= 32,	/* API -> UNI */
-
-	UNIAPI_ADD_PARTY_request	= 33,	/* API -> UNI */
-	UNIAPI_ADD_PARTY_indication	= 34,	/* UNI -> API */
-	UNIAPI_PARTY_ALERTING_request	= 35,	/* API -> UNI */
-	UNIAPI_PARTY_ALERTING_indication= 36,	/* UNI -> API */
-	UNIAPI_ADD_PARTY_ACK_request	= 37,	/* API -> UNI */
-	UNIAPI_ADD_PARTY_ACK_indication	= 38,	/* UNI -> API */
-	UNIAPI_ADD_PARTY_REJ_request	= 39,	/* API -> UNI */
-	UNIAPI_ADD_PARTY_REJ_indication	= 40,	/* UNI -> API */
-	UNIAPI_DROP_PARTY_request	= 41,	/* API -> UNI */
-	UNIAPI_DROP_PARTY_indication	= 42,	/* UNI -> API */
-	UNIAPI_DROP_PARTY_ACK_request	= 43,	/* API -> UNI */
-	UNIAPI_DROP_PARTY_ACK_indication= 44,	/* UNI -> API */
-
-	UNIAPI_ABORT_CALL_request	= 45,	/* API -> UNI */
-
-	UNIAPI_MAXSIG = 47
-};
-
-struct uniapi_error {
-	uint32_t	reason;
-	uint32_t	state;
-};
-/* keep this in sync with atmapi.h:enum atmerr */
-
-#define UNIAPI_DEF_ERRORS(MACRO)					\
-	MACRO(OK, 0, "no error")					\
-	MACRO(ERROR_BAD_SIGNAL,	1, "unknown signal")			\
-	MACRO(ERROR_BADCU,	2, "signal in bad co-ordinator state")	\
-	MACRO(ERROR_BAD_CALLSTATE, 3, "signal in bad call state")	\
-	MACRO(ERROR_BAD_EPSTATE, 4, "signal in bad endpoint state")	\
-	MACRO(ERROR_BAD_ARG,	5, "bad argument")			\
-	MACRO(ERROR_BAD_CALL,	6, "unknown call reference")		\
-	MACRO(ERROR_BAD_PARTY,	7, "unknown party")			\
-	MACRO(ERROR_BAD_CTYPE,	8, "bad type of call for signal")	\
-	MACRO(ERROR_BAD_IE,	9, "bad information element")		\
-	MACRO(ERROR_EPREF_INUSE, 10, "endpoint reference already in use") \
-	MACRO(ERROR_MISSING_IE,	11, "missing information element")	\
-	MACRO(ERROR_ENCODING,	12, "error during message encoding")	\
-	MACRO(ERROR_NOMEM,	13, "out of memory")			\
-	MACRO(ERROR_BUSY,	14, "status enquiry busy")
-
-enum {
-#define DEF(NAME, VAL, STR) UNIAPI_##NAME = VAL,
-UNIAPI_DEF_ERRORS(DEF)
-#undef DEF
-};
-
-struct uniapi_call_created {
-	struct uni_cref		cref;
-};
-struct uniapi_call_destroyed {
-	struct uni_cref		cref;
-};
-struct uniapi_party_created {
-	struct uni_cref		cref;
-	struct uni_ie_epref	epref;
-};
-struct uniapi_party_destroyed {
-	struct uni_cref		cref;
-	struct uni_ie_epref	epref;
-};
-struct uniapi_abort_call_request {
-	struct uni_cref		cref;
-};
-
-struct uniapi_reset_request {
-	struct uni_ie_restart	restart;
-	struct uni_ie_connid	connid;
-};
-
-struct uniapi_reset_confirm {
-	struct uni_ie_restart	restart;
-	struct uni_ie_connid	connid;
-};
-
-struct uniapi_reset_indication {
-	struct uni_ie_restart	restart;
-	struct uni_ie_connid	connid;
-
-};
-struct uniapi_reset_error_indication {
-	uint32_t		source;		/* 0 - start, 1 - response */
-	uint32_t		reason;
-};
-
-#define UNIAPI_DEF_RESET_ERRORS(MACRO)				\
-	MACRO(UNIAPI_RESET_ERROR_NO_CONFIRM,		0,	\
-	    "no confirmation")					\
-	MACRO(UNIAPI_RESET_ERROR_NO_RESPONSE,		1,	\
-	    "no response")					\
-	MACRO(UNIAPI_RESET_ERROR_PEER_INCOMP_STATE,	2,	\
-	    "incompatible state")
-enum {
-#define DEF(NAME, VALUE, STR) NAME = VALUE,
-UNIAPI_DEF_RESET_ERRORS(DEF)
-#undef DEF
-};
-
-struct uniapi_reset_response {
-	struct uni_ie_restart	restart;
-	struct uni_ie_connid	connid;
-};
-
-struct uniapi_reset_error_response {
-	struct uni_ie_cause	cause;
-};
-
-struct uniapi_reset_status_indication {
-	struct uni_cref		cref;		/* STATUS message CREF */
-	struct uni_ie_callstate	callstate;
-	struct uni_ie_cause	cause;
-};
-
-struct uniapi_setup_request {
-	struct uni_setup	setup;
-};
-struct uniapi_setup_indication {
-	struct uni_setup	setup;
-};
-struct uniapi_setup_response {
-	struct uni_connect	connect;
-};
-struct uniapi_setup_confirm {
-	struct uni_connect	connect;
-};
-struct uniapi_setup_complete_indication {
-	struct uni_connect_ack	connect_ack;
-};
-struct uniapi_setup_complete_request {
-	struct uni_connect_ack	connect_ack;
-};
-
-struct uniapi_alerting_request {
-	struct uni_alerting	alerting;
-};
-
-struct uniapi_alerting_indication {
-	struct uni_alerting	alerting;
-};
-
-struct uniapi_proceeding_request {
-	struct uni_call_proc	call_proc;
-};
-
-struct uniapi_proceeding_indication {
-	struct uni_call_proc	call_proc;
-};
-
-
-struct uniapi_release_request {
-	struct uni_release	release;
-};
-struct uniapi_release_indication {
-	struct uni_release	release;
-};
-struct uniapi_release_response {
-	struct uni_release_compl release_compl;
-};
-/*
- * A release confirm can come from a RELEASE COMPLETE or a RELEASE.
- * Because the IEs in a RELEASE COMPLETE are a subset of a RELEASE,
- * use the RELEASE here.
- */
-struct uniapi_release_confirm {
-	struct uni_release	release;
-};
-
-struct uniapi_notify_request {
-	struct uni_notify	notify;
-};
-struct uniapi_notify_indication {
-	struct uni_notify	notify;
-};
-
-struct uniapi_status_indication {
-	struct uni_cref		cref;
-	enum uni_callstate	my_state;
-	enum uni_cause		my_cause;
-	struct uni_ie_callstate	his_state;
-	struct uni_ie_cause	his_cause;
-	struct uni_ie_epref	epref;
-	struct uni_ie_epstate	epstate;
-};
-struct uniapi_status_enquiry_request {
-	struct uni_cref		cref;
-	struct uni_ie_epref	epref;
-};
-
-struct uniapi_add_party_request {
-	struct uni_add_party	add;
-};
-struct uniapi_add_party_indication {
-	struct uni_add_party	add;
-};
-
-struct uniapi_party_alerting_request {
-	struct uni_party_alerting alert;
-};
-struct uniapi_party_alerting_indication {
-	struct uni_party_alerting alert;
-};
-
-struct uniapi_add_party_ack_request {
-	struct uni_add_party_ack ack;
-};
-struct uniapi_add_party_ack_indication {
-	struct uni_add_party_ack ack;
-};
-struct uniapi_add_party_rej_request {
-	struct uni_add_party_rej rej;
-};
-struct uniapi_add_party_rej_indication {
-	struct uni_add_party_rej rej;
-};
-
-struct uniapi_drop_party_request {
-	struct uni_drop_party	drop;
-};
-struct uniapi_drop_party_indication {
-	struct uni_drop_party	drop;
-	struct uni_ie_cause	my_cause;
-};
-
-struct uniapi_drop_party_ack_request {
-	struct uni_drop_party_ack ack;
-};
-struct uniapi_drop_party_ack_indication {
-	struct uni_drop_party	drop;
-	struct uni_ie_crankback	crankback;
-};
-
-union uniapi_all {
-	struct uniapi_error			error;
-	struct uniapi_call_created		call_created;
-	struct uniapi_call_destroyed		call_destroyed;
-	struct uniapi_party_created		party_created;
-	struct uniapi_party_destroyed		party_destroyed;
-	struct uniapi_abort_call_request	abort_call_request;
-	struct uniapi_reset_request		reset_request;
-	struct uniapi_reset_confirm		reset_confirm;
-	struct uniapi_reset_indication		reset_indication;
-	struct uniapi_reset_error_indication	reset_error_indication;
-	struct uniapi_reset_response		reset_response;
-	struct uniapi_reset_error_response	reset_error_response;
-	struct uniapi_reset_status_indication	reset_status_indication;
-	struct uniapi_setup_request		setup_request;
-	struct uniapi_setup_indication		setup_indication;
-	struct uniapi_setup_response		setup_response;
-	struct uniapi_setup_confirm		setup_confirm;
-	struct uniapi_setup_complete_indication	setup_complete_indication;
-	struct uniapi_setup_complete_request	setup_complete_request;
-	struct uniapi_alerting_request		alerting_request;
-	struct uniapi_alerting_indication	alerting_indication;
-	struct uniapi_proceeding_request	proceeding_request;
-	struct uniapi_proceeding_indication	proceeding_indication;
-	struct uniapi_release_request		release_request;
-	struct uniapi_release_indication	release_indication;
-	struct uniapi_release_response		release_response;
-	struct uniapi_release_confirm		release_confirm;
-	struct uniapi_notify_request		notify_request;
-	struct uniapi_notify_indication		notify_indication;
-	struct uniapi_status_indication		status_indication;
-	struct uniapi_status_enquiry_request	status_enquiry_request;
-	struct uniapi_add_party_request		add_party_request;
-	struct uniapi_add_party_indication	add_party_indication;
-	struct uniapi_party_alerting_request	party_alerting_request;
-	struct uniapi_party_alerting_indication	party_alerting_indication;
-	struct uniapi_add_party_ack_request	add_party_ack_request;
-	struct uniapi_add_party_ack_indication	add_party_ack_indication;
-	struct uniapi_add_party_rej_request	add_party_rej_request;
-	struct uniapi_add_party_rej_indication	add_party_rej_indication;
-	struct uniapi_drop_party_request	drop_party_request;
-	struct uniapi_drop_party_indication	drop_party_indication;
-	struct uniapi_drop_party_ack_request	drop_party_ack_request;
-	struct uniapi_drop_party_ack_indication	drop_party_ack_indication;
-};
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/sig/unimkmsg.h b/sys/contrib/ngatm/netnatm/sig/unimkmsg.h
deleted file mode 100644
index 80264e143b1c..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/unimkmsg.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/sig/unimkmsg.h,v 1.4 2003/09/19 12:03:34 hbb Exp $
- *
- * Macros to make messages.
- */
-
-#define MK_MSG_ORIG(MSG,TYPE,CREF,FLAG) 				\
-    do {								\
-	(MSG)->mtype = (TYPE);						\
-	(MSG)->u.hdr.cref.cref = (CREF);				\
-	(MSG)->u.hdr.cref.flag = (FLAG);				\
-	(MSG)->u.hdr.act = UNI_MSGACT_DEFAULT;				\
-    } while(0)
-
-#define MK_MSG_RESP(MSG,TYPE,CREF)					\
-    do {								\
-	(MSG)->mtype = (TYPE);						\
-	(MSG)->u.hdr.cref.cref = (CREF)->cref;				\
-	(MSG)->u.hdr.cref.flag = !(CREF)->flag;				\
-	(MSG)->u.hdr.act = UNI_MSGACT_DEFAULT;				\
-    } while(0)
-
-#define MK_IE_CALLSTATE(IE,CS)						\
-    do {								\
-	(IE).h.present = 0;						\
-	IE_SETPRESENT(IE);						\
-	(IE).h.coding = UNI_CODING_ITU;					\
-	(IE).h.act = UNI_IEACT_DEFAULT;					\
-	(IE).state = CS;						\
-    } while(0)
-
-#define MK_IE_EPREF(IE,EPREF,FLAG)					\
-    do {								\
-	(IE).h.present = 0;						\
-	IE_SETPRESENT(IE);						\
-	(IE).h.coding = UNI_CODING_ITU;					\
-	(IE).h.act = UNI_IEACT_DEFAULT;					\
-	(IE).epref = EPREF;						\
-	(IE).flag = FLAG;						\
-    } while(0)
-
-#define MK_IE_EPSTATE(IE,STATE)						\
-    do {								\
-	(IE).h.present = 0;						\
-	IE_SETPRESENT(IE);						\
-	(IE).h.coding = UNI_CODING_ITU;					\
-	(IE).h.act = UNI_IEACT_DEFAULT;					\
-	(IE).state = STATE;						\
-    } while(0)
-
-#define MK_IE_CAUSE(IE,LOC,CAUSE)					\
-    do {								\
-	(IE).h.present = 0;						\
-	IE_SETPRESENT(IE);						\
-	(IE).h.coding = UNI_CODING_ITU;					\
-	(IE).h.act = UNI_IEACT_DEFAULT;					\
-	(IE).loc = LOC;							\
-	(IE).cause = CAUSE;						\
-    } while(0)
-
-#define ADD_CAUSE_MTYPE(IE,MTYPE)					\
-    do {								\
-	(IE).h.present |= UNI_CAUSE_MTYPE_P;				\
-	(IE).u.mtype = MTYPE;						\
-    } while(0)
-
-#define ADD_CAUSE_CHANNID(IE,VPI,VCI)					\
-    do {								\
-	(IE).h.present |= UNI_CAUSE_VPCI_P;				\
-	(IE).u.vpci.vpci = VPI;						\
-	(IE).u.vpci.vci = VCI;						\
-    } while(0)
-
-#define ADD_CAUSE_TIMER(IE,TIMER)					\
-    do {								\
-	(IE).h.present |= UNI_CAUSE_TIMER_P;				\
-	(IE).u.timer[0] = (TIMER)[0];					\
-	(IE).u.timer[1] = (TIMER)[1];					\
-	(IE).u.timer[2] = (TIMER)[2];					\
-    } while(0)
-
-/************************************************************/
-
-#define COPY_FROM_RELEASE_COMPL(U,DEST)					\
-    do {								\
-	u_int _i, _j;							\
-									\
-	for(_i = _j = 0; _i < 2; _i++)					\
-		if(IE_ISGOOD((U)->u.release_compl.cause[_i]))		\
-			(DEST)->cause[_j++] =				\
-			    (U)->u.release_compl.cause[_i];		\
-	for(_i = _j = 0; _i < UNI_NUM_IE_GIT; _i++)			\
-		if(IE_ISGOOD((U)->u.release_compl.git[_i]))		\
-			(DEST)->git[_j++] =				\
-			    (U)->u.release_compl.git[_i];		\
-	if(IE_ISGOOD((U)->u.release_compl.uu))				\
-		(DEST)->uu = (U)->u.release_compl.uu;			\
-	if(IE_ISGOOD((U)->u.release_compl.crankback))			\
-		(DEST)->crankback = (U)->u.release_compl.crankback;	\
-    } while(0)
-
-#define COPY_FROM_DROP_ACK(U,DEST)					\
-    do {								\
-	u_int _i, _j;							\
-									\
-	if(IE_ISGOOD((U)->u.drop_party_ack.epref))			\
-		(DEST)->epref = (U)->u.drop_party_ack.epref;		\
-	if(IE_ISGOOD((U)->u.drop_party_ack.cause))			\
-		(DEST)->cause = (U)->u.drop_party_ack.cause;		\
-	if(IE_ISGOOD((U)->u.drop_party_ack.uu))				\
-		(DEST)->uu = (U)->u.drop_party_ack.uu;			\
-	for(_i = _j = 0; _i < UNI_NUM_IE_GIT; _i++)			\
-		if(IE_ISGOOD((U)->u.drop_party_ack.git[_i]))		\
-			(DEST)->git[_j++] =				\
-			    (U)->u.drop_party_ack.git[_i];		\
-    } while(0)
-
-#define COPY_FROM_ADD_REJ(U,DEST)					\
-    do {								\
-	u_int _i, _j;							\
-									\
-	if(IE_ISGOOD((U)->u.add_party_rej.epref))			\
-		(DEST)->epref = (U)->u.add_party_rej.epref;		\
-	if(IE_ISGOOD((U)->u.add_party_rej.cause))			\
-		(DEST)->cause = (U)->u.add_party_rej.cause;		\
-	if(IE_ISGOOD((U)->u.add_party_rej.uu))				\
-		(DEST)->uu = (U)->u.add_party_rej.uu;			\
-	for(_i = _j = 0; _i < UNI_NUM_IE_GIT; _i++)			\
-		if(IE_ISGOOD((U)->u.add_party_rej.git[_i]))		\
-			(DEST)->git[_j++] =				\
-			    (U)->u.add_party_rej.git[_i];		\
-    } while(0)
diff --git a/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h b/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h
deleted file mode 100644
index 70e4e2eeb8b4..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/unimsgcpy.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* This file was created automatically
- * Source file: $Begemot: libunimsg/atm/msg/msg.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD$
- */
-
-
-void
-copy_msg_alerting(struct uni_alerting *src, struct uni_alerting *dst);
-
-
-void
-copy_msg_call_proc(struct uni_call_proc *src, struct uni_call_proc *dst);
-
-
-void
-copy_msg_connect(struct uni_connect *src, struct uni_connect *dst);
-
-
-void
-copy_msg_connect_ack(struct uni_connect_ack *src, struct uni_connect_ack *dst);
-
-
-void
-copy_msg_release(struct uni_release *src, struct uni_release *dst);
-
-
-void
-copy_msg_release_compl(struct uni_release_compl *src, struct uni_release_compl *dst);
-
-
-void
-copy_msg_setup(struct uni_setup *src, struct uni_setup *dst);
-
-
-void
-copy_msg_status(struct uni_status *src, struct uni_status *dst);
-
-
-void
-copy_msg_status_enq(struct uni_status_enq *src, struct uni_status_enq *dst);
-
-
-void
-copy_msg_notify(struct uni_notify *src, struct uni_notify *dst);
-
-
-void
-copy_msg_restart(struct uni_restart *src, struct uni_restart *dst);
-
-
-void
-copy_msg_restart_ack(struct uni_restart_ack *src, struct uni_restart_ack *dst);
-
-
-void
-copy_msg_add_party(struct uni_add_party *src, struct uni_add_party *dst);
-
-
-void
-copy_msg_add_party_ack(struct uni_add_party_ack *src, struct uni_add_party_ack *dst);
-
-
-void
-copy_msg_party_alerting(struct uni_party_alerting *src, struct uni_party_alerting *dst);
-
-
-void
-copy_msg_add_party_rej(struct uni_add_party_rej *src, struct uni_add_party_rej *dst);
-
-
-void
-copy_msg_drop_party(struct uni_drop_party *src, struct uni_drop_party *dst);
-
-
-void
-copy_msg_drop_party_ack(struct uni_drop_party_ack *src, struct uni_drop_party_ack *dst);
-
-
-void
-copy_msg_leaf_setup_req(struct uni_leaf_setup_req *src, struct uni_leaf_setup_req *dst);
-
-
-void
-copy_msg_leaf_setup_fail(struct uni_leaf_setup_fail *src, struct uni_leaf_setup_fail *dst);
-
-
-void
-copy_msg_cobisetup(struct uni_cobisetup *src, struct uni_cobisetup *dst);
-
-
-void
-copy_msg_facility(struct uni_facility *src, struct uni_facility *dst);
-
-
-void
-copy_msg_modify_req(struct uni_modify_req *src, struct uni_modify_req *dst);
-
-
-void
-copy_msg_modify_ack(struct uni_modify_ack *src, struct uni_modify_ack *dst);
-
-
-void
-copy_msg_modify_rej(struct uni_modify_rej *src, struct uni_modify_rej *dst);
-
-
-void
-copy_msg_conn_avail(struct uni_conn_avail *src, struct uni_conn_avail *dst);
-
-
-void
-copy_msg_unknown(struct uni_unknown *src, struct uni_unknown *dst);
-
diff --git a/sys/contrib/ngatm/netnatm/sig/unipriv.h b/sys/contrib/ngatm/netnatm/sig/unipriv.h
deleted file mode 100644
index 35dc408b9fde..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/unipriv.h
+++ /dev/null
@@ -1,563 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/sig/unipriv.h,v 1.17 2004/07/08 08:22:25 brandt Exp $
- *
- * Private UNI stuff.
- */
-#ifndef unipriv_h
-#define unipriv_h
-
-#ifdef _KERNEL
-#ifdef __FreeBSD__
-#include <netgraph/atm/uni/ng_uni_cust.h>
-#endif
-#else
-#include "unicust.h"
-#endif
-
-struct call;
-struct party;
-
-enum cu_stat {
-	CU_STAT0,	/* AAL connection released */
-	CU_STAT1,	/* awaiting establish */
-	CU_STAT2,	/* awaiting release */
-	CU_STAT3,	/* AAL connection established */
-};
-
-/*
- * Internal Signals
- */
-#define DEF_COORD_SIGS						\
-  DEF_PRIV_SIG(O_SAAL_ESTABLISH_indication,	SAAL)		\
-  DEF_PRIV_SIG(O_SAAL_ESTABLISH_confirm,	SAAL)		\
-  DEF_PRIV_SIG(O_SAAL_RELEASE_indication,	SAAL)		\
-  DEF_PRIV_SIG(O_SAAL_RELEASE_confirm,		SAAL)		\
-  DEF_PRIV_SIG(O_SAAL_DATA_indication,		SAAL)		\
-  DEF_PRIV_SIG(O_SAAL_UDATA_indication,		SAAL)		\
-  DEF_PRIV_SIG(O_T309,				Coord)		\
-  DEF_PRIV_SIG(O_DATA,				Coord)		\
-  DEF_PRIV_SIG(O_LINK_ESTABLISH_request,	API)		\
-  DEF_PRIV_SIG(O_LINK_RELEASE_request,		API)		\
-  DEF_PRIV_SIG(O_RESET_request,			API)		\
-  DEF_PRIV_SIG(O_RESET_response,		API)		\
-  DEF_PRIV_SIG(O_RESET_ERROR_response,		API)		\
-  DEF_PRIV_SIG(O_SETUP_request,			API)		\
-  DEF_PRIV_SIG(O_SETUP_response,		API)		\
-  DEF_PRIV_SIG(O_SETUP_COMPLETE_request,	API)		\
-  DEF_PRIV_SIG(O_PROCEEDING_request,		API)		\
-  DEF_PRIV_SIG(O_ALERTING_request,		API)		\
-  DEF_PRIV_SIG(O_RELEASE_request,		API)		\
-  DEF_PRIV_SIG(O_RELEASE_response,		API)		\
-  DEF_PRIV_SIG(O_NOTIFY_request,		API)		\
-  DEF_PRIV_SIG(O_STATUS_ENQUIRY_request,	API)		\
-  DEF_PRIV_SIG(O_ADD_PARTY_request,		API)		\
-  DEF_PRIV_SIG(O_PARTY_ALERTING_request,	API)		\
-  DEF_PRIV_SIG(O_ADD_PARTY_ACK_request,		API)		\
-  DEF_PRIV_SIG(O_ADD_PARTY_REJ_request,		API)		\
-  DEF_PRIV_SIG(O_DROP_PARTY_request,		API)		\
-  DEF_PRIV_SIG(O_DROP_PARTY_ACK_request,	API)		\
-  DEF_PRIV_SIG(O_ABORT_CALL_request,		API)		\
-  DEF_PRIV_SIG(O_CALL_DESTROYED,		CallControl)	\
-  DEF_PRIV_SIG(O_RESET_indication,		ResetRespond)	\
-  DEF_PRIV_SIG(O_END,				Coord)
-
-#define DEF_RESPOND_SIGS					\
-  DEF_PRIV_SIG(R_RESTART,			Coord)		\
-  DEF_PRIV_SIG(R_STATUS,			Coord)		\
-  DEF_PRIV_SIG(R_RESET_response,		Coord)		\
-  DEF_PRIV_SIG(R_RESET_ERROR_response,		Coord)		\
-  DEF_PRIV_SIG(R_T317,				ResetRespond)	\
-  DEF_PRIV_SIG(R_END,				ResetRespond)
-
-#define DEF_START_SIGS						\
-  DEF_PRIV_SIG(S_RESTART_ACK,			Coord)		\
-  DEF_PRIV_SIG(S_STATUS,			Coord)		\
-  DEF_PRIV_SIG(S_RESET_request,			Coord)		\
-  DEF_PRIV_SIG(S_T316,				ResetStart)	\
-  DEF_PRIV_SIG(S_END,				ResetStart)
-
-#define DEF_CALL_SIGS						\
-  DEF_PRIV_SIG(C_LINK_ESTABLISH_confirm,	Coord)		\
-  DEF_PRIV_SIG(C_LINK_ESTABLISH_indication,	Coord)		\
-  DEF_PRIV_SIG(C_LINK_ESTABLISH_ERROR_indication,Coord)		\
-  DEF_PRIV_SIG(C_LINK_RELEASE_indication,	Coord)		\
-  DEF_PRIV_SIG(C_SETUP_request,			Coord)		\
-  DEF_PRIV_SIG(C_SETUP_response,		Coord)		\
-  DEF_PRIV_SIG(C_SETUP_COMPLETE_request,	Coord)		\
-  DEF_PRIV_SIG(C_PROCEEDING_request,		Coord)		\
-  DEF_PRIV_SIG(C_ALERTING_request,		Coord)		\
-  DEF_PRIV_SIG(C_RELEASE_request,		Coord)		\
-  DEF_PRIV_SIG(C_RELEASE_response,		Coord)		\
-  DEF_PRIV_SIG(C_NOTIFY_request,		Coord)		\
-  DEF_PRIV_SIG(C_STATUS_ENQUIRY_request,	Coord)		\
-  DEF_PRIV_SIG(C_ADD_PARTY_request,		Coord)		\
-  DEF_PRIV_SIG(C_PARTY_ALERTING_request,	Coord)		\
-  DEF_PRIV_SIG(C_ADD_PARTY_ACK_request,		Coord)		\
-  DEF_PRIV_SIG(C_ADD_PARTY_REJ_request,		Coord)		\
-  DEF_PRIV_SIG(C_DROP_PARTY_request,		Coord)		\
-  DEF_PRIV_SIG(C_DROP_PARTY_ACK_request,	Coord)		\
-  DEF_PRIV_SIG(C_ABORT_CALL_request,		Coord)		\
-  DEF_PRIV_SIG(C_UNKNOWN,			Coord)		\
-  DEF_PRIV_SIG(C_SETUP,				Coord)		\
-  DEF_PRIV_SIG(C_CALL_PROC,			Coord)		\
-  DEF_PRIV_SIG(C_ALERTING,			Coord)		\
-  DEF_PRIV_SIG(C_CONNECT,			Coord)		\
-  DEF_PRIV_SIG(C_CONNECT_ACK,			Coord)		\
-  DEF_PRIV_SIG(C_RELEASE,			Coord)		\
-  DEF_PRIV_SIG(C_RELEASE_COMPL,			Coord)		\
-  DEF_PRIV_SIG(C_COBISETUP,			Coord)		\
-  DEF_PRIV_SIG(C_NOTIFY,			Coord)		\
-  DEF_PRIV_SIG(C_STATUS,			Coord)		\
-  DEF_PRIV_SIG(C_STATUS_ENQ,			Coord)		\
-  DEF_PRIV_SIG(C_ADD_PARTY,			Coord)		\
-  DEF_PRIV_SIG(C_PARTY_ALERTING,		Coord)		\
-  DEF_PRIV_SIG(C_ADD_PARTY_ACK,			Coord)		\
-  DEF_PRIV_SIG(C_ADD_PARTY_REJ,			Coord)		\
-  DEF_PRIV_SIG(C_DROP_PARTY,			Coord)		\
-  DEF_PRIV_SIG(C_DROP_PARTY_ACK,		Coord)		\
-  DEF_PRIV_SIG(C_CALL_DELETE,			CallControl)	\
-  DEF_PRIV_SIG(C_T301,				CallControl)	\
-  DEF_PRIV_SIG(C_T303,				CallControl)	\
-  DEF_PRIV_SIG(C_T308,				CallControl)	\
-  DEF_PRIV_SIG(C_T310,				CallControl)	\
-  DEF_PRIV_SIG(C_T313,				CallControl)	\
-  DEF_PRIV_SIG(C_T322,				CallControl)	\
-  DEF_PRIV_SIG(C_DROP_PARTY_indication,		PartyControl)	\
-  DEF_PRIV_SIG(C_SEND_DROP_PARTY,		PartyControl)	\
-  DEF_PRIV_SIG(C_DROP_PARTY_ACK_indication,	PartyControl)	\
-  DEF_PRIV_SIG(C_SEND_DROP_PARTY_ACK,		PartyControl)	\
-  DEF_PRIV_SIG(C_ADD_PARTY_REJ_indication,	PartyControl)	\
-  DEF_PRIV_SIG(C_SEND_ADD_PARTY_REJ,		PartyControl)	\
-  DEF_PRIV_SIG(C_SEND_STATUS_ENQ,		PartyControl)	\
-  DEF_PRIV_SIG(C_PARTY_DESTROYED,		PartyControl)	\
-  DEF_PRIV_SIG(C_END,				CallControl)
-
-#define DEF_PARTY_SIGS							\
-  DEF_PRIV_SIG(P_SETUP,				CallControl)		\
-  DEF_PRIV_SIG(P_ALERTING,			CallControl)		\
-  DEF_PRIV_SIG(P_CONNECT,			CallControl)		\
-  DEF_PRIV_SIG(P_CONNECT_ACK,			CallControl)		\
-  DEF_PRIV_SIG(P_RELEASE,			CallControl)		\
-  DEF_PRIV_SIG(P_RELEASE_COMPL,			CallControl)		\
-  DEF_PRIV_SIG(P_STATUS,			CallControl)		\
-  DEF_PRIV_SIG(P_ADD_PARTY,			CallControl)		\
-  DEF_PRIV_SIG(P_PARTY_ALERTING,		CallControl)		\
-  DEF_PRIV_SIG(P_ADD_PARTY_ACK,			CallControl)		\
-  DEF_PRIV_SIG(P_ADD_PARTY_REJ,			CallControl)		\
-  DEF_PRIV_SIG(P_DROP_PARTY,			CallControl)		\
-  DEF_PRIV_SIG(P_DROP_PARTY_ACK,		CallControl)		\
-  DEF_PRIV_SIG(P_SETUP_request,			CallControl)		\
-  DEF_PRIV_SIG(P_SETUP_response,		CallControl)		\
-  DEF_PRIV_SIG(P_SETUP_COMPL_request,		CallControl)		\
-  DEF_PRIV_SIG(P_ALERTING_request,		CallControl)		\
-  DEF_PRIV_SIG(P_RELEASE_request,		CallControl)		\
-  DEF_PRIV_SIG(P_RELEASE_response,		CallControl)		\
-  DEF_PRIV_SIG(P_RELEASE_confirm,		CallControl)		\
-  DEF_PRIV_SIG(P_STATUS_ENQUIRY_request,	CallControl)		\
-  DEF_PRIV_SIG(P_ADD_PARTY_request,		CallControl)		\
-  DEF_PRIV_SIG(P_PARTY_ALERTING_request,	CallControl)		\
-  DEF_PRIV_SIG(P_ADD_PARTY_ACK_request,		CallControl)		\
-  DEF_PRIV_SIG(P_ADD_PARTY_REJ_request,		CallControl)		\
-  DEF_PRIV_SIG(P_DROP_PARTY_request,		CallControl)		\
-  DEF_PRIV_SIG(P_DROP_PARTY_ACK_request,	CallControl)		\
-  DEF_PRIV_SIG(P_PARTY_DELETE,			PartyControl)		\
-  DEF_PRIV_SIG(P_T397,				PartyControl)		\
-  DEF_PRIV_SIG(P_T398,				PartyControl)		\
-  DEF_PRIV_SIG(P_T399,				PartyControl)		\
-  DEF_PRIV_SIG(P_END,				PartyControl)
-
-
-#define DEF_PRIV_SIG(NAME, FROM)	SIG##NAME,
-enum coord_sig {
-	DEF_COORD_SIGS
-};
-enum respond_sig {
-	DEF_RESPOND_SIGS
-};
-enum start_sig {
-	DEF_START_SIGS
-};
-enum call_sig {
-	DEF_CALL_SIGS
-};
-enum party_sig {
-	DEF_PARTY_SIGS
-};
-#undef DEF_PRIV_SIG
-
-/*************************************************************
- *
- * SIGNALS and SIGNAL QUEUES
- */
-enum {
-	SIG_COORD,
-	SIG_RESET_START,
-	SIG_RESET_RESP,
-	SIG_CALL,
-	SIG_PARTY,
-};
-
-struct sig {
-	TAILQ_ENTRY(sig) link;
-	u_int		type;	/* one of the above */
-	struct call	*call;	/* call to send to */
-	struct party	*party;	/* party to send to */
-	uint32_t	sig;	/* the signal */
-	uint32_t	cookie;	/* user cookie */
-	struct uni_msg	*msg;	/* attached message */
-	struct uni_all	*u;	/* dito */
-};
-TAILQ_HEAD(sigqueue, sig);
-
-#define SIGQ_CLEAR(Q)							\
-    do {								\
-	struct sig *s;							\
-	while(!TAILQ_EMPTY(Q)) {					\
-		s = TAILQ_FIRST(Q);					\
-		TAILQ_REMOVE(Q, s, link);				\
-		if(s->msg) uni_msg_destroy(s->msg);			\
-		if(s->u) UNI_FREE(s->u);				\
-		SIG_FREE(s);						\
-	}								\
-    } while(0)
-
-void uni_sig_party(struct party *, enum party_sig, uint32_t cookie,
-    struct uni_msg *, struct uni_all *);
-void uni_sig_call(struct call *, enum call_sig, uint32_t cookie,
-    struct uni_msg *, struct uni_all *);
-void uni_sig_coord(struct uni *, enum coord_sig, uint32_t cookie,
-    struct uni_msg *);
-void uni_sig_start(struct uni *, enum start_sig, uint32_t cookie,
-    struct uni_msg *, struct uni_all *);
-void uni_sig_respond(struct uni *, enum respond_sig, uint32_t cookie,
-    struct uni_msg *, struct uni_all *);
-
-/*************************************************************
- *
- * CALL INSTANCES
- */
-struct party {
-	struct call		*call;
-	TAILQ_ENTRY(party)	link;
-	u_int			epref;	/* endpoint reference */
-	u_int			flags;	/* flags */
-	enum uni_epstate	state;	/* party state */
-
-	struct uni_timer	t397;	/* T397 */
-	struct uni_timer	t398;	/* T398 */
-	struct uni_timer	t399;	/* T399 */
-};
-#define	PARTY_MINE	0x0001		/* must be 1 */
-#define	PARTY_CONNECT	0x0002		/* connect request from this party */
-
-TAILQ_HEAD(partyqueue, party);
-
-void uni_destroy_party(struct party *, int);
-struct party *uni_find_party(struct call *, struct uni_ie_epref *);
-struct party *uni_find_partyx(struct call *, u_int epref, u_int mine);
-struct party *uni_create_party(struct call *, struct uni_ie_epref *);
-struct party *uni_create_partyx(struct call *, u_int epref, u_int mine,
-    uint32_t cookie);
-u_int uni_party_act_count(struct call *, int);
-
-enum call_type {
-	CALL_NULL,	/* not known yet */
-	CALL_P2P,	/* normal point-to-point call */
-	CALL_COBI,	/* Q.2932.1 COBI call */
-	CALL_ROOT,	/* point-to-multipoint root */
-	CALL_LEAF,	/* point-to-multipoint leaf */
-};
-
-enum call_state {
-	CALLST_NULL,
-	CALLST_U1, CALLST_U3, CALLST_U4, CALLST_U6, CALLST_U7, CALLST_U8,
-	CALLST_U9, CALLST_U10, CALLST_U11, CALLST_U12,
-	CALLST_N1, CALLST_N3, CALLST_N4, CALLST_N6, CALLST_N7, CALLST_N8,
-	CALLST_N9, CALLST_N10, CALLST_N11, CALLST_N12
-};
-
-struct call {
-	TAILQ_ENTRY(call)	link;	/* link between calls */
-	struct uni		*uni;	/* backpointer to owning UNI */
-	u_int			cref;	/* call reference value or lij seqno */
-	u_int			mine;	/* if TRUE this is my call */
-	enum call_type		type;	/* what call is it */
-	enum call_state		cstate;	/* the state of the call */
-	struct uni_ie_connid	connid;	/* the connection ID */
-	struct uni_setup	msg_setup;	/* retransmission */
-	struct uni_release	msg_release;	/* retransmission */
-	struct uni_ie_epref	stat_epref;	/* retransmission */
-	struct partyqueue	parties;
-	u_int			se_active;	/* status enquiry active */
-	u_int			epref_alloc;
-
-	struct uni_timer	t308;	/* T303 */
-	u_int			cnt308;
-
-	struct uni_timer	t303;	/* T303 */
-	u_int			cnt303;
-
-	struct uni_timer	t301;	/* T301 */
-	struct uni_timer	t310;	/* T310 */
-	struct uni_timer	t313;	/* T313 */
-
-	struct uni_timer	t322;	/* T322 */
-	u_int			cnt322;
-};
-
-TAILQ_HEAD(callqueue, call);
-
-struct call *uni_find_call(struct uni *, struct uni_cref *);
-struct call *uni_find_callx(struct uni *, u_int cref, u_int mine);
-struct call *uni_create_call(struct uni *, u_int cref, u_int mine,
-	uint32_t cookie);
-struct call *uni_create_new_call(struct uni *, uint32_t cookie);
-void uni_destroy_call(struct call *, int);
-
-void uni_bad_message(struct call *, struct uni_all *, u_int,
-    struct uni_ie_epref *, int);
-
-extern const struct callstates {
-	const char *name;
-	enum uni_callstate ext;
-} callstates[];
-
-/*************************************************************
- *
- * UNI INSTANCE
- */
-struct uni {
-	void			*arg;	/* user arg */
-	const struct uni_funcs	*funcs;
-
-	enum uni_proto		proto;	/* protocol */
-	struct unicx		cx;	/* decoding/coding context */
-	int			sb_tb : 1;	/* Sb-Tb/Tb point */
-
-	struct sigqueue		workq;	/* work queue */
-	struct sigqueue		delq;	/* delayed signal queue */
-	int			working;
-
-	uint32_t		cref_alloc;
-
-	enum cu_stat		custat;	/* coordinator state */
-	struct uni_timer	t309;
-	u_int			timer309;
-
-	enum uni_callstate	glob_start;
-	enum uni_callstate	glob_respond;
-	struct uni_timer	t316;
-	struct uni_timer	t317;
-	struct uni_ie_connid	connid_start;
-	struct uni_ie_connid	connid_respond;
-	u_int			cnt316;
-	struct uni_ie_restart	restart_start;
-
-	struct callqueue	calls;
-
-	struct uni_ie_cause	cause;	/* working area for verify */
-
-	/* tuneable parameters */
-	u_int			timer301;
-	u_int			init303;
-	u_int			timer303;
-	u_int			init308;
-	u_int			timer308;
-	u_int			timer310;
-	u_int			timer313;
-	u_int			init316;
-	u_int			timer316;
-	u_int			timer317;
-	u_int			timer322;
-	u_int			init322;
-	u_int			timer397;
-	u_int			timer398;
-	u_int			timer399;
-
-	u_int			debug[UNI_MAXFACILITY];
-};
-
-void uniapi_uni_error(struct uni *uni, uint32_t reason, uint32_t cookie,
-	uint32_t state);
-void uniapi_call_error(struct call *c, uint32_t reason, uint32_t cookie);
-void uniapi_party_error(struct party *p, uint32_t reason, uint32_t cookie);
-
-/*************************************************************
- *
- * INLINE FUNCTIONS
- */
-
-/* Enqueue a signal in the working queue */
-void uni_enq_sig(struct uni *, u_int, struct call *, struct party *,
-    uint32_t, uint32_t, struct uni_msg *, struct uni_all *);
-
-/* Enqueue a signal in the delayed queue */
-void uni_delenq_sig(struct uni *, u_int, struct call *, struct party *,
-    uint32_t, uint32_t, struct uni_msg *, struct uni_all *);
-
-/* Enqueue a signal to the coordinator */
-#define	uni_enq_coord(UNI, SIG, COOKIE, MSG) do {			\
-	uni_enq_sig((UNI), SIG_COORD, NULL, NULL,			\
-	    (SIG), (COOKIE), (MSG), NULL);				\
-    } while (0)
-
-/* Enqueue a delayed signal to the coordinator */
-#define	uni_delenq_coord(UNI, SIG, COOKIE, MSG) do {			\
-	uni_delenq_sig((UNI), SIG_COORD, NULL, NULL,			\
-	    (SIG), (COOKIE), (MSG), NULL);				\
-    } while (0)
-
-/* Enqueue a signal to a call */
-#define uni_enq_call(CALL, SIG, COOKIE, MSG, U) do {			\
-	uni_enq_sig((CALL)->uni, SIG_CALL, (CALL), NULL,		\
-	    (SIG), (COOKIE), (MSG), (U));				\
-    } while (0)
-
-/* Enqueue a signal to a party */
-#define uni_enq_party(PARTY, SIG, COOKIE, MSG, U) do {			\
-	uni_enq_sig((PARTY)->call->uni, SIG_PARTY, (PARTY)->call,	\
-	    (PARTY), (SIG), (COOKIE), (MSG), (U));			\
-    } while (0)
-
-/* Enqueue a signal to RESET-START */
-#define	uni_enq_start(UNI, SIG, COOKIE, MSG, U) do {			\
-	uni_enq_sig((UNI), SIG_RESET_START, NULL, NULL,			\
-	    (SIG), (COOKIE), (MSG), (U));				\
-    } while (0)
-
-/* Enqueue a signal to RESET-RESPOND */
-#define	uni_enq_resp(UNI, SIG, COOKIE, MSG, U) do {			\
-	uni_enq_sig((UNI), SIG_RESET_RESP, NULL, NULL,			\
-	    (SIG), (COOKIE), (MSG), (U));				\
-    } while (0)
-
-int uni_send_output(struct uni_all *u, struct uni *uni);
-void uni_undel(struct uni *, int (*)(struct sig *, void *), void *);
-void uni_delsig(struct uni *, u_int, struct call *, struct party *);
-
-void uni_release_compl(struct call *, struct uni_all *);
-
-/*************************************************************/
-/*
- * Message verification.
- */
-#define MANDATE_IE(UNI,MSG,IE)						\
-    do {								\
-	if (!IE_ISGOOD(MSG))						\
-		uni_mandate_ie(UNI, IE);				\
-    } while(0)
-
-enum verify {
-	VFY_OK,		/* ok */
-	VFY_RAP,	/* report and proceed */
-	VFY_RAPU,	/* report and proceed becuase of unknown IEs */
-	VFY_I,		/* ignore */
-	VFY_CLR,	/* clear call */
-	VFY_RAI,	/* report and ignore */
-	VFY_RAIM,	/* report and ignore because if mandat. IE miss */
-};
-
-void uni_mandate_ie(struct uni *, enum uni_ietype);
-void uni_mandate_epref(struct uni *, struct uni_ie_epref *);
-enum verify uni_verify(struct uni *, enum uni_msgact);
-void uni_respond_status_verify(struct uni *, struct uni_cref *,
-	enum uni_callstate, struct uni_ie_epref *, enum uni_epstate);
-void uni_vfy_remove_unknown(struct uni *);
-void uni_vfy_remove_cause(struct uni *);
-void uni_vfy_collect_ies(struct uni *);
-
-
-void uni_respond_status(struct uni *uni, struct uni_cref *cref,
-    enum uni_callstate cs, enum uni_cause c1);
-void uni_respond_status_mtype(struct uni *uni, struct uni_cref *cref,
-    enum uni_callstate cs, enum uni_cause c1, u_int mtype);
-
-#define	FOREACH_ERR(E, UNI) \
-	for ((E) = (UNI)->cx.err; (E) < (UNI)->cx.err + (UNI)->cx.errcnt; (E)++)
-
-#define ALLOC_API(TYPE,API)					\
-    ({								\
-	TYPE *_tmp = NULL;					\
-								\
-	if(((API) = uni_msg_alloc(sizeof(TYPE))) != NULL) {	\
-		_tmp = uni_msg_wptr((API), TYPE *);		\
-		(API)->b_wptr += sizeof(TYPE);			\
-		memset(_tmp, 0, sizeof(TYPE));			\
-	}							\
-	_tmp;							\
-    })
-
-#if defined(__GNUC__) && __GNUC__ < 3
-
-#define	VERBOSE(UNI, FAC, LEVEL, ARGS...) do {			\
-	if ((UNI)->debug[(FAC)] >= (LEVEL)) {			\
-		(UNI)->funcs->verbose((UNI), (UNI)->arg, (FAC) ,\
-		   ## ARGS);					\
-	}							\
-    } while(0)
-
-#define VERBOSE0(UNI, FAC, ARGS...) do {			\
-	(UNI)->funcs->verbose((UNI), (UNI)->arg, (FAC) ,	\
-	    ## ARGS);						\
-    } while(0)
-
-#else
-
-#define VERBOSE(UNI, FAC, LEVEL, ...) do {			\
-	if ((UNI)->debug[(FAC)] >= (LEVEL)) {			\
-		(UNI)->funcs->verbose((UNI), (UNI)->arg, (FAC),	\
-		    __VA_ARGS__);				\
-	}							\
-    } while(0)
-
-#define VERBOSE0(UNI, FAC, ...) do {				\
-	(UNI)->funcs->verbose((UNI), (UNI)->arg, (FAC),		\
-	    __VA_ARGS__);					\
-    } while(0)
-
-#endif
-
-#define TIMER_INIT_UNI(U,T)	_TIMER_INIT(U,T)
-#define TIMER_INIT_CALL(C,T)	_TIMER_INIT(C,T)
-#define TIMER_INIT_PARTY(P,T)	_TIMER_INIT(P,T)
-
-#define TIMER_DESTROY_UNI(U,T)		_TIMER_DESTROY(U, (U)->T)
-#define TIMER_DESTROY_CALL(C,T)		_TIMER_DESTROY((C)->uni, (C)->T)
-#define TIMER_DESTROY_PARTY(P,T)	_TIMER_DESTROY((P)->call->uni, (P)->T)
-
-#define TIMER_STOP_UNI(U,T)	_TIMER_STOP(U, (U)->T)
-#define TIMER_STOP_CALL(C,T)	_TIMER_STOP((C)->uni, (C)->T)
-#define TIMER_STOP_PARTY(P,T)	_TIMER_STOP((P)->call->uni, (P)->T)
-
-#define TIMER_START_UNI(U,T,N) _TIMER_START(U, U, (U)->T, N, _##T##_func)
-#define TIMER_START_CALL(C,T,N) _TIMER_START(C->uni, C, (C)->T, N, _##T##_func)
-#define TIMER_START_PARTY(P,T,N) _TIMER_START(P->call->uni, P, (P)->T, N, _##T##_func)
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/sig/unisig.h b/sys/contrib/ngatm/netnatm/sig/unisig.h
deleted file mode 100644
index 22ff671d2922..000000000000
--- a/sys/contrib/ngatm/netnatm/sig/unisig.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/sig/unisig.h,v 1.4 2004/07/08 08:22:26 brandt Exp $
- *
- * Utility functions for signalling stuff
- */
-#ifndef _NETNATM_SIG_UNISIG_H_
-#define _NETNATM_SIG_UNISIG_H_
-
-#include <netnatm/sig/unidef.h>
-
-/* names */
-const char *uni_signame(enum uni_sig);
-const char *uni_facname(enum uni_verb);
-
-/* return a string for the error code */
-const char *uni_strerr(u_int _err);
-
-/* format an API message */
-void uni_print_api(char *_buf, size_t _bufsiz, u_int _type, u_int _cookie,
-    const void *_msg, struct unicx *_cx);
-
-#endif
diff --git a/sys/contrib/ngatm/netnatm/unimsg.h b/sys/contrib/ngatm/netnatm/unimsg.h
deleted file mode 100644
index efc91c57a81f..000000000000
--- a/sys/contrib/ngatm/netnatm/unimsg.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $Begemot: libunimsg/netnatm/unimsg.h,v 1.4 2004/07/08 08:21:46 brandt Exp $
- *
- * This defines the structure of messages as handled by this library.
- */
-#ifndef _NETNATM_UNIMSG_H_
-#define _NETNATM_UNIMSG_H_
-
-#include <sys/types.h>
-#ifdef _KERNEL
-#ifdef __FreeBSD__
-#include <sys/systm.h>
-#endif
-#include <sys/stdint.h>
-#else
-#include <string.h>
-#include <stdint.h>
-#endif
-
-struct uni_msg {
-	u_char		*b_wptr;	/* tail pointer */
-	u_char		*b_rptr;	/* head pointer */
-	u_char		*b_buf;		/* data buffer */
-	u_char		*b_lim;		/* end of data buffer */
-};
-
-/* return the current length of the message */
-#define uni_msg_len(M)		((size_t)((M)->b_wptr - (M)->b_rptr))
-
-/* return the number of space behind the message */
-#define uni_msg_space(M)	((size_t)((M)->b_lim - (M)->b_wptr))
-
-/* return the amount of leading free space */
-#define uni_msg_leading(M)	((size_t)((M)->b_rptr - (M)->b_buf))
-
-/* return the maximum size of the message (length plus free space) */
-#define uni_msg_size(M)		((size_t)((M)->b_lim - (M)->b_buf));
-
-/* ensure that there is space for another S bytes. If reallocation fails
- * free message and return -1 */
-#define uni_msg_ensure(M, S)					\
-	((uni_msg_space(M) >= (S)) ? 0 : uni_msg_extend(M, S))
-
-int uni_msg_append(struct uni_msg *, void *, size_t);
-int uni_msg_extend(struct uni_msg *, size_t);
-
-#define uni_msg_rptr(MSG, TYPE) ((TYPE)(void *)(MSG)->b_rptr)
-#define uni_msg_wptr(MSG, TYPE) ((TYPE)(void *)(MSG)->b_wptr)
-
-int uni_msg_prepend(struct uni_msg *, size_t);
-
-#ifndef _KERNEL
-
-struct uni_msg *uni_msg_alloc(size_t);
-struct uni_msg *uni_msg_build(void *, ...);
-void uni_msg_destroy(struct uni_msg *);
-u_int uni_msg_strip32(struct uni_msg *);
-u_int uni_msg_get32(struct uni_msg *);
-int uni_msg_append32(struct uni_msg *, u_int);
-int uni_msg_append8(struct uni_msg *, u_int);
-u_int uni_msg_trail32(const struct uni_msg *, int);
-struct uni_msg *uni_msg_dup(const struct uni_msg *);
-
-#endif /* _KERNEL */
-#endif
diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile
index 8054183d419b..c1c78e351644 100644
--- a/sys/modules/netgraph/Makefile
+++ b/sys/modules/netgraph/Makefile
@@ -1,67 +1,66 @@
 # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $
 # $FreeBSD$
 
 SYSDIR?=${SRCTOP}/sys
 .include "${SYSDIR}/conf/kern.opts.mk"
 
 SUBDIR=	async \
-	atm \
 	atmllc \
 	${_bluetooth} \
 	bpf \
 	bridge \
 	car \
 	checksum \
 	cisco \
 	deflate \
 	device \
 	echo \
 	eiface \
 	etf \
 	ether \
 	ether_echo \
 	frame_relay \
 	gif \
 	gif_demux \
 	hole \
 	hub \
 	iface \
 	ip_input \
 	ipfw \
 	ksocket \
 	l2tp \
 	lmi \
 	macfilter \
 	${_mppc} \
 	nat \
 	netflow \
 	netgraph \
 	one2many \
 	patch \
 	pipe \
 	ppp \
 	pppoe \
 	pptpgre \
 	pred1 \
 	rfc1490 \
 	socket \
 	source \
 	split \
 	tag \
 	tcpmss \
 	tee \
 	tty \
 	UI \
 	vjc \
 	vlan \
 	vlan_rotate
 
 .if ${MK_BLUETOOTH} != "no" || defined(ALL_MODULES)
 _bluetooth=	bluetooth
 .endif
 
 .if ${MK_CRYPT} != "no" && exists(${SYSDIR}/crypto/rc4/rc4.c)
 _mppc=		mppc
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/netgraph/atm/Makefile b/sys/modules/netgraph/atm/Makefile
deleted file mode 100644
index 086819d5b54b..000000000000
--- a/sys/modules/netgraph/atm/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=			\
-	atmbase		\
-	ccatm		\
-	sscfu		\
-	sscop		\
-	uni
-
-.include <bsd.subdir.mk>
diff --git a/sys/modules/netgraph/atm/Makefile.inc b/sys/modules/netgraph/atm/Makefile.inc
deleted file mode 100644
index 265f86d1ed55..000000000000
--- a/sys/modules/netgraph/atm/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-.include "../Makefile.inc"
diff --git a/sys/modules/netgraph/atm/atmbase/Makefile b/sys/modules/netgraph/atm/atmbase/Makefile
deleted file mode 100644
index 68959693811e..000000000000
--- a/sys/modules/netgraph/atm/atmbase/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-#
-# Author: Harti Brandt <harti@freebsd.org>
-#
-
-LIBBASE= ${SRCTOP}/sys/contrib/ngatm
-
-.PATH: ${SRCTOP}/sys/netgraph/atm
-.PATH: ${LIBBASE}/netnatm/misc
-.PATH: ${LIBBASE}/netnatm/msg
-
-KMOD=	ngatmbase
-SRCS= 	ngatmbase.c unimsg_common.c straddr.c				\
-	traffic.c uni_ie.c uni_msg.c
-
-CFLAGS+= -I${LIBBASE} # -DNGATM_DEBUG
-
-EXPORT_SYMS=	YES
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/atm/ccatm/Makefile b/sys/modules/netgraph/atm/ccatm/Makefile
deleted file mode 100644
index 3cf9070dfc50..000000000000
--- a/sys/modules/netgraph/atm/ccatm/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-#
-# Author: Harti Brandt <harti@freebsd.org>
-#
-
-LIBBASE= ${SRCTOP}/sys/contrib/ngatm
-
-.PATH: ${SRCTOP}/sys/netgraph/atm/ccatm
-.PATH: ${LIBBASE}/netnatm/api
-
-KMOD=	ng_ccatm
-SRCS=	ng_ccatm.c cc_conn.c cc_data.c cc_dump.c cc_port.c cc_sig.c	\
-	cc_user.c unisap.c
-
-CFLAGS+= -I${LIBBASE} -DCCATM_DEBUG
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/atm/sscfu/Makefile b/sys/modules/netgraph/atm/sscfu/Makefile
deleted file mode 100644
index 3d747c766ed8..000000000000
--- a/sys/modules/netgraph/atm/sscfu/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-#
-# Author: Harti Brandt <harti@freebsd.org>
-#
-
-LIBBASE= ${SRCTOP}/sys/contrib/ngatm
-
-.PATH: ${SRCTOP}/sys/netgraph/atm/sscfu ${LIBBASE}/netnatm/saal
-
-KMOD=	ng_sscfu
-SRCS= 	ng_sscfu.c saal_sscfu.c
-CFLAGS+= -I${LIBBASE} # -DSSCFU_DEBUG
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/atm/sscop/Makefile b/sys/modules/netgraph/atm/sscop/Makefile
deleted file mode 100644
index 3270f1355d72..000000000000
--- a/sys/modules/netgraph/atm/sscop/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-#
-# Author: Harti Brandt <harti@freebsd.org>
-
-LIBBASE= ${SRCTOP}/sys/contrib/ngatm
-
-.PATH: ${SRCTOP}/sys/netgraph/atm/sscop ${LIBBASE}/netnatm/saal
-
-KMOD=	ng_sscop
-SRCS= 	ng_sscop.c saal_sscop.c
-CFLAGS+= -I${LIBBASE} # -DSSCOP_DEBUG
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/atm/uni/Makefile b/sys/modules/netgraph/atm/uni/Makefile
deleted file mode 100644
index a260fcac2747..000000000000
--- a/sys/modules/netgraph/atm/uni/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-#
-# Author: Harti Brandt <harti@freebsd.org>
-#
-
-LIBBASE= ${SRCTOP}/sys/contrib/ngatm
-
-.PATH: ${SRCTOP}/sys/netgraph/atm/uni
-.PATH: ${LIBBASE}/netnatm/sig
-
-KMOD=	ng_uni
-SRCS=	ng_uni.c sig_call.c sig_uni.c sig_party.c sig_coord.c		\
-	sig_reset.c sig_verify.c sig_print.c sig_unimsgcpy.c
-
-CFLAGS+= -I${LIBBASE} -I${LIBBASE}/netnatm/sig # -DUNI_DEBUG
-
-.include <bsd.kmod.mk>
diff --git a/sys/netgraph/atm/ccatm/ng_ccatm.c b/sys/netgraph/atm/ccatm/ng_ccatm.c
deleted file mode 100644
index 4a7af2c4579b..000000000000
--- a/sys/netgraph/atm/ccatm/ng_ccatm.c
+++ /dev/null
@@ -1,1193 +0,0 @@
-/*-
- * Copyright (c) 2001-2002
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- * Copyright (c) 2003-2004
- *	Hartmut Brandt
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation must retain the above
- *    copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE AUTHOR
- * AND ITS CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR OR ITS CONTRIBUTORS  BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- *
- * ATM call control and API
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/errno.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/sbuf.h>
-#include <machine/stdarg.h>
-
-#include <netgraph/ng_message.h>
-#include <netgraph/netgraph.h>
-#include <netgraph/ng_parse.h>
-#include <netnatm/unimsg.h>
-#include <netnatm/msg/unistruct.h>
-#include <netnatm/api/unisap.h>
-#include <netnatm/sig/unidef.h>
-#include <netgraph/atm/ngatmbase.h>
-#include <netgraph/atm/ng_uni.h>
-#include <netnatm/api/atmapi.h>
-#include <netgraph/atm/ng_ccatm.h>
-#include <netnatm/api/ccatm.h>
-
-MODULE_DEPEND(ng_ccatm, ngatmbase, 1, 1, 1);
-
-MALLOC_DEFINE(M_NG_CCATM, "ng_ccatm", "netgraph uni api node");
-
-/*
- * Command structure parsing
- */
-
-/* ESI */
-static const struct ng_parse_fixedarray_info ng_ccatm_esi_type_info =
-    NGM_CCATM_ESI_INFO;
-static const struct ng_parse_type ng_ccatm_esi_type = {
-	&ng_parse_fixedarray_type,
-	&ng_ccatm_esi_type_info
-};
-
-/* PORT PARAMETERS */
-static const struct ng_parse_struct_field ng_ccatm_atm_port_type_info[] =
-    NGM_CCATM_ATM_PORT_INFO;
-static const struct ng_parse_type ng_ccatm_atm_port_type = {
-	&ng_parse_struct_type,
-	ng_ccatm_atm_port_type_info
-};
-
-/* PORT structure */
-static const struct ng_parse_struct_field ng_ccatm_port_type_info[] =
-    NGM_CCATM_PORT_INFO;
-static const struct ng_parse_type ng_ccatm_port_type = {
-	&ng_parse_struct_type,
-	ng_ccatm_port_type_info
-};
-
-/* the ADDRESS array itself */
-static const struct ng_parse_fixedarray_info ng_ccatm_addr_array_type_info =
-    NGM_CCATM_ADDR_ARRAY_INFO;
-static const struct ng_parse_type ng_ccatm_addr_array_type = {
-	&ng_parse_fixedarray_type,
-	&ng_ccatm_addr_array_type_info
-};
-
-/* one ADDRESS */
-static const struct ng_parse_struct_field ng_ccatm_uni_addr_type_info[] =
-    NGM_CCATM_UNI_ADDR_INFO;
-static const struct ng_parse_type ng_ccatm_uni_addr_type = {
-	&ng_parse_struct_type,
-	ng_ccatm_uni_addr_type_info
-};
-
-/* ADDRESS request */
-static const struct ng_parse_struct_field ng_ccatm_addr_req_type_info[] =
-    NGM_CCATM_ADDR_REQ_INFO;
-static const struct ng_parse_type ng_ccatm_addr_req_type = {
-	&ng_parse_struct_type,
-	ng_ccatm_addr_req_type_info
-};
-
-/* ADDRESS var-array */
-static int
-ng_ccatm_addr_req_array_getlen(const struct ng_parse_type *type,
-    const u_char *start, const u_char *buf)
-{
-	const struct ngm_ccatm_get_addresses *p;
-
-	p = (const struct ngm_ccatm_get_addresses *)
-	    (buf - offsetof(struct ngm_ccatm_get_addresses, addr));
-	return (p->count);
-}
-static const struct ng_parse_array_info ng_ccatm_addr_req_array_type_info =
-    NGM_CCATM_ADDR_REQ_ARRAY_INFO;
-static const struct ng_parse_type ng_ccatm_addr_req_array_type = {
-	&ng_parse_array_type,
-	&ng_ccatm_addr_req_array_type_info
-};
-
-/* Outer get_ADDRESSes structure */
-static const struct ng_parse_struct_field ng_ccatm_get_addresses_type_info[] =
-    NGM_CCATM_GET_ADDRESSES_INFO;
-static const struct ng_parse_type ng_ccatm_get_addresses_type = {
-	&ng_parse_struct_type,
-	ng_ccatm_get_addresses_type_info
-};
-
-/* Port array */
-static int
-ng_ccatm_port_array_getlen(const struct ng_parse_type *type,
-    const u_char *start, const u_char *buf)
-{
-	const struct ngm_ccatm_portlist *p;
-
-	p = (const struct ngm_ccatm_portlist *)
-	    (buf - offsetof(struct ngm_ccatm_portlist, ports));
-	return (p->nports);
-}
-static const struct ng_parse_array_info ng_ccatm_port_array_type_info =
-    NGM_CCATM_PORT_ARRAY_INFO;
-static const struct ng_parse_type ng_ccatm_port_array_type = {
-	&ng_parse_array_type,
-	&ng_ccatm_port_array_type_info
-};
-
-/* Portlist structure */
-static const struct ng_parse_struct_field ng_ccatm_portlist_type_info[] =
-    NGM_CCATM_PORTLIST_INFO;
-static const struct ng_parse_type ng_ccatm_portlist_type = {
-	&ng_parse_struct_type,
-	ng_ccatm_portlist_type_info
-};
-
-/*
- * Command list
- */
-static const struct ng_cmdlist ng_ccatm_cmdlist[] = {
-	{
-	  NGM_CCATM_COOKIE,
-	  NGM_CCATM_DUMP,
-	  "dump",
-	  NULL,
-	  NULL
-	},
-	{
-	  NGM_CCATM_COOKIE,
-	  NGM_CCATM_STOP,
-	  "stop",
-	  &ng_ccatm_port_type,
-	  NULL
-	},
-	{
-	  NGM_CCATM_COOKIE,
-	  NGM_CCATM_START,
-	  "start",
-	  &ng_ccatm_port_type,
-	  NULL
-	},
-	{
-	  NGM_CCATM_COOKIE,
-	  NGM_CCATM_GETSTATE,
-	  "getstate",
-	  &ng_ccatm_port_type,
-	  &ng_parse_uint32_type
-	},
-	{
-	  NGM_CCATM_COOKIE,
-	  NGM_CCATM_GET_ADDRESSES,
-	  "get_addresses",
-	  &ng_ccatm_port_type,
-	  &ng_ccatm_get_addresses_type
-	},
-	{
-	  NGM_CCATM_COOKIE,
-	  NGM_CCATM_CLEAR,
-	  "clear",
-	  &ng_ccatm_port_type,
-	  NULL
-	},
-	{
-	  NGM_CCATM_COOKIE,
-	  NGM_CCATM_ADDRESS_REGISTERED,
-	  "address_reg",
-	  &ng_ccatm_addr_req_type,
-	  NULL
-	},
-	{
-	  NGM_CCATM_COOKIE,
-	  NGM_CCATM_ADDRESS_UNREGISTERED,
-	  "address_unreg",
-	  &ng_ccatm_addr_req_type,
-	  NULL
-	},
-	{
-	  NGM_CCATM_COOKIE,
-	  NGM_CCATM_SET_PORT_PARAM,
-	  "set_port_param",
-	  &ng_ccatm_atm_port_type,
-	  NULL
-	},
-	{
-	  NGM_CCATM_COOKIE,
-	  NGM_CCATM_GET_PORT_PARAM,
-	  "get_port_param",
-	  &ng_ccatm_port_type,
-	  &ng_ccatm_atm_port_type,
-	},
-	{
-	  NGM_CCATM_COOKIE,
-	  NGM_CCATM_GET_PORTLIST,
-	  "get_portlist",
-	  NULL,
-	  &ng_ccatm_portlist_type,
-	},
-	{
-	  NGM_CCATM_COOKIE,
-	  NGM_CCATM_SETLOG,
-	  "setlog",
-	  &ng_parse_hint32_type,
-	  &ng_parse_hint32_type,
-	},
-	{
-	  NGM_CCATM_COOKIE,
-	  NGM_CCATM_RESET,
-	  "reset",
-	  NULL,
-	  NULL,
-	},
-	{ 0 }
-};
-
-/*
- * Module data
- */
-static ng_constructor_t		ng_ccatm_constructor;
-static ng_rcvmsg_t		ng_ccatm_rcvmsg;
-static ng_shutdown_t		ng_ccatm_shutdown;
-static ng_newhook_t		ng_ccatm_newhook;
-static ng_rcvdata_t		ng_ccatm_rcvdata;
-static ng_disconnect_t		ng_ccatm_disconnect;
-static int ng_ccatm_mod_event(module_t, int, void *);
-
-static struct ng_type ng_ccatm_typestruct = {
-	.version =	NG_ABI_VERSION,
-	.name =		NG_CCATM_NODE_TYPE,
-	.mod_event =	ng_ccatm_mod_event,
-	.constructor =	ng_ccatm_constructor,	/* Node constructor */
-	.rcvmsg =	ng_ccatm_rcvmsg,	/* Control messages */
-	.shutdown =	ng_ccatm_shutdown,	/* Node destructor */
-	.newhook =	ng_ccatm_newhook,	/* Arrival of new hook */
-	.rcvdata =	ng_ccatm_rcvdata,	/* receive data */
-	.disconnect =	ng_ccatm_disconnect,	/* disconnect a hook */
-	.cmdlist =	ng_ccatm_cmdlist,
-};
-NETGRAPH_INIT(ccatm, &ng_ccatm_typestruct);
-
-static ng_rcvdata_t	ng_ccatm_rcvuni;
-static ng_rcvdata_t	ng_ccatm_rcvdump;
-static ng_rcvdata_t	ng_ccatm_rcvmanage;
-
-/*
- * Private node data.
- */
-struct ccnode {
-	node_p	node;		/* the owning node */
-	hook_p	dump;		/* dump hook */
-	hook_p	manage;		/* hook to ILMI */
-
-	struct ccdata *data;
-	struct mbuf *dump_first;
-	struct mbuf *dump_last;	/* first and last mbuf when dumping */
-
-	u_int	hook_cnt;	/* count user and port hooks */
-};
-
-/*
- * Private UNI hook data
- */
-struct cchook {
-	int		is_uni;	/* true if uni hook, user otherwise */
-	struct ccnode	*node;	/* the owning node */
-	hook_p		hook;
-	void		*inst;	/* port or user */
-};
-
-static void ng_ccatm_send_user(struct ccuser *, void *, u_int, void *, size_t);
-static void ng_ccatm_respond_user(struct ccuser *, void *, int, u_int,
-    void *, size_t);
-static void ng_ccatm_send_uni(struct ccconn *, void *, u_int, u_int,
-    struct uni_msg *);
-static void ng_ccatm_send_uni_glob(struct ccport *, void *, u_int, u_int,
-    struct uni_msg *);
-static void ng_ccatm_log(const char *, ...) __printflike(1, 2);
-
-static const struct cc_funcs cc_funcs = {
-	.send_user =		ng_ccatm_send_user,
-	.respond_user =		ng_ccatm_respond_user,
-	.send_uni =		ng_ccatm_send_uni,
-	.send_uni_glob =	ng_ccatm_send_uni_glob,
-	.log =			ng_ccatm_log,
-};
-
-/************************************************************
- *
- * Create a new node
- */
-static int
-ng_ccatm_constructor(node_p node)
-{
-	struct ccnode *priv;
-
-	gone_in(14, "ng_ccatm: netgraph ATM modules");
-
-	priv = malloc(sizeof(*priv), M_NG_CCATM, M_WAITOK | M_ZERO);
-
-	priv->node = node;
-	priv->data = cc_create(&cc_funcs);
-	if (priv->data == NULL) {
-		free(priv, M_NG_CCATM);
-		return (ENOMEM);
-	}
-
-	NG_NODE_SET_PRIVATE(node, priv);
-
-	return (0);
-}
-
-/*
- * Destroy a node. The user list is empty here, because all hooks are
- * previously disconnected. The connection lists may not be empty, because
- * connections may be waiting for responses from the stack. This also means,
- * that no orphaned connections will be made by the port_destroy routine.
- */
-static int
-ng_ccatm_shutdown(node_p node)
-{
-	struct ccnode *priv = NG_NODE_PRIVATE(node);
-
-	cc_destroy(priv->data);
-
-	free(priv, M_NG_CCATM);
-	NG_NODE_SET_PRIVATE(node, NULL);
-
-	NG_NODE_UNREF(node);
-
-	return (0);
-}
-
-/*
- * Retrieve the registered addresses for one port or all ports.
- * Returns an error code or 0 on success.
- */
-static int
-ng_ccatm_get_addresses(node_p node, uint32_t portno, struct ng_mesg *msg,
-    struct ng_mesg **resp)
-{
-	struct ccnode *priv = NG_NODE_PRIVATE(node);
-	struct uni_addr *addrs;
-	u_int *ports;
-	struct ngm_ccatm_get_addresses *list;
-	u_int count, i;
-	size_t len;
-	int err;
-
-	err = cc_get_addrs(priv->data, portno, &addrs, &ports, &count);
-	if (err != 0)
-		return (err);
-
-	len = sizeof(*list) + count * sizeof(list->addr[0]);
-	NG_MKRESPONSE(*resp, msg, len, M_NOWAIT);
-	if (*resp == NULL) {
-		free(addrs, M_NG_CCATM);
-		free(ports, M_NG_CCATM);
-		return (ENOMEM);
-	}
-	list = (struct ngm_ccatm_get_addresses *)(*resp)->data;
-
-	list->count = count;
-	for (i = 0; i < count; i++) {
-		list->addr[i].port = ports[i];
-		list->addr[i].addr = addrs[i];
-	}
-
-	free(addrs, M_NG_CCATM);
-	free(ports, M_NG_CCATM);
-
-	return (0);
-}
-
-/*
- * Dumper function. Pack the data into an mbuf chain.
- */
-static int
-send_dump(struct ccdata *data, void *uarg, const char *buf)
-{
-	struct mbuf *m;
-	struct ccnode *priv = uarg;
-
-	if (priv->dump == NULL) {
-		m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
-		if (m == NULL)
-			return (ENOBUFS);
-		priv->dump_first = priv->dump_last = m;
-		m->m_pkthdr.len = 0;
-	} else {
-		m = m_getcl(M_NOWAIT, MT_DATA, 0);
-		if (m == NULL) {
-			m_freem(priv->dump_first);
-			return (ENOBUFS);
-		}
-		priv->dump_last->m_next = m;
-		priv->dump_last = m;
-	}
-
-	strcpy(m->m_data, buf);
-	priv->dump_first->m_pkthdr.len += (m->m_len = strlen(buf));
-
-	return (0);
-}
-
-/*
- * Dump current status to dump hook
- */
-static int
-ng_ccatm_dump(node_p node)
-{
-	struct ccnode *priv = NG_NODE_PRIVATE(node);
-	struct mbuf *m;
-	int error;
-
-	priv->dump_first = priv->dump_last = NULL;
-	error = cc_dump(priv->data, MCLBYTES, send_dump, priv);
-	if (error != 0)
-		return (error);
-
-	if ((m = priv->dump_first) != NULL) {
-		priv->dump_first = priv->dump_last = NULL;
-		NG_SEND_DATA_ONLY(error, priv->dump, m);
-		return (error);
-	}
-	return (0);
-}
-
-/*
- * Control message
- */
-static int
-ng_ccatm_rcvmsg(node_p node, item_p item, hook_p lasthook)
-{
-	struct ng_mesg *resp = NULL;
-	struct ng_mesg *msg;
-	struct ccnode *priv = NG_NODE_PRIVATE(node);
-	int error = 0;
-
-	NGI_GET_MSG(item, msg);
-
-	switch (msg->header.typecookie) {
-	  case NGM_CCATM_COOKIE:
-		switch (msg->header.cmd) {
-		  case NGM_CCATM_DUMP:
-			if (priv->dump)
-				error = ng_ccatm_dump(node);
-			else
-				error = ENOTCONN;
-			break;
-
-		  case NGM_CCATM_STOP:
-		    {
-			struct ngm_ccatm_port *arg;
-
-			if (msg->header.arglen != sizeof(*arg)) {
-				error = EINVAL;
-				break;
-			}
-			arg = (struct ngm_ccatm_port *)msg->data;
-			error = cc_port_stop(priv->data, arg->port);
-			break;
-		    }
-
-		  case NGM_CCATM_START:
-		    {
-			struct ngm_ccatm_port *arg;
-
-			if (msg->header.arglen != sizeof(*arg)) {
-				error = EINVAL;
-				break;
-			}
-			arg = (struct ngm_ccatm_port *)msg->data;
-			error = cc_port_start(priv->data, arg->port);
-			break;
-		    }
-
-		  case NGM_CCATM_GETSTATE:
-		    {
-			struct ngm_ccatm_port *arg;
-			int state;
-
-			if (msg->header.arglen != sizeof(*arg)) {
-				error = EINVAL;
-				break;
-			}
-			arg = (struct ngm_ccatm_port *)msg->data;
-			error = cc_port_isrunning(priv->data, arg->port,
-			    &state);
-			if (error == 0) {
-				NG_MKRESPONSE(resp, msg, sizeof(uint32_t),
-				    M_NOWAIT);
-				if (resp == NULL) {
-					error = ENOMEM;
-					break;
-				}
-				*(uint32_t *)resp->data = state;
-			}
-			break;
-		    }
-
-		  case NGM_CCATM_GET_ADDRESSES:
-		   {
-			struct ngm_ccatm_port *arg;
-
-			if (msg->header.arglen != sizeof(*arg)) {
-				error = EINVAL;
-				break;
-			}
-			arg = (struct ngm_ccatm_port *)msg->data;
-			error = ng_ccatm_get_addresses(node, arg->port, msg,
-			    &resp);
-			break;
-		    }
-
-		  case NGM_CCATM_CLEAR:
-		    {
-			struct ngm_ccatm_port *arg;
-
-			if (msg->header.arglen != sizeof(*arg)) {
-				error = EINVAL;
-				break;
-			}
-			arg = (struct ngm_ccatm_port *)msg->data;
-			error = cc_port_clear(priv->data, arg->port);
-			break;
-		    }
-
-		  case NGM_CCATM_ADDRESS_REGISTERED:
-		    {
-			struct ngm_ccatm_addr_req *arg;
-
-			if (msg->header.arglen != sizeof(*arg)) {
-				error = EINVAL;
-				break;
-			}
-			arg = (struct ngm_ccatm_addr_req *)msg->data;
-			error = cc_addr_register(priv->data, arg->port,
-			    &arg->addr);
-			break;
-		    }
-
-		  case NGM_CCATM_ADDRESS_UNREGISTERED:
-		    {
-			struct ngm_ccatm_addr_req *arg;
-
-			if (msg->header.arglen != sizeof(*arg)) {
-				error = EINVAL;
-				break;
-			}
-			arg = (struct ngm_ccatm_addr_req *)msg->data;
-			error = cc_addr_unregister(priv->data, arg->port,
-			    &arg->addr);
-			break;
-		    }
-
-		  case NGM_CCATM_GET_PORT_PARAM:
-		    {
-			struct ngm_ccatm_port *arg;
-
-			if (msg->header.arglen != sizeof(*arg)) {
-				error = EINVAL;
-				break;
-			}
-			arg = (struct ngm_ccatm_port *)msg->data;
-			NG_MKRESPONSE(resp, msg, sizeof(struct atm_port_info),
-			    M_NOWAIT);
-			if (resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			error = cc_port_get_param(priv->data, arg->port,
-			    (struct atm_port_info *)resp->data);
-			if (error != 0) {
-				free(resp, M_NETGRAPH_MSG);
-				resp = NULL;
-			}
-			break;
-		    }
-
-		  case NGM_CCATM_SET_PORT_PARAM:
-		    {
-			struct atm_port_info *arg;
-
-			if (msg->header.arglen != sizeof(*arg)) {
-				error = EINVAL;
-				break;
-			}
-			arg = (struct atm_port_info *)msg->data;
-			error = cc_port_set_param(priv->data, arg);
-			break;
-		    }
-
-		  case NGM_CCATM_GET_PORTLIST:
-		    {
-			struct ngm_ccatm_portlist *arg;
-			u_int n, *ports;
-
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			error = cc_port_getlist(priv->data, &n, &ports);
-			if (error != 0)
-				break;
-
-			NG_MKRESPONSE(resp, msg, sizeof(*arg) +
-			    n * sizeof(arg->ports[0]), M_NOWAIT);
-			if (resp == NULL) {
-				free(ports, M_NG_CCATM);
-				error = ENOMEM;
-				break;
-			}
-			arg = (struct ngm_ccatm_portlist *)resp->data;
-
-			arg->nports = 0;
-			for (arg->nports = 0; arg->nports < n; arg->nports++)
-				arg->ports[arg->nports] = ports[arg->nports];
-			free(ports, M_NG_CCATM);
-			break;
-		    }
-
-		  case NGM_CCATM_SETLOG:
-		    {
-			uint32_t log_level;
-
-			log_level = cc_get_log(priv->data);
-			if (msg->header.arglen != 0) {
-				if (msg->header.arglen != sizeof(log_level)) {
-					error = EINVAL;
-					break;
-				}
-				cc_set_log(priv->data, *(uint32_t *)msg->data);
-			}
-
-			NG_MKRESPONSE(resp, msg, sizeof(uint32_t), M_NOWAIT);
-			if (resp == NULL) {
-				error = ENOMEM;
-				if (msg->header.arglen != 0)
-					cc_set_log(priv->data, log_level);
-				break;
-			}
-			*(uint32_t *)resp->data = log_level;
-			break;
-		    }
-
-		  case NGM_CCATM_RESET:
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-
-			if (priv->hook_cnt != 0) {
-				error = EBUSY;
-				break;
-			}
-			cc_reset(priv->data);
-			break;
-
-		  case NGM_CCATM_GET_EXSTAT:
-		    {
-			struct atm_exstatus s;
-			struct atm_exstatus_ep *eps;
-			struct atm_exstatus_port *ports;
-			struct atm_exstatus_conn *conns;
-			struct atm_exstatus_party *parties;
-			size_t offs;
-
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			error = cc_get_extended_status(priv->data,
-			    &s, &eps, &ports, &conns, &parties);
-			if (error != 0)
-				break;
-
-			offs = sizeof(s) + s.neps * sizeof(*eps) +
-			    s.nports * sizeof(*ports) +
-			    s.nconns * sizeof(*conns) +
-			    s.nparties * sizeof(*parties);
-
-			NG_MKRESPONSE(resp, msg, offs, M_NOWAIT);
-			if (resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-
-			memcpy(resp->data, &s, sizeof(s));
-			offs = sizeof(s);
-
-			memcpy(resp->data + offs, eps,
-			    sizeof(*eps) * s.neps);
-			offs += sizeof(*eps) * s.neps;
-
-			memcpy(resp->data + offs, ports,
-			    sizeof(*ports) * s.nports);
-			offs += sizeof(*ports) * s.nports;
-
-			memcpy(resp->data + offs, conns,
-			    sizeof(*conns) * s.nconns);
-			offs += sizeof(*conns) * s.nconns;
-
-			memcpy(resp->data + offs, parties,
-			    sizeof(*parties) * s.nparties);
-			offs += sizeof(*parties) * s.nparties;
-
-			free(eps, M_NG_CCATM);
-			free(ports, M_NG_CCATM);
-			free(conns, M_NG_CCATM);
-			free(parties, M_NG_CCATM);
-			break;
-		    }
-
-		  default:
-			error = EINVAL;
-			break;
-		}
-		break;
-
-	  default:
-		error = EINVAL;
-		break;
-	}
-
-	NG_RESPOND_MSG(error, node, item, resp);
-	NG_FREE_MSG(msg);
-	return (error);
-}
-
-/************************************************************
- *
- * New hook arrival
- */
-static int
-ng_ccatm_newhook(node_p node, hook_p hook, const char *name)
-{
-	struct ccnode *priv = NG_NODE_PRIVATE(node);
-	struct ccport *port;
-	struct ccuser *user;
-	struct cchook *hd;
-	u_long lport;
-	char *end;
-
-	if (strncmp(name, "uni", 3) == 0) {
-		/*
-		 * This is a UNI hook. Should be a new port.
-		 */
-		if (name[3] == '\0')
-			return (EINVAL);
-		lport = strtoul(name + 3, &end, 10);
-		if (*end != '\0' || lport == 0 || lport > 0xffffffff)
-			return (EINVAL);
-
-		hd = malloc(sizeof(*hd), M_NG_CCATM, M_NOWAIT);
-		if (hd == NULL)
-			return (ENOMEM);
-		hd->is_uni = 1;
-		hd->node = priv;
-		hd->hook = hook;
-
-		port = cc_port_create(priv->data, hd, (u_int)lport);
-		if (port == NULL) {
-			free(hd, M_NG_CCATM);
-			return (ENOMEM);
-		}
-		hd->inst = port;
-
-		NG_HOOK_SET_PRIVATE(hook, hd);
-		NG_HOOK_SET_RCVDATA(hook, ng_ccatm_rcvuni);
-		NG_HOOK_FORCE_QUEUE(hook);
-
-		priv->hook_cnt++;
-
-		return (0);
-	}
-
-	if (strcmp(name, "dump") == 0) {
-		priv->dump = hook;
-		NG_HOOK_SET_RCVDATA(hook, ng_ccatm_rcvdump);
-		return (0);
-	}
-
-	if (strcmp(name, "manage") == 0) {
-		priv->manage = hook;
-		NG_HOOK_SET_RCVDATA(hook, ng_ccatm_rcvmanage);
-		return (0);
-	}
-
-	/*
-	 * User hook
-	 */
-	hd = malloc(sizeof(*hd), M_NG_CCATM, M_NOWAIT);
-	if (hd == NULL)
-		return (ENOMEM);
-	hd->is_uni = 0;
-	hd->node = priv;
-	hd->hook = hook;
-
-	user = cc_user_create(priv->data, hd, NG_HOOK_NAME(hook));
-	if (user == NULL) {
-		free(hd, M_NG_CCATM);
-		return (ENOMEM);
-	}
-
-	hd->inst = user;
-	NG_HOOK_SET_PRIVATE(hook, hd);
-	NG_HOOK_FORCE_QUEUE(hook);
-
-	priv->hook_cnt++;
-
-	return (0);
-}
-
-/*
- * Disconnect a hook
- */
-static int
-ng_ccatm_disconnect(hook_p hook)
-{
-	node_p node = NG_HOOK_NODE(hook);
-	struct ccnode *priv = NG_NODE_PRIVATE(node);
-	struct cchook *hd = NG_HOOK_PRIVATE(hook);
-	struct ccdata *cc;
-
-	if (hook == priv->dump) {
-		priv->dump = NULL;
-
-	} else if (hook == priv->manage) {
-		priv->manage = NULL;
-		cc_unmanage(priv->data);
-
-	} else {
-		if (hd->is_uni)
-			cc_port_destroy(hd->inst, 0);
-		else
-			cc_user_destroy(hd->inst);
-
-		cc = hd->node->data;
-
-		free(hd, M_NG_CCATM);
-		NG_HOOK_SET_PRIVATE(hook, NULL);
-
-		priv->hook_cnt--;
-
-		cc_work(cc);
-	}
-
-	/*
-	 * When the number of hooks drops to zero, delete the node.
-	 */
-	if (NG_NODE_NUMHOOKS(node) == 0 && NG_NODE_IS_VALID(node))
-		ng_rmnode_self(node);
-
-	return (0);
-}
-
-/************************************************************
- *
- * Receive data from user hook
- */
-static int
-ng_ccatm_rcvdata(hook_p hook, item_p item)
-{
-	struct cchook *hd = NG_HOOK_PRIVATE(hook);
-	struct uni_msg *msg;
-	struct mbuf *m;
-	struct ccatm_op op;
-	int err;
-
-	NGI_GET_M(item, m);
-	NG_FREE_ITEM(item);
-
-	if ((err = uni_msg_unpack_mbuf(m, &msg)) != 0) {
-		m_freem(m);
-		return (err);
-	}
-	m_freem(m);
-
-	if (uni_msg_len(msg) < sizeof(op)) {
-		printf("%s: packet too short\n", __func__);
-		uni_msg_destroy(msg);
-		return (EINVAL);
-	}
-
-	bcopy(msg->b_rptr, &op, sizeof(op));
-	msg->b_rptr += sizeof(op);
-
-	err = cc_user_signal(hd->inst, op.op, msg);
-	cc_work(hd->node->data);
-	return (err);
-}
-
-/*
- * Pack a header and a data area into an mbuf chain
- */
-static struct mbuf *
-pack_buf(void *h, size_t hlen, void *t, size_t tlen)
-{
-	struct mbuf *m, *m0, *last;
-	u_char *buf = (u_char *)t;
-	size_t n;
-
-	/* header should fit into a normal mbuf */
-	MGETHDR(m0, M_NOWAIT, MT_DATA);
-	if (m0 == NULL)
-		return NULL;
-
-	KASSERT(hlen <= MHLEN, ("hlen > MHLEN"));
-
-	bcopy(h, m0->m_data, hlen);
-	m0->m_len = hlen;
-	m0->m_pkthdr.len = hlen;
-
-	last = m0;
-	while ((n = tlen) != 0) {
-		if (n > MLEN) {
-			m = m_getcl(M_NOWAIT, MT_DATA, 0);
-			if (n > MCLBYTES)
-				n = MCLBYTES;
-		} else
-			MGET(m, M_NOWAIT, MT_DATA);
-
-		if(m == NULL)
-			goto drop;
-
-		last->m_next = m;
-		last = m;
-
-		bcopy(buf, m->m_data, n);
-		buf += n;
-		tlen -= n;
-		m->m_len = n;
-		m0->m_pkthdr.len += n;
-	}
-
-	return (m0);
-
-  drop:
-	m_freem(m0);
-	return NULL;
-}
-
-/*
- * Send an indication to the user.
- */
-static void
-ng_ccatm_send_user(struct ccuser *user, void *uarg, u_int op,
-    void *val, size_t len)
-{
-	struct cchook *hd = uarg;
-	struct mbuf *m;
-	struct ccatm_op	h;
-	int error;
-
-	h.op = op;
-	m = pack_buf(&h, sizeof(h), val, len);
-	if (m == NULL)
-		return;
-
-	NG_SEND_DATA_ONLY(error, hd->hook, m);
-	if (error != 0)
-		printf("%s: error=%d\n", __func__, error);
-}
-
-/*
- * Send a response to the user.
- */
-static void
-ng_ccatm_respond_user(struct ccuser *user, void *uarg, int err, u_int data,
-    void *val, size_t len)
-{
-	struct cchook *hd = uarg;
-	struct mbuf *m;
-	struct {
-		struct ccatm_op	op;
-		struct atm_resp resp;
-	} resp;
-	int error;
-
-	resp.op.op = ATMOP_RESP;
-	resp.resp.resp = err;
-	resp.resp.data = data;
-	m = pack_buf(&resp, sizeof(resp), val, len);
-	if (m == NULL)
-		return;
-
-	NG_SEND_DATA_ONLY(error, hd->hook, m);
-	if (error != 0)
-		printf("%s: error=%d\n", __func__, error);
-}
-
-/*
- * Receive data from UNI.
- */
-static int
-ng_ccatm_rcvuni(hook_p hook, item_p item)
-{
-	struct cchook *hd = NG_HOOK_PRIVATE(hook);
-	struct uni_msg *msg;
-	struct uni_arg arg;
-	struct mbuf *m;
-	int err;
-
-	NGI_GET_M(item, m);
-	NG_FREE_ITEM(item);
-
-	if ((err = uni_msg_unpack_mbuf(m, &msg)) != 0) {
-		m_freem(m);
-		return (err);
-	}
-	m_freem(m);
-
-	if (uni_msg_len(msg) < sizeof(arg)) {
-		printf("%s: packet too short\n", __func__);
-		uni_msg_destroy(msg);
-		return (EINVAL);
-	}
-
-	bcopy(msg->b_rptr, &arg, sizeof(arg));
-	msg->b_rptr += sizeof(arg);
-
-	if (arg.sig == UNIAPI_ERROR) {
-		if (uni_msg_len(msg) != sizeof(struct uniapi_error)) {
-			printf("%s: bad UNIAPI_ERROR size %zu\n", __func__,
-			    uni_msg_len(msg));
-			uni_msg_destroy(msg);
-			return (EINVAL);
-		}
-		err = cc_uni_response(hd->inst, arg.cookie,
-		    ((struct uniapi_error *)msg->b_rptr)->reason,
-		    ((struct uniapi_error *)msg->b_rptr)->state);
-		uni_msg_destroy(msg);
-	} else
-		err = cc_uni_signal(hd->inst, arg.cookie, arg.sig, msg);
-
-	cc_work(hd->node->data);
-	return (err);
-}
-
-/*
- * Uarg is the port's uarg.
- */
-static void
-ng_ccatm_send_uni(struct ccconn *conn, void *uarg, u_int op, u_int cookie,
-    struct uni_msg *msg)
-{
-	struct cchook *hd = uarg;
-	struct uni_arg arg;
-	struct mbuf *m;
-	int error;
-
-	arg.sig = op;
-	arg.cookie = cookie;
-
-	m = uni_msg_pack_mbuf(msg, &arg, sizeof(arg));
-	uni_msg_destroy(msg);
-	if (m == NULL)
-		return;
-
-	NG_SEND_DATA_ONLY(error, hd->hook, m);
-	if (error != 0)
-		printf("%s: error=%d\n", __func__, error);
-}
-
-/*
- * Send a global message to the UNI
- */
-static void
-ng_ccatm_send_uni_glob(struct ccport *port, void *uarg, u_int op, u_int cookie,
-    struct uni_msg *msg)
-{
-	struct cchook *hd = uarg;
-	struct uni_arg arg;
-	struct mbuf *m;
-	int error;
-
-	arg.sig = op;
-	arg.cookie = cookie;
-
-	m = uni_msg_pack_mbuf(msg, &arg, sizeof(arg));
-	if (msg != NULL)
-		uni_msg_destroy(msg);
-	if (m == NULL)
-		return;
-
-	NG_SEND_DATA_ONLY(error, hd->hook, m);
-	if (error != 0)
-		printf("%s: error=%d\n", __func__, error);
-}
-/*
- * Receive from ILMID
- */
-static int
-ng_ccatm_rcvmanage(hook_p hook, item_p item)
-{
-	NG_FREE_ITEM(item);
-	return (0);
-}
-
-static int
-ng_ccatm_rcvdump(hook_p hook, item_p item)
-{
-	NG_FREE_ITEM(item);
-	return (0);
-}
-
-static void
-ng_ccatm_log(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vprintf(fmt, ap);
-	printf("\n");
-	va_end(ap);
-}
-
-/*
- * Loading and unloading of node type
- */
-static int
-ng_ccatm_mod_event(module_t mod, int event, void *data)
-{
-	int error = 0;
-
-	switch (event) {
-	  case MOD_LOAD:
-		break;
-
-	  case MOD_UNLOAD:
-		break;
-
-	  default:
-		error = EOPNOTSUPP;
-		break;
-	}
-	return (error);
-}
diff --git a/sys/netgraph/atm/ccatm/ng_ccatm_cust.h b/sys/netgraph/atm/ccatm/ng_ccatm_cust.h
deleted file mode 100644
index 1be23d4b708d..000000000000
--- a/sys/netgraph/atm/ccatm/ng_ccatm_cust.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2003-2004
- *	Hartmut Brandt
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Customisation of call control source to the NG environment.
- *
- * $FreeBSD$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/queue.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/mbuf.h>
-#include <netgraph/ng_message.h>
-#include <netgraph/netgraph.h>
-#include <netgraph/atm/ngatmbase.h>
-
-#define	CCASSERT(E, M) KASSERT(E, M)
-
-MALLOC_DECLARE(M_NG_CCATM);
-
-#define	CCMALLOC(S)	(malloc((S), M_NG_CCATM, M_NOWAIT))
-#define	CCZALLOC(S)	(malloc((S), M_NG_CCATM, M_NOWAIT | M_ZERO))
-#define	CCFREE(P)	do { free((P), M_NG_CCATM); } while (0)
-
-#define	CCGETERRNO()	(ENOMEM)
diff --git a/sys/netgraph/atm/ng_ccatm.h b/sys/netgraph/atm/ng_ccatm.h
deleted file mode 100644
index f85c1286b73d..000000000000
--- a/sys/netgraph/atm/ng_ccatm.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*-
- * Copyright (c) 2001-2002
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- * Copyright (c) 2003-2004
- *	Hartmut Brandt
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation must retain the above
- *    copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-/*
- * Interface to ng_ccatm
- */
-#ifndef _NETGRAPH_ATM_NG_CCATM_H_
-#define _NETGRAPH_ATM_NG_CCATM_H_
-
-#define NG_CCATM_NODE_TYPE	"ccatm"
-#define NGM_CCATM_COOKIE	984046139
-
-enum {
-	NGM_CCATM_DUMP,			/* dump internal status */
-	NGM_CCATM_STOP,			/* stop all processing, close all */
-	NGM_CCATM_START,		/* start processing */
-	NGM_CCATM_CLEAR,		/* clear prefix/address table */
-	NGM_CCATM_GET_ADDRESSES,	/* get list of all addresses */
-	NGM_CCATM_ADDRESS_REGISTERED,	/* registration ok */
-	NGM_CCATM_ADDRESS_UNREGISTERED,	/* unregistration ok */
-	NGM_CCATM_SET_PORT_PARAM,	/* set port parameters */
-	NGM_CCATM_GET_PORT_PARAM,	/* get port parameters */
-	NGM_CCATM_GET_PORTLIST,		/* get list of port numbers */
-	NGM_CCATM_GETSTATE,		/* get port status */
-	NGM_CCATM_SETLOG,		/* set/get loglevel */
-	NGM_CCATM_RESET,		/* reset everything */
-	NGM_CCATM_GET_EXSTAT,		/* get extended status */
-};
-
-/*
- * This must be synchronized with unistruct.h::struct uni_addr
- */
-#define	NGM_CCATM_ADDR_ARRAY_INFO				\
-	{							\
-	  &ng_parse_hint8_type,					\
-	  UNI_ADDR_MAXLEN					\
-	}
-
-#define NGM_CCATM_UNI_ADDR_INFO 				\
- 	{							\
-	  { "type",	&ng_parse_uint32_type },		\
-	  { "plan",	&ng_parse_uint32_type },		\
-	  { "len",	&ng_parse_uint32_type },		\
-	  { "addr",	&ng_ccatm_addr_array_type },		\
-	  { NULL }						\
-	}
-
-/*
- * Address request
- */
-struct ngm_ccatm_addr_req {
-	uint32_t	port;
-	struct uni_addr	addr;
-};
-#define	NGM_CCATM_ADDR_REQ_INFO					\
-	{							\
-	  { "port",	&ng_parse_uint32_type },		\
-	  { "addr",	&ng_ccatm_uni_addr_type },		\
-	  { NULL },						\
-	}
-
-/*
- * Get current address list
- */
-struct ngm_ccatm_get_addresses {
-	uint32_t	count;
-	struct ngm_ccatm_addr_req addr[];
-};
-#define	NGM_CCATM_ADDR_REQ_ARRAY_INFO				\
-	{							\
-	  &ng_ccatm_addr_req_type,				\
-	  ng_ccatm_addr_req_array_getlen			\
-	}
-#define NGM_CCATM_GET_ADDRESSES_INFO 				\
-	{							\
-	  { "count",	&ng_parse_uint32_type },		\
-	  { "addr",	&ng_ccatm_addr_req_array_type },	\
-	  { NULL }						\
-	}
-
-/*
- * Port as parameter
- */
-struct ngm_ccatm_port {
-	uint32_t	port;
-};
-#define NGM_CCATM_PORT_INFO 					\
-	{							\
-	  { "port",	&ng_parse_uint32_type },		\
-	  { NULL }						\
-	}
-
-/*
- * Port parameters.
- * This must be synchronized with atmapi.h::struct atm_port_info.
- */
-#define	NGM_CCATM_ESI_INFO						\
-	{								\
-	  &ng_parse_hint8_type,						\
-	  6								\
-	}
-#define NGM_CCATM_ATM_PORT_INFO 					\
-	{								\
-	  { "port",		&ng_parse_uint32_type },		\
-	  { "pcr",		&ng_parse_uint32_type },		\
-	  { "max_vpi_bits",	&ng_parse_uint32_type },		\
-	  { "max_vci_bits",	&ng_parse_uint32_type },		\
-	  { "max_svpc_vpi",	&ng_parse_uint32_type },		\
-	  { "max_svcc_vpi",	&ng_parse_uint32_type },		\
-	  { "min_svcc_vci",	&ng_parse_uint32_type },		\
-	  { "esi",		&ng_ccatm_esi_type },			\
-	  { "num_addr",		&ng_parse_uint32_type },		\
-	  { NULL }							\
-	}
-
-/*
- * List of port numbers
- */
-struct ngm_ccatm_portlist {
-	uint32_t	nports;
-	uint32_t	ports[];
-};
-#define	NGM_CCATM_PORT_ARRAY_INFO					\
-	{								\
-	  &ng_parse_uint32_type,					\
-	  ng_ccatm_port_array_getlen					\
-	}
-#define NGM_CCATM_PORTLIST_INFO 					\
-	{								\
-	  { "nports",	&ng_parse_uint32_type },			\
-	  { "ports",	&ng_ccatm_port_array_type },			\
-	  { NULL }							\
-	}
-
-struct ccatm_op {
-	uint32_t	op;	/* request code */
-};
-
-#endif
diff --git a/sys/netgraph/atm/ng_sscfu.h b/sys/netgraph/atm/ng_sscfu.h
deleted file mode 100644
index 48cf93b43911..000000000000
--- a/sys/netgraph/atm/ng_sscfu.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- *
- * Netgraph module for ITU-T Q.2120 UNI SSCF.
- */
-#ifndef _NETGRAPH_ATM_NG_SSCFU_H_
-#define	_NETGRAPH_ATM_NG_SSCFU_H_
-
-#define NG_SSCFU_NODE_TYPE "sscfu"
-#define NGM_SSCFU_COOKIE	980517963
-
-/* Netgraph control messages */
-enum {
-	NGM_SSCFU_GETDEFPARAM = 1,	/* get default SSCOP parameters */
-	NGM_SSCFU_ENABLE,		/* enable processing */
-	NGM_SSCFU_DISABLE,		/* disable processing */
-	NGM_SSCFU_GETDEBUG,		/* get debug flags */
-	NGM_SSCFU_SETDEBUG,		/* set debug flags */
-	NGM_SSCFU_GETSTATE,		/* get current state */
-};
-
-/* getdefparam return */
-struct ng_sscfu_getdefparam {
-	struct sscop_param	param;
-	uint32_t		mask;
-};
-#define NG_SSCFU_GETDEFPARAM_INFO 				\
-	{							\
-	  { "param",		&ng_sscop_param_type },		\
-	  { "mask",		&ng_parse_uint32_type },	\
-	  { NULL }						\
-	}
-
-/*
- * Upper interface
- */
-struct sscfu_arg {
-	uint32_t	sig;
-	u_char		data[];
-};
-#endif
diff --git a/sys/netgraph/atm/ng_sscop.h b/sys/netgraph/atm/ng_sscop.h
deleted file mode 100644
index cc67916ca49c..000000000000
--- a/sys/netgraph/atm/ng_sscop.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- *
- * Netgraph module for Q.2110 SSCOP
- */
-#ifndef _NETGRAPH_ATM_NG_SSCOP_H_
-#define _NETGRAPH_ATM_NG_SSCOP_H_
-
-#define NG_SSCOP_NODE_TYPE "sscop"
-#define NGM_SSCOP_COOKIE	980175044
-
-/* Netgraph control messages */
-enum {
-	NGM_SSCOP_GETPARAM = 1,		/* get parameters */
-	NGM_SSCOP_SETPARAM,		/* set parameters */
-	NGM_SSCOP_ENABLE,		/* enable processing */
-	NGM_SSCOP_DISABLE,		/* disable and reset */
-	NGM_SSCOP_GETDEBUG,		/* get debugging flags */
-	NGM_SSCOP_SETDEBUG,		/* set debugging flags */
-	NGM_SSCOP_GETSTATE,		/* get current SSCOP state */
-};
-
-/* This must be in-sync with the definition in sscopdef.h */
-#define NG_SSCOP_PARAM_INFO 					\
-	{							\
-	  { "timer_cc",		&ng_parse_uint32_type },	\
-	  { "timer_poll",	&ng_parse_uint32_type },	\
-	  { "timer_keep_alive",	&ng_parse_uint32_type },	\
-	  { "timer_no_response",&ng_parse_uint32_type },	\
-	  { "timer_idle",	&ng_parse_uint32_type },	\
-	  { "maxk",		&ng_parse_uint32_type },	\
-	  { "maxj",		&ng_parse_uint32_type },	\
-	  { "maxcc",		&ng_parse_uint32_type },	\
-	  { "maxpd",		&ng_parse_uint32_type },	\
-	  { "maxstat",		&ng_parse_uint32_type },	\
-	  { "mr",		&ng_parse_uint32_type },	\
-	  { "flags",		&ng_parse_uint32_type },	\
-	  { NULL }						\
-	}
-
-struct ng_sscop_setparam {
-	uint32_t		mask;
-	struct sscop_param	param;
-};
-#define NG_SSCOP_SETPARAM_INFO 					\
-	{							\
-	  { "mask",		&ng_parse_uint32_type },	\
-	  { "param",		&ng_sscop_param_type },		\
-	  { NULL }						\
-	}
-
-struct ng_sscop_setparam_resp {
-	uint32_t		mask;
-	int32_t			error;
-};
-#define NG_SSCOP_SETPARAM_RESP_INFO 				\
-	{							\
-	  { "mask",		&ng_parse_uint32_type },	\
-	  { "error",		&ng_parse_int32_type },		\
-	  { NULL }						\
-	}
-
-/*
- * Upper interface
- */
-struct sscop_arg {
-	uint32_t	sig;
-	uint32_t	arg;	/* opt. sequence number or clear-buff */
-	u_char		data[];
-};
-
-struct sscop_marg {
-	uint32_t	sig;
-	u_char		data[];
-};
-struct sscop_merr {
-	uint32_t	sig;
-	uint32_t	err;	/* error code */
-	uint32_t	cnt;	/* error count */
-};
-
-#endif
diff --git a/sys/netgraph/atm/ng_uni.h b/sys/netgraph/atm/ng_uni.h
deleted file mode 100644
index 87e8cbe51677..000000000000
--- a/sys/netgraph/atm/ng_uni.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- *
- * Netgraph module for UNI 4.0
- */
-#ifndef _NETGRAPH_ATM_NG_UNI_H_
-#define _NETGRAPH_ATM_NG_UNI_H_
-
-#define NG_UNI_NODE_TYPE "uni"
-#define NGM_UNI_COOKIE	981112392
-
-enum {
-	NGM_UNI_GETDEBUG,	/* get debug flags */
-	NGM_UNI_SETDEBUG,	/* set debug flags */
-	NGM_UNI_GET_CONFIG,	/* get configuration */
-	NGM_UNI_SET_CONFIG,	/* set configuration */
-	NGM_UNI_ENABLE,		/* enable processing */
-	NGM_UNI_DISABLE,	/* free resources and disable */
-	NGM_UNI_GETSTATE,	/* retrieve coord state */
-};
-
-struct ngm_uni_debug {
-	uint32_t	level[UNI_MAXFACILITY];
-};
-#define NGM_UNI_DEBUGLEVEL_INFO {				\
-	&ng_parse_uint32_type,					\
-	UNI_MAXFACILITY						\
-}
-#define NGM_UNI_DEBUG_INFO 					\
-	{							\
-	  { "level",	&ng_uni_debuglevel_type },		\
-	  { NULL }						\
-	}
-
-#define NGM_UNI_CONFIG_INFO 					\
-	{							\
-	  { "proto",	&ng_parse_uint32_type },		\
-	  { "popt",	&ng_parse_uint32_type },		\
-	  { "option",	&ng_parse_uint32_type },		\
-	  { "timer301",	&ng_parse_uint32_type },		\
-	  { "timer303",	&ng_parse_uint32_type },		\
-	  { "init303",	&ng_parse_uint32_type },		\
-	  { "timer308",	&ng_parse_uint32_type },		\
-	  { "init308",	&ng_parse_uint32_type },		\
-	  { "timer309",	&ng_parse_uint32_type },		\
-	  { "timer310",	&ng_parse_uint32_type },		\
-	  { "timer313",	&ng_parse_uint32_type },		\
-	  { "timer316",	&ng_parse_uint32_type },		\
-	  { "init316",	&ng_parse_uint32_type },		\
-	  { "timer317",	&ng_parse_uint32_type },		\
-	  { "timer322",	&ng_parse_uint32_type },		\
-	  { "init322",	&ng_parse_uint32_type },		\
-	  { "timer397",	&ng_parse_uint32_type },		\
-	  { "timer398",	&ng_parse_uint32_type },		\
-	  { "timer399",	&ng_parse_uint32_type },		\
-	  { NULL }						\
-	}
-
-struct ngm_uni_config_mask {
-	uint32_t		mask;
-	uint32_t		popt_mask;
-	uint32_t		option_mask;
-};
-#define NGM_UNI_CONFIG_MASK_INFO 				\
-	{							\
-	  { "mask",		&ng_parse_hint32_type },	\
-	  { "popt_mask",	&ng_parse_hint32_type },	\
-	  { "option_mask",	&ng_parse_hint32_type },	\
-	  { NULL }						\
-	}
-
-struct ngm_uni_set_config {
-	struct uni_config		config;
-	struct ngm_uni_config_mask	mask;
-};
-#define NGM_UNI_SET_CONFIG_INFO 				\
-	{							\
-	  { "config",		&ng_uni_config_type },		\
-	  { "mask",		&ng_uni_config_mask_type },	\
-	  { NULL }						\
-	}
-
-/*
- * API message
- */
-struct uni_arg {
-	uint32_t	sig;
-	uint32_t	cookie;
-	u_char		data[];
-};
-
-#endif
diff --git a/sys/netgraph/atm/ngatmbase.c b/sys/netgraph/atm/ngatmbase.c
deleted file mode 100644
index 0e2d1597d696..000000000000
--- a/sys/netgraph/atm/ngatmbase.c
+++ /dev/null
@@ -1,502 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * In-kernel UNI stack message functions.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/module.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/systm.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/mbuf.h>
-#include <machine/stdarg.h>
-#include <netnatm/unimsg.h>
-#include <netgraph/atm/ngatmbase.h>
-
-#define NGATMBASE_VERSION	1
-
-static int ngatm_handler(module_t, int, void *);
-
-static moduledata_t ngatm_data = {
-	"ngatmbase",
-	ngatm_handler,
-	0
-};
-
-MODULE_VERSION(ngatmbase, NGATMBASE_VERSION);
-DECLARE_MODULE(ngatmbase, ngatm_data, SI_SUB_EXEC, SI_ORDER_ANY);
-
-/*********************************************************************/
-/*
- * UNI Stack message handling functions
- */
-static MALLOC_DEFINE(M_UNIMSG, "unimsg", "uni message buffers");
-static MALLOC_DEFINE(M_UNIMSGHDR, "unimsghdr", "uni message headers");
-
-#define EXTRA	128
-
-/* mutex to protect the free list (and the used list if debugging) */
-static struct mtx ngatm_unilist_mtx;
-
-/*
- * Initialize UNI message subsystem
- */
-static void
-uni_msg_init(void)
-{
-	gone_in(14, "ngatmbase: netgraph ATM modules");
-
-	mtx_init(&ngatm_unilist_mtx, "netgraph UNI msg header lists", NULL,
-	    MTX_DEF);
-}
-
-/*
- * Ensure, that the message can be extended by at least s bytes.
- * Re-allocate the message (not the header). If that fails,
- * free the entire message and return ENOMEM. Free space at the start of
- * the message is retained.
- */
-int
-uni_msg_extend(struct uni_msg *m, size_t s)
-{
-	u_char *b;
-	size_t len, lead;
-
-	lead = uni_msg_leading(m);
-	len = uni_msg_len(m);
-	s += lead + len + EXTRA;
-	if ((b = malloc(s, M_UNIMSG, M_NOWAIT)) == NULL) {
-		uni_msg_destroy(m);
-		return (ENOMEM);
-	}
-
-	bcopy(m->b_rptr, b + lead, len);
-	free(m->b_buf, M_UNIMSG);
-
-	m->b_buf = b;
-	m->b_rptr = m->b_buf + lead;
-	m->b_wptr = m->b_rptr + len;
-	m->b_lim = m->b_buf + s;
-
-	return (0);
-}
-
-/*
- * Append a buffer to the message, making space if needed.
- * If reallocation files, ENOMEM is returned and the message freed.
- */
-int
-uni_msg_append(struct uni_msg *m, void *buf, size_t size)
-{
-	int error;
-
-	if ((error = uni_msg_ensure(m, size)))
-		return (error);
-	bcopy(buf, m->b_wptr, size);
-	m->b_wptr += size;
-
-	return (0);
-}
-
-/*
- * Pack/unpack data from/into mbufs. Assume, that the (optional) header
- * fits into the first mbuf, ie. hdrlen < MHLEN. Note, that the message
- * can be NULL, but hdrlen should not be 0 in this case.
- */
-struct mbuf *
-uni_msg_pack_mbuf(struct uni_msg *msg, void *hdr, size_t hdrlen)
-{
-	struct mbuf *m, *m0, *last;
-	size_t n;
-
-	MGETHDR(m0, M_NOWAIT, MT_DATA);
-	if (m0 == NULL)
-		return (NULL);
-
-	KASSERT(hdrlen <= MHLEN, ("uni_msg_pack_mbuf: hdrlen > MHLEN"));
-
-	if (hdrlen != 0) {
-		bcopy(hdr, m0->m_data, hdrlen);
-		m0->m_len = hdrlen;
-		m0->m_pkthdr.len = hdrlen;
-
-	} else {
-		if ((n = uni_msg_len(msg)) > MHLEN) {
-			if (!(MCLGET(m0, M_NOWAIT)))
-				goto drop;
-			if (n > MCLBYTES)
-				n = MCLBYTES;
-		}
-
-		bcopy(msg->b_rptr, m0->m_data, n);
-		msg->b_rptr += n;
-		m0->m_len = n;
-		m0->m_pkthdr.len = n;
-	}
-
-	last = m0;
-	while (msg != NULL && (n = uni_msg_len(msg)) != 0) {
-		MGET(m, M_NOWAIT, MT_DATA);
-		if (m == NULL)
-			goto drop;
-		last->m_next = m;
-		last = m;
-
-		if (n > MLEN) {
-			if (!(MCLGET(m, M_NOWAIT)))
-				goto drop;
-			if (n > MCLBYTES)
-				n = MCLBYTES;
-		}
-
-		bcopy(msg->b_rptr, m->m_data, n);
-		msg->b_rptr += n;
-		m->m_len = n;
-		m0->m_pkthdr.len += n;
-	}
-
-	return (m0);
-
-  drop:
-	m_freem(m0);
-	return (NULL);
-}
-
-#ifdef NGATM_DEBUG
-
-/*
- * Prepend a debugging header to each message
- */
-struct ngatm_msg {
-	LIST_ENTRY(ngatm_msg) link;
-	const char *file;
-	int line;
-	struct uni_msg msg;
-};
-
-/*
- * These are the lists of free and used message headers.
- */
-static LIST_HEAD(, ngatm_msg) ngatm_freeuni =
-    LIST_HEAD_INITIALIZER(ngatm_freeuni);
-static LIST_HEAD(, ngatm_msg) ngatm_useduni =
-    LIST_HEAD_INITIALIZER(ngatm_useduni);
-
-/*
- * Clean-up UNI message subsystem
- */
-static void
-uni_msg_fini(void)
-{
-	struct ngatm_msg *h;
-
-	/* free all free message headers */
-	while ((h = LIST_FIRST(&ngatm_freeuni)) != NULL) {
-		LIST_REMOVE(h, link);
-		free(h, M_UNIMSGHDR);
-	}
-
-	/* forget about still used messages */
-	LIST_FOREACH(h, &ngatm_useduni, link)
-		printf("unimsg header in use: %p (%s, %d)\n",
-		    &h->msg, h->file, h->line);
-
-	mtx_destroy(&ngatm_unilist_mtx);
-}
-
-/*
- * Allocate a message, that can hold at least s bytes.
- */
-struct uni_msg *
-_uni_msg_alloc(size_t s, const char *file, int line)
-{
-	struct ngatm_msg *m;
-
-	mtx_lock(&ngatm_unilist_mtx);
-	if ((m = LIST_FIRST(&ngatm_freeuni)) != NULL)
-		LIST_REMOVE(m, link);
-	mtx_unlock(&ngatm_unilist_mtx);
-
-	if (m == NULL &&
-	    (m = malloc(sizeof(*m), M_UNIMSGHDR, M_NOWAIT)) == NULL)
-		return (NULL);
-
-	s += EXTRA;
-	if((m->msg.b_buf = malloc(s, M_UNIMSG, M_NOWAIT | M_ZERO)) == NULL) {
-		mtx_lock(&ngatm_unilist_mtx);
-		LIST_INSERT_HEAD(&ngatm_freeuni, m, link);
-		mtx_unlock(&ngatm_unilist_mtx);
-		return (NULL);
-	}
-	m->msg.b_rptr = m->msg.b_wptr = m->msg.b_buf;
-	m->msg.b_lim = m->msg.b_buf + s;
-	m->file = file;
-	m->line = line;
-
-	mtx_lock(&ngatm_unilist_mtx);
-	LIST_INSERT_HEAD(&ngatm_useduni, m, link);
-	mtx_unlock(&ngatm_unilist_mtx);
-	return (&m->msg);
-}
-
-/*
- * Destroy a UNI message.
- * The header is inserted into the free header list.
- */
-void
-_uni_msg_destroy(struct uni_msg *m, const char *file, int line)
-{
-	struct ngatm_msg *h, *d;
-
-	d = (struct ngatm_msg *)((char *)m - offsetof(struct ngatm_msg, msg));
-
-	mtx_lock(&ngatm_unilist_mtx);
-	LIST_FOREACH(h, &ngatm_useduni, link)
-		if (h == d)
-			break;
-
-	if (h == NULL) {
-		/*
-		 * Not on used list. Ups.
-		 */
-		LIST_FOREACH(h, &ngatm_freeuni, link)
-			if (h == d)
-				break;
-
-		if (h == NULL)
-			printf("uni_msg %p was never allocated; found "
-			    "in %s:%u\n", m, file, line);
-		else
-			printf("uni_msg %p was already destroyed in %s,%d; "
-			    "found in %s:%u\n", m, h->file, h->line,
-			    file, line);
-	} else {
-		free(m->b_buf, M_UNIMSG);
-
-		LIST_REMOVE(d, link);
-		LIST_INSERT_HEAD(&ngatm_freeuni, d, link);
-
-		d->file = file;
-		d->line = line;
-	}
-
-	mtx_unlock(&ngatm_unilist_mtx);
-}
-
-#else /* !NGATM_DEBUG */
-
-/*
- * This assumes, that sizeof(struct uni_msg) >= sizeof(struct ngatm_msg)
- * and the alignment requirements of are the same.
- */
-struct ngatm_msg {
-	LIST_ENTRY(ngatm_msg) link;
-};
-
-/* Lists of free message headers.  */
-static LIST_HEAD(, ngatm_msg) ngatm_freeuni =
-    LIST_HEAD_INITIALIZER(ngatm_freeuni);
-
-/*
- * Clean-up UNI message subsystem
- */
-static void
-uni_msg_fini(void)
-{
-	struct ngatm_msg *h;
-
-	/* free all free message headers */
-	while ((h = LIST_FIRST(&ngatm_freeuni)) != NULL) {
-		LIST_REMOVE(h, link);
-		free(h, M_UNIMSGHDR);
-	}
-
-	mtx_destroy(&ngatm_unilist_mtx);
-}
-
-/*
- * Allocate a message, that can hold at least s bytes.
- */
-struct uni_msg *
-uni_msg_alloc(size_t s)
-{
-	struct ngatm_msg *a;
-	struct uni_msg *m;
-
-	mtx_lock(&ngatm_unilist_mtx);
-	if ((a = LIST_FIRST(&ngatm_freeuni)) != NULL)
-		LIST_REMOVE(a, link);
-	mtx_unlock(&ngatm_unilist_mtx);
-
-	if (a == NULL) {
-		if ((m = malloc(sizeof(*m), M_UNIMSGHDR, M_NOWAIT)) == NULL)
-			return (NULL);
-		a = (struct ngatm_msg *)m;
-	} else
-		m = (struct uni_msg *)a;
-
-	s += EXTRA;
-	if((m->b_buf = malloc(s, M_UNIMSG, M_NOWAIT | M_ZERO)) == NULL) {
-		mtx_lock(&ngatm_unilist_mtx);
-		LIST_INSERT_HEAD(&ngatm_freeuni, a, link);
-		mtx_unlock(&ngatm_unilist_mtx);
-		return (NULL);
-	}
-	m->b_rptr = m->b_wptr = m->b_buf;
-	m->b_lim = m->b_buf + s;
-
-	return (m);
-}
-
-/*
- * Destroy a UNI message.
- * The header is inserted into the free header list.
- */
-void
-uni_msg_destroy(struct uni_msg *m)
-{
-	struct ngatm_msg *a;
-
-	a = (struct ngatm_msg *)m;
-
-	free(m->b_buf, M_UNIMSG);
-
-	mtx_lock(&ngatm_unilist_mtx);
-	LIST_INSERT_HEAD(&ngatm_freeuni, a, link);
-	mtx_unlock(&ngatm_unilist_mtx);
-}
-
-#endif
-
-/*
- * Build a message from a number of buffers. Arguments are pairs
- * of (void *, size_t) ending with a NULL pointer.
- */
-#ifdef NGATM_DEBUG
-struct uni_msg *
-_uni_msg_build(const char *file, int line, void *ptr, ...)
-#else
-struct uni_msg *
-uni_msg_build(void *ptr, ...)
-#endif
-{
-	va_list ap;
-	struct uni_msg *m;
-	size_t len, n;
-	void *p1;
-
-	len = 0;
-	va_start(ap, ptr);
-	p1 = ptr;
-	while (p1 != NULL) {
-		n = va_arg(ap, size_t);
-		len += n;
-		p1 = va_arg(ap, void *);
-	}
-	va_end(ap);
-
-#ifdef NGATM_DEBUG
-	if ((m = _uni_msg_alloc(len, file, line)) == NULL)
-#else
-	if ((m = uni_msg_alloc(len)) == NULL)
-#endif
-		return (NULL);
-
-	va_start(ap, ptr);
-	p1 = ptr;
-	while (p1 != NULL) {
-		n = va_arg(ap, size_t);
-		bcopy(p1, m->b_wptr, n);
-		m->b_wptr += n;
-		p1 = va_arg(ap, void *);
-	}
-	va_end(ap);
-
-	return (m);
-}
-
-/*
- * Unpack an mbuf chain into a uni_msg buffer.
- */
-#ifdef NGATM_DEBUG
-int
-_uni_msg_unpack_mbuf(struct mbuf *m, struct uni_msg **pmsg, const char *file,
-    int line)
-#else
-int
-uni_msg_unpack_mbuf(struct mbuf *m, struct uni_msg **pmsg)
-#endif
-{
-	if (!(m->m_flags & M_PKTHDR)) {
-		printf("%s: bogus packet %p\n", __func__, m);
-		return (EINVAL);
-	}
-#ifdef NGATM_DEBUG
-	if ((*pmsg = _uni_msg_alloc(m->m_pkthdr.len, file, line)) == NULL)
-#else
-	if ((*pmsg = uni_msg_alloc(m->m_pkthdr.len)) == NULL)
-#endif
-		return (ENOMEM);
-
-	m_copydata(m, 0, m->m_pkthdr.len, (*pmsg)->b_wptr);
-	(*pmsg)->b_wptr += m->m_pkthdr.len;
-
-	return (0);
-}
-
-/*********************************************************************/
-
-static int
-ngatm_handler(module_t mod, int what, void *arg)
-{
-	int error = 0;
-
-	switch (what) {
-	  case MOD_LOAD:
-		uni_msg_init();
-		break;
-
-	  case MOD_UNLOAD:
-		uni_msg_fini();
-		break;
-
-	  default:
-		error = EOPNOTSUPP;
-		break;
-	}
-
-	return (error);
-}
diff --git a/sys/netgraph/atm/ngatmbase.h b/sys/netgraph/atm/ngatmbase.h
deleted file mode 100644
index 910dd03c0847..000000000000
--- a/sys/netgraph/atm/ngatmbase.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation must retain the above
- *    copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY FRAUNHOFER FOKUS
- * AND ITS 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
- * FRAUNHOFER FOKUS OR ITS CONTRIBUTORS  BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- *
- * In-kernel UNI stack message functions.
- */
-#ifndef _NETGRAPH_ATM_NGATMBASE_H_
-#define	_NETGRAPH_ATM_NGATMBASE_H_
-
-/* forward declarations */
-struct mbuf;
-struct uni_msg;
-
-struct mbuf *uni_msg_pack_mbuf(struct uni_msg *, void *, size_t);
-
-#ifdef NGATM_DEBUG
-
-struct uni_msg *_uni_msg_alloc(size_t, const char *, int);
-struct uni_msg *_uni_msg_build(const char *, int, void *, ...);
-void _uni_msg_destroy(struct uni_msg *, const char *, int);
-int _uni_msg_unpack_mbuf(struct mbuf *, struct uni_msg **, const char *, int);
-
-#define	uni_msg_alloc(S) _uni_msg_alloc((S), __FILE__, __LINE__)
-#define	uni_msg_build(P...) _uni_msg_build(__FILE__, __LINE__, P)
-#define	uni_msg_destroy(M) _uni_msg_destroy((M), __FILE__, __LINE__)
-#define	uni_msg_unpack_mbuf(M, PP) \
-	    _uni_msg_unpack_mbuf((M), (PP), __FILE__, __LINE__)
-
-#else /* !NGATM_DEBUG */
-
-struct uni_msg *uni_msg_alloc(size_t);
-struct uni_msg *uni_msg_build(void *, ...);
-void uni_msg_destroy(struct uni_msg *);
-int uni_msg_unpack_mbuf(struct mbuf *, struct uni_msg **);
-
-#endif
-#endif
diff --git a/sys/netgraph/atm/sscfu/ng_sscfu.c b/sys/netgraph/atm/sscfu/ng_sscfu.c
deleted file mode 100644
index 4811f576df0b..000000000000
--- a/sys/netgraph/atm/sscfu/ng_sscfu.c
+++ /dev/null
@@ -1,604 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * Netgraph module for ITU-T Q.2120 UNI SSCF.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/sbuf.h>
-#include <machine/stdarg.h>
-
-#include <netgraph/ng_message.h>
-#include <netgraph/netgraph.h>
-#include <netgraph/ng_parse.h>
-#include <netnatm/saal/sscopdef.h>
-#include <netnatm/saal/sscfudef.h>
-#include <netgraph/atm/ng_sscop.h>
-#include <netgraph/atm/ng_sscfu.h>
-#include <netgraph/atm/sscfu/ng_sscfu_cust.h>
-#include <netnatm/saal/sscfu.h>
-
-MALLOC_DEFINE(M_NG_SSCFU, "netgraph_sscfu", "netgraph uni sscf node");
-
-MODULE_DEPEND(ng_sscfu, ngatmbase, 1, 1, 1);
-
-/*
- * Private data
- */
-struct priv {
-	hook_p		upper;	/* SAAL interface */
-	hook_p		lower;	/* SSCOP interface */
-	struct sscfu	*sscf;	/* the instance */
-	int		enabled;
-};
-
-/*
- * PARSING
- */
-/*
- * Parse PARAM type
- */
-static const struct ng_parse_struct_field ng_sscop_param_type_info[] =
-    NG_SSCOP_PARAM_INFO;
-
-static const struct ng_parse_type ng_sscop_param_type = {
-	&ng_parse_struct_type,
-	ng_sscop_param_type_info
-};
-
-static const struct ng_parse_struct_field ng_sscfu_getdefparam_type_info[] =
-    NG_SSCFU_GETDEFPARAM_INFO;
-
-static const struct ng_parse_type ng_sscfu_getdefparam_type = {
-	&ng_parse_struct_type,
-	ng_sscfu_getdefparam_type_info
-};
-
-static const struct ng_cmdlist ng_sscfu_cmdlist[] = {
-	{
-	  NGM_SSCFU_COOKIE,
-	  NGM_SSCFU_GETDEFPARAM,
-	  "getdefparam",
-	  NULL,
-	  &ng_sscfu_getdefparam_type
-	},
-	{
-	  NGM_SSCFU_COOKIE,
-	  NGM_SSCFU_ENABLE,
-	  "enable",
-	  NULL,
-	  NULL
-	},
-	{
-	  NGM_SSCFU_COOKIE,
-	  NGM_SSCFU_DISABLE,
-	  "disable",
-	  NULL,
-	  NULL
-	},
-	{
-	  NGM_SSCFU_COOKIE,
-	  NGM_SSCFU_GETDEBUG,
-	  "getdebug",
-	  NULL,
-	  &ng_parse_hint32_type
-	},
-	{
-	  NGM_SSCFU_COOKIE,
-	  NGM_SSCFU_SETDEBUG,
-	  "setdebug",
-	  &ng_parse_hint32_type,
-	  NULL
-	},
-	{
-	  NGM_SSCFU_COOKIE,
-	  NGM_SSCFU_GETSTATE,
-	  "getstate",
-	  NULL,
-	  &ng_parse_uint32_type
-	},
-	{ 0 }
-};
-
-static ng_constructor_t ng_sscfu_constructor;
-static ng_shutdown_t	ng_sscfu_shutdown;
-static ng_rcvmsg_t	ng_sscfu_rcvmsg;
-static ng_newhook_t	ng_sscfu_newhook;
-static ng_disconnect_t	ng_sscfu_disconnect;
-static ng_rcvdata_t	ng_sscfu_rcvupper;
-static ng_rcvdata_t	ng_sscfu_rcvlower;
-
-static int ng_sscfu_mod_event(module_t, int, void *);
-
-static struct ng_type ng_sscfu_typestruct = {
-	.version =	NG_ABI_VERSION,
-	.name =		NG_SSCFU_NODE_TYPE,
-	.mod_event =	ng_sscfu_mod_event,
-	.constructor =	ng_sscfu_constructor,
-	.rcvmsg =	ng_sscfu_rcvmsg,
-	.shutdown =	ng_sscfu_shutdown,
-	.newhook =	ng_sscfu_newhook,
-	.rcvdata =	ng_sscfu_rcvupper,
-	.disconnect =	ng_sscfu_disconnect,
-	.cmdlist =	ng_sscfu_cmdlist,
-};
-NETGRAPH_INIT(sscfu, &ng_sscfu_typestruct);
-
-static void sscfu_send_upper(struct sscfu *, void *, enum saal_sig,
-	struct mbuf *);
-static void sscfu_send_lower(struct sscfu *, void *, enum sscop_aasig,
-	struct mbuf *, u_int);
-static void sscfu_window(struct sscfu *, void *, u_int);
-static void sscfu_verbose(struct sscfu *, void *, const char *, ...)
-	__printflike(3, 4);
-
-static const struct sscfu_funcs sscfu_funcs = {
-	sscfu_send_upper,
-	sscfu_send_lower,
-	sscfu_window,
-	sscfu_verbose
-};
-
-/************************************************************/
-/*
- * CONTROL MESSAGES
- */
-static int
-text_status(node_p node, struct priv *priv, char *arg, u_int len)
-{
-	struct sbuf sbuf;
-
-	sbuf_new(&sbuf, arg, len, 0);
-
-	if (priv->upper)
-		sbuf_printf(&sbuf, "upper hook: %s connected to %s:%s\n",
-		    NG_HOOK_NAME(priv->upper),
-		    NG_NODE_NAME(NG_HOOK_NODE(NG_HOOK_PEER(priv->upper))),
-		    NG_HOOK_NAME(NG_HOOK_PEER(priv->upper)));
-	else
-		sbuf_printf(&sbuf, "upper hook: <not connected>\n");
-
-	if (priv->lower)
-		sbuf_printf(&sbuf, "lower hook: %s connected to %s:%s\n",
-		    NG_HOOK_NAME(priv->lower),
-		    NG_NODE_NAME(NG_HOOK_NODE(NG_HOOK_PEER(priv->lower))),
-		    NG_HOOK_NAME(NG_HOOK_PEER(priv->lower)));
-	else
-		sbuf_printf(&sbuf, "lower hook: <not connected>\n");
-
-	sbuf_printf(&sbuf, "sscf state: %s\n",
-	    priv->enabled == 0 ? "<disabled>" :
-	    sscfu_statename(sscfu_getstate(priv->sscf)));
-
-	sbuf_finish(&sbuf);
-	return (sbuf_len(&sbuf));
-}
-
-static int
-ng_sscfu_rcvmsg(node_p node, item_p item, hook_p lasthook)
-{
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	struct ng_mesg *resp = NULL;
-	struct ng_mesg *msg;
-	int error = 0;
-
-	NGI_GET_MSG(item, msg);
-
-	switch (msg->header.typecookie) {
-	  case NGM_GENERIC_COOKIE:
-		switch (msg->header.cmd) {
-		  case NGM_TEXT_STATUS:
-			NG_MKRESPONSE(resp, msg, NG_TEXTRESPONSE, M_NOWAIT);
-			if (resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			resp->header.arglen = text_status(node, priv,
-			    (char *)resp->data, resp->header.arglen) + 1;
-			break;
-
-		  default:
-			error = EINVAL;
-			break;
-		}
-		break;
-
-	  case NGM_SSCFU_COOKIE:
-		switch (msg->header.cmd) {
-		  case NGM_SSCFU_GETDEFPARAM:
-		    {
-			struct ng_sscfu_getdefparam *p;
-
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			NG_MKRESPONSE(resp, msg, sizeof(*p), M_NOWAIT);
-			if (resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			p = (struct ng_sscfu_getdefparam *)resp->data;
-			p->mask = sscfu_getdefparam(&p->param);
-			break;
-		    }
-
-		  case NGM_SSCFU_ENABLE:
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			if (priv->enabled) {
-				error = EISCONN;
-				break;
-			}
-			priv->enabled = 1;
-			break;
-
-		  case NGM_SSCFU_DISABLE:
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			if (!priv->enabled) {
-				error = ENOTCONN;
-				break;
-			}
-			priv->enabled = 0;
-			sscfu_reset(priv->sscf);
-			break;
-
-		  case NGM_SSCFU_GETSTATE:
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			NG_MKRESPONSE(resp, msg, sizeof(uint32_t), M_NOWAIT);
-			if(resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			*(uint32_t *)resp->data =
-			    priv->enabled ? (sscfu_getstate(priv->sscf) + 1)
-			                  : 0;
-			break;
-
-		  case NGM_SSCFU_GETDEBUG:
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			NG_MKRESPONSE(resp, msg, sizeof(uint32_t), M_NOWAIT);
-			if(resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			*(uint32_t *)resp->data = sscfu_getdebug(priv->sscf);
-			break;
-
-		  case NGM_SSCFU_SETDEBUG:
-			if (msg->header.arglen != sizeof(uint32_t)) {
-				error = EINVAL;
-				break;
-			}
-			sscfu_setdebug(priv->sscf, *(uint32_t *)msg->data);
-			break;
-
-		  default:
-			error = EINVAL;
-			break;
-		}
-		break;
-
-	  default:
-		error = EINVAL;
-		break;
-	}
-
-	NG_RESPOND_MSG(error, node, item, resp);
-	NG_FREE_MSG(msg);
-
-	return (error);
-}
-
-/************************************************************/
-/*
- * HOOK MANAGEMENT
- */
-static int
-ng_sscfu_newhook(node_p node, hook_p hook, const char *name)
-{
-	struct priv *priv = NG_NODE_PRIVATE(node);
-
-	if (strcmp(name, "upper") == 0)
-		priv->upper = hook;
-	else if (strcmp(name, "lower") == 0) {
-		priv->lower = hook;
-		NG_HOOK_SET_RCVDATA(hook, ng_sscfu_rcvlower);
-	} else
-		return (EINVAL);
-	return (0);
-}
-
-static int
-ng_sscfu_disconnect(hook_p hook)
-{
-	node_p node = NG_HOOK_NODE(hook);
-	struct priv *priv = NG_NODE_PRIVATE(node);
-
-	if (hook == priv->upper)
-		priv->upper = NULL;
-	else if (hook == priv->lower)
-		priv->lower = NULL;
-	else {
-		log(LOG_ERR, "bogus hook");
-		return (EINVAL);
-	}
-
-	if (NG_NODE_NUMHOOKS(node) == 0) {
-		if (NG_NODE_IS_VALID(node))
-			ng_rmnode_self(node);
-	} else {
-		/*
-		 * Because there are no timeouts reset the protocol
-		 * if the lower layer is disconnected.
-		 */
-		if (priv->lower == NULL &&
-		    priv->enabled &&
-		    sscfu_getstate(priv->sscf) != SSCFU_RELEASED)
-			sscfu_reset(priv->sscf);
-	}
-	return (0);
-}
-
-/************************************************************/
-/*
- * DATA
- */
-static int
-ng_sscfu_rcvupper(hook_p hook, item_p item)
-{
-	node_p node = NG_HOOK_NODE(hook);
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	struct mbuf *m;
-	struct sscfu_arg a;
-
-	if (!priv->enabled || priv->lower == NULL) {
-		NG_FREE_ITEM(item);
-		return (0);
-	}
-
-	NGI_GET_M(item, m);
-	NG_FREE_ITEM(item);
-
-	if (!(m->m_flags & M_PKTHDR)) {
-		printf("no pkthdr\n");
-		m_freem(m);
-		return (EINVAL);
-	}
-	if (m->m_len < (int)sizeof(a) && (m = m_pullup(m, sizeof(a))) == NULL)
-		return (ENOMEM);
-	bcopy((caddr_t)mtod(m, struct sscfu_arg *), &a, sizeof(a));
-	m_adj(m, sizeof(a));
-
-	return (sscfu_saalsig(priv->sscf, a.sig, m));
-}
-
-static void
-sscfu_send_upper(struct sscfu *sscf, void *p, enum saal_sig sig, struct mbuf *m)
-{
-	node_p node = (node_p)p;
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	int error;
-	struct sscfu_arg *a;
-
-	if (priv->upper == NULL) {
-		if (m != NULL)
-			m_freem(m);
-		return;
-	}
-	if (m == NULL) {
-		MGETHDR(m, M_NOWAIT, MT_DATA);
-		if (m == NULL)
-			return;
-		m->m_len = sizeof(struct sscfu_arg);
-		m->m_pkthdr.len = m->m_len;
-	} else {
-		M_PREPEND(m, sizeof(struct sscfu_arg), M_NOWAIT);
-		if (m == NULL)
-			return;
-	}
-	a = mtod(m, struct sscfu_arg *);
-	a->sig = sig;
-
-	NG_SEND_DATA_ONLY(error, priv->upper, m);
-}
-
-static int
-ng_sscfu_rcvlower(hook_p hook, item_p item)
-{
-	node_p node = NG_HOOK_NODE(hook);
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	struct mbuf *m;
-	struct sscop_arg a;
-
-	if (!priv->enabled || priv->upper == NULL) {
-		NG_FREE_ITEM(item);
-		return (0);
-	}
-
-	NGI_GET_M(item, m);
-	NG_FREE_ITEM(item);
-
-	if (!(m->m_flags & M_PKTHDR)) {
-		printf("no pkthdr\n");
-		m_freem(m);
-		return (EINVAL);
-	}
-
-	/*
-	 * Strip of the SSCOP header.
-	 */
-	if (m->m_len < (int)sizeof(a) && (m = m_pullup(m, sizeof(a))) == NULL)
-		return (ENOMEM);
-	bcopy((caddr_t)mtod(m, struct sscop_arg *), &a, sizeof(a));
-	m_adj(m, sizeof(a));
-
-	sscfu_input(priv->sscf, a.sig, m, a.arg);
-
-	return (0);
-}
-
-static void
-sscfu_send_lower(struct sscfu *sscf, void *p, enum sscop_aasig sig,
-    struct mbuf *m, u_int arg)
-{
-	node_p node = (node_p)p;
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	int error;
-	struct sscop_arg *a;
-
-	if (priv->lower == NULL) {
-		if (m != NULL)
-			m_freem(m);
-		return;
-	}
-	if (m == NULL) {
-		MGETHDR(m, M_NOWAIT, MT_DATA);
-		if (m == NULL)
-			return;
-		m->m_len = sizeof(struct sscop_arg);
-		m->m_pkthdr.len = m->m_len;
-	} else {
-		M_PREPEND(m, sizeof(struct sscop_arg), M_NOWAIT);
-		if (m == NULL)
-			return;
-	}
-	a = mtod(m, struct sscop_arg *);
-	a->sig = sig;
-	a->arg = arg;
-
-	NG_SEND_DATA_ONLY(error, priv->lower, m);
-}
-
-/*
- * Window is handled by ng_sscop so make this a NOP.
- */
-static void
-sscfu_window(struct sscfu *sscfu, void *arg, u_int w)
-{
-}
-
-/************************************************************/
-/*
- * NODE MANAGEMENT
- */
-static int
-ng_sscfu_constructor(node_p node)
-{
-	struct priv *priv;
-
-	gone_in(14, "ng_sscfu: netgraph ATM modules");
-
-	priv = malloc(sizeof(*priv), M_NG_SSCFU, M_WAITOK | M_ZERO);
-
-	if ((priv->sscf = sscfu_create(node, &sscfu_funcs)) == NULL) {
-		free(priv, M_NG_SSCFU);
-		return (ENOMEM);
-	}
-
-	NG_NODE_SET_PRIVATE(node, priv);
-
-	return (0);
-}
-
-static int
-ng_sscfu_shutdown(node_p node)
-{
-	struct priv *priv = NG_NODE_PRIVATE(node);
-
-	sscfu_destroy(priv->sscf);
-
-	free(priv, M_NG_SSCFU);
-	NG_NODE_SET_PRIVATE(node, NULL);
-
-	NG_NODE_UNREF(node);
-
-	return (0);
-}
-
-static void
-sscfu_verbose(struct sscfu *sscfu, void *arg, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	printf("sscfu(%p): ", sscfu);
-	vprintf(fmt, ap);
-	va_end(ap);
-	printf("\n");
-}
-
-/************************************************************/
-/*
- * INITIALISATION
- */
-/*
- * Loading and unloading of node type
- */
-static int
-ng_sscfu_mod_event(module_t mod, int event, void *data)
-{
-	int error = 0;
-
-	switch (event) {
-	  case MOD_LOAD:
-		break;
-
-	  case MOD_UNLOAD:
-		break;
-
-	  default:
-		error = EOPNOTSUPP;
-		break;
-	}
-	return (error);
-}
diff --git a/sys/netgraph/atm/sscfu/ng_sscfu_cust.h b/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
deleted file mode 100644
index f97245833be1..000000000000
--- a/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Customisation of the SSCFU code to ng_sscfu.
- *
- * $FreeBSD$
- */
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/kernel.h>
-#include <sys/mbuf.h>
-#include <sys/queue.h>
-#include <sys/callout.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <machine/stdarg.h>
-
-/*
- * Allocate zeroed or non-zeroed memory of some size and cast it.
- * Return NULL on failure.
- */
-#ifndef SSCFU_DEBUG
-
-#define	MEMINIT() \
-	MALLOC_DECLARE(M_NG_SSCFU); \
-	DECL_SIGQ_GET
-
-#define	MEMZALLOC(PTR, CAST, SIZE) \
-	((PTR) = (CAST)malloc((SIZE), M_NG_SSCFU, M_NOWAIT | M_ZERO))
-#define	MEMFREE(PTR) \
-	free(PTR, M_NG_SSCFU)
-
-#define	SIG_ALLOC(PTR) \
-	MEMZALLOC(PTR, struct sscfu_sig *, sizeof(struct sscfu_sig))
-#define	SIG_FREE(PTR) \
-	MEMFREE(PTR)
-
-#else
-
-#define	MEMINIT() 							\
-	MALLOC_DEFINE(M_NG_SSCFU_INS, "sscfu_ins", "SSCFU instances");	\
-	MALLOC_DEFINE(M_NG_SSCFU_SIG, "sscfu_sig", "SSCFU signals");	\
-	DECL_SIGQ_GET
-
-#define	MEMZALLOC(PTR, CAST, SIZE)					\
-	((PTR) = (CAST)malloc((SIZE), M_NG_SSCFU_INS, M_NOWAIT | M_ZERO))
-#define	MEMFREE(PTR)							\
-	free(PTR, M_NG_SSCFU_INS)
-
-#define	SIG_ALLOC(PTR)							\
-	((PTR) = malloc(sizeof(struct sscfu_sig),			\
-	    M_NG_SSCFU_SIG, M_NOWAIT | M_ZERO))
-#define	SIG_FREE(PTR)							\
-	free(PTR, M_NG_SSCFU_SIG)
-
-#endif
-
-/*
- * Signal queues
- */
-typedef TAILQ_ENTRY(sscfu_sig) sscfu_sigq_link_t;
-typedef TAILQ_HEAD(sscfu_sigq, sscfu_sig) sscfu_sigq_head_t;
-#define	SIGQ_INIT(Q) 		TAILQ_INIT(Q)
-#define	SIGQ_APPEND(Q, S)	TAILQ_INSERT_TAIL(Q, S, link)
-
-#define	SIGQ_GET(Q) ng_sscfu_sigq_get((Q))
-
-#define	DECL_SIGQ_GET							\
-static __inline struct sscfu_sig *					\
-ng_sscfu_sigq_get(struct sscfu_sigq *q)					\
-{									\
-	struct sscfu_sig *s;						\
-									\
-	s = TAILQ_FIRST(q);						\
-	if (s != NULL)							\
-		TAILQ_REMOVE(q, s, link);				\
-	return (s);							\
-}
-
-#define	SIGQ_CLEAR(Q)							\
-    do {								\
-	struct sscfu_sig *_s1, *_s2;					\
-									\
-	_s1 = TAILQ_FIRST(Q);						\
-	while (_s1 != NULL) {						\
-		_s2 = TAILQ_NEXT(_s1, link);				\
-		if (_s1->m)						\
-			MBUF_FREE(_s1->m);				\
-		SIG_FREE(_s1);						\
-		_s1 = _s2;						\
-	}								\
-	TAILQ_INIT(Q);							\
-    } while (0)
-
-/*
- * Message buffers
- */
-#define	MBUF_FREE(M)	m_freem(M)
-
-#ifdef SSCFU_DEBUG
-#define	ASSERT(S)	KASSERT(S, (#S))
-#else
-#define	ASSERT(S)
-#endif
diff --git a/sys/netgraph/atm/sscop/ng_sscop.c b/sys/netgraph/atm/sscop/ng_sscop.c
deleted file mode 100644
index ae60e7557978..000000000000
--- a/sys/netgraph/atm/sscop/ng_sscop.c
+++ /dev/null
@@ -1,874 +0,0 @@
-/*-
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation must retain the above
- *    copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY FRAUNHOFER FOKUS
- * AND ITS 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
- * FRAUNHOFER FOKUS OR ITS CONTRIBUTORS  BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Netgraph module for ITU-T Q.2110 SSCOP.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/callout.h>
-#include <sys/sbuf.h>
-#include <sys/stdint.h>
-#include <machine/stdarg.h>
-
-#include <netgraph/ng_message.h>
-#include <netgraph/netgraph.h>
-#include <netgraph/ng_parse.h>
-#include <netnatm/saal/sscopdef.h>
-#include <netgraph/atm/ng_sscop.h>
-#include <netgraph/atm/sscop/ng_sscop_cust.h>
-#include <netnatm/saal/sscop.h>
-
-#define DDD printf("%s: %d\n", __func__, __LINE__)
-
-#ifdef SSCOP_DEBUG
-#define VERBOSE(P,M,F)							\
-    do {								\
-	if (sscop_getdebug((P)->sscop) & (M))				\
-		sscop_verbose F ;					\
-    } while(0)
-#else
-#define VERBOSE(P,M,F)
-#endif
-
-MALLOC_DEFINE(M_NG_SSCOP, "netgraph_sscop", "netgraph sscop node");
-
-MODULE_DEPEND(ng_sscop, ngatmbase, 1, 1, 1);
-
-struct stats {
-	uint64_t	in_packets;
-	uint64_t	out_packets;
-	uint64_t	aa_signals;
-	uint64_t	errors;
-	uint64_t	data_delivered;
-	uint64_t	aa_dropped;
-	uint64_t	maa_dropped;
-	uint64_t	maa_signals;
-	uint64_t	in_dropped;
-	uint64_t	out_dropped;
-};
-
-/*
- * Private data
- */
-struct priv {
-	hook_p		upper;		/* SAAL interface */
-	hook_p		lower;		/* AAL5 interface */
-	hook_p		manage;		/* management interface */
-
-	struct sscop	*sscop;		/* sscop state */
-	int		enabled;	/* whether the protocol is enabled */
-	int		flow;		/* flow control states */
-	struct stats	stats;		/* sadistics */
-};
-
-/*
- * Parse PARAM type
- */
-static const struct ng_parse_struct_field ng_sscop_param_type_info[] = 
-    NG_SSCOP_PARAM_INFO;
-
-static const struct ng_parse_type ng_sscop_param_type = {
-	&ng_parse_struct_type,
-	ng_sscop_param_type_info
-};
-
-/*
- * Parse a SET PARAM type.
- */
-static const struct ng_parse_struct_field ng_sscop_setparam_type_info[] =
-    NG_SSCOP_SETPARAM_INFO;
-
-static const struct ng_parse_type ng_sscop_setparam_type = {
-	&ng_parse_struct_type,
-	ng_sscop_setparam_type_info,
-};
-
-/*
- * Parse a SET PARAM response
- */
-static const struct ng_parse_struct_field ng_sscop_setparam_resp_type_info[] =
-    NG_SSCOP_SETPARAM_RESP_INFO;
-
-static const struct ng_parse_type ng_sscop_setparam_resp_type = {
-	&ng_parse_struct_type,
-	ng_sscop_setparam_resp_type_info,
-};
-
-static const struct ng_cmdlist ng_sscop_cmdlist[] = {
-	{
-	  NGM_SSCOP_COOKIE,
-	  NGM_SSCOP_GETPARAM,
-	  "getparam",
-	  NULL,
-	  &ng_sscop_param_type
-	},
-	{
-	  NGM_SSCOP_COOKIE,
-	  NGM_SSCOP_SETPARAM,
-	  "setparam",
-	  &ng_sscop_setparam_type,
-	  &ng_sscop_setparam_resp_type
-	},
-	{
-	  NGM_SSCOP_COOKIE,
-	  NGM_SSCOP_ENABLE,
-	  "enable",
-	  NULL,
-	  NULL
-	},
-	{
-	  NGM_SSCOP_COOKIE,
-	  NGM_SSCOP_DISABLE,
-	  "disable",
-	  NULL,
-	  NULL
-	},
-	{
-	  NGM_SSCOP_COOKIE,
-	  NGM_SSCOP_GETDEBUG,
-	  "getdebug",
-	  NULL,
-	  &ng_parse_hint32_type
-	},
-	{
-	  NGM_SSCOP_COOKIE,
-	  NGM_SSCOP_SETDEBUG,
-	  "setdebug",
-	  &ng_parse_hint32_type,
-	  NULL
-	},
-	{
-	  NGM_SSCOP_COOKIE,
-	  NGM_SSCOP_GETSTATE,
-	  "getstate",
-	  NULL,
-	  &ng_parse_uint32_type
-	},
-	{ 0 }
-};
-
-static ng_constructor_t ng_sscop_constructor;
-static ng_shutdown_t	ng_sscop_shutdown;
-static ng_rcvmsg_t	ng_sscop_rcvmsg;
-static ng_newhook_t	ng_sscop_newhook;
-static ng_disconnect_t	ng_sscop_disconnect;
-static ng_rcvdata_t	ng_sscop_rcvlower;
-static ng_rcvdata_t	ng_sscop_rcvupper;
-static ng_rcvdata_t	ng_sscop_rcvmanage;
-
-static int ng_sscop_mod_event(module_t, int, void *);
-
-static struct ng_type ng_sscop_typestruct = {
-	.version =	NG_ABI_VERSION,
-	.name =		NG_SSCOP_NODE_TYPE,
-	.mod_event =	ng_sscop_mod_event,
-	.constructor =	ng_sscop_constructor,
-	.rcvmsg =	ng_sscop_rcvmsg,
-	.shutdown =	ng_sscop_shutdown,
-	.newhook =	ng_sscop_newhook,
-	.rcvdata =	ng_sscop_rcvlower,
-	.disconnect =	ng_sscop_disconnect,
-	.cmdlist =	ng_sscop_cmdlist,
-};
-NETGRAPH_INIT(sscop, &ng_sscop_typestruct);
-
-static void sscop_send_manage(struct sscop *, void *, enum sscop_maasig,
-	struct SSCOP_MBUF_T *, u_int, u_int);
-static void sscop_send_upper(struct sscop *, void *, enum sscop_aasig,
-	struct SSCOP_MBUF_T *, u_int);
-static void sscop_send_lower(struct sscop *, void *,
-	struct SSCOP_MBUF_T *);
-static void sscop_verbose(struct sscop *, void *, const char *, ...)
-	__printflike(3, 4);
-
-static const struct sscop_funcs sscop_funcs = {
-	sscop_send_manage,
-	sscop_send_upper,
-	sscop_send_lower,
-	sscop_verbose
-};
-
-static void
-sscop_verbose(struct sscop *sscop, void *arg, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	printf("sscop(%p): ", sscop);
-	vprintf(fmt, ap);
-	va_end(ap);
-	printf("\n");
-}
-
-/************************************************************/
-/*
- * NODE MANAGEMENT
- */
-static int
-ng_sscop_constructor(node_p node)
-{
-	struct priv *p;
-
-	gone_in(14, "ng_sscop: netgraph ATM modules");
-
-	p = malloc(sizeof(*p), M_NG_SSCOP, M_WAITOK | M_ZERO);
-
-	if ((p->sscop = sscop_create(node, &sscop_funcs)) == NULL) {
-		free(p, M_NG_SSCOP);
-		return (ENOMEM);
-	}
-	NG_NODE_SET_PRIVATE(node, p);
-
-	/* All data message received by the node are expected to change the
-	 * node's state. Therefor we must ensure, that we have a writer lock. */
-	NG_NODE_FORCE_WRITER(node);
-
-	return (0);
-}
-static int
-ng_sscop_shutdown(node_p node)
-{
-	struct priv *priv = NG_NODE_PRIVATE(node);
-
-	sscop_destroy(priv->sscop);
-
-	free(priv, M_NG_SSCOP);
-	NG_NODE_SET_PRIVATE(node, NULL);
-
-	NG_NODE_UNREF(node);
-
-	return (0);
-}
-
-/************************************************************/
-/*
- * CONTROL MESSAGES
- */
-/*
- * Flow control message from upper layer.
- * This is very experimental:
- * If we get a message from the upper layer, that somebody has passed its
- * high water mark, we stop updating the receive window.
- * If we get a low watermark passed, then we raise the window up
- * to max - current.
- * If we get a queue status and it indicates a current below the
- * high watermark, we unstop window updates (if they are stopped) and
- * raise the window to highwater - current.
- */
-static int
-flow_upper(node_p node, struct ng_mesg *msg)
-{
-	struct ngm_queue_state *q;
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	u_int window, space;
-
-	if (msg->header.arglen != sizeof(struct ngm_queue_state))
-		return (EINVAL);
-	q = (struct ngm_queue_state *)msg->data;
-
-	switch (msg->header.cmd) {
-	  case NGM_HIGH_WATER_PASSED:
-		if (priv->flow) {
-			VERBOSE(priv, SSCOP_DBG_FLOW, (priv->sscop, priv,
-			    "flow control stopped"));
-			priv->flow = 0;
-		}
-		break;
-
-	  case NGM_LOW_WATER_PASSED:
-		window = sscop_window(priv->sscop, 0);
-		space = q->max_queuelen_packets - q->current;
-		if (space > window) {
-			VERBOSE(priv, SSCOP_DBG_FLOW, (priv->sscop, priv,
-			    "flow control opened window by %u messages",
-			    space - window));
-			(void)sscop_window(priv->sscop, space - window);
-		}
-		priv->flow = 1;
-		break;
-
-	  case NGM_SYNC_QUEUE_STATE:
-		if (q->high_watermark <= q->current)
-			break;
-		window = sscop_window(priv->sscop, 0);
-		if (priv->flow)
-			space = q->max_queuelen_packets - q->current;
-		else
-			space = q->high_watermark - q->current;
-		if (space > window) {
-			VERBOSE(priv, SSCOP_DBG_FLOW, (priv->sscop, priv,
-			    "flow control opened window by %u messages",
-			    space - window));
-			(void)sscop_window(priv->sscop, space - window);
-		}
-		priv->flow = 1;
-		break;
-
-	  default:
-		return (EINVAL);
-	}
-	return (0);
-}
-
-static int
-flow_lower(node_p node, struct ng_mesg *msg)
-{
-	struct priv *priv = NG_NODE_PRIVATE(node);
-
-	if (msg->header.arglen != sizeof(struct ngm_queue_state))
-		return (EINVAL);
-
-	switch (msg->header.cmd) {
-	  case NGM_HIGH_WATER_PASSED:
-		sscop_setbusy(priv->sscop, 1);
-		break;
-
-	  case NGM_LOW_WATER_PASSED:
-		sscop_setbusy(priv->sscop, 1);
-		break;
-
-	  default:
-		return (EINVAL);
-	}
-	return (0);
-}
-
-/*
- * Produce a readable status description
- */
-static int
-text_status(node_p node, struct priv *priv, char *arg, u_int len)
-{
-	struct sbuf sbuf;
-
-	sbuf_new(&sbuf, arg, len, 0);
-
-	if (priv->upper)
-		sbuf_printf(&sbuf, "upper hook: %s connected to %s:%s\n",
-		    NG_HOOK_NAME(priv->upper),
-		    NG_NODE_NAME(NG_HOOK_NODE(NG_HOOK_PEER(priv->upper))),
-		    NG_HOOK_NAME(NG_HOOK_PEER(priv->upper)));
-	else
-		sbuf_printf(&sbuf, "upper hook: <not connected>\n");
-
-	if (priv->lower)
-		sbuf_printf(&sbuf, "lower hook: %s connected to %s:%s\n",
-		    NG_HOOK_NAME(priv->lower),
-		    NG_NODE_NAME(NG_HOOK_NODE(NG_HOOK_PEER(priv->lower))),
-		    NG_HOOK_NAME(NG_HOOK_PEER(priv->lower)));
-	else
-		sbuf_printf(&sbuf, "lower hook: <not connected>\n");
-
-	if (priv->manage)
-		sbuf_printf(&sbuf, "manage hook: %s connected to %s:%s\n",
-		    NG_HOOK_NAME(priv->manage),
-		    NG_NODE_NAME(NG_HOOK_NODE(NG_HOOK_PEER(priv->manage))),
-		    NG_HOOK_NAME(NG_HOOK_PEER(priv->manage)));
-	else
-		sbuf_printf(&sbuf, "manage hook: <not connected>\n");
-
-	sbuf_printf(&sbuf, "sscop state: %s\n",
-	    !priv->enabled ? "<disabled>" :
-	    sscop_statename(sscop_getstate(priv->sscop)));
-
-	sbuf_printf(&sbuf, "input packets:  %ju\n",
-	    (uintmax_t)priv->stats.in_packets);
-	sbuf_printf(&sbuf, "input dropped:  %ju\n",
-	    (uintmax_t)priv->stats.in_dropped);
-	sbuf_printf(&sbuf, "output packets: %ju\n",
-	    (uintmax_t)priv->stats.out_packets);
-	sbuf_printf(&sbuf, "output dropped: %ju\n",
-	    (uintmax_t)priv->stats.out_dropped);
-	sbuf_printf(&sbuf, "aa signals:     %ju\n",
-	    (uintmax_t)priv->stats.aa_signals);
-	sbuf_printf(&sbuf, "aa dropped:     %ju\n",
-	    (uintmax_t)priv->stats.aa_dropped);
-	sbuf_printf(&sbuf, "maa signals:    %ju\n",
-	    (uintmax_t)priv->stats.maa_signals);
-	sbuf_printf(&sbuf, "maa dropped:    %ju\n",
-	    (uintmax_t)priv->stats.maa_dropped);
-	sbuf_printf(&sbuf, "errors:         %ju\n",
-	    (uintmax_t)priv->stats.errors);
-	sbuf_printf(&sbuf, "data delivered: %ju\n",
-	    (uintmax_t)priv->stats.data_delivered);
-	sbuf_printf(&sbuf, "window:         %u\n",
-	    sscop_window(priv->sscop, 0));
-
-	sbuf_finish(&sbuf);
-	return (sbuf_len(&sbuf));
-}
-
-/*
- * Control message received.
- */
-static int
-ng_sscop_rcvmsg(node_p node, item_p item, hook_p lasthook)
-{
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	struct ng_mesg *resp = NULL;
-	struct ng_mesg *msg;
-	int error = 0;
-
-	NGI_GET_MSG(item, msg);
-
-	switch (msg->header.typecookie) {
-	  case NGM_GENERIC_COOKIE:
-		switch (msg->header.cmd) {
-		  case NGM_TEXT_STATUS:
-			NG_MKRESPONSE(resp, msg, NG_TEXTRESPONSE, M_NOWAIT);
-			if (resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-
-			resp->header.arglen = text_status(node, priv,
-			    (char *)resp->data, resp->header.arglen) + 1;
-			break;
-
-		  default:
-			error = EINVAL;
-			break;
-		}
-		break;
-
-	  case NGM_FLOW_COOKIE:
-		if (priv->enabled && lasthook != NULL) {
-			if (lasthook == priv->upper)
-				error = flow_upper(node, msg);
-			else if (lasthook == priv->lower)
-				error = flow_lower(node, msg);
-		}
-		break;
-
-	  case NGM_SSCOP_COOKIE:
-		switch (msg->header.cmd) {
-		  case NGM_SSCOP_GETPARAM:
-		    {
-			struct sscop_param *p;
-
-			NG_MKRESPONSE(resp, msg, sizeof(*p), M_NOWAIT);
-			if (resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			p = (struct sscop_param *)resp->data;
-			sscop_getparam(priv->sscop, p);
-			break;
-		    }
-
-		  case NGM_SSCOP_SETPARAM:
-		    {
-			struct ng_sscop_setparam *arg;
-			struct ng_sscop_setparam_resp *p;
-
-			if (msg->header.arglen != sizeof(*arg)) {
-				error = EINVAL;
-				break;
-			}
-			if (priv->enabled) {
-				error = EISCONN;
-				break;
-			}
-			arg = (struct ng_sscop_setparam *)msg->data;
-			NG_MKRESPONSE(resp, msg, sizeof(*p), M_NOWAIT);
-			if (resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			p = (struct ng_sscop_setparam_resp *)resp->data;
-			p->mask = arg->mask;
-			p->error = sscop_setparam(priv->sscop,
-			    &arg->param, &p->mask);
-			break;
-		    }
-
-		  case NGM_SSCOP_ENABLE:
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			if (priv->enabled) {
-				error = EBUSY;
-				break;
-			}
-			priv->enabled = 1;
-			priv->flow = 1;
-			memset(&priv->stats, 0, sizeof(priv->stats));
-			break;
-
-		  case NGM_SSCOP_DISABLE:
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			if (!priv->enabled) {
-				error = ENOTCONN;
-				break;
-			}
-			priv->enabled = 0;
-			sscop_reset(priv->sscop);
-			break;
-
-		  case NGM_SSCOP_GETDEBUG:
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			NG_MKRESPONSE(resp, msg, sizeof(u_int32_t), M_NOWAIT);
-			if(resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			*(u_int32_t *)resp->data = sscop_getdebug(priv->sscop);
-			break;
-
-		  case NGM_SSCOP_SETDEBUG:
-			if (msg->header.arglen != sizeof(u_int32_t)) {
-				error = EINVAL;
-				break;
-			}
-			sscop_setdebug(priv->sscop, *(u_int32_t *)msg->data);
-			break;
-
-		  case NGM_SSCOP_GETSTATE:
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			NG_MKRESPONSE(resp, msg, sizeof(u_int32_t), M_NOWAIT);
-			if(resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			*(u_int32_t *)resp->data =
-			    priv->enabled ? (sscop_getstate(priv->sscop) + 1)
-			                  : 0;
-			break;
-
-		  default:
-			error = EINVAL;
-			break;
-		}
-		break;
-
-	  default:
-		error = EINVAL;
-		break;
-	}
-
-	NG_RESPOND_MSG(error, node, item, resp);
-	NG_FREE_MSG(msg);
-
-	return (error);
-}
-
-/************************************************************/
-/*
- * HOOK MANAGEMENT
- */
-static int
-ng_sscop_newhook(node_p node, hook_p hook, const char *name)
-{
-	struct priv *priv = NG_NODE_PRIVATE(node);
-
-	if(strcmp(name, "upper") == 0) {
-		priv->upper = hook;
-		NG_HOOK_SET_RCVDATA(hook, ng_sscop_rcvupper);
-	} else if(strcmp(name, "lower") == 0) {
-		priv->lower = hook;
-	} else if(strcmp(name, "manage") == 0) {
-		priv->manage = hook;
-		NG_HOOK_SET_RCVDATA(hook, ng_sscop_rcvmanage);
-	} else
-		return EINVAL;
-
-	return 0;
-}
-static int
-ng_sscop_disconnect(hook_p hook)
-{
-	node_p node = NG_HOOK_NODE(hook);
-	struct priv *priv = NG_NODE_PRIVATE(node);
-
-	if(hook == priv->upper)
-		priv->upper = NULL;
-	else if(hook == priv->lower)
-		priv->lower = NULL;
-	else if(hook == priv->manage)
-		priv->manage = NULL;
-
-	if(NG_NODE_NUMHOOKS(node) == 0) {
-		if(NG_NODE_IS_VALID(node))
-			ng_rmnode_self(node);
-	} else {
-		/*
-		 * Imply a release request, if the upper layer is
-		 * disconnected.
-		 */
-		if(priv->upper == NULL && priv->lower != NULL &&
-		   priv->enabled &&
-		   sscop_getstate(priv->sscop) != SSCOP_IDLE) {
-			sscop_aasig(priv->sscop, SSCOP_RELEASE_request,
-			    NULL, 0);
-		}
-	}
-	return 0;
-}
-
-/************************************************************/
-/*
- * DATA
- */
-static int
-ng_sscop_rcvlower(hook_p hook, item_p item)
-{
-	struct priv *priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));
-	struct mbuf *m;
-
-	if (!priv->enabled) {
-		NG_FREE_ITEM(item);
-		return EINVAL;
-	}
-
-	/*
-	 * If we are disconnected at the upper layer and in the IDLE
-	 * state, drop any incoming packet.
-	 */
-	if (priv->upper != NULL || sscop_getstate(priv->sscop) != SSCOP_IDLE) {
-		NGI_GET_M(item, m);
-		priv->stats.in_packets++;
-		sscop_input(priv->sscop, m);
-	} else {
-		priv->stats.in_dropped++;
-	}
-	NG_FREE_ITEM(item);
-
-	return (0);
-}
-
-static void
-sscop_send_lower(struct sscop *sscop, void *p, struct mbuf *m)
-{
-	node_p node = (node_p)p;
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	int error;
-
-	if (priv->lower == NULL) {
-		m_freem(m);
-		priv->stats.out_dropped++;
-		return;
-	}
-
-	priv->stats.out_packets++;
-	NG_SEND_DATA_ONLY(error, priv->lower, m);
-}
-
-static int
-ng_sscop_rcvupper(hook_p hook, item_p item)
-{
-	struct priv *priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));
-	struct sscop_arg a;
-	struct mbuf *m;
-
-	if (!priv->enabled) {
-		NG_FREE_ITEM(item);
-		return (EINVAL);
-	}
-
-	/*
-	 * If the lower layer is not connected allow to proceed.
-	 * The lower layer sending function will drop outgoing frames,
-	 * and the sscop will timeout any establish requests.
-	 */
-	NGI_GET_M(item, m);
-	NG_FREE_ITEM(item);
-
-	if (!(m->m_flags & M_PKTHDR)) {
-		printf("no pkthdr\n");
-		m_freem(m);
-		return (EINVAL);
-	}
-	if (m->m_len < (int)sizeof(a) && (m = m_pullup(m, sizeof(a))) == NULL)
-		return (ENOBUFS);
-	bcopy((caddr_t)mtod(m, struct sscop_arg *), &a, sizeof(a));
-	m_adj(m, sizeof(a));
-
-	return (sscop_aasig(priv->sscop, a.sig, m, a.arg));
-}
-
-static void
-sscop_send_upper(struct sscop *sscop, void *p, enum sscop_aasig sig,
-    struct SSCOP_MBUF_T *m, u_int arg)
-{
-	node_p node = (node_p)p;
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	int error;
-	struct sscop_arg *a;
-
-	if (sig == SSCOP_DATA_indication && priv->flow)
-		sscop_window(priv->sscop, 1);
-
-	if (priv->upper == NULL) {
-		if (m != NULL)
-			m_freem(m);
-		priv->stats.aa_dropped++;
-		return;
-	}
-
-	priv->stats.aa_signals++;
-	if (sig == SSCOP_DATA_indication)
-		priv->stats.data_delivered++;
-
-	if (m == NULL) {
-		MGETHDR(m, M_NOWAIT, MT_DATA);
-		if (m == NULL)
-			return;
-		m->m_len = sizeof(struct sscop_arg);
-		m->m_pkthdr.len = m->m_len;
-	} else {
-		M_PREPEND(m, sizeof(struct sscop_arg), M_NOWAIT);
-		if (m == NULL)
-			return;
-	}
-	a = mtod(m, struct sscop_arg *);
-	a->sig = sig;
-	a->arg = arg;
-
-	NG_SEND_DATA_ONLY(error, priv->upper, m);
-}
-
-static int
-ng_sscop_rcvmanage(hook_p hook, item_p item)
-{
-	struct priv *priv = NG_NODE_PRIVATE(NG_HOOK_NODE(hook));
-	struct sscop_marg a;
-	struct mbuf *m;
-
-	if (!priv->enabled) {
-		NG_FREE_ITEM(item);
-		return (EINVAL);
-	}
-
-	NGI_GET_M(item, m);
-	NG_FREE_ITEM(item);
-
-	if (m->m_len < (int)sizeof(a) && (m = m_pullup(m, sizeof(a))) == NULL)
-		return (ENOBUFS);
-	bcopy((caddr_t)mtod(m, struct sscop_arg *), &a, sizeof(a));
-	m_adj(m, sizeof(a));
-
-	return (sscop_maasig(priv->sscop, a.sig, m));
-}
-
-static void
-sscop_send_manage(struct sscop *sscop, void *p, enum sscop_maasig sig,
-    struct SSCOP_MBUF_T *m, u_int err, u_int cnt)
-{
-	node_p node = (node_p)p;
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	int error;
-	struct sscop_merr *e;
-	struct sscop_marg *a;
-
-	if (priv->manage == NULL) {
-		if (m != NULL)
-			m_freem(m);
-		priv->stats.maa_dropped++;
-		return;
-	}
-
-	if (sig == SSCOP_MERROR_indication) {
-		MGETHDR(m, M_NOWAIT, MT_DATA);
-		if (m == NULL)
-			return;
-		m->m_len = sizeof(*e);
-		m->m_pkthdr.len = m->m_len;
-		e = mtod(m, struct sscop_merr *);
-		e->sig = sig;
-		e->err = err;
-		e->cnt = cnt;
-		priv->stats.errors++;
-	} else if (m == NULL) {
-		MGETHDR(m, M_NOWAIT, MT_DATA);
-		if (m == NULL)
-			return;
-		m->m_len = sizeof(*a);
-		m->m_pkthdr.len = m->m_len;
-		a = mtod(m, struct sscop_marg *);
-		a->sig = sig;
-		priv->stats.maa_signals++;
-	} else {
-		M_PREPEND(m, sizeof(*a), M_NOWAIT);
-		if (m == NULL)
-			return;
-		a = mtod(m, struct sscop_marg *);
-		a->sig = sig;
-		priv->stats.maa_signals++;
-	}
-
-	NG_SEND_DATA_ONLY(error, priv->manage, m);
-}
-
-/************************************************************/
-/*
- * INITIALISATION
- */
-
-/*
- * Loading and unloading of node type
- */
-static int
-ng_sscop_mod_event(module_t mod, int event, void *data)
-{
-	int error = 0;
-
-	switch (event) {
-	  case MOD_LOAD:
-		break;
-
-	  case MOD_UNLOAD:
-		break;
-
-	  default:
-		error = EOPNOTSUPP;
-		break;
-	}
-	return (error);
-}
diff --git a/sys/netgraph/atm/sscop/ng_sscop_cust.h b/sys/netgraph/atm/sscop/ng_sscop_cust.h
deleted file mode 100644
index 97456a165220..000000000000
--- a/sys/netgraph/atm/sscop/ng_sscop_cust.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- *
- * Customisation of the SSCOP code to ng_sscop.
- */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/mbuf.h>
-#include <sys/queue.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <netgraph/ng_message.h>
-#include <netgraph/netgraph.h>
-#include <machine/stdarg.h>
-
-#include <netnatm/saal/sscopdef.h>
-
-/*
- * Allocate zeroed or non-zeroed memory of some size and cast it.
- * Return NULL on failure.
- */
-#ifndef SSCOP_DEBUG
-
-#define	MEMINIT() \
-	MALLOC_DECLARE(M_NG_SSCOP); \
-	DECL_MSGQ_GET \
-	DECL_SIGQ_GET \
-	DECL_MBUF_ALLOC
-
-#define	MEMZALLOC(PTR, CAST, SIZE) \
-	((PTR) = (CAST)malloc((SIZE), M_NG_SSCOP, M_NOWAIT | M_ZERO))
-#define	MEMFREE(PTR) \
-	free((PTR), M_NG_SSCOP)
-
-#define	MSG_ALLOC(PTR) \
-	MEMZALLOC(PTR, struct sscop_msg *, sizeof(struct sscop_msg))
-#define	MSG_FREE(PTR) \
-	MEMFREE(PTR)
-
-#define	SIG_ALLOC(PTR) \
-	MEMZALLOC(PTR, struct sscop_sig *, sizeof(struct sscop_sig))
-#define	SIG_FREE(PTR) \
-	MEMFREE(PTR)
-
-#else
-
-#define	MEMINIT() 							\
-	MALLOC_DEFINE(M_NG_SSCOP_INS, "sscop_ins", "SSCOP instances");	\
-	MALLOC_DEFINE(M_NG_SSCOP_MSG, "sscop_msg", "SSCOP buffers");	\
-	MALLOC_DEFINE(M_NG_SSCOP_SIG, "sscop_sig", "SSCOP signals");	\
-	DECL_MSGQ_GET \
-	DECL_SIGQ_GET \
-	DECL_MBUF_ALLOC
-
-#define	MEMZALLOC(PTR, CAST, SIZE)					\
-	((PTR) = (CAST)malloc((SIZE), M_NG_SSCOP_INS, M_NOWAIT | M_ZERO))
-#define	MEMFREE(PTR)							\
-	free((PTR), M_NG_SSCOP_INS)
-
-#define	MSG_ALLOC(PTR)							\
-	((PTR) = malloc(sizeof(struct sscop_msg),			\
-	    M_NG_SSCOP_MSG, M_NOWAIT | M_ZERO))
-#define	MSG_FREE(PTR)							\
-	free((PTR), M_NG_SSCOP_MSG)
-
-#define	SIG_ALLOC(PTR)							\
-	((PTR) = malloc(sizeof(struct sscop_sig),			\
-	    M_NG_SSCOP_SIG, M_NOWAIT | M_ZERO))
-#define	SIG_FREE(PTR)							\
-	free((PTR), M_NG_SSCOP_SIG)
-
-#endif
-
-/*
- * Timer support.
- */
-typedef struct callout sscop_timer_t;
-#define	TIMER_INIT(S, T)	ng_callout_init(&(S)->t_##T)
-#define	TIMER_STOP(S,T)	do {						\
-	ng_uncallout(&(S)->t_##T, (S)->aarg);				\
-    } while (0)
-#define	TIMER_RESTART(S, T) do {					\
-	TIMER_STOP(S, T);						\
-	ng_callout(&(S)->t_##T, (S)->aarg, NULL,			\
-	    hz * (S)->timer##T / 1000, T##_func, (S), 0);		\
-    } while (0)
-#define	TIMER_ISACT(S, T) (callout_pending(&(S)->t_##T))
-
-/*
- * This assumes, that the user argument is the node pointer.
- */
-#define	TIMER_FUNC(T,N)							\
-static void								\
-T##_func(node_p node, hook_p hook, void *arg1, int arg2)		\
-{									\
-	struct sscop *sscop = arg1;					\
-									\
-	VERBOSE(sscop, SSCOP_DBG_TIMER, (sscop, sscop->aarg,		\
-	    "timer_" #T " expired"));					\
-	sscop_signal(sscop, SIG_T_##N, NULL);				\
-}
-
-/*
- * Message queues
- */
-typedef TAILQ_ENTRY(sscop_msg) sscop_msgq_link_t;
-typedef TAILQ_HEAD(sscop_msgq, sscop_msg) sscop_msgq_head_t;
-#define	MSGQ_EMPTY(Q)		TAILQ_EMPTY(Q)
-#define	MSGQ_INIT(Q)		TAILQ_INIT(Q)
-#define	MSGQ_FOREACH(P, Q)	TAILQ_FOREACH(P, Q, link)
-#define	MSGQ_REMOVE(Q, M)	TAILQ_REMOVE(Q, M, link)
-#define	MSGQ_INSERT_BEFORE(B, M) TAILQ_INSERT_BEFORE(B, M, link)
-#define	MSGQ_APPEND(Q, M)	TAILQ_INSERT_TAIL(Q, M, link)
-#define	MSGQ_PEEK(Q)		TAILQ_FIRST((Q))
-
-#define	MSGQ_GET(Q) ng_sscop_msgq_get((Q))
-
-#define DECL_MSGQ_GET							\
-static __inline struct sscop_msg *					\
-ng_sscop_msgq_get(struct sscop_msgq *q)					\
-{									\
-	struct sscop_msg *m;						\
-									\
-	m = TAILQ_FIRST(q);						\
-	if (m != NULL)							\
-		TAILQ_REMOVE(q, m, link);				\
-	return (m);							\
-}
-
-#define	MSGQ_CLEAR(Q)							\
-	do {								\
-		struct sscop_msg *_m1, *_m2;				\
-									\
-		_m1 = TAILQ_FIRST(Q);					\
-		while (_m1 != NULL) {					\
-			_m2 = TAILQ_NEXT(_m1, link);			\
-			SSCOP_MSG_FREE(_m1);				\
-			_m1 = _m2;					\
-		}							\
-		TAILQ_INIT((Q));					\
-	} while (0)
-
-/*
- * Signal queues
- */
-typedef TAILQ_ENTRY(sscop_sig) sscop_sigq_link_t;
-typedef TAILQ_HEAD(sscop_sigq, sscop_sig) sscop_sigq_head_t;
-#define	SIGQ_INIT(Q) 		TAILQ_INIT(Q)
-#define	SIGQ_APPEND(Q, S)	TAILQ_INSERT_TAIL(Q, S, link)
-#define	SIGQ_EMPTY(Q)		TAILQ_EMPTY(Q)
-
-#define	SIGQ_GET(Q)	ng_sscop_sigq_get((Q))
-#define	DECL_SIGQ_GET							\
-static __inline struct sscop_sig *					\
-ng_sscop_sigq_get(struct sscop_sigq *q)					\
-{									\
-	struct sscop_sig *s;						\
-									\
-	s = TAILQ_FIRST(q);						\
-	if (s != NULL)							\
-		TAILQ_REMOVE(q, s, link);				\
-	return (s);							\
-}
-
-#define	SIGQ_MOVE(F, T)							\
-    do {								\
-	struct sscop_sig *_s;						\
-									\
-	while (!TAILQ_EMPTY(F)) {					\
-		_s = TAILQ_FIRST(F);					\
-		TAILQ_REMOVE(F, _s, link);				\
-		TAILQ_INSERT_TAIL(T, _s, link);				\
-	}								\
-    } while (0)
-
-#define	SIGQ_PREPEND(F, T)						\
-    do {								\
-	struct sscop_sig *_s;						\
-									\
-	while (!TAILQ_EMPTY(F)) {					\
-		_s = TAILQ_LAST(F, sscop_sigq);				\
-		TAILQ_REMOVE(F, _s, link);				\
-		TAILQ_INSERT_HEAD(T, _s, link);				\
-	}								\
-    } while (0)
-
-#define	SIGQ_CLEAR(Q)							\
-    do {								\
-	struct sscop_sig *_s1, *_s2;					\
-									\
-	_s1 = TAILQ_FIRST(Q);						\
-	while (_s1 != NULL) {						\
-		_s2 = TAILQ_NEXT(_s1, link);				\
-		SSCOP_MSG_FREE(_s1->msg);				\
-		SIG_FREE(_s1);						\
-		_s1 = _s2;						\
-	}								\
-	TAILQ_INIT(Q);							\
-    } while (0)
-
-/*
- * Message buffers
- */
-#define	MBUF_FREE(M)	do { if ((M)) m_freem((M)); } while(0)
-#define	MBUF_DUP(M)	m_copypacket((M), M_NOWAIT)
-#define	MBUF_LEN(M) 	((size_t)(M)->m_pkthdr.len)
-
-/*
- * Return the i-th word counted from the end of the buffer.
- * i=-1 will return the last 32bit word, i=-2 the 2nd last.
- * Assumes that there is enough space.
- */
-#define	MBUF_TRAIL32(M ,I) ng_sscop_mbuf_trail32((M), (I))
-
-static uint32_t __inline	
-ng_sscop_mbuf_trail32(const struct mbuf *m, int i)
-{
-	uint32_t w;
-
-	m_copydata(m, m->m_pkthdr.len + 4 * i, 4, (caddr_t)&w);
-	return (ntohl(w));
-}
-
-/*
- * Strip 32bit value from the end
- */
-#define	MBUF_STRIP32(M) ng_sscop_mbuf_strip32((M))
-
-static uint32_t __inline
-ng_sscop_mbuf_strip32(struct mbuf *m)
-{
-	uint32_t w;
-
-	m_copydata(m, m->m_pkthdr.len - 4, 4, (caddr_t)&w);
-	m_adj(m, -4);
-	return (ntohl(w));
-}
-
-#define	MBUF_GET32(M) ng_sscop_mbuf_get32((M))
-
-static uint32_t __inline
-ng_sscop_mbuf_get32(struct mbuf *m)
-{
-	uint32_t w;
-
-	m_copydata(m, 0, 4, (caddr_t)&w);
-	m_adj(m, 4);
-	return (ntohl(w));
-}
-
-/*
- * Append a 32bit value to an mbuf. Failures are ignored.
- */
-#define	MBUF_APPEND32(M, W)						\
-     do {								\
-	uint32_t _w = (W);						\
-									\
-	_w = htonl(_w);							\
-	m_copyback((M), (M)->m_pkthdr.len, 4, (caddr_t)&_w);		\
-    } while (0)
-
-/*
- * Pad a message to a multiple of four byte and return the amount of padding
- * Failures are ignored.
- */
-#define	MBUF_PAD4(M) ng_sscop_mbuf_pad4((M))
-
-static u_int __inline
-ng_sscop_mbuf_pad4(struct mbuf *m)
-{
-	static u_char pad[4] = { 0, 0, 0, 0 };
-	int len = m->m_pkthdr.len;
-	int npad = 3 - ((len + 3) & 3);
-
-	if (npad != 0)
-		m_copyback(m, len, npad, (caddr_t)pad);
-	return (npad);
-}
-
-#define	MBUF_UNPAD(M, P) do { if( (P) > 0) m_adj((M), -(P)); } while (0)
-
-/*
- * Allocate a message that will probably hold N bytes.
- */
-#define	MBUF_ALLOC(N) ng_sscop_mbuf_alloc((N))
-
-#define	DECL_MBUF_ALLOC							\
-static __inline struct mbuf *						\
-ng_sscop_mbuf_alloc(size_t n)						\
-{									\
-	struct mbuf *m;							\
-									\
-	MGETHDR(m, M_NOWAIT, MT_DATA);					\
-	if (m != NULL) {						\
-		m->m_len = 0;						\
-		m->m_pkthdr.len = 0;					\
-		if (n > MHLEN) {					\
-			if (!(MCLGET(m, M_NOWAIT))){			\
-				m_free(m);				\
-				m = NULL;				\
-			}						\
-		}							\
-	}								\
-	return (m);							\
-}
-
-#ifdef SSCOP_DEBUG
-#define	ASSERT(X)	KASSERT(X, (#X))
-#else
-#define	ASSERT(X)
-#endif
diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c
deleted file mode 100644
index 1313bd062188..000000000000
--- a/sys/netgraph/atm/uni/ng_uni.c
+++ /dev/null
@@ -1,922 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Netgraph module for ATM-Forum UNI 4.0 signalling
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/errno.h>
-#include <sys/syslog.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/callout.h>
-#include <sys/sbuf.h>
-#include <machine/stdarg.h>
-
-#include <netgraph/ng_message.h>
-#include <netgraph/netgraph.h>
-#include <netgraph/ng_parse.h>
-#include <netnatm/unimsg.h>
-#include <netnatm/msg/unistruct.h>
-#include <netgraph/atm/ngatmbase.h>
-#include <netnatm/saal/sscopdef.h>
-#include <netnatm/saal/sscfudef.h>
-#include <netgraph/atm/uni/ng_uni_cust.h>
-#include <netnatm/sig/uni.h>
-#include <netnatm/sig/unisig.h>
-#include <netgraph/atm/ng_sscop.h>
-#include <netgraph/atm/ng_sscfu.h>
-#include <netgraph/atm/ng_uni.h>
-
-static MALLOC_DEFINE(M_NG_UNI, "netgraph_uni_node", "netgraph uni node");
-static MALLOC_DEFINE(M_UNI, "netgraph_uni_data", "uni protocol data");
-
-MODULE_DEPEND(ng_uni, ngatmbase, 1, 1, 1);
-
-/*
- * Private node data
- */
-struct priv {
-	hook_p	upper;
-	hook_p	lower;
-	struct uni *uni;
-	int	enabled;
-};
-
-/* UNI CONFIG MASK */
-static const struct ng_parse_struct_field ng_uni_config_mask_type_info[] =
-	NGM_UNI_CONFIG_MASK_INFO;
-static const struct ng_parse_type ng_uni_config_mask_type = {
-	&ng_parse_struct_type,
-	ng_uni_config_mask_type_info
-};
-
-/* UNI_CONFIG */
-static const struct ng_parse_struct_field ng_uni_config_type_info[] =
-	NGM_UNI_CONFIG_INFO;
-static const struct ng_parse_type ng_uni_config_type = {
-	&ng_parse_struct_type,
-	ng_uni_config_type_info
-};
-
-/* SET CONFIG */
-static const struct ng_parse_struct_field ng_uni_set_config_type_info[] =
-	NGM_UNI_SET_CONFIG_INFO;
-static const struct ng_parse_type ng_uni_set_config_type = {
-	&ng_parse_struct_type,
-	ng_uni_set_config_type_info
-};
-
-/*
- * Parse DEBUG
- */
-static const struct ng_parse_fixedarray_info ng_uni_debuglevel_type_info =
-    NGM_UNI_DEBUGLEVEL_INFO;
-static const struct ng_parse_type ng_uni_debuglevel_type = {
-	&ng_parse_fixedarray_type,
-	&ng_uni_debuglevel_type_info
-};
-static const struct ng_parse_struct_field ng_uni_debug_type_info[] =
-    NGM_UNI_DEBUG_INFO;
-static const struct ng_parse_type ng_uni_debug_type = {
-	&ng_parse_struct_type,
-	ng_uni_debug_type_info
-};
-
-/*
- * Command list
- */
-static const struct ng_cmdlist ng_uni_cmdlist[] = {
-	{
-	  NGM_UNI_COOKIE,
-	  NGM_UNI_GETDEBUG,
-	  "getdebug",
-	  NULL,
-	  &ng_uni_debug_type
-	},
-	{
-	  NGM_UNI_COOKIE,
-	  NGM_UNI_SETDEBUG,
-	  "setdebug",
-	  &ng_uni_debug_type,
-	  NULL
-	},
-	{
-	  NGM_UNI_COOKIE,
-	  NGM_UNI_GET_CONFIG,
-	  "get_config",
-	  NULL,
-	  &ng_uni_config_type
-	},
-	{
-	  NGM_UNI_COOKIE,
-	  NGM_UNI_SET_CONFIG,
-	  "set_config",
-	  &ng_uni_set_config_type,
-	  &ng_uni_config_mask_type,
-	},
-	{
-	  NGM_UNI_COOKIE,
-	  NGM_UNI_ENABLE,
-	  "enable",
-	  NULL,
-	  NULL,
-	},
-	{
-	  NGM_UNI_COOKIE,
-	  NGM_UNI_DISABLE,
-	  "disable",
-	  NULL,
-	  NULL,
-	},
-	{
-	  NGM_UNI_COOKIE,
-	  NGM_UNI_GETSTATE,
-	  "getstate",
-	  NULL,
-	  &ng_parse_uint32_type
-	},
-	{ 0 }
-};
-
-/*
- * Netgraph module data
- */
-static ng_constructor_t ng_uni_constructor;
-static ng_shutdown_t	ng_uni_shutdown;
-static ng_rcvmsg_t	ng_uni_rcvmsg;
-static ng_newhook_t	ng_uni_newhook;
-static ng_disconnect_t	ng_uni_disconnect;
-static ng_rcvdata_t	ng_uni_rcvlower;
-static ng_rcvdata_t	ng_uni_rcvupper;
-
-static int ng_uni_mod_event(module_t, int, void *);
-
-static struct ng_type ng_uni_typestruct = {
-	.version =	NG_ABI_VERSION,
-	.name =		NG_UNI_NODE_TYPE,
-	.mod_event =	ng_uni_mod_event,
-	.constructor =	ng_uni_constructor,
-	.rcvmsg =	ng_uni_rcvmsg,
-	.shutdown =	ng_uni_shutdown,
-	.newhook =	ng_uni_newhook,
-	.rcvdata =	ng_uni_rcvlower,
-	.disconnect =	ng_uni_disconnect,
-	.cmdlist =	ng_uni_cmdlist,
-};
-NETGRAPH_INIT(uni, &ng_uni_typestruct);
-
-static void uni_uni_output(struct uni *, void *, enum uni_sig, u_int32_t,
-    struct uni_msg *);
-static void uni_saal_output(struct uni *, void *, enum saal_sig,
-    struct uni_msg *);
-static void uni_verbose(struct uni *, void *, u_int, const char *, ...)
-    __printflike(4, 5);
-static void uni_do_status(struct uni *, void *, void *, const char *, ...)
-    __printflike(4, 5);
-
-static const struct uni_funcs uni_funcs = {
-	uni_uni_output,
-	uni_saal_output,
-	uni_verbose,
-	uni_do_status
-};
-
-/************************************************************/
-/*
- * NODE MANAGEMENT
- */
-static int
-ng_uni_constructor(node_p node)
-{
-	struct priv *priv;
-
-	gone_in(14, "ng_uni: netgraph ATM modules");
-
-	priv = malloc(sizeof(*priv), M_NG_UNI, M_WAITOK | M_ZERO);
-
-	if ((priv->uni = uni_create(node, &uni_funcs)) == NULL) {
-		free(priv, M_NG_UNI);
-		return (ENOMEM);
-	}
-
-	NG_NODE_SET_PRIVATE(node, priv);
-	NG_NODE_FORCE_WRITER(node);
-
-	return (0);
-}
-
-static int
-ng_uni_shutdown(node_p node)
-{
-	struct priv *priv = NG_NODE_PRIVATE(node);
-
-	uni_destroy(priv->uni);
-
-	free(priv, M_NG_UNI);
-	NG_NODE_SET_PRIVATE(node, NULL);
-
-	NG_NODE_UNREF(node);
-
-	return (0);
-}
-
-/************************************************************/
-/*
- * CONTROL MESSAGES
- */
-static void
-uni_do_status(struct uni *uni, void *uarg, void *sbuf, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	sbuf_printf(sbuf, fmt, ap);
-	va_end(ap);
-}
-
-static int
-text_status(node_p node, struct priv *priv, char *buf, u_int len)
-{
-	struct sbuf sbuf;
-	u_int f;
-
-	sbuf_new(&sbuf, buf, len, 0);
-
-	if (priv->lower != NULL)
-		sbuf_printf(&sbuf, "lower hook: connected to %s:%s\n",
-		    NG_NODE_NAME(NG_HOOK_NODE(NG_HOOK_PEER(priv->lower))),
-		    NG_HOOK_NAME(NG_HOOK_PEER(priv->lower)));
-	else
-		sbuf_printf(&sbuf, "lower hook: <not connected>\n");
-
-	if (priv->upper != NULL)
-		sbuf_printf(&sbuf, "upper hook: connected to %s:%s\n",
-		    NG_NODE_NAME(NG_HOOK_NODE(NG_HOOK_PEER(priv->upper))),
-		    NG_HOOK_NAME(NG_HOOK_PEER(priv->upper)));
-	else
-		sbuf_printf(&sbuf, "upper hook: <not connected>\n");
-
-	sbuf_printf(&sbuf, "debugging:");
-	for (f = 0; f < UNI_MAXFACILITY; f++)
-		if (uni_get_debug(priv->uni, f) != 0)
-			sbuf_printf(&sbuf, " %s=%u", uni_facname(f),
-			    uni_get_debug(priv->uni, f));
-	sbuf_printf(&sbuf, "\n");
-
-	if (priv->uni)
-		uni_status(priv->uni, &sbuf);
-
-	sbuf_finish(&sbuf);
-	return (sbuf_len(&sbuf));
-}
-
-static int
-ng_uni_rcvmsg(node_p node, item_p item, hook_p lasthook)
-{
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	struct ng_mesg *resp = NULL;
-	struct ng_mesg *msg;
-	int error = 0;
-	u_int i;
-
-	NGI_GET_MSG(item, msg);
-
-	switch (msg->header.typecookie) {
-	  case NGM_GENERIC_COOKIE:
-		switch (msg->header.cmd) {
-		  case NGM_TEXT_STATUS:
-			NG_MKRESPONSE(resp, msg, NG_TEXTRESPONSE, M_NOWAIT);
-			if (resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-
-			resp->header.arglen = text_status(node, priv,
-			    (char *)resp->data, resp->header.arglen) + 1;
-			break;
-
-		  default:
-			error = EINVAL;
-			break;
-		}
-		break;
-
-	  case NGM_UNI_COOKIE:
-		switch (msg->header.cmd) {
-		  case NGM_UNI_SETDEBUG:
-		    {
-			struct ngm_uni_debug *arg;
-
-			if (msg->header.arglen > sizeof(*arg)) {
-				error = EINVAL;
-				break;
-			}
-			arg = (struct ngm_uni_debug *)msg->data;
-			for (i = 0; i < UNI_MAXFACILITY; i++)
-				uni_set_debug(priv->uni, i, arg->level[i]);
-			break;
-		    }
-
-		  case NGM_UNI_GETDEBUG:
-		    {
-			struct ngm_uni_debug *arg;
-
-			NG_MKRESPONSE(resp, msg, sizeof(*arg), M_NOWAIT);
-			if(resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			arg = (struct ngm_uni_debug *)resp->data;
-			for (i = 0; i < UNI_MAXFACILITY; i++)
-				arg->level[i] = uni_get_debug(priv->uni, i);
-			break;
-		    }
-
-		  case NGM_UNI_GET_CONFIG:
-		    {
-			struct uni_config *config;
-
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			NG_MKRESPONSE(resp, msg, sizeof(*config), M_NOWAIT);
-			if (resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			config = (struct uni_config *)resp->data;
-			uni_get_config(priv->uni, config);
-
-			break;
-		    }
-
-		  case NGM_UNI_SET_CONFIG:
-		    {
-			struct ngm_uni_set_config *arg;
-			struct ngm_uni_config_mask *mask;
-
-			if (msg->header.arglen != sizeof(*arg)) {
-				error = EINVAL;
-				break;
-			}
-			arg = (struct ngm_uni_set_config *)msg->data;
-
-			NG_MKRESPONSE(resp, msg, sizeof(*mask), M_NOWAIT);
-			if (resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			mask = (struct ngm_uni_config_mask *)resp->data;
-
-			*mask = arg->mask;
-
-			uni_set_config(priv->uni, &arg->config,
-			    &mask->mask, &mask->popt_mask, &mask->option_mask);
-
-			break;
-		    }
-
-		  case NGM_UNI_ENABLE:
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			if (priv->enabled) {
-				error = EISCONN;
-				break;
-			}
-			priv->enabled = 1;
-			break;
-
-		  case NGM_UNI_DISABLE:
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			if (!priv->enabled) {
-				error = ENOTCONN;
-				break;
-			}
-			priv->enabled = 0;
-			uni_reset(priv->uni);
-			break;
-
-		  case NGM_UNI_GETSTATE:
-			if (msg->header.arglen != 0) {
-				error = EINVAL;
-				break;
-			}
-			NG_MKRESPONSE(resp, msg, sizeof(u_int32_t), M_NOWAIT);
-			if(resp == NULL) {
-				error = ENOMEM;
-				break;
-			}
-			*(u_int32_t *)resp->data =
-			    priv->enabled ? (uni_getcustate(priv->uni) + 1)
-			                  : 0;
-			break;
-
-		  default:
-			error = EINVAL;
-			break;
-		}
-		break;
-
-	  default:
-		error = EINVAL;
-		break;
-	}
-
-	NG_RESPOND_MSG(error, node, item, resp);
-	NG_FREE_MSG(msg);
-	return (error);
-}
-
-/************************************************************/
-/*
- * HOOK MANAGEMENT
- */
-static int
-ng_uni_newhook(node_p node, hook_p hook, const char *name)
-{
-	struct priv *priv = NG_NODE_PRIVATE(node);
-
-	if (strcmp(name, "lower") == 0) {
-		priv->lower = hook;
-	} else if(strcmp(name, "upper") == 0) {
-		priv->upper = hook;
-		NG_HOOK_SET_RCVDATA(hook, ng_uni_rcvupper);
-	} else
-		return EINVAL;
-
-	return 0;
-}
-
-static int
-ng_uni_disconnect(hook_p hook)
-{
-	node_p node = NG_HOOK_NODE(hook);
-	struct priv *priv = NG_NODE_PRIVATE(node);
-
-	if(hook == priv->lower)
-		priv->lower = NULL;
-	else if(hook == priv->upper)
-		priv->upper = NULL;
-	else
-		printf("%s: bogus hook %s\n", __func__, NG_HOOK_NAME(hook));
-
-	if (NG_NODE_NUMHOOKS(node) == 0) {
-		if (NG_NODE_IS_VALID(node))
-			ng_rmnode_self(node);
-	}
-
-	return (0);
-}
-
-/************************************************************/
-/*
- * DATA
- */
-/*
- * Receive signal from USER.
- *
- * Repackage the data into one large buffer.
- */
-static int
-ng_uni_rcvupper(hook_p hook, item_p item)
-{
-	node_p node = NG_HOOK_NODE(hook);
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	struct mbuf *m;
-	struct uni_arg arg;
-	struct uni_msg *msg;
-	int error;
-
-	if (!priv->enabled) {
-		NG_FREE_ITEM(item);
-		return (ENOTCONN);
-	}
-
-	NGI_GET_M(item, m);
-	NG_FREE_ITEM(item);
-
-	if ((error = uni_msg_unpack_mbuf(m, &msg)) != 0) {
-		m_freem(m);
-		return (error);
-	}
-	m_freem(m);
-
-	if (uni_msg_len(msg) < sizeof(arg)) {
-		printf("%s: packet too short\n", __func__);
-		uni_msg_destroy(msg);
-		return (EINVAL);
-	}
-
-	bcopy(msg->b_rptr, &arg, sizeof(arg));
-	msg->b_rptr += sizeof(arg);
-
-	if (arg.sig >= UNIAPI_MAXSIG) {
-		printf("%s: bogus signal\n", __func__);
-		uni_msg_destroy(msg);
-		return (EINVAL);
-	}
-	uni_uni_input(priv->uni, arg.sig, arg.cookie, msg);
-	uni_work(priv->uni);
-
-	return (0);
-}
-
-/*
- * Upper layer signal from UNI
- */
-static void
-uni_uni_output(struct uni *uni, void *varg, enum uni_sig sig, u_int32_t cookie,
-    struct uni_msg *msg)
-{
-	node_p node = (node_p)varg;
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	struct mbuf *m;
-	struct uni_arg arg;
-	int error;
-
-	if (priv->upper == NULL) {
-		if (msg != NULL)
-			uni_msg_destroy(msg);
-		return;
-	}
-	arg.sig = sig;
-	arg.cookie = cookie;
-
-	m = uni_msg_pack_mbuf(msg, &arg, sizeof(arg));
-	if (msg != NULL)
-		uni_msg_destroy(msg);
-	if (m == NULL)
-		return;
-
-	NG_SEND_DATA_ONLY(error, priv->upper, m);
-}
-
-static void
-dump_uni_msg(struct uni_msg *msg)
-{
-	u_int pos;
-
-	for (pos = 0; pos < uni_msg_len(msg); pos++) {
-		if (pos % 16 == 0)
-			printf("%06o ", pos);
-		if (pos % 16 == 8)
-			printf("  ");
-		printf(" %02x", msg->b_rptr[pos]);
-		if (pos % 16 == 15)
-			printf("\n");
-	}
-	if (pos % 16 != 0)
-		printf("\n");
-}
-
-/*
- * Dump a SAAL signal in either direction
- */
-static void
-dump_saal_signal(node_p node, enum saal_sig sig, struct uni_msg *msg, int to)
-{
-	struct priv *priv = NG_NODE_PRIVATE(node);
-
-	printf("signal %s SAAL: ", to ? "to" : "from");
-
-	switch (sig) {
-#define D(S) case S: printf("%s", #S); break
-
-	D(SAAL_ESTABLISH_request);
-	D(SAAL_ESTABLISH_indication);
-	D(SAAL_ESTABLISH_confirm);
-	D(SAAL_RELEASE_request);
-	D(SAAL_RELEASE_confirm);
-	D(SAAL_RELEASE_indication);
-	D(SAAL_DATA_request);
-	D(SAAL_DATA_indication);
-	D(SAAL_UDATA_request);
-	D(SAAL_UDATA_indication);
-
-#undef D
-	  default:
-		printf("sig=%d", sig); break;
-	}
-	if (msg != NULL) {
-		printf(" data=%zu\n", uni_msg_len(msg));
-		if (uni_get_debug(priv->uni, UNI_FAC_SAAL) > 1)
-			dump_uni_msg(msg);
-	} else
-		printf("\n");
-}
-
-/*
- * Receive signal from SSCOP.
- *
- * If this is a data signal, repackage the data into one large buffer.
- * UNI shouldn't be the bottleneck in a system and this greatly simplifies
- * parsing in UNI.
- */
-static int
-ng_uni_rcvlower(hook_p hook __unused, item_p item)
-{
-	node_p node = NG_HOOK_NODE(hook);
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	struct mbuf *m;
-	struct sscfu_arg arg;
-	struct uni_msg *msg;
-	int error;
-
-	if (!priv->enabled) {
-		NG_FREE_ITEM(item);
-		return (ENOTCONN);
-	}
-
-	NGI_GET_M(item, m);
-	NG_FREE_ITEM(item);
-
-	if ((error = uni_msg_unpack_mbuf(m, &msg)) != 0) {
-		m_freem(m);
-		return (error);
-	}
-	m_freem(m);
-
-	if (uni_msg_len(msg) < sizeof(arg)) {
-		uni_msg_destroy(msg);
-		printf("%s: packet too short\n", __func__);
-		return (EINVAL);
-	}
-	bcopy(msg->b_rptr, &arg, sizeof(arg));
-	msg->b_rptr += sizeof(arg);
-
-	if (arg.sig > SAAL_UDATA_indication) {
-		uni_msg_destroy(msg);
-		printf("%s: bogus signal\n", __func__);
-		return (EINVAL);
-	}
-
-	if (uni_get_debug(priv->uni, UNI_FAC_SAAL) > 0)
-		dump_saal_signal(node, arg.sig, msg, 0);
-
-	uni_saal_input(priv->uni, arg.sig, msg);
-	uni_work(priv->uni);
-
-	return (0);
-}
-
-/*
- * Send signal to sscop.
- * Pack the message into an mbuf chain.
- */
-static void
-uni_saal_output(struct uni *uni, void *varg, enum saal_sig sig, struct uni_msg *msg)
-{
-	node_p node = (node_p)varg;
-	struct priv *priv = NG_NODE_PRIVATE(node);
-	struct mbuf *m;
-	struct sscfu_arg arg;
-	int error;
-
-	if (uni_get_debug(priv->uni, UNI_FAC_SAAL) > 0)
-		dump_saal_signal(node, sig, msg, 1);
-
-	if (priv->lower == NULL) {
-		if (msg != NULL)
-			uni_msg_destroy(msg);
-		return;
-	}
-
-	arg.sig = sig;
-
-	m = uni_msg_pack_mbuf(msg, &arg, sizeof(arg));
-	if (msg != NULL)
-		uni_msg_destroy(msg);
-	if (m == NULL)
-		return;
-
-	NG_SEND_DATA_ONLY(error, priv->lower, m);
-}
-
-static void
-uni_verbose(struct uni *uni, void *varg, u_int fac, const char *fmt, ...)
-{
-	va_list ap;
-
-	static char *facnames[] = {
-#define UNI_DEBUG_DEFINE(D) [UNI_FAC_##D] = #D,
-		UNI_DEBUG_FACILITIES
-#undef UNI_DEBUG_DEFINE
-	};
-
-	printf("%s: ", facnames[fac]);
-
-	va_start(ap, fmt);
-	vprintf(fmt, ap);
-	va_end(ap);
-
-	printf("\n");
-}
-
-/************************************************************/
-/*
- * Memory debugging
- */
-struct unimem_debug {
-	const char	*file;
-	u_int		lno;
-	LIST_ENTRY(unimem_debug) link;
-	char		data[0];
-};
-LIST_HEAD(unimem_debug_list, unimem_debug);
-
-static struct unimem_debug_list nguni_freemem[UNIMEM_TYPES] = {
-    LIST_HEAD_INITIALIZER(nguni_freemem[0]),
-    LIST_HEAD_INITIALIZER(nguni_freemem[1]),
-    LIST_HEAD_INITIALIZER(nguni_freemem[2]),
-    LIST_HEAD_INITIALIZER(nguni_freemem[3]),
-    LIST_HEAD_INITIALIZER(nguni_freemem[4]),
-};
-static struct unimem_debug_list nguni_usedmem[UNIMEM_TYPES] = {
-    LIST_HEAD_INITIALIZER(nguni_usedmem[0]),
-    LIST_HEAD_INITIALIZER(nguni_usedmem[1]),
-    LIST_HEAD_INITIALIZER(nguni_usedmem[2]),
-    LIST_HEAD_INITIALIZER(nguni_usedmem[3]),
-    LIST_HEAD_INITIALIZER(nguni_usedmem[4]),
-};
-
-static struct mtx nguni_unilist_mtx;
-
-static const char *unimem_names[UNIMEM_TYPES] = {
-	"instance",
-	"all",
-	"signal",
-	"call",
-	"party"
-};
-
-static void
-uni_init(void)
-{
-	mtx_init(&nguni_unilist_mtx, "netgraph UNI structure lists", NULL,
-	    MTX_DEF);
-}
-
-static void
-uni_fini(void)
-{
-	u_int type;
-	struct unimem_debug *h;
-
-	for (type = 0; type < UNIMEM_TYPES; type++) {
-		while ((h = LIST_FIRST(&nguni_freemem[type])) != NULL) {
-			LIST_REMOVE(h, link);
-			free(h, M_UNI);
-		}
-
-		while ((h = LIST_FIRST(&nguni_usedmem[type])) != NULL) {
-			LIST_REMOVE(h, link);
-			printf("ng_uni: %s in use: %p (%s,%u)\n",
-			    unimem_names[type], (caddr_t)h->data,
-			    h->file, h->lno);
-			free(h, M_UNI);
-		}
-	}
-
-	mtx_destroy(&nguni_unilist_mtx);
-}
-
-/*
- * Allocate a chunk of memory from a given type.
- */
-void *
-ng_uni_malloc(enum unimem type, const char *file, u_int lno)
-{
-	struct unimem_debug *d;
-	size_t full;
-
-	/*
-	 * Try to allocate
-	 */
-	mtx_lock(&nguni_unilist_mtx);
-	if ((d = LIST_FIRST(&nguni_freemem[type])) != NULL)
-		LIST_REMOVE(d, link);
-	mtx_unlock(&nguni_unilist_mtx);
-
-	if (d == NULL) {
-		/*
-		 * allocate
-		 */
-		full = unimem_sizes[type] + offsetof(struct unimem_debug, data);
-		if ((d = malloc(full, M_UNI, M_NOWAIT | M_ZERO)) == NULL)
-			return (NULL);
-	} else {
-		bzero(d->data, unimem_sizes[type]);
-	}
-	d->file = file;
-	d->lno = lno;
-
-	mtx_lock(&nguni_unilist_mtx);
-	LIST_INSERT_HEAD(&nguni_usedmem[type], d, link);
-	mtx_unlock(&nguni_unilist_mtx);
-	return (d->data);
-}
-
-void
-ng_uni_free(enum unimem type, void *ptr, const char *file, u_int lno)
-{
-	struct unimem_debug *d, *h;
-
-	d = (struct unimem_debug *)
-	    ((char *)ptr - offsetof(struct unimem_debug, data));
-
-	mtx_lock(&nguni_unilist_mtx);
-
-	LIST_FOREACH(h, &nguni_usedmem[type], link)
-		if (d == h)
-			break;
-
-	if (h != NULL) {
-		LIST_REMOVE(d, link);
-		LIST_INSERT_HEAD(&nguni_freemem[type], d, link);
-	} else {
-		/*
-		 * Not on used list - try free list.
-		 */
-		LIST_FOREACH(h, &nguni_freemem[type], link)
-			if (d == h)
-				break;
-		if (h == NULL)
-			printf("ng_uni: %s,%u: %p(%s) was never allocated\n",
-			    file, lno, ptr, unimem_names[type]);
-		else
-			printf("ng_uni: %s,%u: %p(%s) was already destroyed "
-			    "in %s,%u\n",
-			    file, lno, ptr, unimem_names[type],
-			    h->file, h->lno);
-	}
-	mtx_unlock(&nguni_unilist_mtx);
-}
-/************************************************************/
-/*
- * INITIALISATION
- */
-
-/*
- * Loading and unloading of node type
- */
-static int
-ng_uni_mod_event(module_t mod, int event, void *data)
-{
-	int error = 0;
-
-	switch(event) {
-	  case MOD_LOAD:
-		uni_init();
-		break;
-
-	  case MOD_UNLOAD:
-		uni_fini();
-		break;
-
-	  default:
-		error = EOPNOTSUPP;
-		break;
-	}
-	return (error);
-}
diff --git a/sys/netgraph/atm/uni/ng_uni_cust.h b/sys/netgraph/atm/uni/ng_uni_cust.h
deleted file mode 100644
index db0d04b95f81..000000000000
--- a/sys/netgraph/atm/uni/ng_uni_cust.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Customisation of signalling source to the NG environment.
- *
- * $FreeBSD$
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/queue.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/mbuf.h>
-#include <netgraph/ng_message.h>
-#include <netgraph/netgraph.h>
-#include <netgraph/atm/ngatmbase.h>
-
-#define	ASSERT(E, M) KASSERT(E,M)
-
-/*
- * Memory
- */
-enum unimem {
-	UNIMEM_INS = 0,
-	UNIMEM_ALL,
-	UNIMEM_SIG,
-	UNIMEM_CALL,
-	UNIMEM_PARTY,
-};
-#define	UNIMEM_TYPES	5
-
-void *ng_uni_malloc(enum unimem, const char *, u_int);
-void ng_uni_free(enum unimem, void *, const char *, u_int);
-
-#define	INS_ALLOC()	ng_uni_malloc(UNIMEM_INS, __FILE__, __LINE__)
-#define	INS_FREE(P)	ng_uni_free(UNIMEM_INS, P, __FILE__, __LINE__)
-
-#define	UNI_ALLOC()	ng_uni_malloc(UNIMEM_ALL, __FILE__, __LINE__)
-#define	UNI_FREE(P)	ng_uni_free(UNIMEM_ALL, P, __FILE__, __LINE__)
-
-#define	SIG_ALLOC()	ng_uni_malloc(UNIMEM_SIG, __FILE__, __LINE__)
-#define	SIG_FREE(P)	ng_uni_free(UNIMEM_SIG, P, __FILE__, __LINE__)
-
-#define	CALL_ALLOC()	ng_uni_malloc(UNIMEM_CALL, __FILE__, __LINE__)
-#define	CALL_FREE(P)	ng_uni_free(UNIMEM_CALL, P, __FILE__, __LINE__)
-
-#define	PARTY_ALLOC()	ng_uni_malloc(UNIMEM_PARTY, __FILE__, __LINE__)
-#define	PARTY_FREE(P)	ng_uni_free(UNIMEM_PARTY, P, __FILE__, __LINE__)
-
-/*
- * Timers
- */
-struct uni_timer {
-	struct callout c;
-};
-
-#define	_TIMER_INIT(X,T)	ng_callout_init(&(X)->T.c)
-#define	_TIMER_DESTROY(UNI,FIELD) _TIMER_STOP(UNI,FIELD)
-#define	_TIMER_STOP(UNI,FIELD) do {						\
-	ng_uncallout(&FIELD.c, (UNI)->arg);					\
-    } while (0)
-#define	TIMER_ISACT(UNI,T)	(callout_active(&(UNI)->T.c) ||		\
-	callout_pending(&(UNI)->T.c))
-#define	_TIMER_START(UNI,ARG,FIELD,DUE,FUNC) do {			\
-	_TIMER_STOP(UNI, FIELD);					\
-	ng_callout(&FIELD.c, (UNI)->arg, NULL,				\
-	    hz * (DUE) / 1000, FUNC, (ARG), 0);				\
-    } while (0)
-
-#define	TIMER_FUNC_UNI(T,F)						\
-static void F(struct uni *);						\
-static void								\
-_##T##_func(node_p node, hook_p hook, void *arg1, int arg2)		\
-{									\
-	struct uni *uni = (struct uni *)arg1;				\
-									\
-	(F)(uni);							\
-	uni_work(uni);							\
-}
-
-/*
- * Be careful: call may be invalid after the call to F
- */
-#define	TIMER_FUNC_CALL(T,F)						\
-static void F(struct call *);						\
-static void								\
-_##T##_func(node_p node, hook_p hook, void *arg1, int arg2)		\
-{									\
-	struct call *call = (struct call *)arg1;			\
-	struct uni *uni = call->uni;					\
-									\
-	(F)(call);							\
-	uni_work(uni);							\
-}
-
-/*
- * Be careful: call/party may be invalid after the call to F
- */
-#define	TIMER_FUNC_PARTY(T,F)						\
-static void F(struct party *);						\
-static void								\
-_##T##_func(node_p node, hook_p hook, void *arg1, int arg2)		\
-{									\
-	struct party *party = (struct party *)arg1;			\
-	struct uni *uni = party->call->uni;				\
-									\
-	(F)(party);							\
-	uni_work(uni);							\
-}
-
-extern size_t unimem_sizes[UNIMEM_TYPES];
-
-#define	UNICORE								\
-size_t unimem_sizes[UNIMEM_TYPES] = {					\
-	[UNIMEM_INS]	= sizeof(struct uni),				\
-	[UNIMEM_ALL]	= sizeof(struct uni_all),			\
-	[UNIMEM_SIG]	= sizeof(struct sig),				\
-	[UNIMEM_CALL]	= sizeof(struct call),				\
-	[UNIMEM_PARTY]	= sizeof(struct party)				\
-};
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 239379214e1c..49a01a156eec 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1,9668 +1,9628 @@
 #
 # $FreeBSD$
 #
 # This file adds support for the WITHOUT_* and WITH_* knobs in src.conf(5) to
 # the check-old* and delete-old* targets.
 #
 
 .if ${MK_ACCT} == no
 OLD_FILES+=etc/rc.d/accounting
 OLD_FILES+=etc/periodic/daily/310.accounting
 OLD_FILES+=usr/sbin/accton
 OLD_FILES+=usr/sbin/sa
 OLD_FILES+=usr/share/man/man8/accton.8.gz
 OLD_FILES+=usr/share/man/man8/sa.8.gz
 OLD_FILES+=usr/tests/usr.sbin/sa/Kyuafile
 OLD_FILES+=usr/tests/usr.sbin/sa/legacy_test
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-sav.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-amd64-usr.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-sav.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-i386-usr.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-sav.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v1-sparc64-usr.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-amd64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-amd64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-amd64-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-i386-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-i386-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-i386-usr.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-sav.in
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-u.out
 OLD_FILES+=usr/tests/usr.sbin/sa/v2-sparc64-usr.in
 OLD_DIRS+=usr/tests/usr.sbin/sa
 .endif
 
 .if ${MK_ACPI} == no
 OLD_FILES+=etc/devd/asus.conf
 OLD_FILES+=etc/rc.d/power_profile
 OLD_FILES+=usr/sbin/acpiconf
 OLD_FILES+=usr/sbin/acpidb
 OLD_FILES+=usr/sbin/acpidump
 OLD_FILES+=usr/sbin/iasl
 OLD_FILES+=usr/share/man/man8/acpiconf.8.gz
 OLD_FILES+=usr/share/man/man8/acpidb.8.gz
 OLD_FILES+=usr/share/man/man8/acpidump.8.gz
 OLD_FILES+=usr/share/man/man8/iasl.8.gz
 .endif
 
 .if ${MK_ACPI} == no && ${MK_APM} == no
 OLD_FILES+=etc/rc.d/powerd
 .endif
 
 .if ${MK_APM} == no
 OLD_FILES+=etc/rc.d/apm
 OLD_FILES+=etc/rc.d/apmd
 OLD_FILES+=etc/apmd.conf
 OLD_FILES+=usr/sbin/apm
 OLD_FILES+=usr/share/examples/etc/apmd.conf
 .endif
 
 .if ${MK_AT} == no
 OLD_FILES+=etc/pam.d/atrun
 OLD_FILES+=usr/bin/at
 OLD_FILES+=usr/bin/atq
 OLD_FILES+=usr/bin/atrm
 OLD_FILES+=usr/bin/batch
 OLD_FILES+=usr/libexec/atrun
 OLD_FILES+=usr/share/man/man1/at.1.gz
 OLD_FILES+=usr/share/man/man1/atq.1.gz
 OLD_FILES+=usr/share/man/man1/atrm.1.gz
 OLD_FILES+=usr/share/man/man1/batch.1.gz
 OLD_FILES+=usr/share/man/man8/atrun.8.gz
 .endif
 
-.if ${MK_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_DIRS+=usr/include/netnatm
-OLD_FILES+=usr/lib/libngatm.a
-OLD_FILES+=usr/lib/libngatm.so
-OLD_LIBS+=usr/lib/libngatm.so.4
-OLD_FILES+=usr/lib/libngatm_p.a
-OLD_FILES+=usr/share/man/man1/sscop.1.gz
-OLD_FILES+=usr/share/man/man3/libngatm.3.gz
-OLD_FILES+=usr/share/man/man3/uniaddr.3.gz
-OLD_FILES+=usr/share/man/man3/unifunc.3.gz
-OLD_FILES+=usr/share/man/man3/unimsg.3.gz
-OLD_FILES+=usr/share/man/man3/unisap.3.gz
-OLD_FILES+=usr/share/man/man3/unistruct.3.gz
-.endif
-
 .if ${MK_AUDIT} == no
 OLD_FILES+=etc/rc.d/auditd
 OLD_FILES+=etc/rc.d/auditdistd
 OLD_FILES+=usr/sbin/audit
 OLD_FILES+=usr/sbin/auditd
 OLD_FILES+=usr/sbin/auditdistd
 OLD_FILES+=usr/sbin/auditreduce
 OLD_FILES+=usr/sbin/praudit
 OLD_FILES+=usr/share/man/man1/auditreduce.1.gz
 OLD_FILES+=usr/share/man/man1/praudit.1.gz
 OLD_FILES+=usr/share/man/man5/auditdistd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/audit.8.gz
 OLD_FILES+=usr/share/man/man8/auditd.8.gz
 OLD_FILES+=usr/share/man/man8/auditdistd.8.gz
 OLD_FILES+=usr/tests/sys/audit/process-control
 OLD_FILES+=usr/tests/sys/audit/open
 OLD_FILES+=usr/tests/sys/audit/network
 OLD_FILES+=usr/tests/sys/audit/miscellaneous
 OLD_FILES+=usr/tests/sys/audit/Kyuafile
 OLD_FILES+=usr/tests/sys/audit/ioctl
 OLD_FILES+=usr/tests/sys/audit/inter-process
 OLD_FILES+=usr/tests/sys/audit/file-write
 OLD_FILES+=usr/tests/sys/audit/file-read
 OLD_FILES+=usr/tests/sys/audit/file-delete
 OLD_FILES+=usr/tests/sys/audit/file-create
 OLD_FILES+=usr/tests/sys/audit/file-close
 OLD_FILES+=usr/tests/sys/audit/file-attribute-modify
 OLD_FILES+=usr/tests/sys/audit/file-attribute-access
 OLD_FILES+=usr/tests/sys/audit/administrative
 OLD_DIRS+=usr/tests/sys/audit
 .endif
 
 .if ${MK_AUTHPF} == no
 OLD_FILES+=usr/sbin/authpf
 OLD_FILES+=usr/sbin/authpf-noip
 OLD_FILES+=usr/share/man/man8/authpf.8.gz
 OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz
 .endif
 
 .if ${MK_AUTOFS} == no
 OLD_FILES+=etc/autofs/include_ldap
 OLD_FILES+=etc/autofs/special_hosts
 OLD_FILES+=etc/autofs/special_media
 OLD_FILES+=etc/autofs/special_noauto
 OLD_FILES+=etc/autofs/special_null
 OLD_FILES+=etc/auto_master
 OLD_FILES+=etc/rc.d/automount
 OLD_FILES+=etc/rc.d/automountd
 OLD_FILES+=etc/rc.d/autounmountd
 OLD_FILES+=usr/sbin/automount
 OLD_FILES+=usr/sbin/automountd
 OLD_FILES+=usr/sbin/autounmountd
 OLD_FILES+=usr/share/man/man5/autofs.5.gz
 OLD_FILES+=usr/share/man/man5/auto_master.5.gz
 OLD_FILES+=usr/share/man/man8/automount.8.gz
 OLD_FILES+=usr/share/man/man8/automountd.8.gz
 OLD_FILES+=usr/share/man/man8/autounmountd.8.gz
 OLD_DIRS+=etc/autofs
 .endif
 
 .if ${MK_BEARSSL} == no
 OLD_FILES+=usr/lib/libbearssl.a
 OLD_FILES+=usr/lib/libbearssl.so
 OLD_LIBS+=usr/lib/libbearssl.so.5
 OLD_FILES+=usr/lib/libsecureboot.a
 OLD_FILES+=usr/lib/libsecureboot.so
 OLD_LIBS+=usr/lib/libsecureboot.so.5
 .endif
 
 .if ${MK_BHYVE} == no
 OLD_FILES+=usr/lib/libvmmapi.a
 OLD_FILES+=usr/lib/libvmmapi.so
 OLD_LIBS+=usr/lib/libvmmapi.so.5
 OLD_FILES+=usr/include/vmmapi.h
 OLD_FILES+=usr/sbin/bhyve
 OLD_FILES+=usr/sbin/bhyvectl
 OLD_FILES+=usr/sbin/bhyveload
 OLD_FILES+=usr/share/examples/bhyve/vmrun.sh
 OLD_FILES+=usr/share/man/man8/bhyve.8.gz
 OLD_FILES+=usr/share/man/man8/bhyveload.8.gz
 OLD_DIRS+=usr/share/examples/bhyve
 .endif
 
 .if ${MK_LLD_IS_LD} == no
 OLD_FILES+=usr/bin/ld
 OLD_FILES+=usr/share/man/man1/ld.1.gz
 .endif
 
 .if ${MK_BLACKLIST} == no
 OLD_FILES+=etc/blacklistd.conf
 OLD_FILES+=etc/rc.d/blacklistd
 OLD_FILES+=usr/include/blacklist.h
 OLD_FILES+=usr/lib/libblacklist.a
 OLD_FILES+=usr/lib/libblacklist_p.a
 OLD_FILES+=usr/lib/libblacklist.so
 OLD_LIBS+=usr/lib/libblacklist.so.0
 OLD_FILES+=usr/libexec/blacklistd-helper
 OLD_FILES+=usr/sbin/blacklistctl
 OLD_FILES+=usr/sbin/blacklistd
 OLD_FILES+=usr/share/man/man3/blacklist.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_close.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_open.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_r.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_sa.3.gz
 OLD_FILES+=usr/share/man/man3/blacklist_sa_r.3.gz
 OLD_FILES+=usr/share/man/man5/blacklistd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/blacklistctl.8.gz
 OLD_FILES+=usr/share/man/man8/blacklistd.8.gz
 .endif
 
 .if ${MK_BLUETOOTH} == no
 OLD_FILES+=etc/bluetooth/hcsecd.conf
 OLD_FILES+=etc/bluetooth/hosts
 OLD_FILES+=etc/bluetooth/protocols
 OLD_FILES+=etc/defaults/bluetooth.device.conf
 OLD_FILES+=etc/devd/iwmbtfw.conf
 OLD_DIRS+=etc/bluetooth
 OLD_FILES+=etc/rc.d/bluetooth
 OLD_FILES+=etc/rc.d/bthidd
 OLD_FILES+=etc/rc.d/hcsecd
 OLD_FILES+=etc/rc.d/rfcomm_pppd_server
 OLD_FILES+=etc/rc.d/sdpd
 OLD_FILES+=etc/rc.d/ubthidhci
 OLD_FILES+=usr/bin/bthost
 OLD_FILES+=usr/bin/btsockstat
 OLD_FILES+=usr/bin/rfcomm_sppd
 OLD_FILES+=usr/include/bluetooth.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_bluetooth.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_bt3c.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_l2cap.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_sco.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_h4.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_hci.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_l2cap.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_ubt.h
 OLD_DIRS+=usr/include/netgraph/bluetooth/include
 OLD_DIRS+=usr/include/netgraph/bluetooth
 OLD_FILES+=usr/include/sdp.h
 OLD_FILES+=usr/lib/libbluetooth.a
 OLD_FILES+=usr/lib/libbluetooth.so
 OLD_LIBS+=usr/lib/libbluetooth.so.4
 OLD_FILES+=usr/lib/libbluetooth_p.a
 OLD_FILES+=usr/lib/libsdp.a
 OLD_FILES+=usr/lib/libsdp.so
 OLD_LIBS+=usr/lib/libsdp.so.4
 OLD_FILES+=usr/lib/libsdp_p.a
 OLD_FILES+=usr/sbin/ath3kfw
 OLD_FILES+=usr/sbin/bcmfw
 OLD_FILES+=usr/sbin/bluetooth-config
 OLD_FILES+=usr/sbin/bt3cfw
 OLD_FILES+=usr/sbin/bthidcontrol
 OLD_FILES+=usr/sbin/bthidd
 OLD_FILES+=usr/sbin/btpand
 OLD_FILES+=usr/sbin/hccontrol
 OLD_FILES+=usr/sbin/hcsecd
 OLD_FILES+=usr/sbin/hcseriald
 OLD_FILES+=usr/sbin/iwmbtfw
 OLD_FILES+=usr/sbin/l2control
 OLD_FILES+=usr/sbin/l2ping
 OLD_FILES+=usr/sbin/rfcomm_pppd
 OLD_FILES+=usr/sbin/sdpcontrol
 OLD_FILES+=usr/sbin/sdpd
 OLD_FILES+=usr/share/examples/etc/defaults/bluetooth.device.conf
 OLD_FILES+=usr/share/man/man1/bthost.1.gz
 OLD_FILES+=usr/share/man/man1/btsockstat.1.gz
 OLD_FILES+=usr/share/man/man1/rfcomm_sppd.1.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET128.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET16.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET32.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET64.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_GET8.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT128.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT16.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT32.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT64.3.gz
 OLD_FILES+=usr/share/man/man3/SDP_PUT8.3.gz
 OLD_FILES+=usr/share/man/man3/bdaddr_any.3.gz
 OLD_FILES+=usr/share/man/man3/bdaddr_copy.3.gz
 OLD_FILES+=usr/share/man/man3/bdaddr_same.3.gz
 OLD_FILES+=usr/share/man/man3/bluetooth.3.gz
 OLD_FILES+=usr/share/man/man3/bt_aton.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devaddr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devclose.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devenum.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_clr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_set.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_evt_tst.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_clr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_set.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devfilter_pkt_tst.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devinfo.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devinquiry.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devname.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devopen.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devreq.3.gz
 OLD_FILES+=usr/share/man/man3/bt_devsend.3.gz
 OLD_FILES+=usr/share/man/man3/bt_endhostent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_endprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_gethostbyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/bt_gethostbyname.3.gz
 OLD_FILES+=usr/share/man/man3/bt_gethostent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotobyname.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotobynumber.3.gz
 OLD_FILES+=usr/share/man/man3/bt_getprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_ntoa.3.gz
 OLD_FILES+=usr/share/man/man3/bt_sethostent.3.gz
 OLD_FILES+=usr/share/man/man3/bt_setprotoent.3.gz
 OLD_FILES+=usr/share/man/man3/sdp.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_attr2desc.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_change_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_close.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_error.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_open.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_open_local.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_register_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_search.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_unregister_service.3.gz
 OLD_FILES+=usr/share/man/man3/sdp_uuid2desc.3.gz
 OLD_FILES+=usr/share/man/man4/ng_bluetooth.4.gz
 OLD_FILES+=usr/share/man/man5/bluetooth.device.conf.5.gz
 OLD_FILES+=usr/share/man/man5/bluetooth.hosts.5.gz
 OLD_FILES+=usr/share/man/man5/bluetooth.protocols.5.gz
 OLD_FILES+=usr/share/man/man5/hcsecd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ath3kfw.8.gz
 OLD_FILES+=usr/share/man/man8/bcmfw.8.gz
 OLD_FILES+=usr/share/man/man8/bluetooth-config.8.gz
 OLD_FILES+=usr/share/man/man8/bt3cfw.8.gz
 OLD_FILES+=usr/share/man/man8/bthidcontrol.8.gz
 OLD_FILES+=usr/share/man/man8/bthidd.8.gz
 OLD_FILES+=usr/share/man/man8/btpand.8.gz
 OLD_FILES+=usr/share/man/man8/hccontrol.8.gz
 OLD_FILES+=usr/share/man/man8/hcsecd.8.gz
 OLD_FILES+=usr/share/man/man8/hcseriald.8.gz
 OLD_FILES+=usr/share/man/man8/iwmbtfw.8.gz
 OLD_FILES+=usr/share/man/man8/l2control.8.gz
 OLD_FILES+=usr/share/man/man8/l2ping.8.gz
 OLD_FILES+=usr/share/man/man8/rfcomm_pppd.8.gz
 OLD_FILES+=usr/share/man/man8/sdpcontrol.8.gz
 OLD_FILES+=usr/share/man/man8/sdpd.8.gz
 .endif
 
 .if ${MK_BOOT} == no
 OLD_FILES+=boot/beastie.4th
 OLD_FILES+=boot/boot
 OLD_FILES+=boot/boot0
 OLD_FILES+=boot/boot0sio
 OLD_FILES+=boot/boot1
 OLD_FILES+=boot/boot1.efi
 OLD_FILES+=boot/boot2
 OLD_FILES+=boot/brand.4th
 OLD_FILES+=boot/cdboot
 OLD_FILES+=boot/check-password.4th
 OLD_FILES+=boot/color.4th
 OLD_FILES+=boot/defaults/loader.conf
 OLD_FILES+=boot/delay.4th
 OLD_FILES+=boot/device.hints
 OLD_FILES+=boot/frames.4th
 OLD_FILES+=boot/gptboot
 OLD_FILES+=boot/gptzfsboot
 OLD_FILES+=boot/loader
 OLD_FILES+=boot/loader.4th
 OLD_FILES+=boot/loader.efi
 OLD_FILES+=boot/loader.help
 OLD_FILES+=boot/loader.rc
 OLD_FILES+=boot/mbr
 OLD_FILES+=boot/menu-commands.4th
 OLD_FILES+=boot/menu.4th
 OLD_FILES+=boot/menu.rc
 OLD_FILES+=boot/menusets.4th
 OLD_FILES+=boot/pcibios.4th
 OLD_FILES+=boot/pmbr
 OLD_FILES+=boot/pxeboot
 OLD_FILES+=boot/screen.4th
 OLD_FILES+=boot/shortcuts.4th
 OLD_FILES+=boot/support.4th
 OLD_FILES+=boot/userboot.so
 OLD_FILES+=boot/version.4th
 OLD_FILES+=boot/zfsboot
 OLD_FILES+=boot/zfsloader
 OLD_FILES+=usr/lib/kgzldr.o
 OLD_FILES+=usr/share/man/man5/loader.conf.5.gz
 OLD_FILES+=usr/share/man/man8/beastie.4th.8.gz
 OLD_FILES+=usr/share/man/man8/brand.4th.8.gz
 OLD_FILES+=usr/share/man/man8/check-password.4th.8.gz
 OLD_FILES+=usr/share/man/man8/color.4th.8.gz
 OLD_FILES+=usr/share/man/man8/delay.4th.8.gz
 OLD_FILES+=usr/share/man/man8/gptboot.8.gz
 OLD_FILES+=usr/share/man/man8/gptzfsboot.8.gz
 OLD_FILES+=usr/share/man/man8/loader.4th.8.gz
 OLD_FILES+=usr/share/man/man8/loader.8.gz
 OLD_FILES+=usr/share/man/man8/menu.4th.8.gz
 OLD_FILES+=usr/share/man/man8/menusets.4th.8.gz
 OLD_FILES+=usr/share/man/man8/pxeboot.8.gz
 OLD_FILES+=usr/share/man/man8/version.4th.8.gz
 OLD_FILES+=usr/share/man/man8/zfsboot.8.gz
 OLD_FILES+=usr/share/man/man8/zfsloader.8.gz
 .endif
 
 .if ${MK_BOOTPARAMD} == no
 OLD_FILES+=etc/rc.d/bootparams
 OLD_FILES+=usr/sbin/bootparamd
 OLD_FILES+=usr/share/man/man5/bootparams.5.gz
 OLD_FILES+=usr/share/man/man8/bootparamd.8.gz
 OLD_FILES+=usr/sbin/callbootd
 .endif
 
 .if ${MK_BOOTPD} == no
 OLD_FILES+=usr/libexec/bootpd
 OLD_FILES+=usr/share/man/man5/bootptab.5.gz
 OLD_FILES+=usr/share/man/man8/bootpd.8.gz
 OLD_FILES+=usr/libexec/bootpgw
 OLD_FILES+=usr/sbin/bootpef
 OLD_FILES+=usr/share/man/man8/bootpef.8.gz
 OLD_FILES+=usr/sbin/bootptest
 OLD_FILES+=usr/share/man/man8/bootptest.8.gz
 .endif
 
 .if ${MK_BSD_CPIO} == no
 OLD_FILES+=usr/bin/bsdcpio
 OLD_FILES+=usr/bin/cpio
 OLD_FILES+=usr/share/man/man1/bsdcpio.1.gz
 OLD_FILES+=usr/share/man/man1/cpio.1.gz
 .endif
 
 .if ${MK_BSDINSTALL} == no
 OLD_FILES+=usr/libexec/bsdinstall/adduser
 OLD_FILES+=usr/libexec/bsdinstall/auto
 OLD_FILES+=usr/libexec/bsdinstall/autopart
 OLD_FILES+=usr/libexec/bsdinstall/bootconfig
 OLD_FILES+=usr/libexec/bsdinstall/checksum
 OLD_FILES+=usr/libexec/bsdinstall/config
 OLD_FILES+=usr/libexec/bsdinstall/distextract
 OLD_FILES+=usr/libexec/bsdinstall/distfetch
 OLD_FILES+=usr/libexec/bsdinstall/docsinstall
 OLD_FILES+=usr/libexec/bsdinstall/entropy
 OLD_FILES+=usr/libexec/bsdinstall/hardening
 OLD_FILES+=usr/libexec/bsdinstall/hostname
 OLD_FILES+=usr/libexec/bsdinstall/jail
 OLD_FILES+=usr/libexec/bsdinstall/keymap
 OLD_FILES+=usr/libexec/bsdinstall/mirrorselect
 OLD_FILES+=usr/libexec/bsdinstall/mount
 OLD_FILES+=usr/libexec/bsdinstall/netconfig
 OLD_FILES+=usr/libexec/bsdinstall/netconfig_ipv4
 OLD_FILES+=usr/libexec/bsdinstall/netconfig_ipv6
 OLD_FILES+=usr/libexec/bsdinstall/partedit
 OLD_FILES+=usr/libexec/bsdinstall/rootpass
 OLD_FILES+=usr/libexec/bsdinstall/runconsoles
 OLD_FILES+=usr/libexec/bsdinstall/script
 OLD_FILES+=usr/libexec/bsdinstall/scriptedpart
 OLD_FILES+=usr/libexec/bsdinstall/services
 OLD_FILES+=usr/libexec/bsdinstall/startbsdinstall
 OLD_FILES+=usr/libexec/bsdinstall/time
 OLD_FILES+=usr/libexec/bsdinstall/umount
 OLD_FILES+=usr/libexec/bsdinstall/wlanconfig
 OLD_FILES+=usr/libexec/bsdinstall/zfsboot
 OLD_FILES+=usr/sbin/bsdinstall
 OLD_FILES+=usr/share/man/man8/bsdinstall.8.gz
 OLD_FILES+=usr/share/man/man8/sade.8.gz
 OLD_DIRS+=usr/libexec/bsdinstall
 .endif
 
 .if ${MK_BSNMP} == no
 OLD_FILES+=etc/snmpd.config
 OLD_FILES+=etc/rc.d/bsnmpd
 OLD_FILES+=usr/bin/bsnmpget
 OLD_FILES+=usr/bin/bsnmpset
 OLD_FILES+=usr/bin/bsnmpwalk
 OLD_FILES+=usr/include/bsnmp/asn1.h
 OLD_FILES+=usr/include/bsnmp/bridge_snmp.h
 OLD_FILES+=usr/include/bsnmp/snmp.h
 OLD_FILES+=usr/include/bsnmp/snmp_mibII.h
 OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h
 OLD_FILES+=usr/include/bsnmp/snmpagent.h
 OLD_FILES+=usr/include/bsnmp/snmpclient.h
 OLD_FILES+=usr/include/bsnmp/snmpmod.h
 OLD_FILES+=usr/lib/libbsnmp.a
 OLD_FILES+=usr/lib/libbsnmp.so
 OLD_LIBS+=usr/lib/libbsnmp.so.6
 OLD_FILES+=usr/lib/libbsnmp_p.a
 OLD_FILES+=usr/lib/libbsnmptools.a
 OLD_FILES+=usr/lib/libbsnmptools.so
 OLD_LIBS+=usr/lib/libbsnmptools.so.0
 OLD_FILES+=usr/lib/libbsnmptools_p.a
 OLD_FILES+=usr/lib/snmp_bridge.so
 OLD_LIBS+=usr/lib/snmp_bridge.so.6
 OLD_FILES+=usr/lib/snmp_hast.so
 OLD_LIBS+=usr/lib/snmp_hast.so.6
 OLD_FILES+=usr/lib/snmp_hostres.so
 OLD_LIBS+=usr/lib/snmp_hostres.so.6
 OLD_FILES+=usr/lib/snmp_lm75.so
 OLD_LIBS+=usr/lib/snmp_lm75.so.6
 OLD_FILES+=usr/lib/snmp_mibII.so
 OLD_LIBS+=usr/lib/snmp_mibII.so.6
 OLD_FILES+=usr/lib/snmp_netgraph.so
 OLD_LIBS+=usr/lib/snmp_netgraph.so.6
 OLD_FILES+=usr/lib/snmp_pf.so
 OLD_LIBS+=usr/lib/snmp_pf.so.6
 OLD_FILES+=usr/lib/snmp_target.so
 OLD_LIBS+=usr/lib/snmp_target.so.6
 OLD_FILES+=usr/lib/snmp_usm.so
 OLD_LIBS+=usr/lib/snmp_usm.so.6
 OLD_FILES+=usr/lib/snmp_vacm.so
 OLD_LIBS+=usr/lib/snmp_vacm.so.6
 OLD_FILES+=usr/lib/snmp_wlan.so
 OLD_LIBS+=usr/lib/snmp_wlan.so.6
 OLD_FILES+=usr/sbin/bsnmpd
 OLD_FILES+=usr/sbin/gensnmptree
 OLD_FILES+=usr/share/examples/etc/snmpd.config
 OLD_FILES+=usr/share/man/man1/bsnmpd.1.gz
 OLD_FILES+=usr/share/man/man1/bsnmpget.1.gz
 OLD_FILES+=usr/share/man/man1/bsnmpset.1.gz
 OLD_FILES+=usr/share/man/man1/bsnmpwalk.1.gz
 OLD_FILES+=usr/share/man/man1/gensnmptree.1.gz
 # lib/libbsnmp/libbsnmp
 OLD_FILES+=usr/share/man/man3/TRUTH_GET.3.gz
 OLD_FILES+=usr/share/man/man3/TRUTH_MK.3.gz
 OLD_FILES+=usr/share/man/man3/TRUTH_OK.3.gz
 OLD_FILES+=usr/share/man/man3/asn1.3.gz
 OLD_FILES+=usr/share/man/man3/asn_append_oid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_commit_header.3.gz
 OLD_FILES+=usr/share/man/man3/asn_compare_oid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_counter64_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_header.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_integer.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_integer_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_ipaddress.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_ipaddress_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_null.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_null_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_objid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_objid_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_octetstring.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_octetstring_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_sequence.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_timeticks.3.gz
 OLD_FILES+=usr/share/man/man3/asn_get_uint32_raw.3.gz
 OLD_FILES+=usr/share/man/man3/asn_is_suboid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_oid2str.3.gz
 OLD_FILES+=usr/share/man/man3/asn_oid2str_r.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_counter64.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_exception.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_header.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_integer.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_ipaddress.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_null.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_objid.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_octetstring.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_temp_header.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_timeticks.3.gz
 OLD_FILES+=usr/share/man/man3/asn_put_uint32.3.gz
 OLD_FILES+=usr/share/man/man3/asn_skip.3.gz
 OLD_FILES+=usr/share/man/man3/asn_slice_oid.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_add_binding.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_calc_keychange.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_client.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_client_init.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_client_set_host.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_client_set_port.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_close.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_debug.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dep_commit.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dep_finish.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dep_lookup.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dep_rollback.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_depop_t.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_dialog.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_discover_engine.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_get.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_get_local_keys.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_getbulk.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_getnext.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_init_context.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_make_errresp.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_oid_append.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_op_t.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_open.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_parse_server.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_passwd_to_keys.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_check.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_create.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_decode.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_decode_header.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_decode_scoped.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_decode_secmode.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_dump.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_encode.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_free.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_init_secparams.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_send.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_receive.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_send_cb_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_set.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_table_cb_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_table_fetch.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_table_fetch_async.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_timeout_cb_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_timeout_start_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_timeout_stop_f.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_trace.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_value_copy.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_value_free.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_value_parse.3.gz
 OLD_FILES+=usr/share/man/man3/tree_size.3.gz
 # usr.sbin/bsnmpd/bsnmpd
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_INT.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_INT_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_INT_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_OID.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_OID_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/FIND_OBJECT_OID_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_INT.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_INT_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_INT_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_OID.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_OID_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/INSERT_OBJECT_OID_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_INT.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_INT_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_INT_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_OID.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_OID_LINK.3.gz
 OLD_FILES+=usr/share/man/man3/NEXT_OBJECT_OID_LINK_INDEX.3.gz
 OLD_FILES+=usr/share/man/man3/asn1.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpagent.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpclient.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpd_get_target_stats.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpd_get_usm_stats.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmpd_reset_usm_stats.3.gz
 OLD_FILES+=usr/share/man/man3/bsnmplib.3.gz
 OLD_FILES+=usr/share/man/man3/buf_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/buf_size.3.gz
 OLD_FILES+=usr/share/man/man3/comm_define.3.gz
 OLD_FILES+=usr/share/man/man3/community.3.gz
 OLD_FILES+=usr/share/man/man3/fd_deselect.3.gz
 OLD_FILES+=usr/share/man/man3/fd_resume.3.gz
 OLD_FILES+=usr/share/man/man3/fd_select.3.gz
 OLD_FILES+=usr/share/man/man3/fd_suspend.3.gz
 OLD_FILES+=usr/share/man/man3/get_ticks.3.gz
 OLD_FILES+=usr/share/man/man3/index_append.3.gz
 OLD_FILES+=usr/share/man/man3/index_append_off.3.gz
 OLD_FILES+=usr/share/man/man3/index_compare.3.gz
 OLD_FILES+=usr/share/man/man3/index_compare_off.3.gz
 OLD_FILES+=usr/share/man/man3/index_decode.3.gz
 OLD_FILES+=usr/share/man/man3/ip_commit.3.gz
 OLD_FILES+=usr/share/man/man3/ip_get.3.gz
 OLD_FILES+=usr/share/man/man3/ip_rollback.3.gz
 OLD_FILES+=usr/share/man/man3/ip_save.3.gz
 OLD_FILES+=usr/share/man/man3/or_register.3.gz
 OLD_FILES+=usr/share/man/man3/or_unregister.3.gz
 OLD_FILES+=usr/share/man/man3/oid_commit.3.gz
 OLD_FILES+=usr/share/man/man3/oid_get.3.gz
 OLD_FILES+=usr/share/man/man3/oid_rollback.3.gz
 OLD_FILES+=usr/share/man/man3/oid_save.3.gz
 OLD_FILES+=usr/share/man/man3/oid_usmNotInTimeWindows.3.gz
 OLD_FILES+=usr/share/man/man3/oid_usmUnknownEngineIDs.3.gz
 OLD_FILES+=usr/share/man/man3/oid_zeroDotZero.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_allocate.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_base.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_istype.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_next.3.gz
 OLD_FILES+=usr/share/man/man3/reqid_type.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_bridge.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_hostres.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_input_finish.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_input_start.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_lm75.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_mibII.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_netgraph.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_output.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_pdu_auth_access.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_send_port.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_send_trap.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_target.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_usm.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_vacm.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz
 OLD_FILES+=usr/share/man/man3/snmpd_target_stat.3.gz
 OLD_FILES+=usr/share/man/man3/snmpd_usmstats.3.gz
 OLD_FILES+=usr/share/man/man3/snmpmod.3.gz
 OLD_FILES+=usr/share/man/man3/start_tick.3.gz
 OLD_FILES+=usr/share/man/man3/string_commit.3.gz
 OLD_FILES+=usr/share/man/man3/string_free.3.gz
 OLD_FILES+=usr/share/man/man3/string_get.3.gz
 OLD_FILES+=usr/share/man/man3/string_get_max.3.gz
 OLD_FILES+=usr/share/man/man3/string_rollback.3.gz
 OLD_FILES+=usr/share/man/man3/string_save.3.gz
 OLD_FILES+=usr/share/man/man3/systemg.3.gz
 OLD_FILES+=usr/share/man/man3/this_tick.3.gz
 OLD_FILES+=usr/share/man/man3/timer_start.3.gz
 OLD_FILES+=usr/share/man/man3/timer_start_repeat.3.gz
 OLD_FILES+=usr/share/man/man3/timer_stop.3.gz
 OLD_FILES+=usr/share/man/man3/target_activate_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_delete_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_delete_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_delete_param.3.gz
 OLD_FILES+=usr/share/man/man3/target_first_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_first_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_first_param.3.gz
 OLD_FILES+=usr/share/man/man3/target_flush_all.3.gz
 OLD_FILES+=usr/share/man/man3/target_next_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_next_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_next_param.3.gz
 OLD_FILES+=usr/share/man/man3/target_new_address.3.gz
 OLD_FILES+=usr/share/man/man3/target_new_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_new_param.3.gz
 OLD_FILES+=usr/share/man/man3/target_notify.3.gz
 OLD_FILES+=usr/share/man/man3/target_param.3.gz
 OLD_FILES+=usr/share/man/man3/usm_delete_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_find_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_first_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_flush_users.3.gz
 OLD_FILES+=usr/share/man/man3/usm_next_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_new_user.3.gz
 OLD_FILES+=usr/share/man/man3/usm_user.3.gz
 OLD_FILES+=usr/share/snmp/defs/bridge_tree.def
 OLD_FILES+=usr/share/snmp/defs/hast_tree.def
 OLD_FILES+=usr/share/snmp/defs/hostres_tree.def
 OLD_FILES+=usr/share/snmp/defs/lm75_tree.def
 OLD_FILES+=usr/share/snmp/defs/mibII_tree.def
 OLD_FILES+=usr/share/snmp/defs/netgraph_tree.def
 OLD_FILES+=usr/share/snmp/defs/pf_tree.def
 OLD_FILES+=usr/share/snmp/defs/target_tree.def
 OLD_FILES+=usr/share/snmp/defs/tc.def
 OLD_FILES+=usr/share/snmp/defs/tree.def
 OLD_FILES+=usr/share/snmp/defs/usm_tree.def
 OLD_FILES+=usr/share/snmp/defs/vacm_tree.def
 OLD_FILES+=usr/share/snmp/defs/wlan_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-BRIDGE-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HAST-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HOSTRES-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-IP-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-LM75-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-MIB2-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-PF-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-SNMPD.txt
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/BRIDGE-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/FOKUS-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/FREEBSD-MIB.txt
 OLD_FILES+=usr/share/snmp/mibs/RSTP-MIB.txt
 OLD_DIRS+=usr/include/bsnmp
 OLD_DIRS+=usr/share/snmp
 OLD_DIRS+=usr/share/snmp/defs
 OLD_DIRS+=usr/share/snmp/mibs
 .endif
 
 .if ${MK_CALENDAR} == no
 OLD_FILES+=etc/periodic/daily/300.calendar
 OLD_FILES+=usr/bin/calendar
 OLD_FILES+=usr/share/calendar/calendar.all
 OLD_FILES+=usr/share/calendar/calendar.australia
 OLD_FILES+=usr/share/calendar/calendar.birthday
 OLD_FILES+=usr/share/calendar/calendar.brazilian
 OLD_FILES+=usr/share/calendar/calendar.christian
 OLD_FILES+=usr/share/calendar/calendar.computer
 OLD_FILES+=usr/share/calendar/calendar.croatian
 OLD_FILES+=usr/share/calendar/calendar.dutch
 OLD_FILES+=usr/share/calendar/calendar.freebsd
 OLD_FILES+=usr/share/calendar/calendar.french
 OLD_FILES+=usr/share/calendar/calendar.german
 OLD_FILES+=usr/share/calendar/calendar.history
 OLD_FILES+=usr/share/calendar/calendar.holiday
 OLD_FILES+=usr/share/calendar/calendar.hungarian
 OLD_FILES+=usr/share/calendar/calendar.judaic
 OLD_FILES+=usr/share/calendar/calendar.lotr
 OLD_FILES+=usr/share/calendar/calendar.music
 OLD_FILES+=usr/share/calendar/calendar.newzealand
 OLD_FILES+=usr/share/calendar/calendar.russian
 OLD_FILES+=usr/share/calendar/calendar.southafrica
 OLD_FILES+=usr/share/calendar/calendar.ukrainian
 OLD_FILES+=usr/share/calendar/calendar.usholiday
 OLD_FILES+=usr/share/calendar/calendar.world
 OLD_FILES+=usr/share/calendar/de_AT.ISO_8859-15/calendar.feiertag
 OLD_DIRS+=usr/share/calendar/de_AT.ISO_8859-15
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.feiertag
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.geschichte
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.kirche
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.literatur
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.musik
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.wissenschaft
 OLD_DIRS+=usr/share/calendar/de_DE.ISO8859-1
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-15
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.fetes
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.french
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.jferies
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.proverbes
 OLD_DIRS+=usr/share/calendar/fr_FR.ISO8859-1
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-15
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.praznici
 OLD_DIRS+=usr/share/calendar/hr_HR.ISO8859-2
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.nevnapok
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.unnepek
 OLD_DIRS+=usr/share/calendar/hu_HU.ISO8859-2
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.commemorative
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.holidays
 OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.mcommemorative
 OLD_DIRS+=usr/share/calendar/pt_BR.ISO8859-1
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.all
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.commemorative
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.holidays
 OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.mcommemorative
 OLD_DIRS+=usr/share/calendar/pt_BR.UTF-8
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.military
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.pagan
 OLD_DIRS+=usr/share/calendar/ru_RU.KOI8-R
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.military
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.pagan
 OLD_DIRS+=usr/share/calendar/ru_RU.UTF-8
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.all
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.holiday
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.misc
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.orthodox
 OLD_DIRS+=usr/share/calendar/uk_UA.KOI8-U
 OLD_DIRS+=usr/share/calendar
 OLD_FILES+=usr/share/man/man1/calendar.1.gz
 OLD_FILES+=usr/tests/usr.bin/calendar/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/calendar/calendar.calibrate
 OLD_FILES+=usr/tests/usr.bin/calendar/legacy_test
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.a5.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.b5.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.s1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.s2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.s3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.s4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.sh
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-5.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-6.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.w0-7.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-1.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-2.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-3.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-4.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-5.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-6.out
 OLD_FILES+=usr/tests/usr.bin/calendar/regress.wn-7.out
 OLD_DIRS+=usr/tests/usr.bin/calendar
 .endif
 
 .if ${MK_CASPER} == no
 OLD_LIBS+=lib/libcasper.so.1
 OLD_LIBS+=lib/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_DTRACE} == no
 OLD_LIBS+=lib/libctf.so.2
 OLD_LIBS+=lib/libdtrace.so.2
 OLD_FILES+=usr/bin/ctfconvert
 OLD_FILES+=usr/bin/ctfdump
 OLD_FILES+=usr/bin/ctfmerge
 OLD_FILES+=usr/lib/dtrace/drti.o
 OLD_FILES+=usr/lib/dtrace/errno.d
 OLD_FILES+=usr/lib/dtrace/io.d
 OLD_FILES+=usr/lib/dtrace/ip.d
 OLD_FILES+=usr/lib/dtrace/mbuf.d
 OLD_FILES+=usr/lib/dtrace/psinfo.d
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/lib/dtrace/regs_x86.d
 .endif
 OLD_FILES+=usr/lib/dtrace/sctp.d
 OLD_FILES+=usr/lib/dtrace/siftr.d
 OLD_FILES+=usr/lib/dtrace/signal.d
 OLD_FILES+=usr/lib/dtrace/socket.d
 OLD_FILES+=usr/lib/dtrace/tcp.d
 OLD_FILES+=usr/lib/dtrace/udp.d
 OLD_FILES+=usr/lib/dtrace/udplite.d
 OLD_FILES+=usr/lib/dtrace/unistd.d
 OLD_FILES+=usr/lib/libctf.a
 OLD_FILES+=usr/lib/libctf.so
 OLD_FILES+=usr/lib/libctf_p.a
 OLD_FILES+=usr/lib/libdtrace.a
 OLD_FILES+=usr/lib/libdtrace.so
 OLD_FILES+=usr/lib/libdtrace_p.a
 OLD_LIBS+=lib/libdtrace.so.2
 OLD_FILES+=usr/libexec/dwatch/chmod
 OLD_FILES+=usr/libexec/dwatch/errno
 OLD_FILES+=usr/libexec/dwatch/fchmodat
 OLD_FILES+=usr/libexec/dwatch/io
 OLD_FILES+=usr/libexec/dwatch/io-done
 OLD_FILES+=usr/libexec/dwatch/io-start
 OLD_FILES+=usr/libexec/dwatch/ip
 OLD_FILES+=usr/libexec/dwatch/ip-receive
 OLD_FILES+=usr/libexec/dwatch/ip-send
 OLD_FILES+=usr/libexec/dwatch/kill
 OLD_FILES+=usr/libexec/dwatch/lchmod
 OLD_FILES+=usr/libexec/dwatch/nanosleep
 OLD_FILES+=usr/libexec/dwatch/open
 OLD_FILES+=usr/libexec/dwatch/openat
 OLD_FILES+=usr/libexec/dwatch/proc
 OLD_FILES+=usr/libexec/dwatch/proc-create
 OLD_FILES+=usr/libexec/dwatch/proc-exec
 OLD_FILES+=usr/libexec/dwatch/proc-exec-failure
 OLD_FILES+=usr/libexec/dwatch/proc-exec-success
 OLD_FILES+=usr/libexec/dwatch/proc-exit
 OLD_FILES+=usr/libexec/dwatch/proc-signal
 OLD_FILES+=usr/libexec/dwatch/proc-signal-clear
 OLD_FILES+=usr/libexec/dwatch/proc-signal-discard
 OLD_FILES+=usr/libexec/dwatch/proc-signal-send
 OLD_FILES+=usr/libexec/dwatch/proc-status
 OLD_FILES+=usr/libexec/dwatch/read
 OLD_FILES+=usr/libexec/dwatch/recv
 OLD_FILES+=usr/libexec/dwatch/recvfrom
 OLD_FILES+=usr/libexec/dwatch/recvmsg
 OLD_FILES+=usr/libexec/dwatch/rw
 OLD_FILES+=usr/libexec/dwatch/sched
 OLD_FILES+=usr/libexec/dwatch/sched-change-pri
 OLD_FILES+=usr/libexec/dwatch/sched-cpu
 OLD_FILES+=usr/libexec/dwatch/sched-dequeue
 OLD_FILES+=usr/libexec/dwatch/sched-enqueue
 OLD_FILES+=usr/libexec/dwatch/sched-exec
 OLD_FILES+=usr/libexec/dwatch/sched-lend-pri
 OLD_FILES+=usr/libexec/dwatch/sched-load-change
 OLD_FILES+=usr/libexec/dwatch/sched-off-cpu
 OLD_FILES+=usr/libexec/dwatch/sched-on-cpu
 OLD_FILES+=usr/libexec/dwatch/sched-preempt
 OLD_FILES+=usr/libexec/dwatch/sched-pri
 OLD_FILES+=usr/libexec/dwatch/sched-queue
 OLD_FILES+=usr/libexec/dwatch/sched-remain-cpu
 OLD_FILES+=usr/libexec/dwatch/sched-sleep
 OLD_FILES+=usr/libexec/dwatch/sched-surrender
 OLD_FILES+=usr/libexec/dwatch/sched-tick
 OLD_FILES+=usr/libexec/dwatch/sched-wakeup
 OLD_FILES+=usr/libexec/dwatch/send
 OLD_FILES+=usr/libexec/dwatch/sendmsg
 OLD_FILES+=usr/libexec/dwatch/sendrecv
 OLD_FILES+=usr/libexec/dwatch/sendto
 OLD_FILES+=usr/libexec/dwatch/systop
 OLD_FILES+=usr/libexec/dwatch/tcp
 OLD_FILES+=usr/libexec/dwatch/tcp-accept
 OLD_FILES+=usr/libexec/dwatch/tcp-accept-established
 OLD_FILES+=usr/libexec/dwatch/tcp-accept-refused
 OLD_FILES+=usr/libexec/dwatch/tcp-connect
 OLD_FILES+=usr/libexec/dwatch/tcp-connect-established
 OLD_FILES+=usr/libexec/dwatch/tcp-connect-refused
 OLD_FILES+=usr/libexec/dwatch/tcp-connect-request
 OLD_FILES+=usr/libexec/dwatch/tcp-established
 OLD_FILES+=usr/libexec/dwatch/tcp-init
 OLD_FILES+=usr/libexec/dwatch/tcp-io
 OLD_FILES+=usr/libexec/dwatch/tcp-receive
 OLD_FILES+=usr/libexec/dwatch/tcp-refused
 OLD_FILES+=usr/libexec/dwatch/tcp-send
 OLD_FILES+=usr/libexec/dwatch/tcp-state-change
 OLD_FILES+=usr/libexec/dwatch/tcp-status
 OLD_FILES+=usr/libexec/dwatch/udp
 OLD_FILES+=usr/libexec/dwatch/udp-receive
 OLD_FILES+=usr/libexec/dwatch/udp-send
 OLD_FILES+=usr/libexec/dwatch/udplite
 OLD_FILES+=usr/libexec/dwatch/udplite-receive
 OLD_FILES+=usr/libexec/dwatch/udplite-send
 OLD_FILES+=usr/libexec/dwatch/vop_create
 OLD_FILES+=usr/libexec/dwatch/vop_lookup
 OLD_FILES+=usr/libexec/dwatch/vop_mkdir
 OLD_FILES+=usr/libexec/dwatch/vop_mknod
 OLD_FILES+=usr/libexec/dwatch/vop_readdir
 OLD_FILES+=usr/libexec/dwatch/vop_remove
 OLD_FILES+=usr/libexec/dwatch/vop_rename
 OLD_FILES+=usr/libexec/dwatch/vop_rmdir
 OLD_FILES+=usr/libexec/dwatch/vop_symlink
 OLD_FILES+=usr/libexec/dwatch/write
 OLD_FILES+=usr/sbin/dtrace
 OLD_FILES+=usr/sbin/dwatch
 OLD_FILES+=usr/sbin/lockstat
 OLD_FILES+=usr/sbin/plockstat
 OLD_FILES+=usr/share/man/man1/dtrace.1.gz
 OLD_FILES+=usr/share/man/man1/dtruss.1.gz
 OLD_FILES+=usr/share/man/man1/lockstat.1.gz
 OLD_FILES+=usr/share/man/man1/plockstat.1.gz
 OLD_FILES+=usr/share/dtrace/blocking
 OLD_FILES+=usr/share/dtrace/disklatency
 OLD_FILES+=usr/share/dtrace/disklatencycmd
 OLD_FILES+=usr/share/dtrace/hotopen
 OLD_FILES+=usr/share/dtrace/nfsattrstats
 OLD_FILES+=usr/share/dtrace/nfsclienttime
 OLD_FILES+=usr/share/dtrace/siftr
 OLD_FILES+=usr/share/dtrace/toolkit/execsnoop
 OLD_FILES+=usr/share/dtrace/toolkit/hotkernel
 OLD_FILES+=usr/share/dtrace/toolkit/hotuser
 OLD_FILES+=usr/share/dtrace/toolkit/opensnoop
 OLD_FILES+=usr/share/dtrace/toolkit/procsystime
 OLD_FILES+=usr/share/dtrace/tcpconn
 OLD_FILES+=usr/share/dtrace/tcpdebug
 OLD_FILES+=usr/share/dtrace/tcpstate
 OLD_FILES+=usr/share/dtrace/tcptrack
 OLD_FILES+=usr/share/dtrace/udptrack
 OLD_FILES+=usr/share/man/man1/dtrace.1.gz
 OLD_DIRS+=usr/lib/dtrace
 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/zfsbe
 OLD_FILES+=etc/rc.d/zfsd
 OLD_FILES+=etc/rc.d/zfskeys
 OLD_FILES+=etc/rc.d/zvol
 OLD_FILES+=etc/devd/zfs.conf
 OLD_FILES+=etc/periodic/daily/404.status-zfs
 OLD_FILES+=etc/periodic/daily/800.scrub-zfs
 OLD_FILES+=etc/zfs/exports
 OLD_DIRS+=etc/zfs
 OLD_LIBS+=lib/libavl.so.2
 OLD_LIBS+=lib/libnvpair.so.2
 OLD_LIBS+=lib/libumem.so.2
 OLD_LIBS+=lib/libuutil.so.2
 OLD_LIBS+=lib/libzfs.so.2
 OLD_LIBS+=lib/libzfs.so.3
 OLD_LIBS+=lib/libzfs_core.so.2
 OLD_LIBS+=lib/libzpool.so.2
 OLD_FILES+=rescue/zdb
 OLD_FILES+=rescue/zfs
 OLD_FILES+=rescue/zpool
 OLD_FILES+=sbin/bectl
 OLD_FILES+=sbin/zfs
 OLD_FILES+=sbin/zpool
 OLD_FILES+=sbin/zfsbootcfg
 OLD_FILES+=usr/bin/zinject
 OLD_FILES+=usr/bin/zstreamdump
 OLD_FILES+=usr/bin/ztest
 OLD_FILES+=usr/lib/libbe.a
 OLD_FILES+=usr/lib/libbe_p.a
 OLD_FILES+=usr/lib/libbe.so
 OLD_LIBS+=lib/libbe.so.1
 OLD_FILES+=usr/lib/libavl.a
 OLD_FILES+=usr/lib/libavl.so
 OLD_FILES+=usr/lib/libavl_p.a
 OLD_FILES+=usr/lib/libnvpair.a
 OLD_FILES+=usr/lib/libnvpair.so
 OLD_FILES+=usr/lib/libnvpair_p.a
 OLD_FILES+=usr/lib/libumem.a
 OLD_FILES+=usr/lib/libumem.so
 OLD_FILES+=usr/lib/libumem_p.a
 OLD_FILES+=usr/lib/libuutil.a
 OLD_FILES+=usr/lib/libuutil.so
 OLD_FILES+=usr/lib/libuutil_p.a
 OLD_FILES+=usr/lib/libzfs.a
 OLD_FILES+=usr/lib/libzfs.so
 OLD_FILES+=usr/lib/libzfs_core.a
 OLD_FILES+=usr/lib/libzfs_core.so
 OLD_FILES+=usr/lib/libzfs_core_p.a
 OLD_FILES+=usr/lib/libzfs_p.a
 OLD_FILES+=usr/lib/libzpool.a
 OLD_FILES+=usr/lib/libzpool.so
 OLD_LIBS+=usr/lib/libzpool.so.2
 OLD_FILES+=usr/sbin/zfsd
 OLD_FILES+=usr/sbin/zhack
 OLD_FILES+=usr/sbin/zdb
 OLD_FILES+=usr/share/man/man3/be_activate.3.gz
 OLD_FILES+=usr/share/man/man3/be_active_name.3.gz
 OLD_FILES+=usr/share/man/man3/be_active_path.3.gz
 OLD_FILES+=usr/share/man/man3/be_create_depth.3.gz
 OLD_FILES+=usr/share/man/man3/be_create_from_existing_snap.3.gz
 OLD_FILES+=usr/share/man/man3/be_create_from_existing.3.gz
 OLD_FILES+=usr/share/man/man3/be_create.3.gz
 OLD_FILES+=usr/share/man/man3/be_deactivate.3.gz
 OLD_FILES+=usr/share/man/man3/be_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/be_exists.3.gz
 OLD_FILES+=usr/share/man/man3/be_export.3.gz
 OLD_FILES+=usr/share/man/man3/be_get_bootenv_props.3.gz
 OLD_FILES+=usr/share/man/man3/be_get_dataset_props.3.gz
 OLD_FILES+=usr/share/man/man3/be_get_dataset_snapshots.3.gz
 OLD_FILES+=usr/share/man/man3/be_import.3.gz
 OLD_FILES+=usr/share/man/man3/be_is_auto_snapshot_name.3.gz
 OLD_FILES+=usr/share/man/man3/be_mount.3.gz
 OLD_FILES+=usr/share/man/man3/be_mounted_at.3.gz
 OLD_FILES+=usr/share/man/man3/be_nextboot_name.3.gz
 OLD_FILES+=usr/share/man/man3/be_nextboot_path.3.gz
 OLD_FILES+=usr/share/man/man3/be_nicenum.3.gz
 OLD_FILES+=usr/share/man/man3/be_prop_list_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/be_prop_list_free.3.gz
 OLD_FILES+=usr/share/man/man3/be_rename.3.gz
 OLD_FILES+=usr/share/man/man3/be_root_concat.3.gz
 OLD_FILES+=usr/share/man/man3/be_root_path.3.gz
 OLD_FILES+=usr/share/man/man3/be_snapshot.3.gz
 OLD_FILES+=usr/share/man/man3/be_unmount.3.gz
 OLD_FILES+=usr/share/man/man3/be_validate_name.3.gz
 OLD_FILES+=usr/share/man/man3/be_validate_snap.3.gz
 OLD_FILES+=usr/share/man/man3/libbe_close.3.gz
 OLD_FILES+=usr/share/man/man3/libbe_errno.3.gz
 OLD_FILES+=usr/share/man/man3/libbe_error_description.3.gz
 OLD_FILES+=usr/share/man/man3/libbe_init.3.gz
 OLD_FILES+=usr/share/man/man3/libbe_print_on_error.3.gz
 OLD_FILES+=usr/share/man/man3/libbe.3.gz
 OLD_FILES+=usr/share/man/man5/zpool-features.5.gz
 OLD_FILES+=usr/share/man/man8/bectl.8.gz
 OLD_FILES+=usr/share/man/man8/gptzfsboot.8.gz
 OLD_FILES+=usr/share/man/man8/zdb.8.gz
 OLD_FILES+=usr/share/man/man8/zfs-program.8.gz
 OLD_FILES+=usr/share/man/man8/zfs.8.gz
 OLD_FILES+=usr/share/man/man8/zfsboot.8.gz
 OLD_FILES+=usr/share/man/man8/zfsbootcfg.8.gz
 OLD_FILES+=usr/share/man/man8/zfsd.8.gz
 OLD_FILES+=usr/share/man/man8/zfsloader.8.gz
 OLD_FILES+=usr/share/man/man8/zpool.8.gz
 .endif
 
 .if ${MK_CLANG} == no && ${MK_LLVM_BINUTILS} == no
 OLD_FILES+=usr/bin/llvm-addr2line
 OLD_FILES+=usr/bin/llvm-ar
 OLD_FILES+=usr/bin/llvm-nm
 OLD_FILES+=usr/bin/llvm-objcopy
 OLD_FILES+=usr/bin/llvm-objdump
 OLD_FILES+=usr/bin/llvm-ranlib
 OLD_FILES+=usr/bin/llvm-readelf
 OLD_FILES+=usr/bin/llvm-readobj
 OLD_FILES+=usr/bin/llvm-size
 OLD_FILES+=usr/bin/llvm-strings
 OLD_FILES+=usr/bin/llvm-symbolizer
 OLD_FILES+=usr/bin/objdump
 OLD_FILES+=usr/share/man/man1/llvm-addr2line.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-objcopy.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-ranlib.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-readelf.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-readobj.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-size.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-strings.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-symbolizer.1.gz
 OLD_FILES+=usr/share/man/man1/objdump.1.gz
 .endif
 
 .if ${MK_CLANG} == no
 OLD_FILES+=usr/bin/clang
 OLD_FILES+=usr/bin/clang++
 OLD_FILES+=usr/bin/clang-cpp
 OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/complex
 OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/new
 OLD_DIRS+=usr/lib/clang/15.0.7/include/cuda_wrappers
 OLD_FILES+=usr/lib/clang/15.0.7/include/fuzzer/FuzzedDataProvider.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/fuzzer
 OLD_FILES+=usr/lib/clang/15.0.7/include/hlsl/hlsl_basic_types.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hlsl/hlsl_intrinsics.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/hlsl
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/__clang_openmp_device_functions.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/cmath
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex_cmath.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/math.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/new
 OLD_DIRS+=usr/lib/clang/15.0.7/include/openmp_wrappers
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/bmiintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/emmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/immintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/mm_malloc.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/mmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/pmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/smmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/tmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/x86intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/xmmintrin.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/ppc_wrappers
 OLD_FILES+=usr/lib/clang/15.0.7/include/profile/InstrProfData.inc
 OLD_FILES+=usr/lib/clang/15.0.7/include/profile/MemProfData.inc
 OLD_DIRS+=usr/lib/clang/15.0.7/include/profile
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/asan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/common_interface_defs.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/coverage_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/dfsan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/hwasan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/linux_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/lsan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/memprof_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/msan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/netbsd_syscall_hooks.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/scudo_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/tsan_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/tsan_interface_atomic.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/ubsan_interface.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/sanitizer
 OLD_FILES+=usr/lib/clang/15.0.7/include/xray/xray_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xray/xray_log_interface.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xray/xray_records.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include/xray
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_cmath.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_complex_builtins.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_device_functions.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_intrinsics.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_math.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_math_forward_declares.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_texture_intrinsics.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_cmath.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_libdevice_declares.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_math.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_runtime_wrapper.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__stddef_max_align_t.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__wmmintrin_aes.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/__wmmintrin_pclmul.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/adxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/altivec.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ammintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/amxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm64intr.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_acle.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_bf16.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_cde.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_cmse.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_fp16.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_mve.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_neon.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_neon_sve_bridge.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/arm_sve.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/armintr.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512bf16intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512bitalgintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512bwintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512cdintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512dqintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512erintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512fintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512fp16intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512ifmaintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512ifmavlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512pfintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vbmi2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vbmiintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vbmivlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlbf16intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlbitalgintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlbwintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlcdintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vldqintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlfp16intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlvbmi2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlvnniintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlvp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vnniintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vp2intersectintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vpopcntdqintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vpopcntdqvlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/avxvnniintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/bmi2intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/bmiintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/builtins.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/cet.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/cetintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/cldemoteintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/clflushoptintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/clwbintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/clzerointrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/cpuid.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/crc32intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/emmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/enqcmdintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/f16cintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/float.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/fma4intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/fmaintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/fxsrintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/gfniintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hexagon_circ_brev_intrinsics.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hexagon_protos.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hexagon_types.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hlsl.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hresetintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/htmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/htmxlintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/hvx_hexagon_protos.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ia32intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/immintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/inttypes.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/invpcidintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/iso646.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/keylockerintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/limits.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/lwpintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/lzcntintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/mm3dnow.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/mm_malloc.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/mmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/module.modulemap
 OLD_FILES+=usr/lib/clang/15.0.7/include/movdirintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/msa.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/mwaitxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/nmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/omp-tools.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/omp.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ompt.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/opencl-c-base.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/opencl-c.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/pconfigintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/pkuintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/pmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/popcntintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/prfchwintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/ptwriteintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/rdpruintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/rdseedintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/riscv_vector.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/rtmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/s390intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/serializeintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/sgxintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/shaintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/smmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdalign.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdarg.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdatomic.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdbool.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stddef.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdint.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/stdnoreturn.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/tbmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/tgmath.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/tmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/tsxldtrkintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/uintrintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/unwind.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/vadefs.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/vaesintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/varargs.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/vecintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/velintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/velintrin_approx.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/velintrin_gen.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/vpclmulqdqintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/waitpkgintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/wasm_simd128.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/wbnoinvdintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/wmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/x86gprintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/x86intrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xmmintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xopintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xsavecintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xsaveintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xsaveoptintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xsavesintrin.h
 OLD_FILES+=usr/lib/clang/15.0.7/include/xtestintrin.h
 OLD_DIRS+=usr/lib/clang/15.0.7/include
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-aarch64.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-arm.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-armhf.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-i386.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-x86_64.so
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.dd-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.dd-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64le.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-arm.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-armhf.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
 OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-x86_64.a
 OLD_DIRS+=usr/lib/clang/15.0.7/lib/freebsd
 OLD_DIRS+=usr/lib/clang/15.0.7/lib
 OLD_FILES+=usr/lib/clang/15.0.7/share/asan_ignorelist.txt
 OLD_FILES+=usr/lib/clang/15.0.7/share/cfi_ignorelist.txt
 OLD_FILES+=usr/lib/clang/15.0.7/share/msan_ignorelist.txt
 OLD_DIRS+=usr/lib/clang/15.0.7/share
 OLD_DIRS+=usr/lib/clang/15.0.7
 OLD_DIRS+=usr/lib/clang
 OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm/clang
 OLD_FILES+=usr/share/doc/llvm/COPYRIGHT.regex
 OLD_FILES+=usr/share/doc/llvm/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm
 OLD_FILES+=usr/share/man/man1/clang.1.gz
 OLD_FILES+=usr/share/man/man1/clang++.1.gz
 OLD_FILES+=usr/share/man/man1/clang-cpp.1.gz
 .endif
 
 .if ${MK_CLANG_EXTRAS} == no
 OLD_FILES+=usr/bin/bugpoint
 OLD_FILES+=usr/bin/llc
 OLD_FILES+=usr/bin/lli
 OLD_FILES+=usr/bin/llvm-as
 OLD_FILES+=usr/bin/llvm-bcanalyzer
 OLD_FILES+=usr/bin/llvm-cxxdump
 OLD_FILES+=usr/bin/llvm-diff
 OLD_FILES+=usr/bin/llvm-dis
 OLD_FILES+=usr/bin/llvm-dwarfdump
 OLD_FILES+=usr/bin/llvm-dwp
 OLD_FILES+=usr/bin/llvm-extract
 OLD_FILES+=usr/bin/llvm-link
 OLD_FILES+=usr/bin/llvm-lto
 OLD_FILES+=usr/bin/llvm-lto2
 OLD_FILES+=usr/bin/llvm-mc
 OLD_FILES+=usr/bin/llvm-mca
 OLD_FILES+=usr/bin/llvm-modextract
 OLD_FILES+=usr/bin/llvm-pdbutil
 OLD_FILES+=usr/bin/llvm-rtdyld
 OLD_FILES+=usr/bin/llvm-xray
 OLD_FILES+=usr/bin/opt
 OLD_FILES+=usr/share/man/man1/bugpoint.1.gz
 OLD_FILES+=usr/share/man/man1/llc.1.gz
 OLD_FILES+=usr/share/man/man1/lli.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-as.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-bcanalyzer.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-diff.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-dis.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-dwarfdump.1
 OLD_FILES+=usr/share/man/man1/llvm-extract.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-link.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-pdbutil.1.gz
 OLD_FILES+=usr/share/man/man1/opt.1.gz
 .endif
 
 .if ${MK_CLANG_EXTRAS} == no && ${MK_CLANG_FORMAT} == no
 OLD_FILES+=usr/bin/clang-format
 .endif
 
 .if ${MK_CLANG_EXTRAS} == no && ${MK_LLVM_CXXFILT} == no
 OLD_FILES+=usr/bin/llvm-cxxfilt
 OLD_FILES+=usr/share/man/man1/llvm-cxxfilt.1.gz
 .endif
 
 .if ${MK_CPP} == no
 OLD_FILES+=usr/bin/cpp
 OLD_FILES+=usr/share/man/man1/cpp.1.gz
 .endif
 
 .if ${MK_CUSE} == no
 OLD_FILES+=usr/include/fs/cuse/cuse_defs.h
 OLD_FILES+=usr/include/fs/cuse/cuse_ioctl.h
 OLD_FILES+=usr/include/cuse.h
 OLD_FILES+=usr/lib/libcuse.a
 OLD_LIBS+=usr/lib/libcuse.so.1
 OLD_FILES+=usr/lib/libcuse_p.a
 OLD_FILES+=usr/share/man/man3/cuse.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_alloc_unit_number_by_id.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_copy_in.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_copy_out.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_create.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_get_current.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_get_per_file_handle.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_get_priv0.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_get_priv1.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_set_per_file_handle.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_set_priv0.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_dev_set_priv1.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_free_unit_number.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_free_unit_number_by_id.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_get_local.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_got_peer_signal.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_init.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_is_vmalloc_addr.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_poll_wakeup.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_set_local.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_uninit.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_vmalloc.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_vmfree.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_vmoffset.3.gz
 OLD_FILES+=usr/share/man/man3/cuse_wait_and_process.3.gz
 OLD_DIRS+=usr/include/fs/cuse
 .endif
 
 .if ${MK_DEBUG_FILES} == no
 .if exists(${DESTDIR}/usr/lib/debug)
 DEBUG_DIRS!=find ${DESTDIR}/usr/lib/debug -mindepth 1 \
     -type d \! -path "${DESTDIR}/usr/lib/debug/boot/*" \
     | sed -e 's,^${DESTDIR}/,,'; echo
 DEBUG_FILES!=find ${DESTDIR}/usr/lib/debug \
     \! -type d \! -path "${DESTDIR}/usr/lib/debug/boot/*" \! -name "lib*.so*" \
     | sed -e 's,^${DESTDIR}/,,'; echo
 DEBUG_LIBS!=find ${DESTDIR}/usr/lib/debug \! -type d -name "lib*.so*" \
     | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${DEBUG_DIRS}
 OLD_FILES+=${DEBUG_FILES}
 OLD_LIBS+=${DEBUG_LIBS}
 .endif
 .endif
 
 .if ${MK_DIALOG} == no
 OLD_FILES+=usr/bin/dialog
 OLD_FILES+=usr/bin/dpv
 OLD_FILES+=usr/lib/libdialog.a
 OLD_FILES+=usr/lib/libdialog.so
 OLD_FILES+=usr/lib/libdialog.so.10
 OLD_FILES+=usr/lib/libdialog_p.a
 OLD_FILES+=usr/lib/libdpv.a
 OLD_FILES+=usr/lib/libdpv.so
 OLD_FILES+=usr/lib/libdpv.so.3
 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_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/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
 OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
 .endif
 
 .if ${MK_LLVM_COV} == no
 OLD_FILES+=usr/bin/llvm-cov
 OLD_FILES+=usr/bin/llvm-profdata
 OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-profdata.1.gz
 .endif
 
 .if ${MK_GH_BC} == no
 OLD_FILES+=usr/share/misc/bc.library
 OLD_FILES+=usr/tests/usr.bin/dc/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/dc/bcode
 OLD_FILES+=usr/tests/usr.bin/dc/inout
 OLD_DIRS+=usr/tests/usr.bin/dc
 .endif
 
 .if ${MK_GOOGLETEST} == no
 OLD_FILES+=usr/include/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/Kyuafile
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-death-test-test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-filepath-test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-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-typed-test_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_skip_in_environment_setup_test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_skip_test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_sole_header_test
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_unittest
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_xml_outfile1_test_
 OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_xml_outfile2_test_
 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/sbin/gpioctl
 OLD_FILES+=usr/share/man/man3/gpio.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_close.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_open.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_open_device.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_config.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_get.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_high.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_input.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_invin.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_invout.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_list.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_low.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_opendrain.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_output.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_pulldown.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_pullup.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_pulsate.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_pushpull.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_set.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/gpio_pin_tristate.3.gz
 OLD_FILES+=usr/share/man/man8/gpioctl.8.gz
 .endif
 
 .if ${MK_GNU_DIFF} == no
 OLD_FILES+=usr/bin/diff3
 OLD_FILES+=usr/share/man/man1/diff3.1.gz
 .endif
 
 .if ${MK_GSSAPI} == no
 OLD_FILES+=usr/include/gssapi/gssapi.h
 OLD_DIRS+=usr/include/gssapi
 OLD_FILES+=usr/include/gssapi.h
 OLD_FILES+=usr/lib/libgssapi.a
 OLD_FILES+=usr/lib/libgssapi.so
 OLD_LIBS+=usr/lib/libgssapi.so.10
 OLD_FILES+=usr/lib/libgssapi_p.a
 OLD_FILES+=usr/lib/librpcsec_gss.a
 OLD_FILES+=usr/lib/librpcsec_gss.so
 OLD_LIBS+=usr/lib/librpcsec_gss.so.1
 OLD_FILES+=usr/sbin/gssd
 OLD_FILES+=usr/share/man/man3/gss_accept_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_acquire_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_add_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_add_oid_set_member.3.gz
 OLD_FILES+=usr/share/man/man3/gss_canonicalize_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_compare_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_context_time.3.gz
 OLD_FILES+=usr/share/man/man3/gss_create_empty_oid_set.3.gz
 OLD_FILES+=usr/share/man/man3/gss_delete_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_display_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_display_status.3.gz
 OLD_FILES+=usr/share/man/man3/gss_duplicate_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_export_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_export_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_get_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_import_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_import_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_indicate_mechs.3.gz
 OLD_FILES+=usr/share/man/man3/gss_init_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_cred_by_mech.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_mechs_for_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_names_for_mech.3.gz
 OLD_FILES+=usr/share/man/man3/gss_process_context_token.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_oid_set.3.gz
 OLD_FILES+=usr/share/man/man3/gss_seal.3.gz
 OLD_FILES+=usr/share/man/man3/gss_sign.3.gz
 OLD_FILES+=usr/share/man/man3/gss_test_oid_set_member.3.gz
 OLD_FILES+=usr/share/man/man3/gss_unseal.3.gz
 OLD_FILES+=usr/share/man/man3/gss_unwrap.3.gz
 OLD_FILES+=usr/share/man/man3/gss_verify.3.gz
 OLD_FILES+=usr/share/man/man3/gss_verify_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_wrap.3.gz
 OLD_FILES+=usr/share/man/man3/gss_wrap_size_limit.3.gz
 OLD_FILES+=usr/share/man/man3/gssapi.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_mech_info.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_mechanisms.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_principal_name.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_versions.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_getcred.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_is_installed.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_max_data_length.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_mech_to_oid.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_oid_to_mech.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_qop_to_num.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_seccreate.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_callback.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_defaults.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_svc_name.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_svc_max_data_length.3.gz
 OLD_FILES+=usr/share/man/man3/rpcsec_gss.3.gz
 OLD_FILES+=usr/share/man/man5/mech.5.gz
 OLD_FILES+=usr/share/man/man5/qop.5.gz
 OLD_FILES+=usr/share/man/man8/gssd.8.gz
 .endif
 
 .if ${MK_HAST} == no
 OLD_FILES+=etc/rc.d/hastd
 OLD_FILES+=sbin/hastctl
 OLD_FILES+=sbin/hastd
 OLD_FILES+=usr/share/examples/hast/ucarp.sh
 OLD_FILES+=usr/share/examples/hast/ucarp_down.sh
 OLD_FILES+=usr/share/examples/hast/ucarp_up.sh
 OLD_FILES+=usr/share/examples/hast/vip-down.sh
 OLD_FILES+=usr/share/examples/hast/vip-up.sh
 OLD_FILES+=usr/share/man/man5/hast.conf.5.gz
 OLD_FILES+=usr/share/man/man8/hastctl.8.gz
 OLD_FILES+=usr/share/man/man8/hastd.8.gz
 OLD_DIRS+=usr/share/examples/hast
 # bsnmp
 OLD_FILES+=usr/lib/snmp_hast.so
 OLD_LIBS+=usr/lib/snmp_hast.so.6
 OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz
 OLD_FILES+=usr/share/snmp/defs/hast_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HAST-MIB.txt
 .endif
 
 .if ${MK_HESIOD} == no
 OLD_FILES+=usr/bin/hesinfo
 OLD_FILES+=usr/include/hesiod.h
 OLD_FILES+=usr/share/man/man1/hesinfo.1.gz
 OLD_FILES+=usr/share/man/man3/hesiod.3.gz
 OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz
 .endif
 
 .if ${MK_HTML} == no
 OLD_FILES+=usr/share/doc/ncurses/hackguide.html
 OLD_FILES+=usr/share/doc/ncurses/ncurses-intro.html
 OLD_DIRS+=usr/share/doc/ncurses
 OLD_FILES+=usr/share/doc/ntp/accopt.html
 OLD_FILES+=usr/share/doc/ntp/assoc.html
 OLD_FILES+=usr/share/doc/ntp/audio.html
 OLD_FILES+=usr/share/doc/ntp/authopt.html
 OLD_FILES+=usr/share/doc/ntp/build.html
 OLD_FILES+=usr/share/doc/ntp/clockopt.html
 OLD_FILES+=usr/share/doc/ntp/config.html
 OLD_FILES+=usr/share/doc/ntp/confopt.html
 OLD_FILES+=usr/share/doc/ntp/copyright.html
 OLD_FILES+=usr/share/doc/ntp/debug.html
 OLD_FILES+=usr/share/doc/ntp/driver1.html
 OLD_FILES+=usr/share/doc/ntp/driver10.html
 OLD_FILES+=usr/share/doc/ntp/driver11.html
 OLD_FILES+=usr/share/doc/ntp/driver12.html
 OLD_FILES+=usr/share/doc/ntp/driver16.html
 OLD_FILES+=usr/share/doc/ntp/driver18.html
 OLD_FILES+=usr/share/doc/ntp/driver19.html
 OLD_FILES+=usr/share/doc/ntp/driver2.html
 OLD_FILES+=usr/share/doc/ntp/driver20.html
 OLD_FILES+=usr/share/doc/ntp/driver22.html
 OLD_FILES+=usr/share/doc/ntp/driver26.html
 OLD_FILES+=usr/share/doc/ntp/driver27.html
 OLD_FILES+=usr/share/doc/ntp/driver28.html
 OLD_FILES+=usr/share/doc/ntp/driver29.html
 OLD_FILES+=usr/share/doc/ntp/driver3.html
 OLD_FILES+=usr/share/doc/ntp/driver30.html
 OLD_FILES+=usr/share/doc/ntp/driver32.html
 OLD_FILES+=usr/share/doc/ntp/driver33.html
 OLD_FILES+=usr/share/doc/ntp/driver34.html
 OLD_FILES+=usr/share/doc/ntp/driver35.html
 OLD_FILES+=usr/share/doc/ntp/driver36.html
 OLD_FILES+=usr/share/doc/ntp/driver37.html
 OLD_FILES+=usr/share/doc/ntp/driver4.html
 OLD_FILES+=usr/share/doc/ntp/driver5.html
 OLD_FILES+=usr/share/doc/ntp/driver6.html
 OLD_FILES+=usr/share/doc/ntp/driver7.html
 OLD_FILES+=usr/share/doc/ntp/driver8.html
 OLD_FILES+=usr/share/doc/ntp/driver9.html
 OLD_FILES+=usr/share/doc/ntp/extern.html
 OLD_FILES+=usr/share/doc/ntp/hints.html
 OLD_FILES+=usr/share/doc/ntp/howto.html
 OLD_FILES+=usr/share/doc/ntp/index.html
 OLD_FILES+=usr/share/doc/ntp/kern.html
 OLD_FILES+=usr/share/doc/ntp/ldisc.html
 OLD_FILES+=usr/share/doc/ntp/measure.html
 OLD_FILES+=usr/share/doc/ntp/miscopt.html
 OLD_FILES+=usr/share/doc/ntp/monopt.html
 OLD_FILES+=usr/share/doc/ntp/mx4200data.html
 OLD_FILES+=usr/share/doc/ntp/notes.html
 OLD_FILES+=usr/share/doc/ntp/ntpd.html
 OLD_FILES+=usr/share/doc/ntp/ntpdate.html
 OLD_FILES+=usr/share/doc/ntp/ntpdc.html
 OLD_FILES+=usr/share/doc/ntp/ntpq.html
 OLD_FILES+=usr/share/doc/ntp/ntptime.html
 OLD_FILES+=usr/share/doc/ntp/ntptrace.html
 OLD_FILES+=usr/share/doc/ntp/parsedata.html
 OLD_FILES+=usr/share/doc/ntp/parsenew.html
 OLD_FILES+=usr/share/doc/ntp/patches.html
 OLD_FILES+=usr/share/doc/ntp/porting.html
 OLD_FILES+=usr/share/doc/ntp/pps.html
 OLD_FILES+=usr/share/doc/ntp/prefer.html
 OLD_FILES+=usr/share/doc/ntp/quick.html
 OLD_FILES+=usr/share/doc/ntp/rdebug.html
 OLD_FILES+=usr/share/doc/ntp/refclock.html
 OLD_FILES+=usr/share/doc/ntp/release.html
 OLD_FILES+=usr/share/doc/ntp/tickadj.html
 .endif
 
 .if ${MK_ICONV} == no
 OLD_FILES+=usr/bin/iconv
 OLD_FILES+=usr/bin/mkcsmapper
 OLD_FILES+=usr/bin/mkesdb
 OLD_FILES+=usr/include/_libiconv_compat.h
 OLD_FILES+=usr/include/iconv.h
 OLD_LIBS+=usr/lib/i18n/libBIG5.so.5
 OLD_FILES+=usr/lib/i18n/libBIG5.so
 OLD_LIBS+=usr/lib/i18n/libDECHanyu.so.5
 OLD_FILES+=usr/lib/i18n/libDECHanyu.so
 OLD_LIBS+=usr/lib/i18n/libEUC.so.5
 OLD_FILES+=usr/lib/i18n/libEUC.so
 OLD_LIBS+=usr/lib/i18n/libEUCTW.so.5
 OLD_FILES+=usr/lib/i18n/libEUCTW.so
 OLD_LIBS+=usr/lib/i18n/libGBK2K.so.5
 OLD_FILES+=usr/lib/i18n/libGBK2K.so
 OLD_LIBS+=usr/lib/i18n/libHZ.so.5
 OLD_FILES+=usr/lib/i18n/libHZ.so
 OLD_LIBS+=usr/lib/i18n/libISO2022.so.5
 OLD_FILES+=usr/lib/i18n/libISO2022.so
 OLD_LIBS+=usr/lib/i18n/libJOHAB.so.5
 OLD_FILES+=usr/lib/i18n/libJOHAB.so
 OLD_LIBS+=usr/lib/i18n/libMSKanji.so.5
 OLD_FILES+=usr/lib/i18n/libMSKanji.so
 OLD_LIBS+=usr/lib/i18n/libUES.so.5
 OLD_FILES+=usr/lib/i18n/libUES.so
 OLD_LIBS+=usr/lib/i18n/libUTF1632.so.5
 OLD_FILES+=usr/lib/i18n/libUTF1632.so
 OLD_LIBS+=usr/lib/i18n/libUTF7.so.5
 OLD_FILES+=usr/lib/i18n/libUTF7.so
 OLD_LIBS+=usr/lib/i18n/libUTF8.so.5
 OLD_FILES+=usr/lib/i18n/libUTF8.so
 OLD_LIBS+=usr/lib/i18n/libVIQR.so.5
 OLD_FILES+=usr/lib/i18n/libVIQR.so
 OLD_LIBS+=usr/lib/i18n/libZW.so.5
 OLD_FILES+=usr/lib/i18n/libZW.so
 OLD_LIBS+=usr/lib/i18n/libiconv_none.so.5
 OLD_FILES+=usr/lib/i18n/libiconv_none.so
 OLD_LIBS+=usr/lib/i18n/libiconv_std.so.5
 OLD_FILES+=usr/lib/i18n/libiconv_std.so
 OLD_LIBS+=usr/lib/i18n/libmapper_646.so.5
 OLD_FILES+=usr/lib/i18n/libmapper_646.so
 OLD_LIBS+=usr/lib/i18n/libmapper_none.so.5
 OLD_FILES+=usr/lib/i18n/libmapper_none.so
 OLD_LIBS+=usr/lib/i18n/libmapper_parallel.so.5
 OLD_FILES+=usr/lib/i18n/libmapper_parallel.so
 OLD_LIBS+=usr/lib/i18n/libmapper_serial.so.5
 OLD_FILES+=usr/lib/i18n/libmapper_serial.so
 OLD_LIBS+=usr/lib/i18n/libmapper_std.so.5
 OLD_FILES+=usr/lib/i18n/libmapper_std.so
 OLD_LIBS+=usr/lib/i18n/libmapper_zone.so.5
 OLD_FILES+=usr/lib/i18n/libmapper_zone.so
 OLD_FILES+=usr/share/man/man1/iconv.1.gz
 OLD_FILES+=usr/share/man/man1/mkcsmapper.1.gz
 OLD_FILES+=usr/share/man/man1/mkesdb.1.gz
 OLD_FILES+=usr/share/man/man3/__iconv.3.gz
 OLD_FILES+=usr/share/man/man3/__iconv_free_list.3.gz
 OLD_FILES+=usr/share/man/man3/__iconv_get_list.3.gz
 OLD_FILES+=usr/share/man/man3/iconv.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_canonicalize.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_close.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_open.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_open_into.3.gz
 OLD_FILES+=usr/share/man/man3/iconvctl.3.gz
 OLD_FILES+=usr/share/man/man3/iconvlist.3.gz
 OLD_DIRS+=usr/lib/i18n
 OLD_DIRS+=usr/share/i18n
 OLD_DIRS+=usr/share/i18n/esdb
 OLD_DIRS+=usr/share/i18n/esdb/ISO-2022
 OLD_DIRS+=usr/share/i18n/esdb/BIG5
 OLD_DIRS+=usr/share/i18n/esdb/MISC
 OLD_DIRS+=usr/share/i18n/esdb/TCVN
 OLD_DIRS+=usr/share/i18n/esdb/EBCDIC
 OLD_DIRS+=usr/share/i18n/esdb/ISO-8859
 OLD_DIRS+=usr/share/i18n/esdb/GEORGIAN
 OLD_DIRS+=usr/share/i18n/esdb/AST
 OLD_DIRS+=usr/share/i18n/esdb/KAZAKH
 OLD_DIRS+=usr/share/i18n/esdb/APPLE
 OLD_DIRS+=usr/share/i18n/esdb/EUC
 OLD_DIRS+=usr/share/i18n/esdb/CP
 OLD_DIRS+=usr/share/i18n/esdb/DEC
 OLD_DIRS+=usr/share/i18n/esdb/UTF
 OLD_DIRS+=usr/share/i18n/esdb/GB
 OLD_DIRS+=usr/share/i18n/esdb/ISO646
 OLD_DIRS+=usr/share/i18n/esdb/KOI
 OLD_DIRS+=usr/share/i18n/csmapper
 OLD_DIRS+=usr/share/i18n/csmapper/KAZAKH
 OLD_DIRS+=usr/share/i18n/csmapper/CNS
 OLD_DIRS+=usr/share/i18n/csmapper/BIG5
 OLD_DIRS+=usr/share/i18n/csmapper/JIS
 OLD_DIRS+=usr/share/i18n/csmapper/KOI
 OLD_DIRS+=usr/share/i18n/csmapper/TCVN
 OLD_DIRS+=usr/share/i18n/csmapper/MISC
 OLD_DIRS+=usr/share/i18n/csmapper/EBCDIC
 OLD_DIRS+=usr/share/i18n/csmapper/ISO646
 OLD_DIRS+=usr/share/i18n/csmapper/CP
 OLD_DIRS+=usr/share/i18n/csmapper/GEORGIAN
 OLD_DIRS+=usr/share/i18n/csmapper/ISO-8859
 OLD_DIRS+=usr/share/i18n/csmapper/AST
 OLD_DIRS+=usr/share/i18n/csmapper/APPLE
 OLD_DIRS+=usr/share/i18n/csmapper/KS
 OLD_DIRS+=usr/share/i18n/csmapper/GB
 .endif
 
 .if ${MK_INET} == no && ${MK_INET6} == no
 OLD_FILES+=sbin/ping
 OLD_FILES+=usr/share/man/man8/ping.8.gz
 .endif
 
 .if ${MK_INET6} == no
 OLD_FILES+=sbin/ping6
 OLD_FILES+=sbin/rtsol
 OLD_FILES+=usr/sbin/ip6addrctl
 OLD_FILES+=usr/sbin/mld6query
 OLD_FILES+=usr/sbin/ndp
 OLD_FILES+=usr/sbin/rip6query
 OLD_FILES+=usr/sbin/route6d
 OLD_FILES+=usr/sbin/rrenumd
 OLD_FILES+=usr/sbin/rtadvctl
 OLD_FILES+=usr/sbin/rtadvd
 OLD_FILES+=usr/sbin/rtsold
 OLD_FILES+=usr/sbin/traceroute6
 OLD_FILES+=usr/share/doc/IPv6/IMPLEMENTATION
 OLD_FILES+=usr/share/man/man5/rrenumd.conf.5.gz
 OLD_FILES+=usr/share/man/man5/rtadvd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ip6addrctl.8.gz
 OLD_FILES+=usr/share/man/man8/mld6query.8.gz
 OLD_FILES+=usr/share/man/man8/ndp.8.gz
 OLD_FILES+=usr/share/man/man8/rip6query.8.gz
 OLD_FILES+=usr/share/man/man8/route6d.8.gz
 OLD_FILES+=usr/share/man/man8/rrenumd.8.gz
 OLD_FILES+=usr/share/man/man8/rtadvctl.8.gz
 OLD_FILES+=usr/share/man/man8/rtadvd.8.gz
 OLD_FILES+=usr/share/man/man8/rtsol.8.gz
 OLD_FILES+=usr/share/man/man8/rtsold.8.gz
 OLD_FILES+=usr/share/man/man8/traceroute6.8.gz
 .endif
 
 .if ${MK_INET6_SUPPORT} == no
 OLD_FILES+=rescue/ping6
 OLD_FILES+=rescue/rtsol
 .endif
 
 .if ${MK_INETD} == no
 OLD_FILES+=etc/inetd.conf
 OLD_FILES+=etc/rc.d/inetd
 OLD_FILES+=usr/sbin/inetd
 OLD_FILES+=usr/share/man/man5/inetd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/inetd.8.gz
 .endif
 
 .if ${MK_IPFILTER} == no
 OLD_FILES+=etc/periodic/security/510.ipfdenied
 OLD_FILES+=etc/periodic/security/610.ipf6denied
 OLD_FILES+=etc/rc.d/ipfilter
 OLD_FILES+=etc/rc.d/ipfs
 OLD_FILES+=etc/rc.d/ipmon
 OLD_FILES+=etc/rc.d/ipnat
 OLD_FILES+=etc/rc.d/ippool
 OLD_FILES+=rescue/ipf
 OLD_FILES+=sbin/ipf
 OLD_FILES+=sbin/ipfs
 OLD_FILES+=sbin/ipfstat
 OLD_FILES+=sbin/ipftest
 OLD_FILES+=sbin/ipmon
 OLD_FILES+=sbin/ipnat
 OLD_FILES+=sbin/ippool
 OLD_FILES+=sbin/ipresend
 OLD_FILES+=usr/include/netinet/ip_auth.h
 OLD_FILES+=usr/include/netinet/ip_compat.h
 OLD_FILES+=usr/include/netinet/ip_fil.h
 OLD_FILES+=usr/include/netinet/ip_frag.h
 OLD_FILES+=usr/include/netinet/ip_htable.h
 OLD_FILES+=usr/include/netinet/ip_lookup.h
 OLD_FILES+=usr/include/netinet/ip_nat.h
 OLD_FILES+=usr/include/netinet/ip_pool.h
 OLD_FILES+=usr/include/netinet/ip_proxy.h
 OLD_FILES+=usr/include/netinet/ip_rules.h
 OLD_FILES+=usr/include/netinet/ip_scan.h
 OLD_FILES+=usr/include/netinet/ip_state.h
 OLD_FILES+=usr/include/netinet/ip_sync.h
 OLD_FILES+=usr/include/netinet/ipl.h
 OLD_FILES+=usr/share/examples/ipfilter/README
 OLD_FILES+=usr/share/examples/ipfilter/BASIC.NAT
 OLD_FILES+=usr/share/examples/ipfilter/BASIC_1.FW
 OLD_FILES+=usr/share/examples/ipfilter/BASIC_2.FW
 OLD_FILES+=usr/share/examples/ipfilter/example.1
 OLD_FILES+=usr/share/examples/ipfilter/example.2
 OLD_FILES+=usr/share/examples/ipfilter/example.3
 OLD_FILES+=usr/share/examples/ipfilter/example.4
 OLD_FILES+=usr/share/examples/ipfilter/example.5
 OLD_FILES+=usr/share/examples/ipfilter/example.6
 OLD_FILES+=usr/share/examples/ipfilter/example.7
 OLD_FILES+=usr/share/examples/ipfilter/example.8
 OLD_FILES+=usr/share/examples/ipfilter/example.9
 OLD_FILES+=usr/share/examples/ipfilter/example.10
 OLD_FILES+=usr/share/examples/ipfilter/example.11
 OLD_FILES+=usr/share/examples/ipfilter/example.12
 OLD_FILES+=usr/share/examples/ipfilter/example.13
 OLD_FILES+=usr/share/examples/ipfilter/example.sr
 OLD_FILES+=usr/share/examples/ipfilter/firewall
 OLD_FILES+=usr/share/examples/ipfilter/ftp-proxy
 OLD_FILES+=usr/share/examples/ipfilter/ftppxy
 OLD_FILES+=usr/share/examples/ipfilter/nat-setup
 OLD_FILES+=usr/share/examples/ipfilter/nat.eg
 OLD_FILES+=usr/share/examples/ipfilter/server
 OLD_FILES+=usr/share/examples/ipfilter/tcpstate
 OLD_FILES+=usr/share/examples/ipfilter/example.14
 OLD_FILES+=usr/share/examples/ipfilter/firewall.1
 OLD_FILES+=usr/share/examples/ipfilter/firewall.2
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.permissive
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.restrictive
 OLD_FILES+=usr/share/examples/ipfilter/ipf.conf.sample
 OLD_FILES+=usr/share/examples/ipfilter/ipnat.conf.sample
 OLD_FILES+=usr/share/examples/ipfilter/ipf-howto.txt
 OLD_FILES+=usr/share/examples/ipfilter/examples.txt
 OLD_FILES+=usr/share/examples/ipfilter/rules.txt
 OLD_FILES+=usr/share/examples/ipfilter/mkfilters
 OLD_DIRS+=usr/share/examples/ipfilter
 OLD_FILES+=usr/share/man/man1/ipftest.1.gz
 OLD_FILES+=usr/share/man/man1/ipresend.1.gz
 OLD_FILES+=usr/share/man/man4/ipf.4.gz
 OLD_FILES+=usr/share/man/man4/ipl.4.gz
 OLD_FILES+=usr/share/man/man4/ipfilter.4.gz
 OLD_FILES+=usr/share/man/man4/ipnat.4.gz
 OLD_FILES+=usr/share/man/man5/ipf.5.gz
 OLD_FILES+=usr/share/man/man5/ipf.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ipf6.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ipfilter.5.gz
 OLD_FILES+=usr/share/man/man8/ipmon.5.gz
 OLD_FILES+=usr/share/man/man5/ipmon.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ipnat.5.gz
 OLD_FILES+=usr/share/man/man5/ipnat.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ippool.5.gz
 OLD_FILES+=usr/share/man/man8/ipf.8.gz
 OLD_FILES+=usr/share/man/man8/ipfs.8.gz
 OLD_FILES+=usr/share/man/man8/ipfstat.8.gz
 OLD_FILES+=usr/share/man/man8/ipmon.8.gz
 OLD_FILES+=usr/share/man/man8/ipnat.8.gz
 OLD_FILES+=usr/share/man/man8/ippool.8.gz
 .endif
 
 .if ${MK_IPFW} == no
 OLD_FILES+=etc/rc.d/ipfw
 OLD_FILES+=etc/periodic/security/500.ipfwdenied
 OLD_FILES+=etc/periodic/security/550.ipfwlimit
 OLD_FILES+=sbin/ipfw
 OLD_FILES+=sbin/natd
 OLD_FILES+=usr/sbin/ipfwpcap
 OLD_FILES+=usr/share/man/man8/ipfw.8.gz
 OLD_FILES+=usr/share/man/man8/ipfwpcap.8.gz
 OLD_FILES+=usr/share/man/man8/natd.8.gz
 .endif
 
 .if ${MK_ISCSI} == no
 OLD_FILES+=etc/rc.d/iscsictl
 OLD_FILES+=etc/rc.d/iscsid
 OLD_FILES+=rescue/iscsictl
 OLD_FILES+=rescue/iscsid
 OLD_FILES+=usr/bin/iscsictl
 OLD_FILES+=usr/sbin/iscsid
 OLD_FILES+=usr/share/man/man4/iscsi.4.gz
 OLD_FILES+=usr/share/man/man5/iscsi.conf.5.gz
 OLD_FILES+=usr/share/man/man8/iscsictl.8.gz
 OLD_FILES+=usr/share/man/man8/iscsid.8.gz
 .endif
 
 .if ${MK_JAIL} == no
 OLD_FILES+=etc/rc.d/jail
 OLD_FILES+=usr/sbin/jail
 OLD_FILES+=usr/sbin/jexec
 OLD_FILES+=usr/sbin/jls
 OLD_FILES+=usr/share/man/man5/jail.conf.5.gz
 OLD_FILES+=usr/share/man/man8/jail.8.gz
 OLD_FILES+=usr/share/man/man8/jexec.8.gz
 OLD_FILES+=usr/share/man/man8/jls.8.gz
 .endif
 
 .if ${MK_KDUMP} == no
 OLD_FILES+=usr/bin/kdump
 OLD_FILES+=usr/bin/truss
 OLD_FILES+=usr/share/man/man1/kdump.1.gz
 OLD_FILES+=usr/share/man/man1/truss.1.gz
 .endif
 
 .if ${MK_KERBEROS} == no
 OLD_FILES+=etc/rc.d/ipropd_master
 OLD_FILES+=etc/rc.d/ipropd_slave
 OLD_FILES+=usr/bin/asn1_compile
 OLD_FILES+=usr/bin/compile_et
 OLD_FILES+=usr/bin/hxtool
 OLD_FILES+=usr/bin/kadmin
 OLD_FILES+=usr/bin/kcc
 OLD_FILES+=usr/bin/kdestroy
 OLD_FILES+=usr/bin/kf
 OLD_FILES+=usr/bin/kgetcred
 OLD_FILES+=usr/bin/kinit
 OLD_FILES+=usr/bin/klist
 OLD_FILES+=usr/bin/kpasswd
 OLD_FILES+=usr/bin/krb5-config
 OLD_FILES+=usr/bin/ksu
 OLD_FILES+=usr/bin/kswitch
 OLD_FILES+=usr/bin/make-roken
 OLD_FILES+=usr/bin/slc
 OLD_FILES+=usr/bin/string2key
 OLD_FILES+=usr/bin/verify_krb5_conf
 OLD_FILES+=usr/include/asn1-common.h
 OLD_FILES+=usr/include/asn1_err.h
 OLD_FILES+=usr/include/base64.h
 OLD_FILES+=usr/include/cms_asn1.h
 OLD_FILES+=usr/include/crmf_asn1.h
 OLD_FILES+=usr/include/der-private.h
 OLD_FILES+=usr/include/der-protos.h
 OLD_FILES+=usr/include/der.h
 OLD_FILES+=usr/include/digest_asn1.h
 OLD_FILES+=usr/include/getarg.h
 OLD_FILES+=usr/include/gssapi/gssapi_krb5.h
 OLD_FILES+=usr/include/hdb-protos.h
 OLD_FILES+=usr/include/hdb.h
 OLD_FILES+=usr/include/hdb_asn1.h
 OLD_FILES+=usr/include/hdb_err.h
 OLD_FILES+=usr/include/heim_asn1.h
 OLD_FILES+=usr/include/heim_err.h
 OLD_FILES+=usr/include/heim_threads.h
 OLD_FILES+=usr/include/heimbase.h
 OLD_FILES+=usr/include/heimntlm-protos.h
 OLD_FILES+=usr/include/heimntlm.h
 OLD_FILES+=usr/include/hex.h
 OLD_FILES+=usr/include/hx509-private.h
 OLD_FILES+=usr/include/hx509-protos.h
 OLD_FILES+=usr/include/hx509.h
 OLD_FILES+=usr/include/hx509_err.h
 OLD_FILES+=usr/include/k524_err.h
 OLD_FILES+=usr/include/kadm5/admin.h
 OLD_FILES+=usr/include/kadm5/kadm5-private.h
 OLD_FILES+=usr/include/kadm5/kadm5-protos.h
 OLD_FILES+=usr/include/kadm5/kadm5-pwcheck.h
 OLD_FILES+=usr/include/kadm5/kadm5_err.h
 OLD_FILES+=usr/include/kadm5/private.h
 OLD_DIRS+=usr/include/kadm5
 OLD_FILES+=usr/include/kafs.h
 OLD_FILES+=usr/include/kdc-protos.h
 OLD_FILES+=usr/include/kdc.h
 OLD_FILES+=usr/include/krb5-private.h
 OLD_FILES+=usr/include/krb5-protos.h
 OLD_FILES+=usr/include/krb5-types.h
 OLD_FILES+=usr/include/krb5.h
 OLD_FILES+=usr/include/krb5/ccache_plugin.h
 OLD_FILES+=usr/include/krb5/locate_plugin.h
 OLD_FILES+=usr/include/krb5/send_to_kdc_plugin.h
 OLD_FILES+=usr/include/krb5/windc_plugin.h
 OLD_DIRS+=usr/include/krb5
 OLD_FILES+=usr/include/krb5_asn1.h
 OLD_FILES+=usr/include/krb5_ccapi.h
 OLD_FILES+=usr/include/krb5_err.h
 OLD_FILES+=usr/include/kx509_asn1.h
 OLD_FILES+=usr/include/ntlm_err.h
 OLD_FILES+=usr/include/ocsp_asn1.h
 OLD_FILES+=usr/include/parse_bytes.h
 OLD_FILES+=usr/include/parse_time.h
 OLD_FILES+=usr/include/parse_units.h
 OLD_FILES+=usr/include/pkcs10_asn1.h
 OLD_FILES+=usr/include/pkcs12_asn1.h
 OLD_FILES+=usr/include/pkcs8_asn1.h
 OLD_FILES+=usr/include/pkcs9_asn1.h
 OLD_FILES+=usr/include/pkinit_asn1.h
 OLD_FILES+=usr/include/resolve.h
 OLD_FILES+=usr/include/rfc2459_asn1.h
 OLD_FILES+=usr/include/roken-common.h
 OLD_FILES+=usr/include/rtbl.h
 OLD_FILES+=usr/include/wind.h
 OLD_FILES+=usr/include/wind_err.h
 OLD_FILES+=usr/include/xdbm.h
 OLD_FILES+=usr/lib/libasn1.a
 OLD_FILES+=usr/lib/libasn1.so
 OLD_LIBS+=usr/lib/libasn1.so.11
 OLD_FILES+=usr/lib/libasn1_p.a
 OLD_FILES+=usr/lib/libcom_err.a
 OLD_FILES+=usr/lib/libcom_err.so
 OLD_LIBS+=usr/lib/libcom_err.so.5
 OLD_FILES+=usr/lib/libcom_err_p.a
 OLD_FILES+=usr/lib/libgssapi_krb5.a
 OLD_FILES+=usr/lib/libgssapi_krb5.so
 OLD_LIBS+=usr/lib/libgssapi_krb5.so.10
 OLD_FILES+=usr/lib/libgssapi_krb5_p.a
 OLD_FILES+=usr/lib/libgssapi_ntlm.a
 OLD_FILES+=usr/lib/libgssapi_ntlm.so
 OLD_LIBS+=usr/lib/libgssapi_ntlm.so.10
 OLD_FILES+=usr/lib/libgssapi_ntlm_p.a
 OLD_FILES+=usr/lib/libgssapi_spnego.a
 OLD_FILES+=usr/lib/libgssapi_spnego.so
 OLD_LIBS+=usr/lib/libgssapi_spnego.so.10
 OLD_FILES+=usr/lib/libgssapi_spnego_p.a
 OLD_FILES+=usr/lib/libhdb.a
 OLD_FILES+=usr/lib/libhdb.so
 OLD_LIBS+=usr/lib/libhdb.so.11
 OLD_FILES+=usr/lib/libhdb_p.a
 OLD_FILES+=usr/lib/libheimbase.a
 OLD_FILES+=usr/lib/libheimbase.so
 OLD_LIBS+=usr/lib/libheimbase.so.11
 OLD_FILES+=usr/lib/libheimbase_p.a
 OLD_FILES+=usr/lib/libheimntlm.a
 OLD_FILES+=usr/lib/libheimntlm.so
 OLD_LIBS+=usr/lib/libheimntlm.so.11
 OLD_FILES+=usr/lib/libheimntlm_p.a
 OLD_FILES+=usr/lib/libheimsqlite.a
 OLD_FILES+=usr/lib/libheimsqlite.so
 OLD_LIBS+=usr/lib/libheimsqlite.so.11
 OLD_FILES+=usr/lib/libheimsqlite_p.a
 OLD_FILES+=usr/lib/libhx509.a
 OLD_FILES+=usr/lib/libhx509.so
 OLD_LIBS+=usr/lib/libhx509.so.11
 OLD_FILES+=usr/lib/libhx509_p.a
 OLD_FILES+=usr/lib/libkadm5clnt.a
 OLD_FILES+=usr/lib/libkadm5clnt.so
 OLD_LIBS+=usr/lib/libkadm5clnt.so.11
 OLD_FILES+=usr/lib/libkadm5clnt_p.a
 OLD_FILES+=usr/lib/libkadm5srv.a
 OLD_FILES+=usr/lib/libkadm5srv.so
 OLD_LIBS+=usr/lib/libkadm5srv.so.11
 OLD_FILES+=usr/lib/libkadm5srv_p.a
 OLD_FILES+=usr/lib/libkafs5.a
 OLD_FILES+=usr/lib/libkafs5.so
 OLD_LIBS+=usr/lib/libkafs5.so.11
 OLD_FILES+=usr/lib/libkafs5_p.a
 OLD_FILES+=usr/lib/libkdc.a
 OLD_FILES+=usr/lib/libkdc.so
 OLD_LIBS+=usr/lib/libkdc.so.11
 OLD_FILES+=usr/lib/libkdc_p.a
 OLD_FILES+=usr/lib/libkrb5.a
 OLD_FILES+=usr/lib/libkrb5.so
 OLD_LIBS+=usr/lib/libkrb5.so.11
 OLD_FILES+=usr/lib/libkrb5_p.a
 OLD_FILES+=usr/lib/libroken.a
 OLD_FILES+=usr/lib/libroken.so
 OLD_LIBS+=usr/lib/libroken.so.11
 OLD_FILES+=usr/lib/libroken_p.a
 OLD_FILES+=usr/lib/libwind.a
 OLD_FILES+=usr/lib/libwind.so
 OLD_LIBS+=usr/lib/libwind.so.11
 OLD_FILES+=usr/lib/libwind_p.a
 OLD_FILES+=usr/lib/pam_krb5.so
 OLD_LIBS+=usr/lib/pam_krb5.so.6
 OLD_FILES+=usr/lib/pam_ksu.so
 OLD_LIBS+=usr/lib/pam_ksu.so.6
 OLD_FILES+=usr/lib/libprivateheimipcc.a
 OLD_FILES+=usr/lib/libprivateheimipcc.so
 OLD_LIBS+=usr/lib/libprivateheimipcc.so.11
 OLD_FILES+=usr/lib/libprivateheimipcc_p.a
 OLD_FILES+=usr/lib/libprivateheimipcs.a
 OLD_FILES+=usr/lib/libprivateheimipcs.so
 OLD_LIBS+=usr/lib/libprivateheimipcs.so.11
 OLD_FILES+=usr/lib/libprivateheimipcs_p.a
 OLD_FILES+=usr/libexec/digest-service
 OLD_FILES+=usr/libexec/hprop
 OLD_FILES+=usr/libexec/hpropd
 OLD_FILES+=usr/libexec/ipropd-master
 OLD_FILES+=usr/libexec/ipropd-slave
 OLD_FILES+=usr/libexec/kadmind
 OLD_FILES+=usr/libexec/kcm
 OLD_FILES+=usr/libexec/kdc
 OLD_FILES+=usr/libexec/kdigest
 OLD_FILES+=usr/libexec/kfd
 OLD_FILES+=usr/libexec/kimpersonate
 OLD_FILES+=usr/libexec/kpasswdd
 OLD_FILES+=usr/sbin/kstash
 OLD_FILES+=usr/sbin/ktutil
 OLD_FILES+=usr/sbin/iprop-log
 OLD_FILES+=usr/share/man/man1/kdestroy.1.gz
 OLD_FILES+=usr/share/man/man1/kf.1.gz
 OLD_FILES+=usr/share/man/man1/kinit.1.gz
 OLD_FILES+=usr/share/man/man1/klist.1.gz
 OLD_FILES+=usr/share/man/man1/kpasswd.1.gz
 OLD_FILES+=usr/share/man/man1/krb5-config.1.gz
 OLD_FILES+=usr/share/man/man1/kswitch.1.gz
 OLD_FILES+=usr/share/man/man3/HDB.3.gz
 OLD_FILES+=usr/share/man/man3/hdb__del.3.gz
 OLD_FILES+=usr/share/man/man3/hdb__get.3.gz
 OLD_FILES+=usr/share/man/man3/hdb__put.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_auth_status.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_check_constrained_delegation.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_check_pkinit_ms_upn_match.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_check_s4u2self.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_close.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_entry_ex.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_fetch_kvno.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_firstkey.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_free.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_get_realms.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_lock.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_name.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_nextkey.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_open.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_password.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_remove.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_rename.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_store.3.gz
 OLD_FILES+=usr/share/man/man3/hdb_unlock.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_build_ntlm1_master.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_build_ntlm2_master.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_calculate_lm2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_calculate_ntlm1.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_calculate_ntlm2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_decode_targetinfo.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_targetinfo.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_type1.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_type2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_encode_type3.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_buf.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_targetinfo.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_type1.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_type2.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_free_type3.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_keyex_unwrap.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_nt_key.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_ntlmv2_key.3.gz
 OLD_FILES+=usr/share/man/man3/heim_ntlm_verify_ntlm2.3.gz
 OLD_FILES+=usr/share/man/man3/hx509.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_bitstring_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_sign.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_sign_self.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_crl_dp_uri.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_eku.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_jid.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_ms_upn.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_otherName.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_pkinit.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_add_san_rfc822name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_ca.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_domaincontroller.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_notAfter.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_notAfter_lifetime.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_notBefore.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_proxy.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_serialnumber.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_spki.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_subject.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_template.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_set_unique.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_subject_expand.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ca_tbs_template_units.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_binary.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_check_eku.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_find_subjectAltName_otherName.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_SPKI.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_SPKI_AlgorithmIdentifier.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_attribute.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_base_subject.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_issuer.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_issuer_unique_id.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_notAfter.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_notBefore.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_serialnumber.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_subject.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_get_subject_unique_id.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_init_data.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_keyusage_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_ref.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cert_set_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_add.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_append.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_end_seq.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_filter.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_find.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_info.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_iter_f.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_merge.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_next_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_start_seq.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_certs_store.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ci_print_names.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_clear_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_create_signed_1.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_envelope_1.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_unenvelope.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_unwrap_ContentInfo.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_verify_signed.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_cms_wrap_ContentInfo.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_context_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_context_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_context_set_missing_revoke.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_add_revoked_certs.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_lifetime.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crl_sign.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_crypto.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_add.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_add_binding.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_find.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_find_binding.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_env_lfind.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_err.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_error.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_free_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_free_octet_string_list.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_general_name_unparse.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_get_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_get_one_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_keyset.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_lock.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_misc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_binary.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_copy.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_expand.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_is_null_p.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_to_Name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_name_to_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ocsp_request.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_ocsp_verify.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_oid_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_oid_sprint.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_parse_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_add_cms_alg.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_set_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_peer_info_set_cms_algs.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_print_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_print_stdout.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_cmp_func.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_eku.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_issuer_serial.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_match_option.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_statistic_file.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_query_unparse_stats.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_add_crl.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_add_ocsp.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_ocsp_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_revoke_verify.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_set_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_set_error_stringv.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_unparse_der_name.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_cert.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_add_flags.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_free.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_init.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_validate_ctx_set_print.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_attach_anchors.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_attach_revoke.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_ctx_f_allow_default_trustanchors.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_destroy_ctx.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_init_ctx.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_path.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_max_depth.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_proxy_certificate.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_strict_rfc3280_verification.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_set_time.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_signature.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_xfree.3.gz
 OLD_FILES+=usr/share/man/man3/k_afs_cell_of_file.3.gz
 OLD_FILES+=usr/share/man/man3/k_hasafs.3.gz
 OLD_FILES+=usr/share/man/man3/k_pioctl.3.gz
 OLD_FILES+=usr/share/man/man3/k_setpag.3.gz
 OLD_FILES+=usr/share/man/man3/k_unlog.3.gz
 OLD_FILES+=usr/share/man/man3/kadm5_pwcheck.3.gz
 OLD_FILES+=usr/share/man/man3/kafs.3.gz
 OLD_FILES+=usr/share/man/man3/kafs5.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_set_verbose.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken5.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken_rxkad.3.gz
 OLD_FILES+=usr/share/man/man3/krb5.3.gz
 OLD_FILES+=usr/share/man/man3/krb524_convert_creds_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb524_convert_creds_kdc_ccache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_425_conv_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_425_conv_principal_ext.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_524_conv_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_acc_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_acl_match_file.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_acl_match_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_add_et_list.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_add_extra_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_add_ignore_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_addlog_dest.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_addlog_func.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_addr2sockaddr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_order.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_prefixlen_boundary.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_search.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_afslog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_afslog_uid.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_allow_weak_crypto.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_aname_to_localname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_anyaddr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault_boolean.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_appdefault_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_append_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_genaddrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getaddrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getflags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getlocalsubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getrcache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getremotesubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_getuserkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_initivector.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setaddrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setaddrs_from_fd.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setflags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setivector.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setlocalsubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setrcache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setremotesubkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_con_setuserkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getauthenticator.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getcksumtype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getkeytype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getlocalseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getremoteseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setcksumtype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setkeytype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setlocalseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setremoteseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal_ext.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal_va.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_build_principal_va_ext.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_c_enctype_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_c_make_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_end_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_get_first.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_match.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_cache_next.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_clear_mcred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_close.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_copy_cache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_copy_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_copy_match_f.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_default_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_end_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_gen_new.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_config.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_full_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_kdc_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_lifetime.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_prefix_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_get_version.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_initialize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_last_change_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_move.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_new_unique.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_next_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_register.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_remove_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_resolve.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_retrieve_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_config.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_default_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_friendly_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_set_kdc_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_start_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_store_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_support_switch.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cc_switch.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ccache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ccache_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_cursor_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_cursor_new.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_cursor_next.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cccol_last_change_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_change_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_check_transited.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_checksum_is_collision_proof.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_checksum_is_keyed.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_checksumsize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_cksumtype_to_enctype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_clear_error_message.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_clear_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_closelog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_compare_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_file_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_free_strings.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_bool.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_bool_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_list.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_string_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_strings.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_get_time_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_parse_file_multi.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_parse_string_multi.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_bool.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_bool_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_list.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_string_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_strings.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_config_vget_time_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_creds_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_host_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_keyblock_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_copy_ticket.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_create_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_create_checksum_iov.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_credential.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_creds_get_ticket_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_fx_cf2.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getblocksize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getconfoundersize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getenctype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_getpadsize.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_crypto_iov.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_copy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_ct_cmp.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_realloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_data_zero.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_decrypt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_decrypt_EncryptedData.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_decrypt_iov_ivec.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_deprecated.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_digest.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_digest_probe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_eai_to_heim_errno.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_encrypt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_encrypt_EncryptedData.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_encrypt_iov_ivec.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctype_disable.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctype_enable.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctype_valid.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_enctypes_compatible_keys.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_expand_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_expand_hostname_realms.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_fcc_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_fileformats.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_find_padata.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_config_files.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_cred_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_creds_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_data_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_host_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_keyblock_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_krbhst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_ticket.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_unparsed_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_fwd_tgt_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_generate_random_block.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_generate_subkey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_generate_subkey_extended.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_all_client_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_all_server_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_cred_from_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_cred_from_kdc_opt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_credentials.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_config_files.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_in_tkt_etypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_default_realms.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_dns_canonicalize_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_extra_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_fcache_version.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_forwarded_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_host_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_ignore_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_cred.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_tkt_with_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_tkt_with_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_in_tkt_with_skey.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_opt_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_init_creds_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_kdc_sec_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krb524hst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krb_admin_hst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krb_changepw_hst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_krbhst.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_max_time_skew.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_use_admin_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_get_validated_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_getportbyname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_h_addr2addr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_h_addr2sockaddr.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_h_errno_to_heim_errno.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_set_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_set_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_set_service.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_creds_step.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_init_ets.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_initlog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_introduction.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_is_config_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_is_thread_safe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kerberos_enctypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keyblock_get_enctype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keyblock_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keyblock_zero.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytab_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytab_key_proc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytype_to_enctypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytype_to_enctypes_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_keytype_to_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_format_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_get_addrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_next.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_next_as_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_reset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_add_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_close.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_copy_entry_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_default_modify_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_default_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_destroy.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_end_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_free_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_full_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_get_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_have_content.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_next_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_read_service_key.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_register.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_remove_entry.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_resolve.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kt_start_seq_get.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_kuserok.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_log.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_log_msg.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_make_addrport.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_make_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_max_sockaddr_size.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_mcc_ops.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_mk_req.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_mk_safe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_openlog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_pac.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_pac_get_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_pac_verify.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_name_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_nametype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_password_key_proc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_plugin_register.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_prepend_config_files_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_princ_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_princ_set_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_compare_any_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_comp_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_num_comp.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_get_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_intro.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_is_krbtgt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_match.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_set_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_set_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_print_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_random_to_key.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rcache.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_error.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_ctx.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_in_ctx_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_in_set_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_in_set_pac_check.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_out_ctx_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_req_out_get_server.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_rd_safe.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_realm_compare.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_authdata.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_creds_tag.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_int16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_int32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_int8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_stringz.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_times.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_uint16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_uint32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ret_uint8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_config_files.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_default_in_tkt_etypes.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_default_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_dns_canonicalize_hostname.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_error_message.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_extra_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_fcache_version.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_home_dir_access.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_ignore_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_kdc_sec_offset.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_max_time_skew.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_password.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_real_time.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_set_use_admin_kdc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sname_to_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sock_to_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sockaddr2address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sockaddr2port.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_sockaddr_uninteresting.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_clear_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_emem.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_fd.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_mem.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_from_readonly_mem.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_get_byteorder.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_get_eof_code.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_is_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_read.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_seek.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_byteorder.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_eof_code.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_set_max_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_to_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_truncate.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_storage_write.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_addrs.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_authdata.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_creds_tag.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_int16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_int32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_int8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_stringz.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_times.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_uint16.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_uint32.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_store_uint8.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_string_to_key.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_string_to_keytype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_support.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_authorization_data_type.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_client.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_endtime.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_ticket_get_server.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_timeofday.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_fixed.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_fixed_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_fixed_short.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_unparse_name_short.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_us_timeofday.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_v4compat.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_checksum_iov.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_init_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_keytab.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_secure.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_opt_set_service.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_user.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_user_lrealm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_verify_user_opt.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vlog.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vlog_msg.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vset_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vwarn.3.gz
 OLD_FILES+=usr/share/man/man3/krb_afslog.3.gz
 OLD_FILES+=usr/share/man/man3/krb_afslog_uid.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_buf.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_core.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_type1.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_type2.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_type3.3.gz
 OLD_FILES+=usr/share/man/man5/krb5.conf.5.gz
 OLD_FILES+=usr/share/man/man8/hprop.8.gz
 OLD_FILES+=usr/share/man/man8/hpropd.8.gz
 OLD_FILES+=usr/share/man/man8/iprop-log.8.gz
 OLD_FILES+=usr/share/man/man8/iprop.8.gz
 OLD_FILES+=usr/share/man/man8/kadmin.8.gz
 OLD_FILES+=usr/share/man/man8/kadmind.8.gz
 OLD_FILES+=usr/share/man/man8/kcm.8.gz
 OLD_FILES+=usr/share/man/man8/kdc.8.gz
 OLD_FILES+=usr/share/man/man8/kdigest.8.gz
 OLD_FILES+=usr/share/man/man8/kerberos.8.gz
 OLD_FILES+=usr/share/man/man8/kimpersonate.8.gz
 OLD_FILES+=usr/share/man/man8/kpasswdd.8.gz
 OLD_FILES+=usr/share/man/man8/kstash.8.gz
 OLD_FILES+=usr/share/man/man8/ktutil.8.gz
 OLD_FILES+=usr/share/man/man8/pam_krb5.8.gz
 OLD_FILES+=usr/share/man/man8/pam_ksu.8.gz
 OLD_FILES+=usr/share/man/man8/string2key.8.gz
 OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz
 .endif
 
 .if ${MK_KERBEROS_SUPPORT} == no
 OLD_FILES+=usr/bin/compile_et
 OLD_FILES+=usr/include/com_err.h
 OLD_FILES+=usr/include/com_right.h
 OLD_FILES+=usr/lib/libcom_err.a
 OLD_FILES+=usr/lib/libcom_err.so
 OLD_LIBS+=usr/lib/libcom_err.so.5
 OLD_FILES+=usr/lib/libcom_err_p.a
 OLD_FILES+=usr/share/man/man1/compile_et.1.gz
 OLD_FILES+=usr/share/man/man3/com_err.3.gz
 .endif
 
 .if ${MK_LDNS} == no
 OLD_FILES+=usr/lib/libprivateldns.a
 OLD_FILES+=usr/lib/libprivateldns.so
 OLD_LIBS+=usr/lib/libprivateldns.so.5
 OLD_FILES+=usr/lib/libprivateldns_p.a
 .endif
 
 .if ${MK_LDNS_UTILS} == no
 OLD_FILES+=usr/bin/drill
 OLD_FILES+=usr/share/man/man1/drill.1.gz
 OLD_FILES+=usr/bin/host
 OLD_FILES+=usr/share/man/man1/host.1.gz
 .endif
 
 .if ${MK_LEGACY_CONSOLE} == no
 OLD_FILES+=etc/rc.d/moused
 OLD_FILES+=etc/rc.d/syscons
 OLD_FILES+=usr/sbin/kbdcontrol
 OLD_FILES+=usr/sbin/kbdmap
 OLD_FILES+=usr/sbin/moused
 OLD_FILES+=usr/sbin/vidcontrol
 OLD_FILES+=usr/sbin/vidfont
 OLD_FILES+=usr/share/man/man1/kbdcontrol.1.gz
 OLD_FILES+=usr/share/man/man1/kbdmap.1.gz
 OLD_FILES+=usr/share/man/man1/vidcontrol.1.gz
 OLD_FILES+=usr/share/man/man1/vidfont.1.gz
 OLD_FILES+=usr/share/man/man5/kbdmap.5.gz
 OLD_FILES+=usr/share/man/man5/keymap.5.gz
 OLD_FILES+=usr/share/man/man8/moused.8.gz
 .endif
 
 .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_LLD} == no
 OLD_FILES+=usr/bin/ld.lld
 .endif
 
 .if ${MK_LLDB} == no
 OLD_FILES+=usr/bin/lldb
 OLD_FILES+=usr/bin/lldb-server
 OLD_FILES+=usr/share/man/man1/lldb-server.1.gz
 OLD_FILES+=usr/share/man/man1/lldb.1.gz
 .endif
 
 .if ${MK_LOCALES} == no
 OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-15
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-1
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/af_ZA.UTF-8
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/af_ZA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/am_ET.UTF-8
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/am_ET.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ar_AE.UTF-8
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_AE.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ar_EG.UTF-8
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_EG.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ar_JO.UTF-8
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_JO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ar_MA.UTF-8
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_MA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ar_QA.UTF-8
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_QA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ar_SA.UTF-8
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ar_SA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/be_BY.CP1131
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_COLLATE
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_CTYPE
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MESSAGES
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_MONETARY
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_NUMERIC
 OLD_FILES+=usr/share/locale/be_BY.CP1131/LC_TIME
 OLD_DIRS+=usr/share/locale/be_BY.CP1251
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_COLLATE
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_CTYPE
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_MESSAGES
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_MONETARY
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_NUMERIC
 OLD_FILES+=usr/share/locale/be_BY.CP1251/LC_TIME
 OLD_DIRS+=usr/share/locale/be_BY.ISO8859-5
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/be_BY.ISO8859-5/LC_TIME
 OLD_DIRS+=usr/share/locale/be_BY.UTF-8
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/be_BY.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/bg_BG.CP1251
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_COLLATE
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_CTYPE
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_MESSAGES
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_MONETARY
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_NUMERIC
 OLD_FILES+=usr/share/locale/bg_BG.CP1251/LC_TIME
 OLD_DIRS+=usr/share/locale/bg_BG.UTF-8
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/bg_BG.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_AD.ISO8859-1
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_AD.ISO8859-15
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_AD.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_AD.UTF-8
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_AD.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_ES.ISO8859-1
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_ES.ISO8859-15
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_ES.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_ES.UTF-8
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_ES.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_FR.ISO8859-1
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_FR.ISO8859-15
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_FR.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_FR.UTF-8
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_FR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_IT.ISO8859-1
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_IT.ISO8859-15
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_IT.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/ca_IT.UTF-8
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ca_IT.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/cs_CZ.ISO8859-2
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/cs_CZ.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/cs_CZ.UTF-8
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/cs_CZ.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/da_DK.ISO8859-1
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/da_DK.ISO8859-15
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/da_DK.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/da_DK.UTF-8
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/da_DK.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/de_AT.ISO8859-1
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/de_AT.ISO8859-15
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_AT.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/de_AT.UTF-8
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_AT.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/de_CH.ISO8859-1
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/de_CH.ISO8859-15
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_CH.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/de_CH.UTF-8
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_CH.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/de_DE.ISO8859-1
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/de_DE.ISO8859-15
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_DE.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/de_DE.UTF-8
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/de_DE.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/el_GR.ISO8859-7
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_COLLATE
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_CTYPE
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_MESSAGES
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_MONETARY
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_NUMERIC
 OLD_FILES+=usr/share/locale/el_GR.ISO8859-7/LC_TIME
 OLD_DIRS+=usr/share/locale/el_GR.UTF-8
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/el_GR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_AU.ISO8859-1
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_AU.ISO8859-15
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/en_AU.US-ASCII
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/en_AU.UTF-8
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_AU.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_CA.ISO8859-1
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_CA.ISO8859-15
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/en_CA.US-ASCII
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/en_CA.UTF-8
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_CA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_GB.ISO8859-1
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_GB.ISO8859-15
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_GB.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/en_GB.US-ASCII
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_GB.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/en_GB.UTF-8
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_GB.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_HK.ISO8859-1
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_HK.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_HK.UTF-8
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_HK.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_IE.ISO8859-1
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_IE.ISO8859-15
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_IE.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/en_IE.UTF-8
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_IE.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_NZ.ISO8859-1
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_NZ.ISO8859-15
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/en_NZ.US-ASCII
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/en_NZ.UTF-8
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_NZ.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_PH.UTF-8
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_PH.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_SG.ISO8859-1
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_SG.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_SG.UTF-8
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_SG.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_US.ISO8859-1
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_US.ISO8859-15
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/en_US.US-ASCII
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/en_US.UTF-8
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_US.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/en_ZA.ISO8859-1
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/en_ZA.ISO8859-15
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_ZA.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/en_ZA.US-ASCII
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_ZA.US-ASCII/LC_TIME
 OLD_DIRS+=usr/share/locale/en_ZA.UTF-8
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/en_ZA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/es_AR.ISO8859-1
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_AR.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/es_AR.UTF-8
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_AR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/es_CR.UTF-8
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_CR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/es_ES.ISO8859-1
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/es_ES.ISO8859-15
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_ES.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/es_ES.UTF-8
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_ES.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/es_MX.ISO8859-1
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_MX.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/es_MX.UTF-8
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/es_MX.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/et_EE.ISO8859-1
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/et_EE.ISO8859-15
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/et_EE.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/et_EE.UTF-8
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/et_EE.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/eu_ES.ISO8859-1
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/eu_ES.ISO8859-15
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/eu_ES.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/eu_ES.UTF-8
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/eu_ES.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/fi_FI.ISO8859-1
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/fi_FI.ISO8859-15
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fi_FI.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/fi_FI.UTF-8
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fi_FI.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_BE.ISO8859-1
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_BE.ISO8859-15
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_BE.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_BE.UTF-8
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_BE.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_CA.ISO8859-1
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_CA.ISO8859-15
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_CA.UTF-8
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_CH.ISO8859-1
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_CH.ISO8859-15
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CH.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_CH.UTF-8
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_CH.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_FR.ISO8859-1
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_FR.ISO8859-15
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_FR.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/fr_FR.UTF-8
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/fr_FR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/he_IL.UTF-8
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/he_IL.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/hi_IN.ISCII-DEV
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_COLLATE
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_CTYPE
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_MONETARY
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hi_IN.ISCII-DEV/LC_TIME
 OLD_DIRS+=usr/share/locale/hi_IN.UTF-8
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hi_IN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/hr_HR.ISO8859-2
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hr_HR.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/hr_HR.UTF-8
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hr_HR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/hu_HU.ISO8859-2
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hu_HU.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/hu_HU.UTF-8
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hu_HU.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/hy_AM.ARMSCII-8
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hy_AM.ARMSCII-8/LC_TIME
 OLD_DIRS+=usr/share/locale/hy_AM.UTF-8
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/hy_AM.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/is_IS.ISO8859-1
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/is_IS.ISO8859-15
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/is_IS.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/is_IS.UTF-8
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/is_IS.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/it_CH.ISO8859-1
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/it_CH.ISO8859-15
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_CH.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/it_CH.UTF-8
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_CH.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/it_IT.ISO8859-1
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/it_IT.ISO8859-15
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_IT.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/it_IT.UTF-8
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/it_IT.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ja_JP.eucJP
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_COLLATE
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_CTYPE
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_MONETARY
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ja_JP.eucJP/LC_TIME
 OLD_DIRS+=usr/share/locale/ja_JP.SJIS
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_COLLATE
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_CTYPE
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_MONETARY
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ja_JP.SJIS/LC_TIME
 OLD_DIRS+=usr/share/locale/ja_JP.UTF-8
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ja_JP.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/kk_KZ.UTF-8
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ko_KR.CP949
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_COLLATE
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_CTYPE
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_MONETARY
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ko_KR.CP949/LC_TIME
 OLD_DIRS+=usr/share/locale/ko_KR.eucKR
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_COLLATE
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_CTYPE
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_MONETARY
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ko_KR.eucKR/LC_TIME
 OLD_DIRS+=usr/share/locale/ko_KR.UTF-8
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ko_KR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/lt_LT.ISO8859-13
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_COLLATE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_CTYPE
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_MONETARY
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_NUMERIC
 OLD_FILES+=usr/share/locale/lt_LT.ISO8859-13/LC_TIME
 OLD_DIRS+=usr/share/locale/lt_LT.UTF-8
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/lt_LT.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/lv_LV.ISO8859-13
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_COLLATE
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_CTYPE
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_MONETARY
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_NUMERIC
 OLD_FILES+=usr/share/locale/lv_LV.ISO8859-13/LC_TIME
 OLD_DIRS+=usr/share/locale/lv_LV.UTF-8
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/lv_LV.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/mn_MN.UTF-8
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/nb_NO.ISO8859-1
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/nb_NO.ISO8859-15
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nb_NO.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/nb_NO.UTF-8
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nb_NO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/nl_BE.ISO8859-1
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/nl_BE.ISO8859-15
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_BE.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/nl_BE.UTF-8
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_BE.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/nl_NL.ISO8859-1
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/nl_NL.ISO8859-15
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_NL.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/nl_NL.UTF-8
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nl_NL.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/nn_NO.ISO8859-1
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/nn_NO.ISO8859-15
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nn_NO.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/nn_NO.UTF-8
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/nn_NO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/pl_PL.ISO8859-2
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pl_PL.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/pl_PL.UTF-8
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pl_PL.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/pt_BR.ISO8859-1
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_BR.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/pt_BR.UTF-8
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_BR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/pt_PT.ISO8859-1
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/pt_PT.ISO8859-15
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_PT.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/pt_PT.UTF-8
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/pt_PT.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ro_RO.ISO8859-2
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ro_RO.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/ro_RO.UTF-8
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ro_RO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/ru_RU.CP1251
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.CP1251/LC_TIME
 OLD_DIRS+=usr/share/locale/ru_RU.CP866
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.CP866/LC_TIME
 OLD_DIRS+=usr/share/locale/ru_RU.ISO8859-5
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.ISO8859-5/LC_TIME
 OLD_DIRS+=usr/share/locale/ru_RU.KOI8-R
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.KOI8-R/LC_TIME
 OLD_DIRS+=usr/share/locale/ru_RU.UTF-8
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/ru_RU.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/se_FI.UTF-8
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/se_FI.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/se_NO.UTF-8
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/se_NO.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sk_SK.ISO8859-2
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sk_SK.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/sk_SK.UTF-8
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sk_SK.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sl_SI.ISO8859-2
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sl_SI.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/sl_SI.UTF-8
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sl_SI.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_RS.ISO8859-5
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-5/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_RS.UTF-8
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_RS.ISO8859-2
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_RS.ISO8859-2/LC_TIME
 OLD_DIRS+=usr/share/locale/sr_RS.UTF-8@latin
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_COLLATE
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_CTYPE
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_MONETARY
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sr_RS.UTF-8@latin/LC_TIME
 OLD_DIRS+=usr/share/locale/sv_FI.ISO8859-1
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/sv_FI.ISO8859-15
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_FI.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/sv_FI.UTF-8
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_FI.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/sv_SE.ISO8859-1
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-1/LC_TIME
 OLD_DIRS+=usr/share/locale/sv_SE.ISO8859-15
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_SE.ISO8859-15/LC_TIME
 OLD_DIRS+=usr/share/locale/sv_SE.UTF-8
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/sv_SE.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/tr_TR.ISO8859-9
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_COLLATE
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_CTYPE
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_MESSAGES
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_MONETARY
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_NUMERIC
 OLD_FILES+=usr/share/locale/tr_TR.ISO8859-9/LC_TIME
 OLD_DIRS+=usr/share/locale/tr_TR.UTF-8
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/tr_TR.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/uk_UA.CP1251
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_COLLATE
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_CTYPE
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_MESSAGES
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_MONETARY
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_NUMERIC
 OLD_FILES+=usr/share/locale/uk_UA.CP1251/LC_TIME
 OLD_DIRS+=usr/share/locale/uk_UA.ISO8859-5
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_COLLATE
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_CTYPE
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_MONETARY
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/uk_UA.ISO8859-5/LC_TIME
 OLD_DIRS+=usr/share/locale/uk_UA.KOI8-U
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_COLLATE
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_CTYPE
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_MESSAGES
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_MONETARY
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_NUMERIC
 OLD_FILES+=usr/share/locale/uk_UA.KOI8-U/LC_TIME
 OLD_DIRS+=usr/share/locale/uk_UA.UTF-8
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/uk_UA.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_CN.eucCN
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.eucCN/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_CN.GB18030
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.GB18030/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_CN.GB2312
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.GB2312/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_CN.GBK
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.GBK/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_CN.UTF-8
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_CN.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_HK.UTF-8
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_HK.UTF-8/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_TW.Big5
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_TW.Big5/LC_TIME
 OLD_DIRS+=usr/share/locale/zh_TW.UTF-8
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_COLLATE
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_CTYPE
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_MESSAGES
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_MONETARY
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_NUMERIC
 OLD_FILES+=usr/share/locale/zh_TW.UTF-8/LC_TIME
 .endif
 
 .if ${MK_LOCATE} == no
 OLD_FILES+=etc/locate.rc
 OLD_FILES+=etc/periodic/weekly/310.locate
 OLD_FILES+=usr/bin/locate
 OLD_FILES+=usr/libexec/locate.bigram
 OLD_FILES+=usr/libexec/locate.code
 OLD_FILES+=usr/libexec/locate.concatdb
 OLD_FILES+=usr/libexec/locate.mklocatedb
 OLD_FILES+=usr/libexec/locate.updatedb
 OLD_FILES+=usr/share/man/man1/locate.1.gz
 OLD_FILES+=usr/share/man/man8/locate.updatedb.8.gz
 OLD_FILES+=usr/share/man/man8/updatedb.8.gz
 .endif
 
 .if ${MK_LPR} == no
 OLD_FILES+=etc/hosts.lpd
 OLD_FILES+=etc/printcap
 OLD_FILES+=etc/newsyslog.conf.d/lpr.conf
 OLD_FILES+=etc/rc.d/lpd
 OLD_FILES+=etc/syslog.d/lpr.conf
 OLD_FILES+=usr/bin/lp
 OLD_FILES+=usr/bin/lpq
 OLD_FILES+=usr/bin/lpr
 OLD_FILES+=usr/bin/lprm
 OLD_FILES+=usr/libexec/lpr/ru/bjc-240.sh.sample
 OLD_FILES+=usr/libexec/lpr/ru/koi2alt
 OLD_FILES+=usr/libexec/lpr/ru/koi2855
 OLD_DIRS+=usr/libexec/lpr/ru
 OLD_FILES+=usr/libexec/lpr/lpf
 OLD_DIRS+=usr/libexec/lpr
 OLD_FILES+=usr/sbin/chkprintcap
 OLD_FILES+=usr/sbin/lpc
 OLD_FILES+=usr/sbin/lpd
 OLD_FILES+=usr/sbin/lptest
 OLD_FILES+=usr/sbin/pac
 OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/07.lpd
 OLD_FILES+=usr/share/examples/etc/hosts.lpd
 OLD_FILES+=usr/share/examples/etc/printcap
 OLD_FILES+=usr/share/man/man1/lp.1.gz
 OLD_FILES+=usr/share/man/man1/lpq.1.gz
 OLD_FILES+=usr/share/man/man1/lpr.1.gz
 OLD_FILES+=usr/share/man/man1/lprm.1.gz
 OLD_FILES+=usr/share/man/man1/lptest.1.gz
 OLD_FILES+=usr/share/man/man5/printcap.5.gz
 OLD_FILES+=usr/share/man/man8/chkprintcap.8.gz
 OLD_FILES+=usr/share/man/man8/lpc.8.gz
 OLD_FILES+=usr/share/man/man8/lpd.8.gz
 OLD_FILES+=usr/share/man/man8/pac.8.gz
 .endif
 
 .if ${MK_MAIL} == no
 OLD_FILES+=etc/aliases
 OLD_FILES+=etc/mail.rc
 OLD_FILES+=etc/mail/aliases
 OLD_FILES+=etc/mail/mailer.conf
 OLD_FILES+=etc/periodic/daily/130.clean-msgs
 OLD_FILES+=usr/bin/Mail
 OLD_FILES+=usr/bin/biff
 OLD_FILES+=usr/bin/from
 OLD_FILES+=usr/bin/mail
 OLD_FILES+=usr/bin/mailx
 OLD_FILES+=usr/bin/msgs
 OLD_FILES+=usr/libexec/comsat
 OLD_FILES+=usr/share/examples/etc/mail.rc
 OLD_FILES+=usr/share/man/man1/Mail.1.gz
 OLD_FILES+=usr/share/man/man1/biff.1.gz
 OLD_FILES+=usr/share/man/man1/from.1.gz
 OLD_FILES+=usr/share/man/man1/mail.1.gz
 OLD_FILES+=usr/share/man/man1/mailx.1.gz
 OLD_FILES+=usr/share/man/man1/msgs.1.gz
 OLD_FILES+=usr/share/man/man8/comsat.8.gz
 OLD_FILES+=usr/share/misc/mail.help
 OLD_FILES+=usr/share/misc/mail.tildehelp
 .endif
 
 .if ${MK_MAILWRAPPER} == no
 OLD_FILES+=etc/mail/mailer.conf
 # Don't remove, for no mailwrapper case:
 # /usr/sbin/sendmail -> /usr/sbin/mailwrapper
 # /usr/sbin/mailwrapper -> /usr/libexec/sendmail/sendmail
 #OLD_FILES+=usr/sbin/mailwrapper
 OLD_FILES+=usr/share/man/man8/mailwrapper.8.gz
 .endif
 
 .if ${MK_MAKE} == no
 OLD_FILES+=usr/bin/make
 OLD_FILES+=usr/share/man/man1/make.1.gz
 OLD_FILES+=usr/share/mk/atf.test.mk
 OLD_FILES+=usr/share/mk/bsd.README
 OLD_FILES+=usr/share/mk/bsd.arch.inc.mk
 OLD_FILES+=usr/share/mk/bsd.compiler.mk
 OLD_FILES+=usr/share/mk/bsd.cpu.mk
 OLD_FILES+=usr/share/mk/bsd.crunchgen.mk
 OLD_FILES+=usr/share/mk/bsd.dep.mk
 OLD_FILES+=usr/share/mk/bsd.doc.mk
 OLD_FILES+=usr/share/mk/bsd.dtb.mk
 OLD_FILES+=usr/share/mk/bsd.endian.mk
 OLD_FILES+=usr/share/mk/bsd.files.mk
 OLD_FILES+=usr/share/mk/bsd.incs.mk
 OLD_FILES+=usr/share/mk/bsd.info.mk
 OLD_FILES+=usr/share/mk/bsd.init.mk
 OLD_FILES+=usr/share/mk/bsd.kmod.mk
 OLD_FILES+=usr/share/mk/bsd.lib.mk
 OLD_FILES+=usr/share/mk/bsd.libnames.mk
 OLD_FILES+=usr/share/mk/bsd.links.mk
 OLD_FILES+=usr/share/mk/bsd.man.mk
 OLD_FILES+=usr/share/mk/bsd.mkopt.mk
 OLD_FILES+=usr/share/mk/bsd.nls.mk
 OLD_FILES+=usr/share/mk/bsd.obj.mk
 OLD_FILES+=usr/share/mk/bsd.opts.mk
 OLD_FILES+=usr/share/mk/bsd.own.mk
 OLD_FILES+=usr/share/mk/bsd.port.mk
 OLD_FILES+=usr/share/mk/bsd.port.options.mk
 OLD_FILES+=usr/share/mk/bsd.port.post.mk
 OLD_FILES+=usr/share/mk/bsd.port.pre.mk
 OLD_FILES+=usr/share/mk/bsd.port.subdir.mk
 OLD_FILES+=usr/share/mk/bsd.prog.mk
 OLD_FILES+=usr/share/mk/bsd.progs.mk
 OLD_FILES+=usr/share/mk/bsd.snmpmod.mk
 OLD_FILES+=usr/share/mk/bsd.subdir.mk
 OLD_FILES+=usr/share/mk/bsd.symver.mk
 OLD_FILES+=usr/share/mk/bsd.sys.mk
 OLD_FILES+=usr/share/mk/bsd.test.mk
 OLD_FILES+=usr/share/mk/plain.test.mk
 OLD_FILES+=usr/share/mk/suite.test.mk
 OLD_FILES+=usr/share/mk/sys.mk
 OLD_FILES+=usr/share/mk/tap.test.mk
 OLD_FILES+=usr/share/mk/version_gen.awk
 OLD_FILES+=usr/tests/usr.bin/bmake/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd/libtest.a
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_44bsd_mod/libtest.a
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/archives/fmt_oldbsd/libtest.a
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t2/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/basic/t3/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/common.sh
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/ellipsis/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/empty/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/joberr/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/execution/plus/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/builtin/sh
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/meta/sh
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path/sh
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/path_select/shell
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/replace/shell
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/shell/select/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/basic/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/TEST2.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/TEST2.a
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/suffixes/src_wild2/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/directive-t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/enl/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/funny-targets/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/syntax/semi/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t0/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/cleanup
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t1/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/cleanup
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/sysmk/t2/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/bmake/test-new.mk
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_M/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/modifier_t/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/opt_V/legacy_test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/bmake/variables/t0/legacy_test
 .endif
 
 .if ${MK_MAN} == no
 MAN_FILES!=find ${DESTDIR}/usr/share/man ${DESTDIR}/usr/share/openssl/man -type f | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_FILES+=${MAN_FILES}
 MAN_DIRS!=find ${DESTDIR}/usr/share/man ${DESTDIR}/usr/share/openssl/man -type d | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${MAN_DIRS}
 .endif
 
 .if ${MK_MAN_UTILS} == no
 OLD_FILES+=etc/periodic/weekly/320.whatis
 OLD_FILES+=usr/bin/apropos
 OLD_FILES+=usr/bin/makewhatis
 OLD_FILES+=usr/bin/man
 OLD_FILES+=usr/bin/manpath
 OLD_FILES+=usr/bin/whatis
 OLD_FILES+=usr/libexec/makewhatis.local
 OLD_FILES+=usr/sbin/manctl
 OLD_FILES+=usr/share/man/man1/apropos.1.gz
 OLD_FILES+=usr/share/man/man1/makewhatis.1.gz
 OLD_FILES+=usr/share/man/man1/man.1.gz
 OLD_FILES+=usr/share/man/man1/manpath.1.gz
 OLD_FILES+=usr/share/man/man1/whatis.1.gz
 OLD_FILES+=usr/share/man/man5/man.conf.5.gz
 OLD_FILES+=usr/share/man/man8/makewhatis.local.8.gz
 OLD_FILES+=usr/share/man/man8/manctl.8.gz
 OLD_FILES+=usr/share/man/whatis
 OLD_FILES+=usr/share/openssl/man/whatis
 .endif
 
 .if ${MK_NETCAT} == no
 OLD_FILES+=rescue/nc
 OLD_FILES+=usr/bin/nc
 OLD_FILES+=usr/share/man/man1/nc.1.gz
 .endif
 
 .if ${MK_NETGRAPH} == no
 OLD_FILES+=usr/include/netgraph.h
 OLD_FILES+=usr/lib/libnetgraph.a
 OLD_FILES+=usr/lib/libnetgraph.so
 OLD_LIBS+=usr/lib/libnetgraph.so.4
 OLD_FILES+=usr/lib/libnetgraph_p.a
 OLD_FILES+=usr/libexec/pppoed
 OLD_FILES+=usr/sbin/flowctl
 OLD_FILES+=usr/sbin/lmcconfig
 OLD_FILES+=usr/sbin/ngctl
 OLD_FILES+=usr/sbin/nghook
 OLD_FILES+=usr/share/man/man3/NgAllocRecvAsciiMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgAllocRecvData.3.gz
 OLD_FILES+=usr/share/man/man3/NgAllocRecvMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgMkSockNode.3.gz
 OLD_FILES+=usr/share/man/man3/NgNameNode.3.gz
 OLD_FILES+=usr/share/man/man3/NgRecvAsciiMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgRecvData.3.gz
 OLD_FILES+=usr/share/man/man3/NgRecvMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgSendAsciiMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgSendData.3.gz
 OLD_FILES+=usr/share/man/man3/NgSendMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgSendReplyMsg.3.gz
 OLD_FILES+=usr/share/man/man3/NgSetDebug.3.gz
 OLD_FILES+=usr/share/man/man3/NgSetErrLog.3.gz
 OLD_FILES+=usr/share/man/man3/netgraph.3.gz
 OLD_FILES+=usr/share/man/man8/flowctl.8.gz
 OLD_FILES+=usr/share/man/man8/lmcconfig.8.gz
 OLD_FILES+=usr/share/man/man8/ngctl.8.gz
 OLD_FILES+=usr/share/man/man8/nghook.8.gz
 OLD_FILES+=usr/share/man/man8/pppoed.8.gz
 .endif
 
 .if ${MK_IPFW} == no || ${MK_NETGRAPH} == no
 OLD_FILES+=etc/rc.d/ipfw_netflow
 .endif
 
 .if ${MK_NETGRAPH_SUPPORT} == no
 OLD_FILES+=usr/include/bsnmp/snmp_netgraph.h
 OLD_FILES+=usr/lib/snmp_netgraph.so
 OLD_LIBS+=usr/lib/snmp_netgraph.so.6
 OLD_FILES+=usr/share/man/man3/snmp_netgraph.3.gz
 OLD_FILES+=usr/share/snmp/defs/netgraph_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-NETGRAPH.txt
 .endif
 
 .if ${MK_NIS} == no
 OLD_FILES+=etc/rc.d/ypbind
 OLD_FILES+=etc/rc.d/ypldap
 OLD_FILES+=etc/rc.d/yppasswdd
 OLD_FILES+=etc/rc.d/ypserv
 OLD_FILES+=etc/rc.d/ypset
 OLD_FILES+=etc/rc.d/ypupdated
 OLD_FILES+=etc/rc.d/ypxfrd
 OLD_FILES+=usr/bin/ypcat
 OLD_FILES+=usr/bin/ypchfn
 OLD_FILES+=usr/bin/ypchpass
 OLD_FILES+=usr/bin/ypchsh
 OLD_FILES+=usr/bin/ypmatch
 OLD_FILES+=usr/bin/yppasswd
 OLD_FILES+=usr/bin/ypwhich
 OLD_FILES+=usr/include/ypclnt.h
 OLD_FILES+=usr/lib/libypclnt.a
 OLD_FILES+=usr/lib/libypclnt.so
 OLD_LIBS+=usr/lib/libypclnt.so.4
 OLD_FILES+=usr/lib/libypclnt_p.a
 OLD_FILES+=usr/libexec/mknetid
 OLD_FILES+=usr/libexec/yppwupdate
 OLD_FILES+=usr/libexec/ypxfr
 OLD_FILES+=usr/sbin/rpc.yppasswdd
 OLD_FILES+=usr/sbin/rpc.ypupdated
 OLD_FILES+=usr/sbin/rpc.ypxfrd
 OLD_FILES+=usr/sbin/yp_mkdb
 OLD_FILES+=usr/sbin/ypbind
 OLD_FILES+=usr/sbin/ypinit
 OLD_FILES+=usr/sbin/ypldap
 OLD_FILES+=usr/sbin/yppoll
 OLD_FILES+=usr/sbin/yppush
 OLD_FILES+=usr/sbin/ypserv
 OLD_FILES+=usr/sbin/ypset
 OLD_FILES+=usr/share/man/man1/ypcat.1.gz
 OLD_FILES+=usr/share/man/man1/ypchfn.1.gz
 OLD_FILES+=usr/share/man/man1/ypchpass.1.gz
 OLD_FILES+=usr/share/man/man1/ypchsh.1.gz
 OLD_FILES+=usr/share/man/man1/ypmatch.1.gz
 OLD_FILES+=usr/share/man/man1/yppasswd.1.gz
 OLD_FILES+=usr/share/man/man1/ypwhich.1.gz
 OLD_FILES+=usr/share/man/man5/netid.5.gz
 OLD_FILES+=usr/share/man/man5/ypldap.conf.5.gz
 OLD_FILES+=usr/share/man/man8/mknetid.8.gz
 OLD_FILES+=usr/share/man/man8/rpc.yppasswdd.8.gz
 OLD_FILES+=usr/share/man/man8/rpc.ypxfrd.8.gz
 OLD_FILES+=usr/share/man/man8/NIS.8.gz
 OLD_FILES+=usr/share/man/man8/YP.8.gz
 OLD_FILES+=usr/share/man/man8/yp.8.gz
 OLD_FILES+=usr/share/man/man8/nis.8.gz
 OLD_FILES+=usr/share/man/man8/yp_mkdb.8.gz
 OLD_FILES+=usr/share/man/man8/ypbind.8.gz
 OLD_FILES+=usr/share/man/man8/ypinit.8.gz
 OLD_FILES+=usr/share/man/man8/ypldap.8.gz
 OLD_FILES+=usr/share/man/man8/yppoll.8.gz
 OLD_FILES+=usr/share/man/man8/yppush.8.gz
 OLD_FILES+=usr/share/man/man8/ypserv.8.gz
 OLD_FILES+=usr/share/man/man8/ypset.8.gz
 OLD_FILES+=usr/share/man/man8/ypxfr.8.gz
 OLD_FILES+=var/yp/Makefile
 OLD_FILES+=var/yp/Makefile.dist
 OLD_DIRS+=var/yp
 .endif
 
 .if ${MK_NLS} == no
 OLD_DIRS+=usr/share/nls/
 OLD_DIRS+=usr/share/nls/C
 OLD_FILES+=usr/share/nls/C/ee.cat
 OLD_DIRS+=usr/share/nls/af_ZA.ISO8859-1
 OLD_DIRS+=usr/share/nls/af_ZA.ISO8859-15
 OLD_DIRS+=usr/share/nls/af_ZA.UTF-8
 OLD_DIRS+=usr/share/nls/am_ET.UTF-8
 OLD_DIRS+=usr/share/nls/be_BY.CP1131
 OLD_DIRS+=usr/share/nls/be_BY.CP1251
 OLD_DIRS+=usr/share/nls/be_BY.ISO8859-5
 OLD_DIRS+=usr/share/nls/be_BY.UTF-8
 OLD_FILES+=usr/share/nls/be_BY.UTF-8/libc.cat
 OLD_DIRS+=usr/share/nls/bg_BG.CP1251
 OLD_DIRS+=usr/share/nls/bg_BG.UTF-8
 OLD_DIRS+=usr/share/nls/ca_ES.ISO8859-1
 OLD_FILES+=usr/share/nls/ca_ES.ISO8859-1/libc.cat
 OLD_DIRS+=usr/share/nls/ca_ES.ISO8859-15
 OLD_DIRS+=usr/share/nls/ca_ES.UTF-8
 OLD_DIRS+=usr/share/nls/cs_CZ.ISO8859-2
 OLD_DIRS+=usr/share/nls/cs_CZ.UTF-8
 OLD_DIRS+=usr/share/nls/da_DK.ISO8859-1
 OLD_DIRS+=usr/share/nls/da_DK.ISO8859-15
 OLD_DIRS+=usr/share/nls/da_DK.UTF-8
 OLD_DIRS+=usr/share/nls/de_AT.ISO8859-1
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_AT.ISO8859-15
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_AT.UTF-8
 OLD_FILES+=usr/share/nls/de_AT.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_CH.ISO8859-1
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_CH.ISO8859-15
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_CH.UTF-8
 OLD_FILES+=usr/share/nls/de_CH.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_DE.ISO8859-1
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_DE.ISO8859-15
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/de_DE.UTF-8
 OLD_FILES+=usr/share/nls/de_DE.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/el_GR.ISO8859-7
 OLD_FILES+=usr/share/nls/el_GR.ISO8859-7/libc.cat
 OLD_FILES+=usr/share/nls/el_GR.ISO8859-7/tcsh.cat
 OLD_DIRS+=usr/share/nls/el_GR.UTF-8
 OLD_FILES+=usr/share/nls/el_GR.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/en_AU.ISO8859-1
 OLD_DIRS+=usr/share/nls/en_AU.ISO8859-15
 OLD_DIRS+=usr/share/nls/en_AU.US-ASCII
 OLD_DIRS+=usr/share/nls/en_AU.UTF-8
 OLD_DIRS+=usr/share/nls/en_CA.ISO8859-1
 OLD_FILES+=usr/share/nls/en_US.ISO8859-1/ee.cat
 OLD_DIRS+=usr/share/nls/en_CA.ISO8859-15
 OLD_DIRS+=usr/share/nls/en_CA.US-ASCII
 OLD_DIRS+=usr/share/nls/en_CA.UTF-8
 OLD_DIRS+=usr/share/nls/en_GB.ISO8859-1
 OLD_DIRS+=usr/share/nls/en_GB.ISO8859-15
 OLD_DIRS+=usr/share/nls/en_GB.US-ASCII
 OLD_DIRS+=usr/share/nls/en_GB.UTF-8
 OLD_DIRS+=usr/share/nls/en_IE.UTF-8
 OLD_DIRS+=usr/share/nls/en_NZ.ISO8859-1
 OLD_DIRS+=usr/share/nls/en_NZ.ISO8859-15
 OLD_DIRS+=usr/share/nls/en_NZ.US-ASCII
 OLD_DIRS+=usr/share/nls/en_NZ.UTF-8
 OLD_DIRS+=usr/share/nls/en_US.ISO8859-1
 OLD_DIRS+=usr/share/nls/en_US.ISO8859-15
 OLD_FILES+=usr/share/nls/en_US.ISO8859-15/ee.cat
 OLD_DIRS+=usr/share/nls/en_US.UTF-8
 OLD_DIRS+=usr/share/nls/es_ES.UTF-8
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/es_ES.ISO8859-1
 OLD_DIRS+=usr/share/nls/es_ES.ISO8859-15
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-15/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/et_EE.ISO8859-15
 OLD_FILES+=usr/share/nls/et_EE.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/et_EE.UTF-8
 OLD_FILES+=usr/share/nls/et_EE.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/fi_FI.ISO8859-1
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/fi_FI.ISO8859-15
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/fi_FI.UTF-8
 OLD_FILES+=usr/share/nls/fi_FI.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_BE.ISO8859-1
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_BE.ISO8859-15
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_BE.UTF-8
 OLD_FILES+=usr/share/nls/fr_BE.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_CA.ISO8859-1
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_CA.ISO8859-15
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_CA.UTF-8
 OLD_FILES+=usr/share/nls/fr_CA.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_CH.ISO8859-1
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_CH.ISO8859-15
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_CH.UTF-8
 OLD_FILES+=usr/share/nls/fr_CH.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_FR.ISO8859-1
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_FR.ISO8859-15
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/ee.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/fr_FR.UTF-8
 OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/gl_ES.ISO8859-1
 OLD_FILES+=usr/share/nls/gl_ES.ISO8859-1/libc.cat
 OLD_DIRS+=usr/share/nls/he_IL.UTF-8
 OLD_DIRS+=usr/share/nls/hi_IN.ISCII-DEV
 OLD_DIRS+=usr/share/nls/hr_HR.ISO8859-2
 OLD_DIRS+=usr/share/nls/hu_HU.ISO8859-2
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/ee.cat
 OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/libc.cat
 OLD_DIRS+=usr/share/nls/hr_HR.UTF-8
 OLD_DIRS+=usr/share/nls/hu_HU.UTF-8
 OLD_DIRS+=usr/share/nls/hy_AM.ARMSCII-8
 OLD_DIRS+=usr/share/nls/hy_AM.UTF-8
 OLD_DIRS+=usr/share/nls/is_IS.ISO8859-1
 OLD_DIRS+=usr/share/nls/is_IS.ISO8859-15
 OLD_DIRS+=usr/share/nls/is_IS.UTF-8
 OLD_DIRS+=usr/share/nls/it_CH.ISO8859-1
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/it_CH.ISO8859-15
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/it_CH.UTF-8
 OLD_FILES+=usr/share/nls/it_CH.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/it_IT.ISO8859-1
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-1/tcsh.cat
 OLD_DIRS+=usr/share/nls/it_IT.ISO8859-15
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/libc.cat
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/tcsh.cat
 OLD_DIRS+=usr/share/nls/it_IT.UTF-8
 OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/ja_JP.SJIS
 OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat
 OLD_DIRS+=usr/share/nls/ja_JP.UTF-8
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/libc.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/ja_JP.eucJP
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/libc.cat
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/tcsh.cat
 OLD_DIRS+=usr/share/nls/kk_KZ.PT154
 OLD_DIRS+=usr/share/nls/kk_KZ.UTF-8
 OLD_DIRS+=usr/share/nls/ko_KR.CP949
 OLD_DIRS+=usr/share/nls/ko_KR.UTF-8
 OLD_FILES+=usr/share/nls/ko_KR.UTF-8/libc.cat
 OLD_DIRS+=usr/share/nls/ko_KR.eucKR
 OLD_FILES+=usr/share/nls/ko_KR.eucKR/libc.cat
 OLD_DIRS+=usr/share/nls/lv_LV.UTF-8
 OLD_DIRS+=usr/share/nls/lt_LT.ISO8859-13
 OLD_DIRS+=usr/share/nls/lt_LT.UTF-8
 OLD_DIRS+=usr/share/nls/lv_LV.ISO8859-13
 OLD_DIRS+=usr/share/nls/mn_MN.UTF-8
 OLD_FILES+=usr/share/nls/mn_MN.UTF-8/libc.cat
 OLD_DIRS+=usr/share/nls/nl_BE.ISO8859-1
 OLD_DIRS+=usr/share/nls/nl_BE.ISO8859-15
 OLD_DIRS+=usr/share/nls/nl_BE.UTF-8
 OLD_DIRS+=usr/share/nls/no_NO.ISO8859-1
 OLD_FILES+=usr/share/nls/nl_NL.ISO8859-1/libc.cat
 OLD_DIRS+=usr/share/nls/nl_NL.ISO8859-15
 OLD_DIRS+=usr/share/nls/nl_NL.ISO8859-1
 OLD_FILES+=usr/share/nls/no_NO.ISO8859-1/libc.cat
 OLD_DIRS+=usr/share/nls/no_NO.ISO8859-15
 OLD_DIRS+=usr/share/nls/nl_NL.UTF-8
 OLD_DIRS+=usr/share/nls/no_NO.UTF-8
 OLD_DIRS+=usr/share/nls/pl_PL.ISO8859-2
 OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/ee.cat
 OLD_FILES+=usr/share/nls/pl_PL.ISO8859-2/libc.cat
 OLD_DIRS+=usr/share/nls/pl_PL.UTF-8
 OLD_DIRS+=usr/share/nls/pt_BR.ISO8859-1
 OLD_DIRS+=usr/share/nls/pt_BR.UTF-8
 OLD_DIRS+=usr/share/nls/pt_PT.ISO8859-1
 OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/ee.cat
 OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/libc.cat
 OLD_FILES+=usr/share/nls/pt_PT.ISO8859-1/ee.cat
 OLD_DIRS+=usr/share/nls/pt_PT.ISO8859-15
 OLD_DIRS+=usr/share/nls/pt_PT.UTF-8
 OLD_DIRS+=usr/share/nls/ro_RO.ISO8859-2
 OLD_DIRS+=usr/share/nls/ro_RO.UTF-8
 OLD_DIRS+=usr/share/nls/ru_RU.CP1251
 OLD_FILES+=usr/share/nls/ru_RU.CP1251/tcsh.cat
 OLD_DIRS+=usr/share/nls/ru_RU.CP866
 OLD_FILES+=usr/share/nls/ru_RU.CP866/tcsh.cat
 OLD_DIRS+=usr/share/nls/ru_RU.ISO8859-5
 OLD_FILES+=usr/share/nls/ru_RU.ISO8859-5/tcsh.cat
 OLD_DIRS+=usr/share/nls/ru_RU.KOI8-R
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/libc.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/tcsh.cat
 OLD_DIRS+=usr/share/nls/ru_RU.UTF-8
 OLD_FILES+=usr/share/nls/ru_RU.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/sk_SK.ISO8859-2
 OLD_FILES+=usr/share/nls/sk_SK.ISO8859-2/libc.cat
 OLD_DIRS+=usr/share/nls/sk_SK.UTF-8
 OLD_DIRS+=usr/share/nls/sl_SI.ISO8859-2
 OLD_DIRS+=usr/share/nls/sl_SI.UTF-8
 OLD_DIRS+=usr/share/nls/sr_YU.ISO8859-2
 OLD_DIRS+=usr/share/nls/sr_YU.ISO8859-5
 OLD_DIRS+=usr/share/nls/sr_YU.UTF-8
 OLD_DIRS+=usr/share/nls/sv_SE.ISO8859-1
 OLD_FILES+=usr/share/nls/sv_SE.ISO8859-1/libc.cat
 OLD_DIRS+=usr/share/nls/sv_SE.ISO8859-15
 OLD_DIRS+=usr/share/nls/sv_SE.UTF-8
 OLD_DIRS+=usr/share/nls/tr_TR.ISO8859-9
 OLD_DIRS+=usr/share/nls/tr_TR.UTF-8
 OLD_DIRS+=usr/share/nls/uk_UA.ISO8859-5
 OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5/tcsh.cat
 OLD_DIRS+=usr/share/nls/uk_UA.KOI8-U
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/tcsh.cat
 OLD_DIRS+=usr/share/nls/uk_UA.UTF-8
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/libc.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
 OLD_DIRS+=usr/share/nls/zh_CN.GB18030
 OLD_FILES+=usr/share/nls/zh_CN.GB18030/libc.cat
 OLD_DIRS+=usr/share/nls/zh_CN.GBK
 OLD_DIRS+=usr/share/nls/zh_CN.GB2312
 OLD_FILES+=usr/share/nls/zh_CN.GB2312/libc.cat
 OLD_DIRS+=usr/share/nls/zh_CN.UTF-8
 OLD_FILES+=usr/share/nls/zh_CN.UTF-8/libc.cat
 OLD_DIRS+=usr/share/nls/zh_CN.eucCN
 OLD_DIRS+=usr/share/nls/zh_HK.UTF-8
 OLD_DIRS+=usr/share/nls/zh_TW.UTF-8
 OLD_FILES+=usr/tests/bin/sh/builtins/locale1.0
 .endif
 
 .if ${MK_NLS_CATALOGS} == no
 OLD_FILES+=usr/share/nls/de_AT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/el_GR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/et_EE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.CP1251/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.CP866/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
 .endif
 
 .if ${MK_NS_CACHING} == no
 OLD_FILES+=etc/nscd.conf
 OLD_FILES+=etc/rc.d/nscd
 OLD_FILES+=usr/sbin/nscd
 OLD_FILES+=usr/share/examples/etc/nscd.conf
 OLD_FILES+=usr/share/man/man5/nscd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/nscd.8.gz
 .endif
 
 .if ${MK_NTP} == no
 OLD_FILES+=etc/ntp/leap-seconds
 OLD_DIRS+=etc/ntp
 OLD_FILES+=etc/ntp.conf
 OLD_FILES+=etc/periodic/daily/480.status-ntpd
 OLD_FILES+=etc/periodic/daily/480.leapfile-ntpd
 OLD_FILES+=etc/rc.d/ntpd
 OLD_FILES+=usr/bin/ntpq
 OLD_FILES+=usr/sbin/ntp-keygen
 OLD_FILES+=usr/sbin/ntpd
 OLD_FILES+=usr/sbin/ntpdate
 OLD_FILES+=usr/sbin/ntpdc
 OLD_FILES+=usr/sbin/ntptime
 OLD_FILES+=usr/sbin/sntp
 OLD_FILES+=usr/share/doc/ntp/access.html
 OLD_FILES+=usr/share/doc/ntp/accopt.html
 OLD_FILES+=usr/share/doc/ntp/assoc.html
 OLD_FILES+=usr/share/doc/ntp/audio.html
 OLD_FILES+=usr/share/doc/ntp/authentic.html
 OLD_FILES+=usr/share/doc/ntp/authopt.html
 OLD_FILES+=usr/share/doc/ntp/autokey.html
 OLD_FILES+=usr/share/doc/ntp/bugs.html
 OLD_FILES+=usr/share/doc/ntp/build.html
 OLD_FILES+=usr/share/doc/ntp/clock.html
 OLD_FILES+=usr/share/doc/ntp/clockopt.html
 OLD_FILES+=usr/share/doc/ntp/cluster.html
 OLD_FILES+=usr/share/doc/ntp/comdex.html
 OLD_FILES+=usr/share/doc/ntp/config.html
 OLD_FILES+=usr/share/doc/ntp/confopt.html
 OLD_FILES+=usr/share/doc/ntp/copyright.html
 OLD_FILES+=usr/share/doc/ntp/debug.html
 OLD_FILES+=usr/share/doc/ntp/decode.html
 OLD_FILES+=usr/share/doc/ntp/discipline.html
 OLD_FILES+=usr/share/doc/ntp/discover.html
 OLD_FILES+=usr/share/doc/ntp/driver1.html
 OLD_FILES+=usr/share/doc/ntp/driver10.html
 OLD_FILES+=usr/share/doc/ntp/driver11.html
 OLD_FILES+=usr/share/doc/ntp/driver12.html
 OLD_FILES+=usr/share/doc/ntp/driver16.html
 OLD_FILES+=usr/share/doc/ntp/driver18.html
 OLD_FILES+=usr/share/doc/ntp/driver19.html
 OLD_FILES+=usr/share/doc/ntp/driver2.html
 OLD_FILES+=usr/share/doc/ntp/driver20.html
 OLD_FILES+=usr/share/doc/ntp/driver22.html
 OLD_FILES+=usr/share/doc/ntp/driver26.html
 OLD_FILES+=usr/share/doc/ntp/driver27.html
 OLD_FILES+=usr/share/doc/ntp/driver28.html
 OLD_FILES+=usr/share/doc/ntp/driver29.html
 OLD_FILES+=usr/share/doc/ntp/driver3.html
 OLD_FILES+=usr/share/doc/ntp/driver30.html
 OLD_FILES+=usr/share/doc/ntp/driver32.html
 OLD_FILES+=usr/share/doc/ntp/driver33.html
 OLD_FILES+=usr/share/doc/ntp/driver34.html
 OLD_FILES+=usr/share/doc/ntp/driver35.html
 OLD_FILES+=usr/share/doc/ntp/driver36.html
 OLD_FILES+=usr/share/doc/ntp/driver37.html
 OLD_FILES+=usr/share/doc/ntp/driver4.html
 OLD_FILES+=usr/share/doc/ntp/driver5.html
 OLD_FILES+=usr/share/doc/ntp/driver6.html
 OLD_FILES+=usr/share/doc/ntp/driver7.html
 OLD_FILES+=usr/share/doc/ntp/driver8.html
 OLD_FILES+=usr/share/doc/ntp/driver9.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver1.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver10.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver11.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver12.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver16.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver18.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver19.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver20.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver22.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver26.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver27.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver28.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver29.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver3.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver30.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver31.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver32.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver33.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver34.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver35.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver36.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver37.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver38.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver39.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver4.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver40.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver42.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver43.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver44.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver45.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver46.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver5.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver6.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver7.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver8.html
 OLD_FILES+=usr/share/doc/ntp/drivers/driver9.html
 OLD_FILES+=usr/share/doc/ntp/drivers/icons/home.gif
 OLD_FILES+=usr/share/doc/ntp/drivers/icons/mail2.gif
 OLD_FILES+=usr/share/doc/ntp/drivers/mx4200data.html
 OLD_FILES+=usr/share/doc/ntp/drivers/oncore-shmem.html
 OLD_FILES+=usr/share/doc/ntp/drivers/scripts/footer.txt
 OLD_FILES+=usr/share/doc/ntp/drivers/scripts/style.css
 OLD_FILES+=usr/share/doc/ntp/drivers/tf582_4.html
 OLD_FILES+=usr/share/doc/ntp/extern.html
 OLD_FILES+=usr/share/doc/ntp/filter.html
 OLD_FILES+=usr/share/doc/ntp/hints.html
 OLD_FILES+=usr/share/doc/ntp/hints/a-ux
 OLD_FILES+=usr/share/doc/ntp/hints/aix
 OLD_FILES+=usr/share/doc/ntp/hints/bsdi
 OLD_FILES+=usr/share/doc/ntp/hints/changes
 OLD_FILES+=usr/share/doc/ntp/hints/decosf1
 OLD_FILES+=usr/share/doc/ntp/hints/decosf2
 OLD_FILES+=usr/share/doc/ntp/hints/freebsd
 OLD_FILES+=usr/share/doc/ntp/hints/hpux
 OLD_FILES+=usr/share/doc/ntp/hints/linux
 OLD_FILES+=usr/share/doc/ntp/hints/mpeix
 OLD_FILES+=usr/share/doc/ntp/hints/notes-xntp-v3
 OLD_FILES+=usr/share/doc/ntp/hints/parse
 OLD_FILES+=usr/share/doc/ntp/hints/refclocks
 OLD_FILES+=usr/share/doc/ntp/hints/rs6000
 OLD_FILES+=usr/share/doc/ntp/hints/sco.html
 OLD_FILES+=usr/share/doc/ntp/hints/sgi
 OLD_FILES+=usr/share/doc/ntp/hints/solaris-dosynctodr.html
 OLD_FILES+=usr/share/doc/ntp/hints/solaris.html
 OLD_FILES+=usr/share/doc/ntp/hints/solaris.xtra.4023118
 OLD_FILES+=usr/share/doc/ntp/hints/solaris.xtra.4095849
 OLD_FILES+=usr/share/doc/ntp/hints/solaris.xtra.S99ntpd
 OLD_FILES+=usr/share/doc/ntp/hints/solaris.xtra.patchfreq
 OLD_FILES+=usr/share/doc/ntp/hints/sun4
 OLD_FILES+=usr/share/doc/ntp/hints/svr4-dell
 OLD_FILES+=usr/share/doc/ntp/hints/svr4_package
 OLD_FILES+=usr/share/doc/ntp/hints/todo
 OLD_FILES+=usr/share/doc/ntp/hints/vxworks.html
 OLD_FILES+=usr/share/doc/ntp/hints/winnt.html
 OLD_FILES+=usr/share/doc/ntp/history.html
 OLD_FILES+=usr/share/doc/ntp/howto.html
 OLD_FILES+=usr/share/doc/ntp/huffpuff.html
 OLD_FILES+=usr/share/doc/ntp/icons/home.gif
 OLD_FILES+=usr/share/doc/ntp/icons/mail2.gif
 OLD_FILES+=usr/share/doc/ntp/icons/sitemap.png
 OLD_FILES+=usr/share/doc/ntp/index.html
 OLD_FILES+=usr/share/doc/ntp/kern.html
 OLD_FILES+=usr/share/doc/ntp/kernpps.html
 OLD_FILES+=usr/share/doc/ntp/keygen.html
 OLD_FILES+=usr/share/doc/ntp/ldisc.html
 OLD_FILES+=usr/share/doc/ntp/leap.html
 OLD_FILES+=usr/share/doc/ntp/measure.html
 OLD_FILES+=usr/share/doc/ntp/miscopt.html
 OLD_FILES+=usr/share/doc/ntp/monopt.html
 OLD_FILES+=usr/share/doc/ntp/msyslog.html
 OLD_FILES+=usr/share/doc/ntp/mx4200data.html
 OLD_FILES+=usr/share/doc/ntp/notes.html
 OLD_FILES+=usr/share/doc/ntp/ntp-keygen.html
 OLD_FILES+=usr/share/doc/ntp/ntp-wait.html
 OLD_FILES+=usr/share/doc/ntp/ntp.conf.html
 OLD_FILES+=usr/share/doc/ntp/ntp.keys.html
 OLD_FILES+=usr/share/doc/ntp/ntp_conf.html
 OLD_FILES+=usr/share/doc/ntp/ntpd.html
 OLD_FILES+=usr/share/doc/ntp/ntpdate.html
 OLD_FILES+=usr/share/doc/ntp/ntpdc.html
 OLD_FILES+=usr/share/doc/ntp/ntpdsim.html
 OLD_FILES+=usr/share/doc/ntp/ntpdsim_new.html
 OLD_FILES+=usr/share/doc/ntp/ntpq.html
 OLD_FILES+=usr/share/doc/ntp/ntpsnmpd.html
 OLD_FILES+=usr/share/doc/ntp/ntptime.html
 OLD_FILES+=usr/share/doc/ntp/ntptrace.html
 OLD_FILES+=usr/share/doc/ntp/orphan.html
 OLD_FILES+=usr/share/doc/ntp/parsedata.html
 OLD_FILES+=usr/share/doc/ntp/parsenew.html
 OLD_FILES+=usr/share/doc/ntp/patches.html
 OLD_FILES+=usr/share/doc/ntp/pic/9400n.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/alice11.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice13.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice15.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice23.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice31.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice32.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice35.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice38.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice44.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice47.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice51.gif
 OLD_FILES+=usr/share/doc/ntp/pic/alice61.gif
 OLD_FILES+=usr/share/doc/ntp/pic/barnstable.gif
 OLD_FILES+=usr/share/doc/ntp/pic/beaver.gif
 OLD_FILES+=usr/share/doc/ntp/pic/boom3.gif
 OLD_FILES+=usr/share/doc/ntp/pic/boom3a.gif
 OLD_FILES+=usr/share/doc/ntp/pic/boom4.gif
 OLD_FILES+=usr/share/doc/ntp/pic/broad.gif
 OLD_FILES+=usr/share/doc/ntp/pic/bustardfly.gif
 OLD_FILES+=usr/share/doc/ntp/pic/c51.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/description.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/discipline.gif
 OLD_FILES+=usr/share/doc/ntp/pic/dogsnake.gif
 OLD_FILES+=usr/share/doc/ntp/pic/driver29.gif
 OLD_FILES+=usr/share/doc/ntp/pic/driver43_1.gif
 OLD_FILES+=usr/share/doc/ntp/pic/driver43_2.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/fg6021.gif
 OLD_FILES+=usr/share/doc/ntp/pic/fg6039.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/fig_3_1.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flatheads.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt1.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt2.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt3.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt4.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt5.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt6.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt7.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt8.gif
 OLD_FILES+=usr/share/doc/ntp/pic/flt9.gif
 OLD_FILES+=usr/share/doc/ntp/pic/freq1211.gif
 OLD_FILES+=usr/share/doc/ntp/pic/gadget.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/gps167.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/group.gif
 OLD_FILES+=usr/share/doc/ntp/pic/hornraba.gif
 OLD_FILES+=usr/share/doc/ntp/pic/igclock.gif
 OLD_FILES+=usr/share/doc/ntp/pic/neoclock4x.gif
 OLD_FILES+=usr/share/doc/ntp/pic/offset1211.gif
 OLD_FILES+=usr/share/doc/ntp/pic/oncore_evalbig.gif
 OLD_FILES+=usr/share/doc/ntp/pic/oncore_remoteant.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/oncore_utplusbig.gif
 OLD_FILES+=usr/share/doc/ntp/pic/oz2.gif
 OLD_FILES+=usr/share/doc/ntp/pic/panda.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pd_om006.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pd_om011.gif
 OLD_FILES+=usr/share/doc/ntp/pic/peer.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo1a.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo3a.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo4.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo5.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo6.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo7.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pogo8.gif
 OLD_FILES+=usr/share/doc/ntp/pic/pzf509.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/pzf511.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/rabbit.gif
 OLD_FILES+=usr/share/doc/ntp/pic/radio2.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/sheepb.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/stack1a.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/stats.gif
 OLD_FILES+=usr/share/doc/ntp/pic/sx5.gif
 OLD_FILES+=usr/share/doc/ntp/pic/thunderbolt.jpg
 OLD_FILES+=usr/share/doc/ntp/pic/time1.gif
 OLD_FILES+=usr/share/doc/ntp/pic/tonea.gif
 OLD_FILES+=usr/share/doc/ntp/pic/tribeb.gif
 OLD_FILES+=usr/share/doc/ntp/pic/wingdorothy.gif
 OLD_FILES+=usr/share/doc/ntp/poll.html
 OLD_FILES+=usr/share/doc/ntp/porting.html
 OLD_FILES+=usr/share/doc/ntp/pps.html
 OLD_FILES+=usr/share/doc/ntp/prefer.html
 OLD_FILES+=usr/share/doc/ntp/quick.html
 OLD_FILES+=usr/share/doc/ntp/rate.html
 OLD_FILES+=usr/share/doc/ntp/rdebug.html
 OLD_FILES+=usr/share/doc/ntp/refclock.html
 OLD_FILES+=usr/share/doc/ntp/release.html
 OLD_FILES+=usr/share/doc/ntp/scripts/accopt.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/audio.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/authopt.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/clockopt.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/command.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/config.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/confopt.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/external.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/footer.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/hand.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/install.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/manual.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/misc.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/miscopt.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/monopt.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/refclock.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/special.txt
 OLD_FILES+=usr/share/doc/ntp/scripts/style.css
 OLD_FILES+=usr/share/doc/ntp/select.html
 OLD_FILES+=usr/share/doc/ntp/sitemap.html
 OLD_FILES+=usr/share/doc/ntp/sntp.html
 OLD_FILES+=usr/share/doc/ntp/stats.html
 OLD_FILES+=usr/share/doc/ntp/tickadj.html
 OLD_FILES+=usr/share/doc/ntp/warp.html
 OLD_FILES+=usr/share/doc/ntp/xleave.html
 OLD_DIRS+=usr/share/doc/ntp/drivers
 OLD_DIRS+=usr/share/doc/ntp/drivers/scripts
 OLD_DIRS+=usr/share/doc/ntp/drivers/icons
 OLD_DIRS+=usr/share/doc/ntp/hints
 OLD_DIRS+=usr/share/doc/ntp/icons
 OLD_DIRS+=usr/share/doc/ntp/pic
 OLD_DIRS+=usr/share/doc/ntp/scripts
 OLD_DIRS+=usr/share/doc/ntp
 OLD_FILES+=usr/share/examples/etc/ntp.conf
 OLD_FILES+=usr/share/man/man1/sntp.1.gz
 OLD_FILES+=usr/share/man/man5/ntp.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ntp.keys.5.gz
 OLD_FILES+=usr/share/man/man8/ntp-keygen.8.gz
 OLD_FILES+=usr/share/man/man8/ntpd.8.gz
 OLD_FILES+=usr/share/man/man8/ntpdate.8.gz
 OLD_FILES+=usr/share/man/man8/ntpdc.8.gz
 OLD_FILES+=usr/share/man/man8/ntpq.8.gz
 OLD_FILES+=usr/share/man/man8/ntptime.8.gz
 .endif
 
 .if ${MK_OFED} == no
 OLD_FILES+=etc/newsyslog.conf.d/opensm.conf
 OLD_FILES+=etc/rc.d/opensm
 OLD_FILES+=usr/bin/ibstat
 OLD_FILES+=usr/bin/ibv_asyncwatch
 OLD_FILES+=usr/bin/ibv_devices
 OLD_FILES+=usr/bin/ibv_devinfo
 OLD_FILES+=usr/bin/ibv_rc_pingpong
 OLD_FILES+=usr/bin/ibv_srq_pingpong
 OLD_FILES+=usr/bin/ibv_uc_pingpong
 OLD_FILES+=usr/bin/ibv_ud_pingpong
 OLD_FILES+=usr/bin/mckey
 OLD_FILES+=usr/bin/rping
 OLD_FILES+=usr/bin/ucmatose
 OLD_FILES+=usr/bin/udaddy
 OLD_FILES+=usr/include/infiniband/marshall.h
 OLD_FILES+=usr/include/infiniband/kern-abi.h
 OLD_FILES+=usr/include/infiniband/umad_sm.h
 OLD_FILES+=usr/include/infiniband/umad.h
 OLD_FILES+=usr/include/infiniband/arch.h
 OLD_FILES+=usr/include/infiniband/verbs.h
 OLD_FILES+=usr/include/infiniband/ib.h
 OLD_FILES+=usr/include/infiniband/cm.h
 OLD_FILES+=usr/include/infiniband/opcode.h
 OLD_FILES+=usr/include/infiniband/ibnetdisc.h
 OLD_FILES+=usr/include/infiniband/driver.h
 OLD_FILES+=usr/include/infiniband/mad_osd.h
 OLD_FILES+=usr/include/infiniband/umad_types.h
 OLD_FILES+=usr/include/infiniband/umad_cm.h
 OLD_FILES+=usr/include/infiniband/cm_abi.h
 OLD_FILES+=usr/include/infiniband/sa-kern-abi.h
 OLD_FILES+=usr/include/infiniband/ibnetdisc_osd.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_event_plugin.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_console_io.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_ucast_cache.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_port.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_path.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_mtree.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_log.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_mcm_port.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_subnet.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_pkey.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_remote_sm.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_qos_policy.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_sm.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_node.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_mcast_mgr.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_madw.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_lid_mgr.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_congestion_control.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_port_profile.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_perfmgr.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_service.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_base.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_vl15intf.h
 OLD_FILES+=usr/include/infiniband/opensm/st.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_attrib_req.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_ucast_mgr.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_db.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_sa_mad_ctrl.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_db_pack.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_opensm.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_mesh.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_mcast_tbl.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_sm_mad_ctrl.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_stats.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_mad_pool.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_switch.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_ucast_lash.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_errors.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_partition.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_prefix_route.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_helper.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_version.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_sa.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_config.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_multicast.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_file_ids.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_perfmgr_db.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_console.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_msgdef.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_router.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_guid.h
 OLD_FILES+=usr/include/infiniband/opensm/osm_inform.h
 OLD_DIRS+=usr/include/infiniband/opensm
 OLD_FILES+=usr/include/infiniband/iba/ib_types.h
 OLD_FILES+=usr/include/infiniband/iba/ib_cm_types.h
 OLD_DIRS+=usr/include/infiniband/iba
 OLD_FILES+=usr/include/infiniband/umad_str.h
 OLD_FILES+=usr/include/infiniband/udma_barrier.h
 OLD_FILES+=usr/include/infiniband/umad_sa.h
 OLD_FILES+=usr/include/infiniband/mad.h
 OLD_FILES+=usr/include/infiniband/sa.h
 OLD_FILES+=usr/include/infiniband/byteorder.h
 OLD_FILES+=usr/include/infiniband/types.h
 OLD_FILES+=usr/include/infiniband/byteswap.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_pkt_randomizer.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_rmpp_ctx.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mtl_hca_guid.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_txn.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_svc.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_test.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_inout.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_mtl_bind.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_hca.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_sa_api.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_sender.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_umadt.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mtl_transaction_mgr.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_defs.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_dispatcher.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_api.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mtl.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_transport.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_al.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_sar.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_umadt.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_ts_useraccess.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_ts.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_mlx_transport_anafa.h
 OLD_FILES+=usr/include/infiniband/vendor/osm_vendor_ibumad.h
 OLD_DIRS+=usr/include/infiniband/vendor
 OLD_FILES+=usr/include/infiniband/endian.h
 OLD_FILES+=usr/include/infiniband/complib/cl_byteswap.h
 OLD_FILES+=usr/include/infiniband/complib/cl_types.h
 OLD_FILES+=usr/include/infiniband/complib/cl_map.h
 OLD_FILES+=usr/include/infiniband/complib/cl_packon.h
 OLD_FILES+=usr/include/infiniband/complib/cl_timer.h
 OLD_FILES+=usr/include/infiniband/complib/cl_thread_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_thread.h
 OLD_FILES+=usr/include/infiniband/complib/cl_event.h
 OLD_FILES+=usr/include/infiniband/complib/cl_byteswap_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_passivelock.h
 OLD_FILES+=usr/include/infiniband/complib/cl_vector.h
 OLD_FILES+=usr/include/infiniband/complib/cl_nodenamemap.h
 OLD_FILES+=usr/include/infiniband/complib/cl_event_wheel.h
 OLD_FILES+=usr/include/infiniband/complib/cl_log.h
 OLD_FILES+=usr/include/infiniband/complib/cl_fleximap.h
 OLD_FILES+=usr/include/infiniband/complib/cl_qlist.h
 OLD_FILES+=usr/include/infiniband/complib/cl_timer_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_pool.h
 OLD_FILES+=usr/include/infiniband/complib/cl_debug.h
 OLD_FILES+=usr/include/infiniband/complib/cl_types_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_dispatcher.h
 OLD_FILES+=usr/include/infiniband/complib/cl_ptr_vector.h
 OLD_FILES+=usr/include/infiniband/complib/cl_atomic_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_qmap.h
 OLD_FILES+=usr/include/infiniband/complib/cl_spinlock_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_qcomppool.h
 OLD_FILES+=usr/include/infiniband/complib/cl_threadpool.h
 OLD_FILES+=usr/include/infiniband/complib/cl_list.h
 OLD_FILES+=usr/include/infiniband/complib/cl_debug_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_packoff.h
 OLD_FILES+=usr/include/infiniband/complib/cl_qpool.h
 OLD_FILES+=usr/include/infiniband/complib/cl_spinlock.h
 OLD_FILES+=usr/include/infiniband/complib/cl_event_osd.h
 OLD_FILES+=usr/include/infiniband/complib/cl_atomic.h
 OLD_FILES+=usr/include/infiniband/complib/cl_math.h
 OLD_FILES+=usr/include/infiniband/complib/cl_comppool.h
 OLD_DIRS+=usr/include/infiniband/complib
 OLD_DIRS+=usr/include/infiniband
 OLD_FILES+=usr/lib/libcxgb4.a
 OLD_FILES+=usr/lib/libcxgb4.so
 OLD_LIBS+=usr/lib/libcxgb4.so.1
 OLD_FILES+=usr/lib/libibcm.a
 OLD_FILES+=usr/lib/libibcm.so
 OLD_LIBS+=usr/lib/libibcm.so.1
 OLD_FILES+=usr/lib/libibmad.a
 OLD_FILES+=usr/lib/libibmad.so
 OLD_LIBS+=usr/lib/libibmad.so.5
 OLD_FILES+=usr/lib/libibnetdisc.a
 OLD_FILES+=usr/lib/libibnetdisc.so
 OLD_LIBS+=usr/lib/libibnetdisc.so.5
 OLD_FILES+=usr/lib/libibumad.a
 OLD_FILES+=usr/lib/libibumad.so
 OLD_LIBS+=usr/lib/libibumad.so.1
 OLD_FILES+=usr/lib/libibverbs.a
 OLD_FILES+=usr/lib/libibverbs.so
 OLD_LIBS+=lib/libibverbs.so.1
 OLD_FILES+=usr/lib/libmlx4.a
 OLD_FILES+=usr/lib/libmlx4.so
 OLD_LIBS+=usr/lib/libmlx4.so.1
 OLD_FILES+=usr/lib/libmlx5.a
 OLD_FILES+=usr/lib/libmlx5.so
 OLD_LIBS+=lib/libmlx5.so.1
 OLD_FILES+=usr/lib/libopensm.a
 OLD_FILES+=usr/lib/libopensm.so
 OLD_LIBS+=usr/lib/libopensm.so.5
 OLD_FILES+=usr/lib/libosmcomp.a
 OLD_FILES+=usr/lib/libosmcomp.so
 OLD_LIBS+=usr/lib/libosmcomp.so.3
 OLD_FILES+=usr/lib/libosmvendor.a
 OLD_FILES+=usr/lib/libosmvendor.so
 OLD_LIBS+=usr/lib/libosmvendor.so.4
 OLD_FILES+=usr/lib/librdmacm.a
 OLD_FILES+=usr/lib/librdmacm.so
 OLD_LIBS+=usr/lib/librdmacm.so.1
 OLD_FILES+=usr/share/man/man1/ibv_asyncwatch.1.gz
 OLD_FILES+=usr/share/man/man1/ibv_devices.1.gz
 OLD_FILES+=usr/share/man/man1/ibv_devinfo.1.gz
 OLD_FILES+=usr/share/man/man1/ibv_rc_pingpong.1.gz
 OLD_FILES+=usr/share/man/man1/ibv_srq_pingpong.1.gz
 OLD_FILES+=usr/share/man/man1/ibv_uc_pingpong.1.gz
 OLD_FILES+=usr/share/man/man1/ibv_ud_pingpong.1.gz
 OLD_FILES+=usr/share/man/man1/mckey.1.gz
 OLD_FILES+=usr/share/man/man1/rping.1.gz
 OLD_FILES+=usr/share/man/man1/ucmatose.1.gz
 OLD_FILES+=usr/share/man/man1/udaddy.1.gz
 OLD_FILES+=usr/share/man/man3/ibnd_debug.3.gz
 OLD_FILES+=usr/share/man/man3/ibnd_destroy_fabric.3.gz
 OLD_FILES+=usr/share/man/man3/ibnd_discover_fabric.3.gz
 OLD_FILES+=usr/share/man/man3/ibnd_find_node_dr.3.gz
 OLD_FILES+=usr/share/man/man3/ibnd_find_node_guid.3.gz
 OLD_FILES+=usr/share/man/man3/ibnd_iter_nodes.3.gz
 OLD_FILES+=usr/share/man/man3/ibnd_iter_nodes_type.3.gz
 OLD_FILES+=usr/share/man/man3/ibnd_show_progress.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_alloc_mw.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_alloc_pd.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_attach_mcast.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_bind_mw.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_ah.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_ah_from_wc.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_comp_channel.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_cq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_cq_ex.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_flow.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_qp.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_qp_ex.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_rwq_ind_table.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_srq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_srq_ex.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_create_wq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_event_type_str.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_fork_init.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_get_async_event.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_get_cq_event.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_get_device_guid.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_get_device_list.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_get_device_name.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_get_srq_num.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_inc_rkey.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_modify_qp.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_modify_srq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_modify_wq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_open_device.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_open_qp.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_open_xrcd.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_poll_cq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_post_recv.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_post_send.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_post_srq_recv.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_device.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_device_ex.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_gid.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_pkey.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_port.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_qp.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_rt_values_ex.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_query_srq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_rate_to_mbps.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_rate_to_mult.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_reg_mr.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_req_notify_cq.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_rereg_mr.3.gz
 OLD_FILES+=usr/share/man/man3/ibv_resize_cq.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_accept.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_ack_cm_event.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_bind_addr.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_connect.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_create_ep.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_create_event_channel.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_create_id.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_create_qp.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_create_srq.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_dereg_mr.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_destroy_ep.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_destroy_event_channel.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_destroy_id.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_destroy_qp.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_destroy_srq.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_disconnect.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_event_str.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_free_devices.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_cm_event.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_devices.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_dst_port.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_local_addr.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_peer_addr.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_recv_comp.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_request.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_send_comp.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_get_src_port.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_getaddrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_join_multicast.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_leave_multicast.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_listen.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_migrate_id.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_notify.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_read.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_readv.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_recv.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_recvv.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_send.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_sendv.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_ud_send.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_write.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_post_writev.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_reg_msgs.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_reg_read.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_reg_write.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_reject.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_resolve_addr.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_resolve_route.3.gz
 OLD_FILES+=usr/share/man/man3/rdma_set_option.3.gz
 OLD_FILES+=usr/share/man/man4/mlx4ib.4.gz
 OLD_FILES+=usr/share/man/man4/mlx5ib.4.gz
 OLD_FILES+=usr/share/man/man8/ibstat.8.gz
 .endif
 
 .if ${MK_OFED_EXTRA} == no
 OLD_FILES+=usr/bin/dump_fts
 OLD_FILES+=usr/bin/ibaddr
 OLD_FILES+=usr/bin/ibcacheedit
 OLD_FILES+=usr/bin/ibccconfig
 OLD_FILES+=usr/bin/ibccquery
 OLD_FILES+=usr/bin/iblinkinfo
 OLD_FILES+=usr/bin/ibmirror
 OLD_FILES+=usr/bin/ibnetdiscover
 OLD_FILES+=usr/bin/ibping
 OLD_FILES+=usr/bin/ibportstate
 OLD_FILES+=usr/bin/ibqueryerrors
 OLD_FILES+=usr/bin/ibroute
 OLD_FILES+=usr/bin/ibsysstat
 OLD_FILES+=usr/bin/ibtracert
 OLD_FILES+=usr/bin/opensm
 OLD_FILES+=usr/bin/perfquery
 OLD_FILES+=usr/bin/saquery
 OLD_FILES+=usr/bin/sminfo
 OLD_FILES+=usr/bin/smpdump
 OLD_FILES+=usr/bin/smpquery
 OLD_FILES+=usr/bin/vendstat
 OLD_FILES+=usr/share/man/man8/dump_fts.8.gz
 OLD_FILES+=usr/share/man/man8/ibaddr.8.gz
 OLD_FILES+=usr/share/man/man8/ibcacheedit.8.gz
 OLD_FILES+=usr/share/man/man8/ibccconfig.8.gz
 OLD_FILES+=usr/share/man/man8/ibccquery.8.gz
 OLD_FILES+=usr/share/man/man8/iblinkinfo.8.gz
 OLD_FILES+=usr/share/man/man8/ibnetdiscover.8.gz
 OLD_FILES+=usr/share/man/man8/ibping.8.gz
 OLD_FILES+=usr/share/man/man8/ibportstate.8.gz
 OLD_FILES+=usr/share/man/man8/ibqueryerrors.8.gz
 OLD_FILES+=usr/share/man/man8/ibroute.8.gz
 OLD_FILES+=usr/share/man/man8/ibsysstat.8.gz
 OLD_FILES+=usr/share/man/man8/ibtracert.8.gz
 OLD_FILES+=usr/share/man/man8/opensm.8.gz
 OLD_FILES+=usr/share/man/man8/perfquery.8.gz
 OLD_FILES+=usr/share/man/man8/saquery.8.gz
 OLD_FILES+=usr/share/man/man8/sminfo.8.gz
 OLD_FILES+=usr/share/man/man8/smpdump.8.gz
 OLD_FILES+=usr/share/man/man8/smpquery.8.gz
 OLD_FILES+=usr/share/man/man8/vendstat.8.gz
 .endif
 
 .if ${MK_OPENMP} == no
 OLD_FILES+=usr/include/omp.h
 OLD_FILES+=usr/lib/libgomp.so
 OLD_LIBS+=usr/lib/libomp.so
 .endif
 
 .if ${MK_OPENSSH} == no
 OLD_FILES+=etc/rc.d/sshd
 OLD_FILES+=etc/ssh/moduli
 OLD_FILES+=etc/ssh/ssh_config
 OLD_FILES+=etc/ssh/sshd_config
 OLD_DIRS+=etc/ssh
 OLD_FILES+=usr/bin/scp
 OLD_FILES+=usr/bin/sftp
 OLD_FILES+=usr/bin/slogin
 OLD_FILES+=usr/bin/ssh
 OLD_FILES+=usr/bin/ssh-add
 OLD_FILES+=usr/bin/ssh-agent
 OLD_FILES+=usr/bin/ssh-copy-id
 OLD_FILES+=usr/bin/ssh-keygen
 OLD_FILES+=usr/bin/ssh-keyscan
 OLD_FILES+=usr/lib/libprivatecbor.a
 OLD_FILES+=usr/lib/libprivatecbor.so
 OLD_LIBS+=usr/lib/libprivatecbor.so.5
 OLD_FILES+=/usr/lib/libprivatefido2.a
 OLD_FILES+=/usr/lib/libprivatefido2.so
 OLD_LIBS+=/usr/lib/libprivatefido2.so.5
 OLD_FILES+=usr/lib/pam_ssh.so
 OLD_LIBS+=usr/lib/pam_ssh.so.6
 OLD_FILES+=usr/lib/libprivatessh.a
 OLD_FILES+=usr/lib/libprivatessh.so
 OLD_LIBS+=usr/lib/libprivatessh.so.5
 OLD_FILES+=usr/lib/libprivatessh_p.a
 OLD_FILES+=usr/libexec/sftp-server
 OLD_FILES+=usr/libexec/ssh-keysign
 OLD_FILES+=usr/libexec/ssh-pkcs11-helper
 OLD_FILES+=usr/libexec/ssh-sk-helper
 OLD_FILES+=usr/sbin/sshd
 OLD_FILES+=usr/share/man/man1/scp.1.gz
 OLD_FILES+=usr/share/man/man1/sftp.1.gz
 OLD_FILES+=usr/share/man/man1/slogin.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-add.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-agent.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-copy-id.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-keygen.1.gz
 OLD_FILES+=usr/share/man/man1/ssh-keyscan.1.gz
 OLD_FILES+=usr/share/man/man1/ssh.1.gz
 OLD_FILES+=usr/share/man/man5/ssh_config.5.gz
 OLD_FILES+=usr/share/man/man5/sshd_config.5.gz
 OLD_FILES+=usr/share/man/man8/pam_ssh.8.gz
 OLD_FILES+=usr/share/man/man8/sftp-server.8.gz
 OLD_FILES+=usr/share/man/man8/ssh-keysign.8.gz
 OLD_FILES+=usr/share/man/man8/ssh-pkcs11-helper.8.gz
 OLD_FILES+=usr/share/man/man8/ssh-sk-helper.8.gz
 OLD_FILES+=usr/share/man/man8/sshd.8.gz
 .endif
 
 .if ${MK_OPENSSL} == no
 OLD_FILES+=etc/rc.d/keyserv
 .endif
 
 .if ${MK_PF} == no
 OLD_FILES+=etc/newsyslog.conf.d/pf.conf
 OLD_FILES+=etc/periodic/security/520.pfdenied
 OLD_FILES+=etc/pf.os
 OLD_FILES+=etc/rc.d/ftp-proxy
 OLD_FILES+=sbin/pfctl
 OLD_FILES+=sbin/pflogd
 OLD_FILES+=usr/include/netpfil/pf/pf.h
 OLD_FILES+=usr/include/netpfil/pf/pf_altq.h
 OLD_FILES+=usr/include/netpfil/pf/pf_mtag.h
 OLD_FILES+=usr/lib/snmp_pf.so
 OLD_LIBS+=usr/lib/snmp_pf.so.6
 OLD_FILES+=usr/libexec/tftp-proxy
 OLD_FILES+=usr/sbin/ftp-proxy
 OLD_FILES+=usr/share/examples/etc/pf.os
 OLD_FILES+=usr/share/examples/pf/ackpri
 OLD_FILES+=usr/share/examples/pf/faq-example1
 OLD_FILES+=usr/share/examples/pf/faq-example2
 OLD_FILES+=usr/share/examples/pf/faq-example3
 OLD_FILES+=usr/share/examples/pf/pf.conf
 OLD_FILES+=usr/share/examples/pf/queue1
 OLD_FILES+=usr/share/examples/pf/queue2
 OLD_FILES+=usr/share/examples/pf/queue3
 OLD_FILES+=usr/share/examples/pf/queue4
 OLD_FILES+=usr/share/examples/pf/spamd
 OLD_DIRS+=usr/share/examples/pf
 OLD_FILES+=usr/share/man/man4/pf.4.gz
 OLD_FILES+=usr/share/man/man4/pflog.4.gz
 OLD_FILES+=usr/share/man/man4/pfsync.4.gz
 OLD_FILES+=usr/share/man/man5/pf.conf.5.gz
 OLD_FILES+=usr/share/man/man5/pf.os.5.gz
 OLD_FILES+=usr/share/man/man8/ftp-proxy.8.gz
 OLD_FILES+=usr/share/man/man8/pfctl.8.gz
 OLD_FILES+=usr/share/man/man8/pflogd.8.gz
 OLD_FILES+=usr/share/man/man8/tftp-proxy.8.gz
 OLD_FILES+=usr/share/snmp/defs/pf_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-PF-MIB.txt
 .endif
 
 .if ${MK_PKGBOOTSTRAP} == no
 OLD_FILES+=usr/sbin/pkg
 OLD_FILES+=usr/share/man/man7/pkg.7.gz
 .endif
 
 .if ${MK_PMC} == no
 OLD_FILES+=usr/bin/pmcstudy
 .if ${TARGET_ARCH} == "amd64"
 OLD_FILES+=usr/include/libipt/pt_last_ip.h
 OLD_FILES+=usr/include/libipt/intel-pt.h
 OLD_FILES+=usr/include/libipt/pt_time.h
 OLD_FILES+=usr/include/libipt/pt_cpu.h
 OLD_FILES+=usr/include/libipt/pt_compiler.h
 OLD_DIRS+=usr/include/libipt
 .endif
 .if ${TARGET_ARCH} == "aarch64"
 OLD_FILES+=usr/include/opencsd/c_api/opencsd_c_api.h
 OLD_FILES+=usr/include/opencsd/c_api/ocsd_c_api_cust_impl.h
 OLD_FILES+=usr/include/opencsd/c_api/ocsd_c_api_types.h
 OLD_FILES+=usr/include/opencsd/c_api/ocsd_c_api_cust_fact.h
 OLD_FILES+=usr/include/opencsd/c_api/ocsd_c_api_custom.h
 OLD_DIRS+=usr/include/opencsd/c_api
 OLD_FILES+=usr/include/opencsd/ocsd_if_types.h
 OLD_FILES+=usr/include/opencsd/ptm/trc_dcd_mngr_ptm.h
 OLD_FILES+=usr/include/opencsd/ptm/trc_pkt_proc_ptm.h
 OLD_FILES+=usr/include/opencsd/ptm/trc_cmp_cfg_ptm.h
 OLD_FILES+=usr/include/opencsd/ptm/ptm_decoder.h
 OLD_FILES+=usr/include/opencsd/ptm/trc_pkt_elem_ptm.h
 OLD_FILES+=usr/include/opencsd/ptm/trc_pkt_decode_ptm.h
 OLD_FILES+=usr/include/opencsd/ptm/trc_pkt_types_ptm.h
 OLD_DIRS+=usr/include/opencsd/ptm
 OLD_FILES+=usr/include/opencsd/trc_gen_elem_types.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_proc_etmv4.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_etmv4_stack_elem.h
 OLD_FILES+=usr/include/opencsd/etmv4/etmv4_decoder.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_elem_etmv4i.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_dcd_mngr_etmv4i.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_types_etmv4.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_elem_etmv4d.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_pkt_decode_etmv4i.h
 OLD_FILES+=usr/include/opencsd/etmv4/trc_cmp_cfg_etmv4.h
 OLD_DIRS+=usr/include/opencsd/etmv4
 OLD_FILES+=usr/include/opencsd/etmv3/trc_pkt_decode_etmv3.h
 OLD_FILES+=usr/include/opencsd/etmv3/trc_cmp_cfg_etmv3.h
 OLD_FILES+=usr/include/opencsd/etmv3/etmv3_decoder.h
 OLD_FILES+=usr/include/opencsd/etmv3/trc_pkt_proc_etmv3.h
 OLD_FILES+=usr/include/opencsd/etmv3/trc_pkt_elem_etmv3.h
 OLD_FILES+=usr/include/opencsd/etmv3/trc_pkt_types_etmv3.h
 OLD_FILES+=usr/include/opencsd/etmv3/trc_dcd_mngr_etmv3.h
 OLD_DIRS+=usr/include/opencsd/etmv3
 OLD_FILES+=usr/include/opencsd/trc_pkt_types.h
 OLD_FILES+=usr/include/opencsd/stm/trc_pkt_proc_stm.h
 OLD_FILES+=usr/include/opencsd/stm/trc_pkt_types_stm.h
 OLD_FILES+=usr/include/opencsd/stm/stm_decoder.h
 OLD_FILES+=usr/include/opencsd/stm/trc_dcd_mngr_stm.h
 OLD_FILES+=usr/include/opencsd/stm/trc_cmp_cfg_stm.h
 OLD_FILES+=usr/include/opencsd/stm/trc_pkt_elem_stm.h
 OLD_FILES+=usr/include/opencsd/stm/trc_pkt_decode_stm.h
 OLD_DIRS+=usr/include/opencsd/stm
 OLD_DIRS+=usr/include/opencsd
 .endif
 OLD_FILES+=usr/include/pmc.h
 OLD_FILES+=usr/include/pmclog.h
 OLD_FILES+=usr/include/pmcformat.h
 OLD_FILES+=usr/include/libpmcstat.h
 .if ${TARGET_ARCH} == "amd64"
 OLD_FILES+=usr/lib/libipt.a
 OLD_FILES+=usr/lib/libipt.so
 OLD_LIBS+=lib/libipt.so.0
 OLD_FILES+=usr/lib/libipt_p.a
 .endif
 .if ${TARGET_ARCH} == "aarch64"
 OLD_FILES+=usr/lib/libopencsd.a
 OLD_FILES+=usr/lib/libopencsd.so
 OLD_LIBS+=lib/libopencsd.so.0
 OLD_FILES+=usr/lib/libopencsd_p.a
 .endif
 OLD_FILES+=usr/lib/libpmc.a
 OLD_FILES+=usr/lib/libpmc.so
 OLD_LIBS+=usr/lib/libpmc.so.5
 OLD_FILES+=usr/lib/libpmc_p.a
 OLD_FILES+=usr/sbin/pmc
 OLD_FILES+=usr/sbin/pmcannotate
 OLD_FILES+=usr/sbin/pmccontrol
 OLD_FILES+=usr/sbin/pmcstat
 OLD_FILES+=usr/share/man/man3/pmc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.atom.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.atomsilvermont.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.core.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.core2.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.corei7.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.corei7uc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.haswell.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.haswelluc.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.haswellxeon.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.iaf.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.ivybridge.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.ivybridgexeon.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.k8.3.gz
 OLD_FILES+=usr/share/man/man3/pmc.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/lib9p_p.a
 OLD_FILES+=usr/lib/libBlocksRuntime_p.a
 OLD_FILES+=usr/lib/libalias_dummy_p.a
 OLD_FILES+=usr/lib/libalias_ftp_p.a
 OLD_FILES+=usr/lib/libalias_irc_p.a
 OLD_FILES+=usr/lib/libalias_nbt_p.a
 OLD_FILES+=usr/lib/libalias_p.a
 OLD_FILES+=usr/lib/libalias_pptp_p.a
 OLD_FILES+=usr/lib/libalias_skinny_p.a
 OLD_FILES+=usr/lib/libalias_smedia_p.a
 OLD_FILES+=usr/lib/libarchive_p.a
 OLD_FILES+=usr/lib/libasn1_p.a
 OLD_FILES+=usr/lib/libauditd_p.a
 OLD_FILES+=usr/lib/libavl_p.a
 OLD_FILES+=usr/lib/libbe_p.a
 OLD_FILES+=usr/lib/libbegemot_p.a
 OLD_FILES+=usr/lib/libblacklist_p.a
 OLD_FILES+=usr/lib/libbluetooth_p.a
 OLD_FILES+=usr/lib/libbsdxml_p.a
 OLD_FILES+=usr/lib/libbsm_p.a
 OLD_FILES+=usr/lib/libbsnmp_p.a
 OLD_FILES+=usr/lib/libbz2_p.a
 OLD_FILES+=usr/lib/libc++_p.a
 OLD_FILES+=usr/lib/libc_p.a
 OLD_FILES+=usr/lib/libcalendar_p.a
 OLD_FILES+=usr/lib/libcam_p.a
 OLD_FILES+=usr/lib/libcom_err_p.a
 OLD_FILES+=usr/lib/libcompat_p.a
 OLD_FILES+=usr/lib/libcompiler_rt_p.a
 OLD_FILES+=usr/lib/libcrypt_p.a
 OLD_FILES+=usr/lib/libcrypto_p.a
 OLD_FILES+=usr/lib/libctf_p.a
 OLD_FILES+=usr/lib/libcurses_p.a
 OLD_FILES+=usr/lib/libcursesw_p.a
 OLD_FILES+=usr/lib/libcuse_p.a
 OLD_FILES+=usr/lib/libcxxrt_p.a
 OLD_FILES+=usr/lib/libdevctl_p.a
 OLD_FILES+=usr/lib/libdevinfo_p.a
 OLD_FILES+=usr/lib/libdevstat_p.a
 OLD_FILES+=usr/lib/libdialog_p.a
 OLD_FILES+=usr/lib/libdl_p.a
 OLD_FILES+=usr/lib/libdpv_p.a
 OLD_FILES+=usr/lib/libdtrace_p.a
 OLD_FILES+=usr/lib/libdwarf_p.a
 OLD_FILES+=usr/lib/libedit_p.a
 OLD_FILES+=usr/lib/libefivar_p.a
 OLD_FILES+=usr/lib/libelf_p.a
 OLD_FILES+=usr/lib/libexecinfo_p.a
 OLD_FILES+=usr/lib/libfetch_p.a
 OLD_FILES+=usr/lib/libfigpar_p.a
 OLD_FILES+=usr/lib/libfl_p.a
 OLD_FILES+=usr/lib/libform_p.a
 OLD_FILES+=usr/lib/libformw_p.a
 OLD_FILES+=usr/lib/libgcc_eh_p.a
 OLD_FILES+=usr/lib/libgcc_p.a
 OLD_FILES+=usr/lib/libgeom_p.a
 OLD_FILES+=usr/lib/libgpio_p.a
 OLD_FILES+=usr/lib/libgssapi_krb5_p.a
 OLD_FILES+=usr/lib/libgssapi_ntlm_p.a
 OLD_FILES+=usr/lib/libgssapi_p.a
 OLD_FILES+=usr/lib/libgssapi_spnego_p.a
 OLD_FILES+=usr/lib/libhdb_p.a
 OLD_FILES+=usr/lib/libheimbase_p.a
 OLD_FILES+=usr/lib/libheimntlm_p.a
 OLD_FILES+=usr/lib/libheimsqlite_p.a
 OLD_FILES+=usr/lib/libhistory_p.a
 OLD_FILES+=usr/lib/libhx509_p.a
 OLD_FILES+=usr/lib/libicp_p.a
 OLD_FILES+=usr/lib/libicp_rescue_p.a
 OLD_FILES+=usr/lib/libipsec_p.a
 OLD_FILES+=usr/lib/libipt_p.a
 OLD_FILES+=usr/lib/libjail_p.a
 OLD_FILES+=usr/lib/libkadm5clnt_p.a
 OLD_FILES+=usr/lib/libkadm5srv_p.a
 OLD_FILES+=usr/lib/libkafs5_p.a
 OLD_FILES+=usr/lib/libkdc_p.a
 OLD_FILES+=usr/lib/libkiconv_p.a
 OLD_FILES+=usr/lib/libkrb5_p.a
 OLD_FILES+=usr/lib/libkvm_p.a
 OLD_FILES+=usr/lib/libl_p.a
 OLD_FILES+=usr/lib/libln_p.a
 OLD_FILES+=usr/lib/liblzma_p.a
 OLD_FILES+=usr/lib/libm_p.a
 OLD_FILES+=usr/lib/libmagic_p.a
 OLD_FILES+=usr/lib/libmd_p.a
 OLD_FILES+=usr/lib/libmemstat_p.a
 OLD_FILES+=usr/lib/libmenu_p.a
 OLD_FILES+=usr/lib/libmenuw_p.a
 OLD_FILES+=usr/lib/libmilter_p.a
 OLD_FILES+=usr/lib/libmp_p.a
 OLD_FILES+=usr/lib/libmt_p.a
 OLD_FILES+=usr/lib/libncurses_p.a
 OLD_FILES+=usr/lib/libncursesw_p.a
 OLD_FILES+=usr/lib/libnetgraph_p.a
 OLD_FILES+=usr/lib/libnetmap_p.a
-OLD_FILES+=usr/lib/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/libprivateatf-c++_p.a
 OLD_FILES+=usr/lib/libprivateatf-c_p.a
 OLD_FILES+=usr/lib/libprivateauditd_p.a
 OLD_FILES+=usr/lib/libprivatebsdstat_p.a
 OLD_FILES+=usr/lib/libprivatedevdctl_p.a
 OLD_FILES+=usr/lib/libprivateevent_p.a
 OLD_FILES+=usr/lib/libprivateevent1_p.a
 OLD_FILES+=usr/lib/libprivategmock_main_p.a
 OLD_FILES+=usr/lib/libprivategmock_p.a
 OLD_FILES+=usr/lib/libprivategtest_main_p.a
 OLD_FILES+=usr/lib/libprivategtest_p.a
 OLD_FILES+=usr/lib/libprivateheimipcc_p.a
 OLD_FILES+=usr/lib/libprivateheimipcs_p.a
 OLD_FILES+=usr/lib/libprivateifconfig_p.a
 OLD_FILES+=usr/lib/libprivateldns_p.a
 OLD_FILES+=usr/lib/libprivatesqlite3_p.a
 OLD_FILES+=usr/lib/libprivatessh_p.a
 OLD_FILES+=usr/lib/libprivateucl_p.a
 OLD_FILES+=usr/lib/libprivateunbound_p.a
 OLD_FILES+=usr/lib/libprivatezstd_p.a
 OLD_FILES+=usr/lib/libproc_p.a
 OLD_FILES+=usr/lib/libprocstat_p.a
 OLD_FILES+=usr/lib/libpthread_p.a
 OLD_FILES+=usr/lib/libradius_p.a
 OLD_FILES+=usr/lib/libregex_p.a
 OLD_FILES+=usr/lib/libroken_p.a
 OLD_FILES+=usr/lib/librpcsvc_p.a
 OLD_FILES+=usr/lib/librss_p.a
 OLD_FILES+=usr/lib/librt_p.a
 OLD_FILES+=usr/lib/librtld_db_p.a
 OLD_FILES+=usr/lib/libsbuf_p.a
 OLD_FILES+=usr/lib/libsdp_p.a
 OLD_FILES+=usr/lib/libsmb_p.a
 OLD_FILES+=usr/lib/libspl_p.a
 OLD_FILES+=usr/lib/libssl_p.a
 OLD_FILES+=usr/lib/libstats_p.a
 OLD_FILES+=usr/lib/libstdbuf_p.a
 OLD_FILES+=usr/lib/libstdc++_p.a
 OLD_FILES+=usr/lib/libstdthreads_p.a
 OLD_FILES+=usr/lib/libsupc++_p.a
 OLD_FILES+=usr/lib/libsysdecode_p.a
 OLD_FILES+=usr/lib/libtacplus_p.a
 OLD_FILES+=usr/lib/libtermcap_p.a
 OLD_FILES+=usr/lib/libtermcapw_p.a
 OLD_FILES+=usr/lib/libtermlib_p.a
 OLD_FILES+=usr/lib/libtermlibw_p.a
 OLD_FILES+=usr/lib/libthr_p.a
 OLD_FILES+=usr/lib/libthread_db_p.a
 OLD_FILES+=usr/lib/libtinfo_p.a
 OLD_FILES+=usr/lib/libtinfow_p.a
 OLD_FILES+=usr/lib/libtpool_p.a
 OLD_FILES+=usr/lib/libufs_p.a
 OLD_FILES+=usr/lib/libugidfw_p.a
 OLD_FILES+=usr/lib/libulog_p.a
 OLD_FILES+=usr/lib/libumem_p.a
 OLD_FILES+=usr/lib/libusb_p.a
 OLD_FILES+=usr/lib/libusbhid_p.a
 OLD_FILES+=usr/lib/libutempter_p.a
 OLD_FILES+=usr/lib/libutil_p.a
 OLD_FILES+=usr/lib/libuutil_p.a
 OLD_FILES+=usr/lib/libvgl_p.a
 OLD_FILES+=usr/lib/libvmmapi_p.a
 OLD_FILES+=usr/lib/libwind_p.a
 OLD_FILES+=usr/lib/libwrap_p.a
 OLD_FILES+=usr/lib/libxo_p.a
 OLD_FILES+=usr/lib/liby_p.a
 OLD_FILES+=usr/lib/libypclnt_p.a
 OLD_FILES+=usr/lib/libz_p.a
 OLD_FILES+=usr/lib/libzfs_core_p.a
 OLD_FILES+=usr/lib/libzfs_p.a
 OLD_FILES+=usr/lib/libzfsbootenv_p.a
 OLD_FILES+=usr/lib/libzutil_p.a
 .endif
 
 .if ${MK_QUOTAS} == no
 OLD_FILES+=sbin/quotacheck
 OLD_FILES+=usr/bin/quota
 OLD_FILES+=usr/sbin/edquota
 OLD_FILES+=usr/sbin/quotaoff
 OLD_FILES+=usr/sbin/quotaon
 OLD_FILES+=usr/sbin/repquota
 OLD_FILES+=usr/share/man/man1/quota.1.gz
 OLD_FILES+=usr/share/man/man8/edquota.8.gz
 OLD_FILES+=usr/share/man/man8/quotacheck.8.gz
 OLD_FILES+=usr/share/man/man8/quotaoff.8.gz
 OLD_FILES+=usr/share/man/man8/quotaon.8.gz
 OLD_FILES+=usr/share/man/man8/repquota.8.gz
 .endif
 
 .if ${MK_RADIUS_SUPPORT} == no
 OLD_FILES+=usr/lib/libradius.a
 OLD_FILES+=usr/lib/libradius.so
 OLD_LIBS+=usr/lib/libradius.so.4
 OLD_FILES+=usr/lib/libradius_p.a
 OLD_FILES+=usr/lib/pam_radius.so
 OLD_LIBS+=usr/lib/pam_radius.so.6
 OLD_FILES+=usr/include/radlib.h
 OLD_FILES+=usr/include/radlib_vs.h
 OLD_FILES+=usr/share/man/man3/libradius.3.gz
 OLD_FILES+=usr/share/man/man3/rad_acct_open.3.gz
 OLD_FILES+=usr/share/man/man3/rad_add_server.3.gz
 OLD_FILES+=usr/share/man/man3/rad_add_server_ex.3.gz
 OLD_FILES+=usr/share/man/man3/rad_auth_open.3.gz
 OLD_FILES+=usr/share/man/man3/rad_bind_to.3.gz
 OLD_FILES+=usr/share/man/man3/rad_close.3.gz
 OLD_FILES+=usr/share/man/man3/rad_config.3.gz
 OLD_FILES+=usr/share/man/man3/rad_continue_send_request.3.gz
 OLD_FILES+=usr/share/man/man3/rad_create_request.3.gz
 OLD_FILES+=usr/share/man/man3/rad_create_response.3.gz
 OLD_FILES+=usr/share/man/man3/rad_cvt_addr.3.gz
 OLD_FILES+=usr/share/man/man3/rad_cvt_int.3.gz
 OLD_FILES+=usr/share/man/man3/rad_cvt_string.3.gz
 OLD_FILES+=usr/share/man/man3/rad_demangle.3.gz
 OLD_FILES+=usr/share/man/man3/rad_demangle_mppe_key.3.gz
 OLD_FILES+=usr/share/man/man3/rad_get_attr.3.gz
 OLD_FILES+=usr/share/man/man3/rad_get_vendor_attr.3.gz
 OLD_FILES+=usr/share/man/man3/rad_init_send_request.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_addr.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_attr.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_int.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_message_authentic.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_string.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_vendor_addr.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_vendor_attr.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_vendor_int.3.gz
 OLD_FILES+=usr/share/man/man3/rad_put_vendor_string.3.gz
 OLD_FILES+=usr/share/man/man3/rad_receive_request.3.gz
 OLD_FILES+=usr/share/man/man3/rad_request_authenticator.3.gz
 OLD_FILES+=usr/share/man/man3/rad_send_request.3.gz
 OLD_FILES+=usr/share/man/man3/rad_send_response.3.gz
 OLD_FILES+=usr/share/man/man3/rad_server_open.3.gz
 OLD_FILES+=usr/share/man/man3/rad_server_secret.3.gz
 OLD_FILES+=usr/share/man/man3/rad_strerror.3.gz
 OLD_FILES+=usr/share/man/man5/radius.conf.5.gz
 OLD_FILES+=usr/share/man/man8/pam_radius.8.gz
 .endif
 
 .if ${MK_RBOOTD} == no
 OLD_FILES+=usr/libexec/rbootd
 OLD_FILES+=usr/share/man/man8/rbootd.8.gz
 .endif
 
 .if ${MK_RESCUE} == no
 . if exists(${DESTDIR}${TESTSBASE})
 RESCUE_DIRS!=find ${DESTDIR}/rescue -type d 2>/dev/null | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${RESCUE_DIRS}
 RESCUE_FILES!=find ${DESTDIR}/rescue \! -type d 2>/dev/null | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_FILES+=${RESCUE_FILES}
 . endif
 .endif
 
 .if ${MK_ROUTED} == no
 OLD_FILES+=etc/rc.d/routed
 OLD_FILES+=rescue/routed
 OLD_FILES+=rescue/rtquery
 OLD_FILES+=sbin/routed
 OLD_FILES+=sbin/rtquery
 OLD_FILES+=usr/share/man/man8/routed.8.gz
 OLD_FILES+=usr/share/man/man8/rtquery.8.gz
 .endif
 
 .if ${MK_SENDMAIL} == no
 OLD_FILES+=etc/mtree/BSD.sendmail.dist
 OLD_FILES+=etc/newsyslog.conf.d/sendmail.conf
 OLD_FILES+=etc/periodic/daily/150.clean-hoststat
 OLD_FILES+=etc/periodic/daily/440.status-mailq
 OLD_FILES+=etc/periodic/daily/460.status-mail-rejects
 OLD_FILES+=etc/periodic/daily/500.queuerun
 OLD_FILES+=etc/rc.d/sendmail
 .if ${MK_MAILWRAPPER} == no
 OLD_FILES+=bin/rmail
 .endif
 OLD_FILES+=usr/bin/vacation
 OLD_FILES+=usr/include/libmilter/mfapi.h
 OLD_FILES+=usr/include/libmilter/mfdef.h
 OLD_DIRS+=usr/include/libmilter
 OLD_FILES+=usr/lib/libmilter.a
 OLD_FILES+=usr/lib/libmilter.so
 OLD_LIBS+=usr/lib/libmilter.so.5
 OLD_FILES+=usr/lib/libmilter_p.a
 OLD_FILES+=usr/libexec/mail.local
 OLD_FILES+=usr/libexec/sendmail/sendmail
 OLD_FILES+=usr/libexec/smrsh
 OLD_FILES+=usr/sbin/editmap
 OLD_FILES+=usr/sbin/mailstats
 OLD_FILES+=usr/sbin/makemap
 OLD_FILES+=usr/sbin/praliases
 OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz
 OLD_DIRS+=usr/share/doc/smm/08.sendmailop
 OLD_FILES+=usr/share/man/man1/mailq.1.gz
 OLD_FILES+=usr/share/man/man1/newaliases.1.gz
 OLD_FILES+=usr/share/man/man1/vacation.1.gz
 OLD_FILES+=usr/share/man/man5/aliases.5.gz
 OLD_FILES+=usr/share/man/man8/editmap.8.gz
 OLD_FILES+=usr/share/man/man8/hoststat.8.gz
 OLD_FILES+=usr/share/man/man8/mail.local.8.gz
 OLD_FILES+=usr/share/man/man8/mailstats.8.gz
 OLD_FILES+=usr/share/man/man8/makemap.8.gz
 OLD_FILES+=usr/share/man/man8/praliases.8.gz
 OLD_FILES+=usr/share/man/man8/purgestat.8.gz
 OLD_FILES+=usr/share/man/man8/rmail.8.gz
 OLD_FILES+=usr/share/man/man8/sendmail.8.gz
 OLD_FILES+=usr/share/man/man8/smrsh.8.gz
 OLD_FILES+=usr/share/sendmail/cf/README
 OLD_FILES+=usr/share/sendmail/cf/cf/Makefile
 OLD_FILES+=usr/share/sendmail/cf/cf/README
 OLD_FILES+=usr/share/sendmail/cf/cf/chez.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/clientproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-hpux10.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-hpux9.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-osf1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-solaris2.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-sunos4.1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cs-ultrix4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/cyrusproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-bsd4.4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-hpux10.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-hpux9.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-linux.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-mpeix.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-nextstep3.3.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-osf1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-solaris.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-sunos4.1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/generic-ultrix4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/huginn.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/knecht.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/mail.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/mail.eecs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/mailspool.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/python.cs.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/s2k-osf1.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/s2k-ultrix4.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/submit.cf
 OLD_FILES+=usr/share/sendmail/cf/cf/submit.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/tcpproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/ucbarpa.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/ucbvax.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/uucpproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/vangogh.cs.mc
 OLD_DIRS+=usr/share/sendmail/cf/cf
 OLD_FILES+=usr/share/sendmail/cf/domain/Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/CS.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/EECS.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/S2K.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/berkeley-only.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/generic.m4
 OLD_DIRS+=usr/share/sendmail/cf/domain
 OLD_FILES+=usr/share/sendmail/cf/feature/accept_unqualified_senders.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/accept_unresolvable_domains.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/access_db.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/allmasquerade.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/always_add_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/authinfo.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/blocklist_recipients.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/badmx.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/bcc.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/bestmx_is_local.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/bitdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/blacklist_recipients.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/block_bad_helo.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/check_cert_altnames.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_failures.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/tls_session_features.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/use_client_ptr.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/use_ct_file.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/use_cw_file.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/uucpdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/virtuser_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/virtusertable.m4
 OLD_DIRS+=usr/share/sendmail/cf/feature
 OLD_FILES+=usr/share/sendmail/cf/hack/cssubdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/hack/xconnect.m4
 OLD_DIRS+=usr/share/sendmail/cf/hack
 OLD_FILES+=usr/share/sendmail/cf/m4/cf.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/cfhead.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/proto.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/version.m4
 OLD_DIRS+=usr/share/sendmail/cf/m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/cyrus.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/cyrusv2.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/fax.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/local.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/mail11.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/phquery.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/pop.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/procmail.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/qpage.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/smtp.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/usenet.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/uucp.m4
 OLD_DIRS+=usr/share/sendmail/cf/mailer
 OLD_FILES+=usr/share/sendmail/cf/ostype/a-ux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/aix3.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/aix4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/aix5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/altos.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/amdahl-uts.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsd4.3.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsd4.4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi1.0.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/bsdi2.0.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/darwin.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/dgux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/domainos.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/dragonfly.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/dynix3.2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/freebsd6.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/gnu.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/hpux10.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/hpux11.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/hpux9.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/irix4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/irix5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/irix6.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/isc4.1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/linux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/maxion.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/mklinux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/mpeix.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/nextstep.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/openbsd.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/osf1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/powerux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/ptx2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/qnx.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/riscos4.5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sco-uw-2.1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sco3.2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sinix.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris11.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.ml.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.pre5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris8.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sunos3.5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sunos4.1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/svr4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/ultrix4.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unicos.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unicosmk.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unicosmp.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unixware7.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unknown.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/uxpds.m4
 OLD_DIRS+=usr/share/sendmail/cf/ostype
 OLD_FILES+=usr/share/sendmail/cf/sendmail.schema
 OLD_FILES+=usr/share/sendmail/cf/sh/makeinfo.sh
 OLD_DIRS+=usr/share/sendmail/cf/sh
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.cogsci.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.old.arpa.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbarpa.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbvax.m4
 OLD_DIRS+=usr/share/sendmail/cf/siteconfig
 OLD_DIRS+=usr/share/sendmail/cf
 OLD_DIRS+=usr/share/sendmail
 OLD_DIRS+=var/spool/clientmqueue
 .endif
 
 .if ${MK_SERVICESDB} == no
 OLD_FILES+=var/db/services.db
 .endif
 
 .if ${MK_SHAREDOCS} == no
 OLD_FILES+=usr/share/doc/pjdfstest/README
 OLD_DIRS+=usr/share/doc/pjdfstest
 .endif
 
 .if ${MK_SYSCONS} == no
 OLD_FILES+=usr/share/syscons/fonts/INDEX.fonts
 OLD_FILES+=usr/share/syscons/fonts/armscii8-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/armscii8-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/armscii8-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp1251-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp1251-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp1251-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp437-thin-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp850-thin-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp865-thin-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866b-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866c-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866u-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866u-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/cp866u-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/haik8-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/haik8-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/haik8-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso02-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso02-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso02-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-vga9-wide-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso04-wide-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso05-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso05-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso05-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso07-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso07-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso07-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso08-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso08-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso08-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso09-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso15-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso15-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso15-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/iso15-thin-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-r-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-rb-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-rc-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/koi8-u-8x8.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-1131-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-1251-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-8x14.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-8x16.fnt
 OLD_FILES+=usr/share/syscons/fonts/swiss-8x8.fnt
 OLD_FILES+=usr/share/syscons/keymaps/INDEX.keymaps
 OLD_FILES+=usr/share/syscons/keymaps/be.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/be.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/bg.bds.ctrlcaps.kbd
 OLD_FILES+=usr/share/syscons/keymaps/bg.phonetic.ctrlcaps.kbd
 OLD_FILES+=usr/share/syscons/keymaps/br275.cp850.kbd
 OLD_FILES+=usr/share/syscons/keymaps/br275.iso.acc.kbd
 OLD_FILES+=usr/share/syscons/keymaps/br275.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/by.cp1131.kbd
 OLD_FILES+=usr/share/syscons/keymaps/by.cp1251.kbd
 OLD_FILES+=usr/share/syscons/keymaps/by.iso5.kbd
 OLD_FILES+=usr/share/syscons/keymaps/ce.iso2.kbd
 OLD_FILES+=usr/share/syscons/keymaps/colemak.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+=usr/bin/telnet
 OLD_FILES+=usr/share/man/man1/telnet.1.gz
 .endif
 
 .if ${MK_TESTS} == yes
 OLD_FILES+=usr/bin/atf-sh
 OLD_FILES+=usr/include/atf-c++/config.hpp
 OLD_FILES+=usr/include/atf-c/config.h
 OLD_FILES+=usr/lib/libatf-c++.a
 OLD_FILES+=usr/lib/libatf-c++.so
 OLD_LIBS+=usr/lib/libatf-c++.so.1
 OLD_LIBS+=usr/lib/libatf-c++.so.2
 OLD_FILES+=usr/lib/libatf-c++_p.a
 OLD_FILES+=usr/lib/libatf-c.a
 OLD_FILES+=usr/lib/libatf-c.so
 OLD_LIBS+=usr/lib/libatf-c.so.1
 OLD_FILES+=usr/lib/libatf-c_p.a
 OLD_LIBS+=usr/lib/libprivateatf-c.so.0
 OLD_LIBS+=usr/lib/libprivateatf-c++.so.1
 OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc
 OLD_FILES+=usr/libdata/pkgconfig/atf-c.pc
 OLD_FILES+=usr/libdata/pkgconfig/atf-sh.pc
 OLD_FILES+=usr/share/aclocal/atf-c++.m4
 OLD_FILES+=usr/share/aclocal/atf-c.m4
 OLD_FILES+=usr/share/aclocal/atf-common.m4
 OLD_FILES+=usr/share/aclocal/atf-sh.m4
 OLD_DIRS+=usr/share/aclocal
 OLD_DIRS+=usr/tests/bin/chown
 OLD_FILES+=usr/tests/bin/chown/Kyuafile
 OLD_FILES+=usr/tests/bin/chown/chown-f_test
 OLD_FILES+=usr/tests/bin/chown/units_basics
 OLD_FILES+=usr/tests/bin/date/legacy_test
 OLD_FILES+=usr/tests/bin/sh/legacy_test
 OLD_FILES+=usr/tests/usr.bin/atf/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/atf_check_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/config_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/integration_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/misc_helpers
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/normalize_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/tc_test
 OLD_FILES+=usr/tests/usr.bin/atf/atf-sh/tp_test
 OLD_DIRS+=usr/tests/usr.bin/atf/atf-sh
 OLD_DIRS+=usr/tests/usr.bin/atf
 OLD_FILES+=usr/tests/lib/atf/libatf-c/test_helpers_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/fork_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/application_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/expand_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/parser_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/ui_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/exceptions_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/expand_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/parser_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/pkg_config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/ui_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/dynstr_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/list_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/map_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/pkg_config_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/process_helpers
 OLD_FILES+=usr/tests/lib/atf/libatf-c/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/user_test
 .if ${MK_MAKE} == yes
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/libtest.a
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/libtest.a
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7
 OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/libtest.a
 OLD_FILES+=usr/tests/usr.bin/make/archives/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/basic/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/execution/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/sh
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/meta/sh
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path/sh
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/shell
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/replace/shell
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/shell/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST2.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST1.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST2.a
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/suffixes/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.4
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.5
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.4
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.5
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.4
 OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.5
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/syntax/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/cleanup
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/cleanup
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/sys.mk
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/sysmk/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.3
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.3
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.3
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.2
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/legacy_test
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Makefile.test
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.status.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stderr.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stdout.1
 OLD_FILES+=usr/tests/usr.bin/make/variables/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/make/common.sh
 OLD_FILES+=usr/tests/usr.bin/make/test-new.mk
 OLD_DIRS+=usr/tests/usr.bin/make/variables/t0
 OLD_DIRS+=usr/tests/usr.bin/make/variables/opt_V
 OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_t
 OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_M
 OLD_DIRS+=usr/tests/usr.bin/make/variables
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/mk
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2/1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/mk
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2/1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/mk
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2/1
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0
 OLD_DIRS+=usr/tests/usr.bin/make/sysmk
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/semi
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/funny-targets
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/enl
 OLD_DIRS+=usr/tests/usr.bin/make/syntax/directive-t0
 OLD_DIRS+=usr/tests/usr.bin/make/syntax
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild2
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild1
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes/basic
 OLD_DIRS+=usr/tests/usr.bin/make/suffixes
 OLD_DIRS+=usr/tests/usr.bin/make/shell/select
 OLD_DIRS+=usr/tests/usr.bin/make/shell/replace
 OLD_DIRS+=usr/tests/usr.bin/make/shell/path_select
 OLD_DIRS+=usr/tests/usr.bin/make/shell/path
 OLD_DIRS+=usr/tests/usr.bin/make/shell/meta
 OLD_DIRS+=usr/tests/usr.bin/make/shell/builtin
 OLD_DIRS+=usr/tests/usr.bin/make/shell
 OLD_DIRS+=usr/tests/usr.bin/make/execution/plus
 OLD_DIRS+=usr/tests/usr.bin/make/execution/joberr
 OLD_DIRS+=usr/tests/usr.bin/make/execution/empty
 OLD_DIRS+=usr/tests/usr.bin/make/execution/ellipsis
 OLD_DIRS+=usr/tests/usr.bin/make/execution
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t3
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t2
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t1
 OLD_DIRS+=usr/tests/usr.bin/make/basic/t0
 OLD_DIRS+=usr/tests/usr.bin/make/basic
 OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_oldbsd
 OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod
 OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd
 OLD_DIRS+=usr/tests/usr.bin/make/archives
 OLD_DIRS+=usr/tests/usr.bin/make
 OLD_FILES+=usr/tests/usr.bin/yacc/legacy_test
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.00.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.01.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.02.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.03.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.04.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.05.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.06.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.07.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.08.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.09.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.10.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.11.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.12.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.13.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.14.out
 OLD_FILES+=usr/tests/usr.bin/yacc/regress.sh
 OLD_FILES+=usr/tests/usr.bin/yacc/undefined.y
 .endif
 .else
 # ATF libraries.
 OLD_FILES+=etc/mtree/BSD.tests.dist
 OLD_FILES+=usr/bin/atf-sh
 OLD_DIRS+=usr/include/atf-c
 OLD_FILES+=usr/include/atf-c/build.h
 OLD_FILES+=usr/include/atf-c/check.h
 OLD_FILES+=usr/include/atf-c/config.h
 OLD_FILES+=usr/include/atf-c/defs.h
 OLD_FILES+=usr/include/atf-c/error.h
 OLD_FILES+=usr/include/atf-c/error_fwd.h
 OLD_FILES+=usr/include/atf-c/macros.h
 OLD_FILES+=usr/include/atf-c/tc.h
 OLD_FILES+=usr/include/atf-c/tp.h
 OLD_FILES+=usr/include/atf-c/utils.h
 OLD_FILES+=usr/include/atf-c.h
 OLD_DIRS+=usr/include/atf-c++
 OLD_FILES+=usr/include/atf-c++/build.hpp
 OLD_FILES+=usr/include/atf-c++/check.hpp
 OLD_FILES+=usr/include/atf-c++/config.hpp
 OLD_FILES+=usr/include/atf-c++/macros.hpp
 OLD_FILES+=usr/include/atf-c++/tests.hpp
 OLD_FILES+=usr/include/atf-c++/utils.hpp
 OLD_FILES+=usr/include/atf-c++.hpp
 OLD_FILES+=usr/lib/libatf-c_p.a
 OLD_FILES+=usr/lib/libatf-c.so.1
 OLD_FILES+=usr/lib/libatf-c.so
 OLD_FILES+=usr/lib/libatf-c++.a
 OLD_FILES+=usr/lib/libatf-c++_p.a
 OLD_FILES+=usr/lib/libatf-c++.so.1
 OLD_FILES+=usr/lib/libatf-c++.so
 OLD_FILES+=usr/lib/libatf-c.a
 OLD_FILES+=usr/libexec/atf-check
 OLD_FILES+=usr/libexec/atf-sh
 OLD_DIRS+=usr/share/atf
 OLD_FILES+=usr/share/atf/libatf-sh.subr
 OLD_DIRS+=usr/share/doc/atf
 OLD_FILES+=usr/share/doc/atf/AUTHORS
 OLD_FILES+=usr/share/doc/atf/COPYING
 OLD_FILES+=usr/share/doc/atf/NEWS
 OLD_FILES+=usr/share/doc/atf/README
 OLD_FILES+=usr/share/doc/pjdfstest/README
 OLD_FILES+=usr/share/man/man1/atf-check.1.gz
 OLD_FILES+=usr/share/man/man1/atf-sh.1.gz
 OLD_FILES+=usr/share/man/man1/atf-test-program.1.gz
 OLD_FILES+=usr/share/man/man3/atf-c-api.3.gz
 OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz
 OLD_FILES+=usr/share/man/man3/atf-sh-api.3.gz
 OLD_FILES+=usr/share/man/man3/atf-sh.3.gz
 OLD_FILES+=usr/share/man/man4/atf-test-case.4.gz
 OLD_FILES+=usr/share/man/man7/atf.7.gz
 OLD_FILES+=usr/share/mk/atf.test.mk
 OLD_FILES+=usr/share/mk/plain.test.mk
 OLD_FILES+=usr/share/mk/suite.test.mk
 OLD_FILES+=usr/share/mk/tap.test.mk
 
 # Test suite.
 . if exists(${DESTDIR}${TESTSBASE})
 TESTS_DIRS!=find ${DESTDIR}${TESTSBASE} -type d | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${TESTS_DIRS}
 TESTS_FILES!=find ${DESTDIR}${TESTSBASE} \! -type d | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_FILES+=${TESTS_FILES}
 . endif
 .endif	# Test suite.
 
 .if ${MK_TESTS_SUPPORT} == no
 OLD_FILES+=usr/bin/kyua
 OLD_FILES+=usr/include/atf-c++.hpp
 OLD_FILES+=usr/include/atf-c++/build.hpp
 OLD_FILES+=usr/include/atf-c++/check.hpp
 OLD_FILES+=usr/include/atf-c++/macros.hpp
 OLD_FILES+=usr/include/atf-c++/tests.hpp
 OLD_FILES+=usr/include/atf-c++/utils.hpp
 OLD_FILES+=usr/include/atf-c.h
 OLD_FILES+=usr/include/atf-c/build.h
 OLD_FILES+=usr/include/atf-c/check.h
 OLD_FILES+=usr/include/atf-c/defs.h
 OLD_FILES+=usr/include/atf-c/error.h
 OLD_FILES+=usr/include/atf-c/error_fwd.h
 OLD_FILES+=usr/include/atf-c/macros.h
 OLD_FILES+=usr/include/atf-c/tc.h
 OLD_FILES+=usr/include/atf-c/tp.h
 OLD_FILES+=usr/include/atf-c/utils.h
 OLD_LIBS+=usr/lib/libprivateatf-c++.so.2
 OLD_LIBS+=usr/lib/libprivateatf-c.so.1
 OLD_FILES+=usr/share/examples/kyua/kyua.conf
 OLD_FILES+=usr/share/examples/kyua/Kyuafile.top
 OLD_FILES+=usr/share/kyua/misc/context.html
 OLD_FILES+=usr/share/kyua/misc/index.html
 OLD_FILES+=usr/share/kyua/misc/report.css
 OLD_FILES+=usr/share/kyua/misc/test_result.html
 OLD_FILES+=usr/share/kyua/store/migrate_v1_v2.sql
 OLD_FILES+=usr/share/kyua/store/migrate_v2_v3.sql
 OLD_FILES+=usr/share/kyua/store/schema_v3.sql
 OLD_FILES+=usr/share/man/man1/kyua-about.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-config.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-db-exec.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-db-migrate.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-debug.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-help.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-list.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-report-html.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-report-junit.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-report.1.gz
 OLD_FILES+=usr/share/man/man1/kyua-test.1.gz
 OLD_FILES+=usr/share/man/man1/kyua.1.gz
 OLD_FILES+=usr/share/man/man3/atf-c++.3.gz
 OLD_FILES+=usr/share/man/man3/atf-c-api++.3.gz
 OLD_FILES+=usr/share/man/man3/atf-c-api.3.gz
 OLD_FILES+=usr/share/man/man3/atf-c.3.gz
 OLD_FILES+=usr/share/man/man5/kyua.conf.5.gz
 OLD_FILES+=usr/share/man/man5/kyuafile.5.gz
 OLD_FILES+=usr/tests/lib/atf/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/atf_c++_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/build_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/check_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/application_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/exceptions_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/detail/version_helper
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/macros_hpp_test.cpp
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/macros_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/tests_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/unused_test.cpp
 OLD_FILES+=usr/tests/lib/atf/libatf-c++/utils_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c/atf_c_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/build_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/check_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/dynstr_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/env_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/fs_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/list_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/map_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/process_helpers
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/process_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/user_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/detail/version_helper
 OLD_FILES+=usr/tests/lib/atf/libatf-c/error_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/macros_h_test.c
 OLD_FILES+=usr/tests/lib/atf/libatf-c/macros_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/tc_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/tp_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/unused_test.c
 OLD_FILES+=usr/tests/lib/atf/libatf-c/utils_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/Kyuafile
 OLD_FILES+=usr/tests/lib/atf/test-programs/c_helpers
 OLD_FILES+=usr/tests/lib/atf/test-programs/config_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/cpp_helpers
 OLD_FILES+=usr/tests/lib/atf/test-programs/expect_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/meta_data_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/result_test
 OLD_FILES+=usr/tests/lib/atf/test-programs/sh_helpers
 OLD_FILES+=usr/tests/lib/atf/test-programs/srcdir_test
 .endif
 
 .if ${MK_TEXTPROC} == no
 OLD_FILES+=usr/bin/checknr
 OLD_FILES+=usr/bin/colcrt
 OLD_FILES+=usr/bin/ul
 OLD_FILES+=usr/share/man/man1/checknr.1.gz
 OLD_FILES+=usr/share/man/man1/colcrt.1.gz
 OLD_FILES+=usr/share/man/man1/ul.1.gz
 .endif
 
 .if ${MK_TFTP} == no
 OLD_FILES+=usr/bin/tftp
 OLD_FILES+=usr/libexec/tftpd
 OLD_FILES+=usr/share/man/man1/tftp.1.gz
 OLD_FILES+=usr/share/man/man8/tftpd.8.gz
 .endif
 
 .if ${MK_TOOLCHAIN} == no
 OLD_FILES+=usr/bin/CC
 OLD_FILES+=usr/bin/addr2line
 OLD_FILES+=usr/bin/as
 OLD_FILES+=usr/bin/byacc
 OLD_FILES+=usr/bin/cc
 OLD_FILES+=usr/bin/c88
 OLD_FILES+=usr/bin/c++
 OLD_FILES+=usr/bin/c++filt
 OLD_FILES+=usr/bin/ld
 OLD_FILES+=usr/bin/ld.bfd
 OLD_FILES+=usr/bin/nm
 OLD_FILES+=usr/bin/objcopy
 OLD_FILES+=usr/bin/readelf
 OLD_FILES+=usr/bin/size
 OLD_FILES+=usr/bin/strip
 OLD_FILES+=usr/bin/yacc
 OLD_FILES+=usr/share/man/man1/addr2line.1.gz
 OLD_FILES+=usr/share/man/man1/c++filt.1.gz
 OLD_FILES+=usr/share/man/man1/nm.1.gz
 OLD_FILES+=usr/share/man/man1/readelf.1.gz
 OLD_FILES+=usr/share/man/man1/size.1.gz
 OLD_FILES+=usr/share/man/man1/strip.1.gz
 OLD_FILES+=usr/share/man/man1/objcopy.1.gz
 # lib/libelf
 OLD_FILES+=usr/share/man/man3/elf.3.gz
 OLD_FILES+=usr/share/man/man3/elf_begin.3.gz
 OLD_FILES+=usr/share/man/man3/elf_cntl.3.gz
 OLD_FILES+=usr/share/man/man3/elf_end.3.gz
 OLD_FILES+=usr/share/man/man3/elf_errmsg.3.gz
 OLD_FILES+=usr/share/man/man3/elf_fill.3.gz
 OLD_FILES+=usr/share/man/man3/elf_flagdata.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getarhdr.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getarsym.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getbase.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getdata.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getident.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getscn.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getphdrnum.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getphnum.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getshdrnum.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getshnum.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getshdrstrndx.3.gz
 OLD_FILES+=usr/share/man/man3/elf_getshstrndx.3.gz
 OLD_FILES+=usr/share/man/man3/elf_hash.3.gz
 OLD_FILES+=usr/share/man/man3/elf_kind.3.gz
 OLD_FILES+=usr/share/man/man3/elf_memory.3.gz
 OLD_FILES+=usr/share/man/man3/elf_next.3.gz
 OLD_FILES+=usr/share/man/man3/elf_open.3.gz
 OLD_FILES+=usr/share/man/man3/elf_rawfile.3.gz
 OLD_FILES+=usr/share/man/man3/elf_rand.3.gz
 OLD_FILES+=usr/share/man/man3/elf_strptr.3.gz
 OLD_FILES+=usr/share/man/man3/elf_update.3.gz
 OLD_FILES+=usr/share/man/man3/elf_version.3.gz
 OLD_FILES+=usr/share/man/man3/gelf.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_checksum.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_fsize.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getcap.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getclass.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getdyn.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getehdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getmove.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getphdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getrel.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getrela.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getshdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getsym.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getsyminfo.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_getsymshndx.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_newehdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_newphdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_update_ehdr.3.gz
 OLD_FILES+=usr/share/man/man3/gelf_xlatetof.3.gz
 # lib/libelftc
 OLD_FILES+=usr/share/man/man3/elftc.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_bfd_find_target.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_copyfile.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_demangle.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_reloc_type_str.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_set_timestamps.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_timestamp.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_string_table_create.3.gz
 OLD_FILES+=usr/share/man/man3/elftc_version.3.gz
 OLD_FILES+=usr/tests/usr.bin/yacc/Kyuafile
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_calc1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/btyacc_demo.y
 OLD_FILES+=usr/tests/usr.bin/yacc/calc.y
 OLD_FILES+=usr/tests/usr.bin/yacc/calc1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/calc2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/calc3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/code_calc.y
 OLD_FILES+=usr/tests/usr.bin/yacc/code_debug.y
 OLD_FILES+=usr/tests/usr.bin/yacc/code_error.y
 OLD_FILES+=usr/tests/usr.bin/yacc/empty.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit4.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_inherit5.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax10.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax11.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax12.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax13.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax14.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax15.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax16.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax17.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax18.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax19.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax20.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax21.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax22.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax23.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax24.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax25.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax26.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax27.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax4.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax5.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax6.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax7.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax7a.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax7b.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax8.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax8a.y
 OLD_FILES+=usr/tests/usr.bin/yacc/err_syntax9.y
 OLD_FILES+=usr/tests/usr.bin/yacc/error.y
 OLD_FILES+=usr/tests/usr.bin/yacc/grammar.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit0.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/inherit2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/ok_syntax1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/pure_calc.y
 OLD_FILES+=usr/tests/usr.bin/yacc/pure_error.y
 OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc.y
 OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc2.y
 OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc3.y
 OLD_FILES+=usr/tests/usr.bin/yacc/quote_calc4.y
 OLD_FILES+=usr/tests/usr.bin/yacc/run_test
 OLD_FILES+=usr/tests/usr.bin/yacc/varsyntax_calc1.y
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_b.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_b.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_l.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/big_l.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc1.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc2.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc2.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc2.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc2.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc3.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc3.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc3.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/calc3.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.code.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_calc.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.code.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/code_error.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/empty.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/empty.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/empty.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/empty.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax1.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax1.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax10.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax10.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax10.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax10.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax11.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax11.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax11.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax11.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax12.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax12.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax12.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax12.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax13.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax13.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax13.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax13.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax14.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax14.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax14.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax14.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax15.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax15.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax15.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax15.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax16.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax16.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax16.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax16.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax17.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax17.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax17.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax17.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax18.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax18.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax18.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax18.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax19.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax19.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax19.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax19.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax2.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax2.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax2.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax2.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax20.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax20.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax20.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax20.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax21.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax21.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax21.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax21.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax22.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax22.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax22.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax22.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax23.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax23.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax23.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax23.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax24.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax24.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax24.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax24.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax25.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax25.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax25.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax25.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax26.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax26.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax26.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax26.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax27.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax27.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax27.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax27.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax3.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax3.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax3.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax3.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax4.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax4.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax4.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax4.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax5.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax5.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax5.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax5.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax6.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax6.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax6.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax6.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7a.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7a.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7a.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7a.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7b.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7b.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7b.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax7b.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8a.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8a.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8a.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax8a.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax9.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax9.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax9.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/err_syntax9.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/error.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/error.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/error.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/error.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.dot
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/grammar.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/help.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/help.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_b_opt.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_b_opt.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_b_opt1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_b_opt1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_code_c.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_code_c.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_defines.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_defines.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_graph.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_graph.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_include.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_include.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_opts.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_opts.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output2.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_output2.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_p_opt.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_p_opt.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_p_opt1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_p_opt1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_verbose.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/no_verbose.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/nostdin.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/nostdin.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/ok_syntax1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/ok_syntax1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/ok_syntax1.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/ok_syntax1.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_calc.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_calc.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_calc.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_calc.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_error.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_error.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_error.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/pure_error.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc-s.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc-s.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc-s.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc-s.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2-s.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2-s.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2-s.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2-s.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc2.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3-s.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3-s.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3-s.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3-s.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc3.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4-s.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4-s.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4-s.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4-s.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/quote_calc4.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.i
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/rename_debug.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/varsyntax_calc1.error
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/varsyntax_calc1.output
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/varsyntax_calc1.tab.c
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc/varsyntax_calc1.tab.h
 OLD_FILES+=usr/tests/usr.bin/yacc/yacc_tests
 OLD_DIRS+=usr/tests/usr.bin/yacc/yacc
 OLD_DIRS+=usr/tests/usr.bin/yacc
 .endif
 
 .if ${MK_UNBOUND} == no
 OLD_FILES+=etc/rc.d/local_unbound
 OLD_FILES+=etc/unbound
 OLD_FILES+=usr/lib/libprivateunbound.a
 OLD_FILES+=usr/lib/libprivateunbound.so
 OLD_LIBS+=usr/lib/libprivateunbound.so.5
 OLD_FILES+=usr/lib/libprivateunbound_p.a
 OLD_FILES+=usr/share/man/man5/local-unbound.conf.5.gz
 OLD_FILES+=usr/share/man/man8/local-unbound-anchor.8.gz
 OLD_FILES+=usr/share/man/man8/local-unbound-checkconf.8.gz
 OLD_FILES+=usr/share/man/man8/local-unbound-control.8.gz
 OLD_FILES+=usr/share/man/man8/local-unbound.8.gz
 OLD_FILES+=usr/sbin/local-unbound-setup
 OLD_FILES+=usr/sbin/local-unbound
 OLD_FILES+=usr/sbin/local-unbound-anchor
 OLD_FILES+=usr/sbin/local-unbound-checkconf
 OLD_FILES+=usr/sbin/local-unbound-control
 .endif
 
 .if ${MK_USB} == no
 OLD_FILES+=etc/devd/uath.conf
 OLD_FILES+=etc/devd/uauth.conf
 OLD_FILES+=etc/devd/ulpt.conf
 OLD_FILES+=etc/devd/usb.conf
 OLD_FILES+=usr/bin/usbhidaction
 OLD_FILES+=usr/bin/usbhidctl
 OLD_FILES+=usr/include/libusb.h
 OLD_FILES+=usr/include/libusb20.h
 OLD_FILES+=usr/include/libusb20_desc.h
 OLD_FILES+=usr/include/usb.h
 OLD_FILES+=usr/include/usbhid.h
 OLD_FILES+=usr/lib/libusb.a
 OLD_FILES+=usr/lib/libusb.so
 OLD_LIBS+=usr/lib/libusb.so.3
 OLD_FILES+=usr/lib/libusb_p.a
 OLD_FILES+=usr/lib/libusbhid.a
 OLD_FILES+=usr/lib/libusbhid.so
 OLD_LIBS+=usr/lib/libusbhid.so.4
 OLD_FILES+=usr/lib/libusbhid_p.a
 OLD_FILES+=usr/libdata/pkgconfig/libusb-0.1.pc
 OLD_FILES+=usr/libdata/pkgconfig/libusb-1.0.pc
 OLD_FILES+=usr/libdata/pkgconfig/libusb-2.0.pc
 OLD_FILES+=usr/sbin/uathload
 OLD_FILES+=usr/sbin/uhsoctl
 OLD_FILES+=usr/sbin/usbconfig
 OLD_FILES+=usr/sbin/usbdump
 OLD_FILES+=usr/share/examples/libusb20/Makefile
 OLD_FILES+=usr/share/examples/libusb20/README
 OLD_FILES+=usr/share/examples/libusb20/bulk.c
 OLD_FILES+=usr/share/examples/libusb20/control.c
 OLD_FILES+=usr/share/examples/libusb20/util.c
 OLD_FILES+=usr/share/examples/libusb20/util.h
 OLD_DIRS+=usr/share/examples/libusb20
 OLD_FILES+=usr/share/firmware/ar5523.bin
 OLD_FILES+=usr/share/man/man1/uhsoctl.1.gz
 OLD_FILES+=usr/share/man/man1/usbhidaction.1.gz
 OLD_FILES+=usr/share/man/man1/usbhidctl.1.gz
 OLD_FILES+=usr/share/man/man3/hid_dispose_report_desc.3.gz
 OLD_FILES+=usr/share/man/man3/hid_end_parse.3.gz
 OLD_FILES+=usr/share/man/man3/hid_get_data.3.gz
 OLD_FILES+=usr/share/man/man3/hid_get_item.3.gz
 OLD_FILES+=usr/share/man/man3/hid_get_report_desc.3.gz
 OLD_FILES+=usr/share/man/man3/hid_init.3.gz
 OLD_FILES+=usr/share/man/man3/hid_locate.3.gz
 OLD_FILES+=usr/share/man/man3/hid_report_size.3.gz
 OLD_FILES+=usr/share/man/man3/hid_set_data.3.gz
 OLD_FILES+=usr/share/man/man3/hid_start_parse.3.gz
 OLD_FILES+=usr/share/man/man3/hid_usage_in_page.3.gz
 OLD_FILES+=usr/share/man/man3/hid_usage_page.3.gz
 OLD_FILES+=usr/share/man/man3/libusb.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_add_dev_quirk.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_alloc_default.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_dequeue_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_device_foreach.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_enqueue_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_free.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_get_dev_quirk.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_get_quirk_name.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_get_template.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_remove_dev_quirk.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_be_set_template.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_desc_foreach.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_alloc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_alloc_config.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_check_connected.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_close.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_detach_kernel_driver.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_free.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_address.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_backend_name.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_bus_number.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_config_index.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_debug.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_desc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_device_desc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_fd.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_iface_desc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_info.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_mode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_parent_address.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_parent_port.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_port_path.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_power_mode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_power_usage.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_get_speed.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_kernel_driver_active.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_open.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_process.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_req_string_simple_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_req_string_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_request_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_reset.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_set_alt_index.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_set_config_index.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_set_debug.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_set_power_mode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_dev_wait_process.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_error_name.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_me_decode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_me_encode.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_me_get_1.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_me_get_2.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_bulk_intr_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_callback_wrapper.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_clear_stall_sync.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_close.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_drain.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_actual_frames.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_actual_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_frames.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_packet_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_max_total_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_pointer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_priv_sc0.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_priv_sc1.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_status.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_get_time_complete.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_open.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_pending.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_callback.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_flags.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_length.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_priv_sc0.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_priv_sc1.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_set_total_frames.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_bulk.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_control.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_intr.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_setup_isoc.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_start.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_stop.3.gz
 OLD_FILES+=usr/share/man/man3/libusb20_tr_submit.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_alloc_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_attach_kernel_driver.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_bulk_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_cancel_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_check_connected.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_claim_interface.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_clear_halt.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_close.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_control_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_detach_kernel_driver.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_detach_kernel_driver_np.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_error_name.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_event_handler_active.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_event_handling_ok.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_exit.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_bos_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_config_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_device_list.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_ss_endpoint_comp.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_free_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_active_config_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_bus_number.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_config_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_config_descriptor_by_value.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device_address.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device_list.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_device_speed.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_driver.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_driver_np.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_max_iso_packet_size.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_max_packet_size.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_next_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_pollfds.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_string_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_get_string_descriptor_ascii.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events_completed.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events_locked.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events_timeout.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_handle_events_timeout_completed.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_init.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_interrupt_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_kernel_driver_active.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_lock_event_waiters.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_lock_events.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_open.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_open_device_with_vid_pid.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_parse_bos_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_parse_ss_endpoint_comp.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_ref_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_release_interface.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_reset_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_set_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_set_debug.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_set_interface_alt_setting.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_set_pollfd_notifiers.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_submit_transfer.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_try_lock_events.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_unlock_event_waiters.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_unlock_events.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_unref_device.3.gz
 OLD_FILES+=usr/share/man/man3/libusb_wait_for_event.3.gz
 OLD_FILES+=usr/share/man/man3/libusbhid.3.gz
 OLD_FILES+=usr/share/man/man3/usb.3.gz
 OLD_FILES+=usr/share/man/man3/usb_bulk_read.3.gz
 OLD_FILES+=usr/share/man/man3/usb_bulk_write.3.gz
 OLD_FILES+=usr/share/man/man3/usb_check_connected.3.gz
 OLD_FILES+=usr/share/man/man3/usb_claim_interface.3.gz
 OLD_FILES+=usr/share/man/man3/usb_clear_halt.3.gz
 OLD_FILES+=usr/share/man/man3/usb_close.3.gz
 OLD_FILES+=usr/share/man/man3/usb_control_msg.3.gz
 OLD_FILES+=usr/share/man/man3/usb_destroy_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/usb_device.3.gz
 OLD_FILES+=usr/share/man/man3/usb_fetch_and_parse_descriptors.3.gz
 OLD_FILES+=usr/share/man/man3/usb_find_busses.3.gz
 OLD_FILES+=usr/share/man/man3/usb_find_devices.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_busses.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_descriptor_by_endpoint.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_string.3.gz
 OLD_FILES+=usr/share/man/man3/usb_get_string_simple.3.gz
 OLD_FILES+=usr/share/man/man3/usb_init.3.gz
 OLD_FILES+=usr/share/man/man3/usb_interrupt_read.3.gz
 OLD_FILES+=usr/share/man/man3/usb_interrupt_write.3.gz
 OLD_FILES+=usr/share/man/man3/usb_open.3.gz
 OLD_FILES+=usr/share/man/man3/usb_parse_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/usb_parse_descriptor.3.gz
 OLD_FILES+=usr/share/man/man3/usb_release_interface.3.gz
 OLD_FILES+=usr/share/man/man3/usb_reset.3.gz
 OLD_FILES+=usr/share/man/man3/usb_resetep.3.gz
 OLD_FILES+=usr/share/man/man3/usb_set_altinterface.3.gz
 OLD_FILES+=usr/share/man/man3/usb_set_configuration.3.gz
 OLD_FILES+=usr/share/man/man3/usb_set_debug.3.gz
 OLD_FILES+=usr/share/man/man3/usb_strerror.3.gz
 OLD_FILES+=usr/share/man/man3/usbhid.3.gz
 OLD_FILES+=usr/share/man/man4/if_otus.4.gz
 OLD_FILES+=usr/share/man/man4/if_rsu.4.gz
 OLD_FILES+=usr/share/man/man4/if_rtwn_usb.4.gz
 OLD_FILES+=usr/share/man/man4/if_rum.4.gz
 OLD_FILES+=usr/share/man/man4/if_run.4.gz
 OLD_FILES+=usr/share/man/man4/if_zyd.4.gz
 OLD_FILES+=usr/share/man/man4/otus.4.gz
 OLD_FILES+=usr/share/man/man4/otusfw.4.gz
 OLD_FILES+=usr/share/man/man4/rsu.4.gz
 OLD_FILES+=usr/share/man/man4/rsufw.4.gz
 OLD_FILES+=usr/share/man/man4/rtwn_usb.4.gz
 OLD_FILES+=usr/share/man/man4/rum.4.gz
 OLD_FILES+=usr/share/man/man4/run.4.gz
 OLD_FILES+=usr/share/man/man4/runfw.4.gz
 OLD_FILES+=usr/share/man/man4/u3g.4.gz
 OLD_FILES+=usr/share/man/man4/u3gstub.4.gz
 OLD_FILES+=usr/share/man/man4/uark.4.gz
 OLD_FILES+=usr/share/man/man4/uart.4.gz
 OLD_FILES+=usr/share/man/man4/uath.4.gz
 OLD_FILES+=usr/share/man/man4/ubsa.4.gz
 OLD_FILES+=usr/share/man/man4/ubser.4.gz
 OLD_FILES+=usr/share/man/man4/ubtbcmfw.4.gz
 OLD_FILES+=usr/share/man/man4/uchcom.4.gz
 OLD_FILES+=usr/share/man/man4/ucom.4.gz
 OLD_FILES+=usr/share/man/man4/ucycom.4.gz
 OLD_FILES+=usr/share/man/man4/udav.4.gz
 OLD_FILES+=usr/share/man/man4/udbp.4.gz
 OLD_FILES+=usr/share/man/man4/uep.4.gz
 OLD_FILES+=usr/share/man/man4/ufm.4.gz
 OLD_FILES+=usr/share/man/man4/ufoma.4.gz
 OLD_FILES+=usr/share/man/man4/uftdi.4.gz
 OLD_FILES+=usr/share/man/man4/ugen.4.gz
 OLD_FILES+=usr/share/man/man4/uhci.4.gz
 OLD_FILES+=usr/share/man/man4/uhid.4.gz
 OLD_FILES+=usr/share/man/man4/uhso.4.gz
 OLD_FILES+=usr/share/man/man4/uipaq.4.gz
 OLD_FILES+=usr/share/man/man4/ukbd.4.gz
 OLD_FILES+=usr/share/man/man4/uled.4.gz
 OLD_FILES+=usr/share/man/man4/ulpt.4.gz
 OLD_FILES+=usr/share/man/man4/umass.4.gz
 OLD_FILES+=usr/share/man/man4/umcs.4.gz
 OLD_FILES+=usr/share/man/man4/umct.4.gz
 OLD_FILES+=usr/share/man/man4/umodem.4.gz
 OLD_FILES+=usr/share/man/man4/umoscom.4.gz
 OLD_FILES+=usr/share/man/man4/ums.4.gz
 OLD_FILES+=usr/share/man/man4/unix.4.gz
 OLD_FILES+=usr/share/man/man4/upgt.4.gz
 OLD_FILES+=usr/share/man/man4/uplcom.4.gz
 OLD_FILES+=usr/share/man/man4/ural.4.gz
 OLD_FILES+=usr/share/man/man4/urio.4.gz
 OLD_FILES+=usr/share/man/man4/urndis.4.gz
 OLD_FILES+=usr/share/man/man4/urtw.4.gz
 OLD_FILES+=usr/share/man/man4/usb.4.gz
 OLD_FILES+=usr/share/man/man4/usb_quirk.4.gz
 OLD_FILES+=usr/share/man/man4/usb_template.4.gz
 OLD_FILES+=usr/share/man/man4/usfs.4.gz
 OLD_FILES+=usr/share/man/man4/uslcom.4.gz
 OLD_FILES+=usr/share/man/man4/uvisor.4.gz
 OLD_FILES+=usr/share/man/man4/uvscom.4.gz
 OLD_FILES+=usr/share/man/man4/zyd.4.gz
 OLD_FILES+=usr/share/man/man8/uathload.8.gz
 OLD_FILES+=usr/share/man/man8/usbconfig.8.gz
 OLD_FILES+=usr/share/man/man8/usbdump.8.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_alloc_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_attach.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_detach.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_free_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_get_data.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_error.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_get_data_linear.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_bytes_max.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_data.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_buffer.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_error.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_put_data_linear.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_reset.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_softc.9.gz
 OLD_FILES+=usr/share/man/man9/usb_fifo_wakeup.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_do_request_flags.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_errstr.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_lookup_id_by_info.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_lookup_id_by_uaa.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_clear_stall.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_drain.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_pending.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_poll.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_setup.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_start.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_stop.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_submit.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_transfer_unsetup.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_clr_flag.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_frame_data.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_frame_len.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_get_frame.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_get_priv.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_is_stalled.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_max_framelen.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_max_frames.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_max_len.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_flag.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_data.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_len.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frame_offset.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_frames.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_interval.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_priv.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_stall.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_set_timeout.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_softc.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_state.9.gz
 OLD_FILES+=usr/share/man/man9/usbd_xfer_status.9.gz
 OLD_FILES+=usr/share/man/man9/usbdi.9.gz
 OLD_FILES+=usr/share/misc/usb_hid_usages
 OLD_FILES+=usr/share/misc/usbdevs
 .endif
 
 .if ${MK_UTMPX} == no
 OLD_FILES+=etc/periodic/monthly/200.accounting
 OLD_FILES+=etc/rc.d/utx
 OLD_FILES+=usr/bin/last
 OLD_FILES+=usr/bin/users
 OLD_FILES+=usr/bin/who
 OLD_FILES+=usr/sbin/ac
 OLD_FILES+=usr/sbin/lastlogin
 OLD_FILES+=usr/sbin/utx
 OLD_FILES+=usr/share/man/man1/last.1.gz
 OLD_FILES+=usr/share/man/man1/users.1.gz
 OLD_FILES+=usr/share/man/man1/who.1.gz
 OLD_FILES+=usr/share/man/man8/ac.8.gz
 OLD_FILES+=usr/share/man/man8/lastlogin.8.gz
 OLD_FILES+=usr/share/man/man8/utx.8.gz
 .endif
 
 .if ${MK_VERIEXEC} == no
 OLD_FILES+=sbin/veriexec
 OLD_FILES+=usr/share/man/man8/veriexec.8.gz
 OLD_FILES+=usr/lib/libveriexec.a
 OLD_FILES+=usr/lib/libveriexec.so
 OLD_LIBS+=usr/lib/libveriexec.so.5
 .endif
 
 .if ${MK_VI} == no
 OLD_FILES+=etc/rc.d/virecover
 OLD_FILES+=rescue/ex
 OLD_FILES+=rescue/vi
 OLD_FILES+=usr/bin/ex
 OLD_FILES+=usr/bin/nex
 OLD_FILES+=usr/bin/nvi
 OLD_FILES+=usr/bin/nview
 OLD_FILES+=usr/bin/vi
 OLD_FILES+=usr/bin/view
 OLD_FILES+=usr/share/man/man1/ex.1.gz
 OLD_FILES+=usr/share/man/man1/nex.1.gz
 OLD_FILES+=usr/share/man/man1/nvi.1.gz
 OLD_FILES+=usr/share/man/man1/nview.1.gz
 OLD_FILES+=usr/share/man/man1/vi.1.gz
 OLD_FILES+=usr/share/man/man1/view.1.gz
 .  if exists(${DESTDIR}/usr/share/vi)
 VI_DIRS!=find ${DESTDIR}/usr/share/vi -type d \
     | sed -e 's,^${DESTDIR}/,,'; echo
 VI_FILES!=find ${DESTDIR}/usr/share/vi \! -type d \
     | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${VI_DIRS}
 OLD_FILES+=${VI_FILES}
 .  endif
 .endif
 
 .if ${MK_WIRELESS} == no
 OLD_FILES+=etc/regdomain.xml
 OLD_FILES+=etc/rc.d/hostapd
 OLD_FILES+=etc/rc.d/wpa_supplicant
 OLD_FILES+=usr/sbin/ancontrol
 OLD_FILES+=usr/sbin/hostapd
 OLD_FILES+=usr/sbin/hostapd_cli
 OLD_FILES+=usr/sbin/ndis_events
 OLD_FILES+=usr/sbin/wlandebug
 OLD_FILES+=usr/sbin/wpa_cli
 OLD_FILES+=usr/sbin/wpa_passphrase
 OLD_FILES+=usr/sbin/wpa_supplicant
 OLD_FILES+=usr/share/examples/etc/regdomain.xml
 OLD_FILES+=usr/share/examples/etc/wpa_supplicant.conf
 OLD_FILES+=usr/share/examples/hostapd/hostapd.conf
 OLD_FILES+=usr/share/examples/hostapd/hostapd.eap_user
 OLD_FILES+=usr/share/examples/hostapd/hostapd.wpa_psk
 OLD_DIRS+=usr/share/examples/hostapd
 OLD_FILES+=usr/share/man/man5/hostapd.conf.5.gz
 OLD_FILES+=usr/share/man/man5/wpa_supplicant.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ancontrol.8.gz
 OLD_FILES+=usr/share/man/man8/hostapd.8.gz
 OLD_FILES+=usr/share/man/man8/hostapd_cli.8.gz
 OLD_FILES+=usr/share/man/man8/ndis_events.8.gz
 OLD_FILES+=usr/share/man/man8/wlandebug.8.gz
 OLD_FILES+=usr/share/man/man8/wpa_cli.8.gz
 OLD_FILES+=usr/share/man/man8/wpa_passphrase.8.gz
 OLD_FILES+=usr/share/man/man8/wpa_supplicant.8.gz
 OLD_FILES+=usr/lib/snmp_wlan.so
 OLD_LIBS+=usr/lib/snmp_wlan.so.6
 # bsnmp module
 OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz
 OLD_FILES+=usr/share/snmp/defs/wlan_tree.def
 OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt
 .endif
 
 .if ${MK_HYPERV} == no
 OLD_FILES+=etc/devd/hyperv.conf
 OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig
 OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info
 OLD_FILES+=usr/libexec/hyperv/hv_get_dhcp_info
 OLD_FILES+=usr/sbin/hv_kvp_daemon
 OLD_FILES+=usr/sbin/hv_vss_daemon
 OLD_FILES+=usr/share/man/man8/hv_kvp_daemon.8.gz
 .endif
 
 .if ${MK_ZONEINFO} == no
 OLD_FILES+=usr/share/zoneinfo/Africa/Abidjan
 OLD_FILES+=usr/share/zoneinfo/Africa/Accra
 OLD_FILES+=usr/share/zoneinfo/Africa/Addis_Ababa
 OLD_FILES+=usr/share/zoneinfo/Africa/Algiers
 OLD_FILES+=usr/share/zoneinfo/Africa/Asmara
 OLD_FILES+=usr/share/zoneinfo/Africa/Bamako
 OLD_FILES+=usr/share/zoneinfo/Africa/Bangui
 OLD_FILES+=usr/share/zoneinfo/Africa/Banjul
 OLD_FILES+=usr/share/zoneinfo/Africa/Bissau
 OLD_FILES+=usr/share/zoneinfo/Africa/Blantyre
 OLD_FILES+=usr/share/zoneinfo/Africa/Brazzaville
 OLD_FILES+=usr/share/zoneinfo/Africa/Bujumbura
 OLD_FILES+=usr/share/zoneinfo/Africa/Cairo
 OLD_FILES+=usr/share/zoneinfo/Africa/Casablanca
 OLD_FILES+=usr/share/zoneinfo/Africa/Ceuta
 OLD_FILES+=usr/share/zoneinfo/Africa/Conakry
 OLD_FILES+=usr/share/zoneinfo/Africa/Dakar
 OLD_FILES+=usr/share/zoneinfo/Africa/Dar_es_Salaam
 OLD_FILES+=usr/share/zoneinfo/Africa/Djibouti
 OLD_FILES+=usr/share/zoneinfo/Africa/Douala
 OLD_FILES+=usr/share/zoneinfo/Africa/El_Aaiun
 OLD_FILES+=usr/share/zoneinfo/Africa/Freetown
 OLD_FILES+=usr/share/zoneinfo/Africa/Gaborone
 OLD_FILES+=usr/share/zoneinfo/Africa/Harare
 OLD_FILES+=usr/share/zoneinfo/Africa/Johannesburg
 OLD_FILES+=usr/share/zoneinfo/Africa/Juba
 OLD_FILES+=usr/share/zoneinfo/Africa/Kampala
 OLD_FILES+=usr/share/zoneinfo/Africa/Khartoum
 OLD_FILES+=usr/share/zoneinfo/Africa/Kigali
 OLD_FILES+=usr/share/zoneinfo/Africa/Kinshasa
 OLD_FILES+=usr/share/zoneinfo/Africa/Lagos
 OLD_FILES+=usr/share/zoneinfo/Africa/Libreville
 OLD_FILES+=usr/share/zoneinfo/Africa/Lome
 OLD_FILES+=usr/share/zoneinfo/Africa/Luanda
 OLD_FILES+=usr/share/zoneinfo/Africa/Lubumbashi
 OLD_FILES+=usr/share/zoneinfo/Africa/Lusaka
 OLD_FILES+=usr/share/zoneinfo/Africa/Malabo
 OLD_FILES+=usr/share/zoneinfo/Africa/Maputo
 OLD_FILES+=usr/share/zoneinfo/Africa/Maseru
 OLD_FILES+=usr/share/zoneinfo/Africa/Mbabane
 OLD_FILES+=usr/share/zoneinfo/Africa/Mogadishu
 OLD_FILES+=usr/share/zoneinfo/Africa/Monrovia
 OLD_FILES+=usr/share/zoneinfo/Africa/Nairobi
 OLD_FILES+=usr/share/zoneinfo/Africa/Ndjamena
 OLD_FILES+=usr/share/zoneinfo/Africa/Niamey
 OLD_FILES+=usr/share/zoneinfo/Africa/Nouakchott
 OLD_FILES+=usr/share/zoneinfo/Africa/Ouagadougou
 OLD_FILES+=usr/share/zoneinfo/Africa/Porto-Novo
 OLD_FILES+=usr/share/zoneinfo/Africa/Sao_Tome
 OLD_FILES+=usr/share/zoneinfo/Africa/Tripoli
 OLD_FILES+=usr/share/zoneinfo/Africa/Tunis
 OLD_FILES+=usr/share/zoneinfo/Africa/Windhoek
 OLD_FILES+=usr/share/zoneinfo/America/Adak
 OLD_FILES+=usr/share/zoneinfo/America/Anchorage
 OLD_FILES+=usr/share/zoneinfo/America/Anguilla
 OLD_FILES+=usr/share/zoneinfo/America/Antigua
 OLD_FILES+=usr/share/zoneinfo/America/Araguaina
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Buenos_Aires
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Catamarca
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Cordoba
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Jujuy
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/La_Rioja
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Mendoza
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Rio_Gallegos
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Salta
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/San_Juan
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/San_Luis
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Tucuman
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/Ushuaia
 OLD_FILES+=usr/share/zoneinfo/America/Aruba
 OLD_FILES+=usr/share/zoneinfo/America/Asuncion
 OLD_FILES+=usr/share/zoneinfo/America/Atikokan
 OLD_FILES+=usr/share/zoneinfo/America/Bahia
 OLD_FILES+=usr/share/zoneinfo/America/Bahia_Banderas
 OLD_FILES+=usr/share/zoneinfo/America/Barbados
 OLD_FILES+=usr/share/zoneinfo/America/Belem
 OLD_FILES+=usr/share/zoneinfo/America/Belize
 OLD_FILES+=usr/share/zoneinfo/America/Blanc-Sablon
 OLD_FILES+=usr/share/zoneinfo/America/Boa_Vista
 OLD_FILES+=usr/share/zoneinfo/America/Bogota
 OLD_FILES+=usr/share/zoneinfo/America/Boise
 OLD_FILES+=usr/share/zoneinfo/America/Cambridge_Bay
 OLD_FILES+=usr/share/zoneinfo/America/Campo_Grande
 OLD_FILES+=usr/share/zoneinfo/America/Cancun
 OLD_FILES+=usr/share/zoneinfo/America/Caracas
 OLD_FILES+=usr/share/zoneinfo/America/Cayenne
 OLD_FILES+=usr/share/zoneinfo/America/Cayman
 OLD_FILES+=usr/share/zoneinfo/America/Chicago
 OLD_FILES+=usr/share/zoneinfo/America/Chihuahua
 OLD_FILES+=usr/share/zoneinfo/America/Ciudad_Juarez
 OLD_FILES+=usr/share/zoneinfo/America/Costa_Rica
 OLD_FILES+=usr/share/zoneinfo/America/Creston
 OLD_FILES+=usr/share/zoneinfo/America/Cuiaba
 OLD_FILES+=usr/share/zoneinfo/America/Curacao
 OLD_FILES+=usr/share/zoneinfo/America/Danmarkshavn
 OLD_FILES+=usr/share/zoneinfo/America/Dawson
 OLD_FILES+=usr/share/zoneinfo/America/Dawson_Creek
 OLD_FILES+=usr/share/zoneinfo/America/Denver
 OLD_FILES+=usr/share/zoneinfo/America/Detroit
 OLD_FILES+=usr/share/zoneinfo/America/Dominica
 OLD_FILES+=usr/share/zoneinfo/America/Edmonton
 OLD_FILES+=usr/share/zoneinfo/America/Eirunepe
 OLD_FILES+=usr/share/zoneinfo/America/El_Salvador
 OLD_FILES+=usr/share/zoneinfo/America/Fortaleza
 OLD_FILES+=usr/share/zoneinfo/America/Glace_Bay
 OLD_FILES+=usr/share/zoneinfo/America/Godthab
 OLD_FILES+=usr/share/zoneinfo/America/Goose_Bay
 OLD_FILES+=usr/share/zoneinfo/America/Grand_Turk
 OLD_FILES+=usr/share/zoneinfo/America/Grenada
 OLD_FILES+=usr/share/zoneinfo/America/Guadeloupe
 OLD_FILES+=usr/share/zoneinfo/America/Guatemala
 OLD_FILES+=usr/share/zoneinfo/America/Guayaquil
 OLD_FILES+=usr/share/zoneinfo/America/Guyana
 OLD_FILES+=usr/share/zoneinfo/America/Halifax
 OLD_FILES+=usr/share/zoneinfo/America/Havana
 OLD_FILES+=usr/share/zoneinfo/America/Hermosillo
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Indianapolis
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Knox
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Marengo
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Petersburg
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Tell_City
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Vevay
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Vincennes
 OLD_FILES+=usr/share/zoneinfo/America/Indiana/Winamac
 OLD_FILES+=usr/share/zoneinfo/America/Inuvik
 OLD_FILES+=usr/share/zoneinfo/America/Iqaluit
 OLD_FILES+=usr/share/zoneinfo/America/Jamaica
 OLD_FILES+=usr/share/zoneinfo/America/Juneau
 OLD_FILES+=usr/share/zoneinfo/America/Kentucky/Louisville
 OLD_FILES+=usr/share/zoneinfo/America/Kentucky/Monticello
 OLD_FILES+=usr/share/zoneinfo/America/Kralendijk
 OLD_FILES+=usr/share/zoneinfo/America/La_Paz
 OLD_FILES+=usr/share/zoneinfo/America/Lima
 OLD_FILES+=usr/share/zoneinfo/America/Los_Angeles
 OLD_FILES+=usr/share/zoneinfo/America/Lower_Princes
 OLD_FILES+=usr/share/zoneinfo/America/Maceio
 OLD_FILES+=usr/share/zoneinfo/America/Managua
 OLD_FILES+=usr/share/zoneinfo/America/Manaus
 OLD_FILES+=usr/share/zoneinfo/America/Marigot
 OLD_FILES+=usr/share/zoneinfo/America/Martinique
 OLD_FILES+=usr/share/zoneinfo/America/Matamoros
 OLD_FILES+=usr/share/zoneinfo/America/Mazatlan
 OLD_FILES+=usr/share/zoneinfo/America/Menominee
 OLD_FILES+=usr/share/zoneinfo/America/Merida
 OLD_FILES+=usr/share/zoneinfo/America/Metlakatla
 OLD_FILES+=usr/share/zoneinfo/America/Mexico_City
 OLD_FILES+=usr/share/zoneinfo/America/Miquelon
 OLD_FILES+=usr/share/zoneinfo/America/Moncton
 OLD_FILES+=usr/share/zoneinfo/America/Monterrey
 OLD_FILES+=usr/share/zoneinfo/America/Montevideo
 OLD_FILES+=usr/share/zoneinfo/America/Montreal
 OLD_FILES+=usr/share/zoneinfo/America/Montserrat
 OLD_FILES+=usr/share/zoneinfo/America/Nassau
 OLD_FILES+=usr/share/zoneinfo/America/New_York
 OLD_FILES+=usr/share/zoneinfo/America/Nipigon
 OLD_FILES+=usr/share/zoneinfo/America/Nome
 OLD_FILES+=usr/share/zoneinfo/America/Noronha
 OLD_FILES+=usr/share/zoneinfo/America/North_Dakota/Beulah
 OLD_FILES+=usr/share/zoneinfo/America/North_Dakota/Center
 OLD_FILES+=usr/share/zoneinfo/America/North_Dakota/New_Salem
 OLD_FILES+=usr/share/zoneinfo/America/Ojinaga
 OLD_FILES+=usr/share/zoneinfo/America/Panama
 OLD_FILES+=usr/share/zoneinfo/America/Pangnirtung
 OLD_FILES+=usr/share/zoneinfo/America/Paramaribo
 OLD_FILES+=usr/share/zoneinfo/America/Phoenix
 OLD_FILES+=usr/share/zoneinfo/America/Port-au-Prince
 OLD_FILES+=usr/share/zoneinfo/America/Port_of_Spain
 OLD_FILES+=usr/share/zoneinfo/America/Porto_Velho
 OLD_FILES+=usr/share/zoneinfo/America/Puerto_Rico
 OLD_FILES+=usr/share/zoneinfo/America/Rainy_River
 OLD_FILES+=usr/share/zoneinfo/America/Rankin_Inlet
 OLD_FILES+=usr/share/zoneinfo/America/Recife
 OLD_FILES+=usr/share/zoneinfo/America/Regina
 OLD_FILES+=usr/share/zoneinfo/America/Resolute
 OLD_FILES+=usr/share/zoneinfo/America/Rio_Branco
 OLD_FILES+=usr/share/zoneinfo/America/Santa_Isabel
 OLD_FILES+=usr/share/zoneinfo/America/Santarem
 OLD_FILES+=usr/share/zoneinfo/America/Santiago
 OLD_FILES+=usr/share/zoneinfo/America/Santo_Domingo
 OLD_FILES+=usr/share/zoneinfo/America/Sao_Paulo
 OLD_FILES+=usr/share/zoneinfo/America/Scoresbysund
 OLD_FILES+=usr/share/zoneinfo/America/Sitka
 OLD_FILES+=usr/share/zoneinfo/America/St_Barthelemy
 OLD_FILES+=usr/share/zoneinfo/America/St_Johns
 OLD_FILES+=usr/share/zoneinfo/America/St_Kitts
 OLD_FILES+=usr/share/zoneinfo/America/St_Lucia
 OLD_FILES+=usr/share/zoneinfo/America/St_Thomas
 OLD_FILES+=usr/share/zoneinfo/America/St_Vincent
 OLD_FILES+=usr/share/zoneinfo/America/Swift_Current
 OLD_FILES+=usr/share/zoneinfo/America/Tegucigalpa
 OLD_FILES+=usr/share/zoneinfo/America/Thule
 OLD_FILES+=usr/share/zoneinfo/America/Thunder_Bay
 OLD_FILES+=usr/share/zoneinfo/America/Tijuana
 OLD_FILES+=usr/share/zoneinfo/America/Toronto
 OLD_FILES+=usr/share/zoneinfo/America/Tortola
 OLD_FILES+=usr/share/zoneinfo/America/Vancouver
 OLD_FILES+=usr/share/zoneinfo/America/Whitehorse
 OLD_FILES+=usr/share/zoneinfo/America/Winnipeg
 OLD_FILES+=usr/share/zoneinfo/America/Yakutat
 OLD_FILES+=usr/share/zoneinfo/America/Yellowknife
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Casey
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Davis
 OLD_FILES+=usr/share/zoneinfo/Antarctica/DumontDUrville
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Macquarie
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Mawson
 OLD_FILES+=usr/share/zoneinfo/Antarctica/McMurdo
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Palmer
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Rothera
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Syowa
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Troll
 OLD_FILES+=usr/share/zoneinfo/Antarctica/Vostok
 OLD_FILES+=usr/share/zoneinfo/Arctic/Longyearbyen
 OLD_FILES+=usr/share/zoneinfo/Asia/Aden
 OLD_FILES+=usr/share/zoneinfo/Asia/Almaty
 OLD_FILES+=usr/share/zoneinfo/Asia/Amman
 OLD_FILES+=usr/share/zoneinfo/Asia/Anadyr
 OLD_FILES+=usr/share/zoneinfo/Asia/Aqtau
 OLD_FILES+=usr/share/zoneinfo/Asia/Aqtobe
 OLD_FILES+=usr/share/zoneinfo/Asia/Ashgabat
 OLD_FILES+=usr/share/zoneinfo/Asia/Baghdad
 OLD_FILES+=usr/share/zoneinfo/Asia/Bahrain
 OLD_FILES+=usr/share/zoneinfo/Asia/Baku
 OLD_FILES+=usr/share/zoneinfo/Asia/Bangkok
 OLD_FILES+=usr/share/zoneinfo/Asia/Beirut
 OLD_FILES+=usr/share/zoneinfo/Asia/Bishkek
 OLD_FILES+=usr/share/zoneinfo/Asia/Brunei
 OLD_FILES+=usr/share/zoneinfo/Asia/Chita
 OLD_FILES+=usr/share/zoneinfo/Asia/Choibalsan
 OLD_FILES+=usr/share/zoneinfo/Asia/Colombo
 OLD_FILES+=usr/share/zoneinfo/Asia/Damascus
 OLD_FILES+=usr/share/zoneinfo/Asia/Dhaka
 OLD_FILES+=usr/share/zoneinfo/Asia/Dili
 OLD_FILES+=usr/share/zoneinfo/Asia/Dubai
 OLD_FILES+=usr/share/zoneinfo/Asia/Dushanbe
 OLD_FILES+=usr/share/zoneinfo/Asia/Gaza
 OLD_FILES+=usr/share/zoneinfo/Asia/Hebron
 OLD_FILES+=usr/share/zoneinfo/Asia/Ho_Chi_Minh
 OLD_FILES+=usr/share/zoneinfo/Asia/Hong_Kong
 OLD_FILES+=usr/share/zoneinfo/Asia/Hovd
 OLD_FILES+=usr/share/zoneinfo/Asia/Irkutsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Istanbul
 OLD_FILES+=usr/share/zoneinfo/Asia/Jakarta
 OLD_FILES+=usr/share/zoneinfo/Asia/Jayapura
 OLD_FILES+=usr/share/zoneinfo/Asia/Jerusalem
 OLD_FILES+=usr/share/zoneinfo/Asia/Kabul
 OLD_FILES+=usr/share/zoneinfo/Asia/Kamchatka
 OLD_FILES+=usr/share/zoneinfo/Asia/Karachi
 OLD_FILES+=usr/share/zoneinfo/Asia/Kathmandu
 OLD_FILES+=usr/share/zoneinfo/Asia/Khandyga
 OLD_FILES+=usr/share/zoneinfo/Asia/Kolkata
 OLD_FILES+=usr/share/zoneinfo/Asia/Krasnoyarsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Kuala_Lumpur
 OLD_FILES+=usr/share/zoneinfo/Asia/Kuching
 OLD_FILES+=usr/share/zoneinfo/Asia/Kuwait
 OLD_FILES+=usr/share/zoneinfo/Asia/Macau
 OLD_FILES+=usr/share/zoneinfo/Asia/Magadan
 OLD_FILES+=usr/share/zoneinfo/Asia/Makassar
 OLD_FILES+=usr/share/zoneinfo/Asia/Manila
 OLD_FILES+=usr/share/zoneinfo/Asia/Muscat
 OLD_FILES+=usr/share/zoneinfo/Asia/Nicosia
 OLD_FILES+=usr/share/zoneinfo/Asia/Novokuznetsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Novosibirsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Omsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Oral
 OLD_FILES+=usr/share/zoneinfo/Asia/Phnom_Penh
 OLD_FILES+=usr/share/zoneinfo/Asia/Pontianak
 OLD_FILES+=usr/share/zoneinfo/Asia/Pyongyang
 OLD_FILES+=usr/share/zoneinfo/Asia/Qatar
 OLD_FILES+=usr/share/zoneinfo/Asia/Qyzylorda
 OLD_FILES+=usr/share/zoneinfo/Asia/Rangoon
 OLD_FILES+=usr/share/zoneinfo/Asia/Riyadh
 OLD_FILES+=usr/share/zoneinfo/Asia/Sakhalin
 OLD_FILES+=usr/share/zoneinfo/Asia/Samarkand
 OLD_FILES+=usr/share/zoneinfo/Asia/Seoul
 OLD_FILES+=usr/share/zoneinfo/Asia/Shanghai
 OLD_FILES+=usr/share/zoneinfo/Asia/Singapore
 OLD_FILES+=usr/share/zoneinfo/Asia/Srednekolymsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Taipei
 OLD_FILES+=usr/share/zoneinfo/Asia/Tashkent
 OLD_FILES+=usr/share/zoneinfo/Asia/Tbilisi
 OLD_FILES+=usr/share/zoneinfo/Asia/Tehran
 OLD_FILES+=usr/share/zoneinfo/Asia/Thimphu
 OLD_FILES+=usr/share/zoneinfo/Asia/Tokyo
 OLD_FILES+=usr/share/zoneinfo/Asia/Ulaanbaatar
 OLD_FILES+=usr/share/zoneinfo/Asia/Urumqi
 OLD_FILES+=usr/share/zoneinfo/Asia/Ust-Nera
 OLD_FILES+=usr/share/zoneinfo/Asia/Vientiane
 OLD_FILES+=usr/share/zoneinfo/Asia/Vladivostok
 OLD_FILES+=usr/share/zoneinfo/Asia/Yakutsk
 OLD_FILES+=usr/share/zoneinfo/Asia/Yekaterinburg
 OLD_FILES+=usr/share/zoneinfo/Asia/Yerevan
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Azores
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Bermuda
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Canary
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Cape_Verde
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Faroe
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Madeira
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Reykjavik
 OLD_FILES+=usr/share/zoneinfo/Atlantic/South_Georgia
 OLD_FILES+=usr/share/zoneinfo/Atlantic/St_Helena
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Stanley
 OLD_FILES+=usr/share/zoneinfo/Australia/Adelaide
 OLD_FILES+=usr/share/zoneinfo/Australia/Brisbane
 OLD_FILES+=usr/share/zoneinfo/Australia/Broken_Hill
 OLD_FILES+=usr/share/zoneinfo/Australia/Currie
 OLD_FILES+=usr/share/zoneinfo/Australia/Darwin
 OLD_FILES+=usr/share/zoneinfo/Australia/Eucla
 OLD_FILES+=usr/share/zoneinfo/Australia/Hobart
 OLD_FILES+=usr/share/zoneinfo/Australia/Lindeman
 OLD_FILES+=usr/share/zoneinfo/Australia/Lord_Howe
 OLD_FILES+=usr/share/zoneinfo/Australia/Melbourne
 OLD_FILES+=usr/share/zoneinfo/Australia/Perth
 OLD_FILES+=usr/share/zoneinfo/Australia/Sydney
 OLD_FILES+=usr/share/zoneinfo/CET
 OLD_FILES+=usr/share/zoneinfo/CST6CDT
 OLD_FILES+=usr/share/zoneinfo/EET
 OLD_FILES+=usr/share/zoneinfo/EST
 OLD_FILES+=usr/share/zoneinfo/EST5EDT
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+0
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+1
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+10
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+11
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+12
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+2
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+3
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+4
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+5
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+6
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+7
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+8
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT+9
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-0
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-1
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-10
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-11
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-12
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-13
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-14
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-2
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-3
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-4
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-5
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-6
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-7
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-8
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT-9
 OLD_FILES+=usr/share/zoneinfo/Etc/GMT0
 OLD_FILES+=usr/share/zoneinfo/Etc/Greenwich
 OLD_FILES+=usr/share/zoneinfo/Etc/UCT
 OLD_FILES+=usr/share/zoneinfo/Etc/UTC
 OLD_FILES+=usr/share/zoneinfo/Etc/Universal
 OLD_FILES+=usr/share/zoneinfo/Etc/Zulu
 OLD_FILES+=usr/share/zoneinfo/Europe/Amsterdam
 OLD_FILES+=usr/share/zoneinfo/Europe/Andorra
 OLD_FILES+=usr/share/zoneinfo/Europe/Athens
 OLD_FILES+=usr/share/zoneinfo/Europe/Belgrade
 OLD_FILES+=usr/share/zoneinfo/Europe/Berlin
 OLD_FILES+=usr/share/zoneinfo/Europe/Bratislava
 OLD_FILES+=usr/share/zoneinfo/Europe/Brussels
 OLD_FILES+=usr/share/zoneinfo/Europe/Bucharest
 OLD_FILES+=usr/share/zoneinfo/Europe/Budapest
 OLD_FILES+=usr/share/zoneinfo/Europe/Busingen
 OLD_FILES+=usr/share/zoneinfo/Europe/Chisinau
 OLD_FILES+=usr/share/zoneinfo/Europe/Copenhagen
 OLD_FILES+=usr/share/zoneinfo/Europe/Dublin
 OLD_FILES+=usr/share/zoneinfo/Europe/Gibraltar
 OLD_FILES+=usr/share/zoneinfo/Europe/Guernsey
 OLD_FILES+=usr/share/zoneinfo/Europe/Helsinki
 OLD_FILES+=usr/share/zoneinfo/Europe/Isle_of_Man
 OLD_FILES+=usr/share/zoneinfo/Europe/Istanbul
 OLD_FILES+=usr/share/zoneinfo/Europe/Jersey
 OLD_FILES+=usr/share/zoneinfo/Europe/Kaliningrad
 OLD_FILES+=usr/share/zoneinfo/Europe/Kiev
 OLD_FILES+=usr/share/zoneinfo/Europe/Lisbon
 OLD_FILES+=usr/share/zoneinfo/Europe/Ljubljana
 OLD_FILES+=usr/share/zoneinfo/Europe/London
 OLD_FILES+=usr/share/zoneinfo/Europe/Luxembourg
 OLD_FILES+=usr/share/zoneinfo/Europe/Madrid
 OLD_FILES+=usr/share/zoneinfo/Europe/Malta
 OLD_FILES+=usr/share/zoneinfo/Europe/Mariehamn
 OLD_FILES+=usr/share/zoneinfo/Europe/Minsk
 OLD_FILES+=usr/share/zoneinfo/Europe/Monaco
 OLD_FILES+=usr/share/zoneinfo/Europe/Moscow
 OLD_FILES+=usr/share/zoneinfo/Europe/Nicosia
 OLD_FILES+=usr/share/zoneinfo/Europe/Oslo
 OLD_FILES+=usr/share/zoneinfo/Europe/Paris
 OLD_FILES+=usr/share/zoneinfo/Europe/Podgorica
 OLD_FILES+=usr/share/zoneinfo/Europe/Prague
 OLD_FILES+=usr/share/zoneinfo/Europe/Riga
 OLD_FILES+=usr/share/zoneinfo/Europe/Rome
 OLD_FILES+=usr/share/zoneinfo/Europe/Samara
 OLD_FILES+=usr/share/zoneinfo/Europe/San_Marino
 OLD_FILES+=usr/share/zoneinfo/Europe/Sarajevo
 OLD_FILES+=usr/share/zoneinfo/Europe/Simferopol
 OLD_FILES+=usr/share/zoneinfo/Europe/Skopje
 OLD_FILES+=usr/share/zoneinfo/Europe/Sofia
 OLD_FILES+=usr/share/zoneinfo/Europe/Stockholm
 OLD_FILES+=usr/share/zoneinfo/Europe/Tallinn
 OLD_FILES+=usr/share/zoneinfo/Europe/Tirane
 OLD_FILES+=usr/share/zoneinfo/Europe/Uzhgorod
 OLD_FILES+=usr/share/zoneinfo/Europe/Vaduz
 OLD_FILES+=usr/share/zoneinfo/Europe/Vatican
 OLD_FILES+=usr/share/zoneinfo/Europe/Vienna
 OLD_FILES+=usr/share/zoneinfo/Europe/Vilnius
 OLD_FILES+=usr/share/zoneinfo/Europe/Volgograd
 OLD_FILES+=usr/share/zoneinfo/Europe/Warsaw
 OLD_FILES+=usr/share/zoneinfo/Europe/Zagreb
 OLD_FILES+=usr/share/zoneinfo/Europe/Zaporozhye
 OLD_FILES+=usr/share/zoneinfo/Europe/Zurich
 OLD_FILES+=usr/share/zoneinfo/Factory
 OLD_FILES+=usr/share/zoneinfo/HST
 OLD_FILES+=usr/share/zoneinfo/Indian/Antananarivo
 OLD_FILES+=usr/share/zoneinfo/Indian/Chagos
 OLD_FILES+=usr/share/zoneinfo/Indian/Christmas
 OLD_FILES+=usr/share/zoneinfo/Indian/Cocos
 OLD_FILES+=usr/share/zoneinfo/Indian/Comoro
 OLD_FILES+=usr/share/zoneinfo/Indian/Kerguelen
 OLD_FILES+=usr/share/zoneinfo/Indian/Mahe
 OLD_FILES+=usr/share/zoneinfo/Indian/Maldives
 OLD_FILES+=usr/share/zoneinfo/Indian/Mauritius
 OLD_FILES+=usr/share/zoneinfo/Indian/Mayotte
 OLD_FILES+=usr/share/zoneinfo/Indian/Reunion
 OLD_FILES+=usr/share/zoneinfo/MET
 OLD_FILES+=usr/share/zoneinfo/MST
 OLD_FILES+=usr/share/zoneinfo/MST7MDT
 OLD_FILES+=usr/share/zoneinfo/PST8PDT
 OLD_FILES+=usr/share/zoneinfo/Pacific/Apia
 OLD_FILES+=usr/share/zoneinfo/Pacific/Auckland
 OLD_FILES+=usr/share/zoneinfo/Pacific/Bougainville
 OLD_FILES+=usr/share/zoneinfo/Pacific/Chatham
 OLD_FILES+=usr/share/zoneinfo/Pacific/Chuuk
 OLD_FILES+=usr/share/zoneinfo/Pacific/Easter
 OLD_FILES+=usr/share/zoneinfo/Pacific/Efate
 OLD_FILES+=usr/share/zoneinfo/Pacific/Enderbury
 OLD_FILES+=usr/share/zoneinfo/Pacific/Fakaofo
 OLD_FILES+=usr/share/zoneinfo/Pacific/Fiji
 OLD_FILES+=usr/share/zoneinfo/Pacific/Funafuti
 OLD_FILES+=usr/share/zoneinfo/Pacific/Galapagos
 OLD_FILES+=usr/share/zoneinfo/Pacific/Gambier
 OLD_FILES+=usr/share/zoneinfo/Pacific/Guadalcanal
 OLD_FILES+=usr/share/zoneinfo/Pacific/Guam
 OLD_FILES+=usr/share/zoneinfo/Pacific/Honolulu
 OLD_FILES+=usr/share/zoneinfo/Pacific/Johnston
 OLD_FILES+=usr/share/zoneinfo/Pacific/Kiritimati
 OLD_FILES+=usr/share/zoneinfo/Pacific/Kosrae
 OLD_FILES+=usr/share/zoneinfo/Pacific/Kwajalein
 OLD_FILES+=usr/share/zoneinfo/Pacific/Majuro
 OLD_FILES+=usr/share/zoneinfo/Pacific/Marquesas
 OLD_FILES+=usr/share/zoneinfo/Pacific/Midway
 OLD_FILES+=usr/share/zoneinfo/Pacific/Nauru
 OLD_FILES+=usr/share/zoneinfo/Pacific/Niue
 OLD_FILES+=usr/share/zoneinfo/Pacific/Norfolk
 OLD_FILES+=usr/share/zoneinfo/Pacific/Noumea
 OLD_FILES+=usr/share/zoneinfo/Pacific/Pago_Pago
 OLD_FILES+=usr/share/zoneinfo/Pacific/Palau
 OLD_FILES+=usr/share/zoneinfo/Pacific/Pitcairn
 OLD_FILES+=usr/share/zoneinfo/Pacific/Pohnpei
 OLD_FILES+=usr/share/zoneinfo/Pacific/Port_Moresby
 OLD_FILES+=usr/share/zoneinfo/Pacific/Rarotonga
 OLD_FILES+=usr/share/zoneinfo/Pacific/Saipan
 OLD_FILES+=usr/share/zoneinfo/Pacific/Tahiti
 OLD_FILES+=usr/share/zoneinfo/Pacific/Tarawa
 OLD_FILES+=usr/share/zoneinfo/Pacific/Tongatapu
 OLD_FILES+=usr/share/zoneinfo/Pacific/Wake
 OLD_FILES+=usr/share/zoneinfo/Pacific/Wallis
 OLD_FILES+=usr/share/zoneinfo/UTC
 OLD_FILES+=usr/share/zoneinfo/WET
 OLD_FILES+=usr/share/zoneinfo/posixrules
 OLD_FILES+=usr/share/zoneinfo/zone.tab
 .endif
diff --git a/tools/regression/atm/Funcs.sh b/tools/regression/atm/Funcs.sh
deleted file mode 100644
index c981f101df94..000000000000
--- a/tools/regression/atm/Funcs.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-fatal() {
-	echo -e "$*" >&2
-	exit 1
-}
-
-msg() {
-	echo -e "$*" >&2
-}
-
-usage1() {
-	msg "Usage: RunTest.sh [-hq] [-b <localbase>]"
-	msg "Options:"
-	msg " -h		show this info"
-	msg " -b <localbase>	localbase if not /usr/local"
-	msg " -q		be quite"
-	msg " -u		run user space test, not kernel"
-	exit 0
-}
-
-parse_options() {
-	args=`getopt b:hqu $*`
-	if [ $? -ne 0 ] ; then
-		fatal "Usage: $0 [-qu] [-b <localbase>]"
-	fi
-
-	options=""
-	set -- $args
-	for i
-	do
-		case "$i"
-		in
-
-		-h)	usage1;;
-		-u|-q)	options="$options $i"; shift;;
-		-b)	LOCALBASE="$2"; shift; shift;;
-		--)	shift; break;;
-		esac
-	done
-
-	if [ "$LOCALBASE" = "" ] ; then
-		LOCALBASE="/usr/local"
-
-		pkg_info -I atmsupport-\* 2>/dev/null >/dev/null
-		if [ $? -ne 0 ] ; then
-			fatal "Atmsupport package not installed. \
-Goto /usr/ports/net/atmsupport,\ntype 'make ; make install ; make clean' \
-and re-run this script"
-		fi
-	fi
-}
diff --git a/tools/regression/atm/README b/tools/regression/atm/README
deleted file mode 100644
index 4c7f28a15a11..000000000000
--- a/tools/regression/atm/README
+++ /dev/null
@@ -1,14 +0,0 @@
-$FreeBSD$
-
-This directory contains tests for the ATM stuff.  All tests can be run
-from the top-level or from their sub-directories by starting RunTest.sh.
-
-These tests require ports/net/atmsupport to be installed - the
-scripts will remind you if they cannot find the package.
-
-proto_sscfu		test suite for the SSCF at the user interface
-proto_sscop		test suite for the SSCOP protocol
-proto_uni		test suite for the UNI protocol
-proto_cc		test suite for the call control function
-
-harti@freebsd.org
diff --git a/tools/regression/atm/RunTest.sh b/tools/regression/atm/RunTest.sh
deleted file mode 100644
index 90f69658d4aa..000000000000
--- a/tools/regression/atm/RunTest.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-. ./Funcs.sh
-
-#
-# Just check the legality of the options and pass them along
-#
-args=`getopt b:hq $*`
-if [ $? -ne 0 ] ; then
-	fatal "Usage: $0 [-q] [-b <localbase>]"
-fi
-
-usage() {
-	msg "Usage: RunTest.sh [-hq] [-b <localbase>]"
-	msg "Options:"
-	msg " -h		show this info"
-	msg " -b <localbase>	localbase if not /usr/local"
-	msg " -q		be quite"
-	exit 0
-}
-
-options=""
-set -- $args
-for i
-do
-	case "$i"
-	in
-
-	-h)	usage;;
-	-b)	options="$options $i $2" ; shift; shift;;
-	-q)	options="$options $i" ; shift;;
-	--)	shift; break;;
-	esac
-done
-
-(cd proto_sscop ; sh ./RunTest.sh -u $options)
-(cd proto_sscfu ; sh ./RunTest.sh -u $options)
-(cd proto_uni ; sh ./RunTest.sh -u $options)
-(cd proto_cc ; sh ./RunTest.sh -u $options)
-
-(cd proto_sscop ; sh ./RunTest.sh $options)
-(cd proto_sscfu ; sh ./RunTest.sh $options)
-(cd proto_uni ; sh ./RunTest.sh $options)
-(cd proto_cc ; sh ./RunTest.sh $options)
diff --git a/tools/regression/atm/proto_cc/RunTest.sh b/tools/regression/atm/proto_cc/RunTest.sh
deleted file mode 100644
index f6c7ce00d336..000000000000
--- a/tools/regression/atm/proto_cc/RunTest.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-. ../Funcs.sh
-
-parse_options $*
-
-DATA=$LOCALBASE/share/atmsupport/testsuite_cc
-
-$LOCALBASE/bin/ats_cc $options $DATA/CC_Funcs $DATA/CC_??_??
diff --git a/tools/regression/atm/proto_sscfu/RunTest.sh b/tools/regression/atm/proto_sscfu/RunTest.sh
deleted file mode 100644
index 2f0865937224..000000000000
--- a/tools/regression/atm/proto_sscfu/RunTest.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-. ../Funcs.sh
-
-parse_options $*
-
-DATA=$LOCALBASE/share/atmsupport/testsuite_sscfu
-
-$LOCALBASE/bin/ats_sscfu $options $DATA/Funcs $DATA/EST* $DATA/REL* \
-$DATA/REC* $DATA/RES* $DATA/DATA* $DATA/UDATA*
diff --git a/tools/regression/atm/proto_sscop/RunTest.sh b/tools/regression/atm/proto_sscop/RunTest.sh
deleted file mode 100644
index 60812deeb6ed..000000000000
--- a/tools/regression/atm/proto_sscop/RunTest.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-. ../Funcs.sh
-
-parse_options $*
-
-DATA=$LOCALBASE/share/atmsupport/testsuite_sscop
-
-$LOCALBASE/bin/ats_sscop $options $DATA/Funcs $DATA/S*
diff --git a/tools/regression/atm/proto_uni/RunTest.sh b/tools/regression/atm/proto_uni/RunTest.sh
deleted file mode 100644
index 8b9c9e5e38c9..000000000000
--- a/tools/regression/atm/proto_uni/RunTest.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-. ../Funcs.sh
-
-parse_options $*
-
-DATA=$LOCALBASE/share/atmsupport/testsuite_uni
-
-$LOCALBASE/bin/ats_sig $options $DATA/Funcs $DATA/L3MU_Funcs $DATA/Restart.??? \
-	$DATA/Unknown.??? $DATA/Incoming.??? $DATA/MpOut.??? $DATA/MpIn.??? \
-	$DATA/L???_??_??
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index cb7d414c81f8..417c564b2fae 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,291 +1,290 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 SUBDIR=	alias \
 	apply \
 	asa \
 	awk \
 	backlight \
 	banner \
 	basename \
 	beep \
 	bintrans \
 	brandelf \
 	bsdcat \
 	bsddialog \
 	bsdiff \
 	bzip2 \
 	bzip2recover \
 	cap_mkdb \
 	chat \
 	chpass \
 	cksum \
 	cmp \
 	col \
 	colrm \
 	column \
 	comm \
 	compress \
 	cpuset \
 	csplit \
 	ctlstat \
 	cut \
 	diff \
 	dirname \
 	dtc \
 	du \
 	elfctl \
 	elfdump \
 	enigma \
 	env \
 	etdump \
 	expand \
 	false \
 	fetch \
 	find \
 	fmt \
 	fold \
 	fstat \
 	fsync \
 	gcore \
 	gencat \
 	getaddrinfo \
 	getconf \
 	getent \
 	getopt \
 	grep \
 	gzip \
 	head \
 	hexdump \
 	id \
 	ident \
 	ipcrm \
 	ipcs \
 	join \
 	jot \
 	keylogin \
 	keylogout \
 	killall \
 	ktrace \
 	ktrdump \
 	lam \
 	ldd \
 	leave \
 	less \
 	lessecho \
 	lesskey \
 	limits \
 	locale \
 	localedef \
 	lock \
 	lockf \
 	logger \
 	login \
 	logins \
 	logname \
 	look \
 	lorder \
 	lsvfs \
 	lzmainfo \
 	m4 \
 	mandoc \
 	mesg \
 	ministat \
 	mkdep \
 	mkfifo \
 	mkimg \
 	mktemp \
 	mkuzip \
 	mt \
 	ncal \
 	ncurses \
 	netstat \
 	newgrp \
 	nfsstat \
 	nice \
 	nl \
 	nohup \
 	pagesize \
 	passwd \
 	paste \
 	patch \
 	pathchk \
 	perror \
 	posixshmcontrol \
 	pr \
 	printenv \
 	printf \
 	proccontrol \
 	procstat \
 	protect \
 	rctl \
 	renice \
 	resizewin \
 	rev \
 	revoke \
 	rpcinfo \
 	rs \
 	rup \
 	ruptime \
 	rusers \
 	rwall \
 	rwho \
 	script \
 	sdiff \
 	sed \
 	seq \
 	shar \
 	showmount \
 	sockstat \
 	soelim \
 	sort \
 	split \
 	stat \
 	stdbuf \
 	strings \
 	su \
 	systat \
 	tail \
 	tar \
 	tcopy \
 	tee \
 	time \
 	tip \
 	top \
 	touch \
 	tr \
 	true \
 	truncate \
 	tsort \
 	tty \
 	uname \
 	unexpand \
 	uniq \
 	unzip \
 	units \
 	unvis \
 	vis \
 	vmstat \
 	w \
 	wall \
 	wc \
 	wg \
 	what \
 	whereis \
 	which \
 	whois \
 	write \
 	xargs \
 	xinstall \
 	xo \
 	xz \
 	xzdec \
 	yes \
 	zstd
 
 # NB: keep these sorted by MK_* knobs
 
 SUBDIR.${MK_ACCT}+=	lastcomm
 SUBDIR.${MK_AT}+=	at
-SUBDIR.${MK_ATM}+=	atm
 SUBDIR.${MK_BLUETOOTH}+=	bluetooth
 SUBDIR.${MK_BSD_CPIO}+=	cpio
 SUBDIR.${MK_CALENDAR}+=	calendar
 .if ${MK_CLANG} != "no" || ${MK_LLVM_BINUTILS} != "no" || \
     ${MK_LLD} != "no" || ${MK_LLDB} != "no"
 SUBDIR+=	clang
 .endif
 SUBDIR.${MK_DIALOG}+=	dpv
 SUBDIR.${MK_EE}+=	ee
 SUBDIR.${MK_FILE}+=	file
 SUBDIR.${MK_FINGER}+=	finger
 SUBDIR.${MK_FTP}+=	ftp
 SUBDIR.${MK_GAMES}+=	caesar
 SUBDIR.${MK_GAMES}+=	factor
 SUBDIR.${MK_GAMES}+=	fortune
 SUBDIR.${MK_GAMES}+=	grdc
 SUBDIR.${MK_GAMES}+=	morse
 SUBDIR.${MK_GAMES}+=	number
 SUBDIR.${MK_GAMES}+=	pom
 SUBDIR.${MK_GAMES}+=	primes
 SUBDIR.${MK_GAMES}+=	random
 .if ${MK_GH_BC} == "yes"
 SUBDIR+=		gh-bc
 .else
 SUBDIR.${MK_OPENSSL}+=	bc
 SUBDIR.${MK_OPENSSL}+=	dc
 .endif
 SUBDIR.${MK_HESIOD}+=	hesinfo
 SUBDIR.${MK_ICONV}+=	iconv
 SUBDIR.${MK_ICONV}+=	mkcsmapper
 SUBDIR.${MK_ICONV}+=	mkesdb
 SUBDIR.${MK_ISCSI}+=	iscsictl
 SUBDIR.${MK_KDUMP}+=	kdump
 SUBDIR.${MK_KDUMP}+=	truss
 SUBDIR.${MK_KERBEROS_SUPPORT}+=	compile_et
 SUBDIR.${MK_LDNS_UTILS}+=	drill
 SUBDIR.${MK_LDNS_UTILS}+=	host
 SUBDIR.${MK_LIB32}+=	ldd32
 SUBDIR.${MK_LOCATE}+=	locate
 # XXX msgs?
 SUBDIR.${MK_MAIL}+=	biff
 SUBDIR.${MK_MAIL}+=	from
 SUBDIR.${MK_MAIL}+=	mail
 SUBDIR.${MK_MAIL}+=	msgs
 SUBDIR.${MK_MAKE}+=	bmake
 SUBDIR.${MK_MAN_UTILS}+=	man
 SUBDIR.${MK_NETCAT}+=	nc
 SUBDIR.${MK_NIS}+=	ypcat
 SUBDIR.${MK_NIS}+=	ypmatch
 SUBDIR.${MK_NIS}+=	ypwhich
 SUBDIR.${MK_OPENSSH}+=	ssh-copy-id
 SUBDIR.${MK_OPENSSL}+=	chkey
 SUBDIR.${MK_OPENSSL}+=	newkey
 SUBDIR.${MK_QUOTAS}+=	quota
 SUBDIR.${MK_SENDMAIL}+=	vacation
 SUBDIR.${MK_TALK}+=	talk
 SUBDIR.${MK_TELNET}+=	telnet
 SUBDIR.${MK_TESTS_SUPPORT}+=	kyua
 SUBDIR.${MK_TESTS}+=	tests
 SUBDIR.${MK_TEXTPROC}+=	ul
 SUBDIR.${MK_TFTP}+=	tftp
 .if ${MK_LLVM_BINUTILS} == "no"
 # Only build the elftoolchain tools if we aren't using the LLVM ones.
 SUBDIR.${MK_TOOLCHAIN}+=	addr2line
 SUBDIR.${MK_TOOLCHAIN}+=	ar
 SUBDIR.${MK_TOOLCHAIN}+=	nm
 SUBDIR.${MK_TOOLCHAIN}+=	objcopy
 SUBDIR.${MK_TOOLCHAIN}+=	readelf
 SUBDIR.${MK_TOOLCHAIN}+=	size
 .endif
 SUBDIR.${MK_TOOLCHAIN}+=	c89
 SUBDIR.${MK_TOOLCHAIN}+=	c99
 SUBDIR.${MK_TOOLCHAIN}+=	ctags
 .if ${MK_LLVM_CXXFILT} == "no"
 SUBDIR.${MK_TOOLCHAIN}+=	cxxfilt
 .endif
 SUBDIR.${MK_TOOLCHAIN}+=	file2c
 SUBDIR.${MK_TOOLCHAIN}+=	gprof
 SUBDIR.${MK_TOOLCHAIN}+=	indent
 SUBDIR.${MK_TOOLCHAIN}+=	lex
 SUBDIR.${MK_TOOLCHAIN}+=	mkstr
 SUBDIR.${MK_TOOLCHAIN}+=	rpcgen
 SUBDIR.${MK_TOOLCHAIN}+=	unifdef
 SUBDIR.${MK_TOOLCHAIN}+=	xstr
 SUBDIR.${MK_TOOLCHAIN}+=	yacc
 SUBDIR.${MK_VI}+=	vi
 SUBDIR.${MK_VT}+=	vtfontcvt
 SUBDIR.${MK_USB}+=	usbhidaction
 SUBDIR.${MK_USB}+=	usbhidctl
 SUBDIR.${MK_UTMPX}+=	last
 SUBDIR.${MK_UTMPX}+=	users
 SUBDIR.${MK_UTMPX}+=	who
 SUBDIR.${MK_OFED}+=	ofed
 
 .include <bsd.arch.inc.mk>
 
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>
diff --git a/usr.bin/atm/Makefile b/usr.bin/atm/Makefile
deleted file mode 100644
index 9ed46ef7a16d..000000000000
--- a/usr.bin/atm/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	sscop
-
-.include <bsd.subdir.mk>
diff --git a/usr.bin/atm/Makefile.inc b/usr.bin/atm/Makefile.inc
deleted file mode 100644
index 265f86d1ed55..000000000000
--- a/usr.bin/atm/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-.include "../Makefile.inc"
diff --git a/usr.bin/atm/sscop/Makefile b/usr.bin/atm/sscop/Makefile
deleted file mode 100644
index 491986791282..000000000000
--- a/usr.bin/atm/sscop/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-CONTRIB= ${SRCTOP}/contrib/ngatm/sscop
-
-.PATH:	${CONTRIB}
-
-PROG=	sscop
-SRCS=	common.c sscop_main.c
-CFLAGS+= -I${CONTRIB} -DUSE_LIBBEGEMOT
-
-LIBADD=	begemot ngatm
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/atm/sscop/Makefile.depend b/usr.bin/atm/sscop/Makefile.depend
deleted file mode 100644
index 34779573a216..000000000000
--- a/usr.bin/atm/sscop/Makefile.depend
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libbegemot \
-	lib/libc \
-	lib/libcompiler_rt \
-	lib/libngatm \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif