Index: stable/10/Makefile.inc1
===================================================================
--- stable/10/Makefile.inc1	(revision 277456)
+++ stable/10/Makefile.inc1	(revision 277457)
@@ -1,2040 +1,2043 @@
 #
 # $FreeBSD$
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNO_CLEAN do not clean at all
 #	-DDB_FROM_SRC use the user/group databases in src/etc instead of
 #	    the system database when installing.
 #	-DNO_SHARE do not go into share subdir
 #	-DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ}
 #	-DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
 #	-DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
 #	-DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
 #	-DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel
 #	-DNO_PORTSUPDATE do not update ports in ${MAKE} update
 #	-DNO_ROOT install without using root privilege
 #	-DNO_DOCUPDATE do not update doc in ${MAKE} update
 #	-DNO_CTF do not run the DTrace CTF conversion tools on built objects
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
 #	LOCAL_ITOOLS="list of tools" to add additional tools to the ITOOLS list
 #	LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target
 #	LOCAL_MTREE="list of mtree files" to process to allow local directories
 #	    to be created before files are installed
 #	LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools
 #	    list
 #	METALOG="path to metadata log" to write permission and ownership
 #	    when NO_ROOT is set.  (default: ${DESTDIR}/METALOG)
 #	TARGET="machine" to crossbuild world for a different machine type
 #	TARGET_ARCH= may be required when a TARGET supports multiple endians
 #	BUILDENV_SHELL= shell to launch for the buildenv target (def:/bin/sh)
 #	WORLD_FLAGS= additional flags to pass to make(1) during buildworld
 #	KERNEL_FLAGS= additional flags to pass to make(1) during buildkernel
 
 #
 # The intended user-driven targets are:
 # buildworld  - rebuild *everything*, including glue to help do upgrades
 # installworld- install everything built by "buildworld"
 # doxygen     - build API documentation of the kernel
 # update      - convenient way to update your source tree (eg: svn/svnup)
 #
 # Standard targets (not defined here) are documented in the makefiles in
 # /usr/share/mk.  These include:
 #		obj depend all install clean cleandepend cleanobj
 
 .if !defined(TARGET) || !defined(TARGET_ARCH)
 .error "Both TARGET and TARGET_ARCH must be defined."
 .endif
 
 .include <bsd.own.mk>
 .include <bsd.arch.inc.mk>
 .include <bsd.compiler.mk>
 
 # We must do share/info early so that installation of info `dir'
 # entries works correctly.  Do it first since it is less likely to
 # grow dependencies on include and lib than vice versa.
 #
 # We must do lib/ and libexec/ before bin/, because if installworld
 # installs a new /bin/sh, the 'make' command will *immediately*
 # use that new version.  And the new (dynamically-linked) /bin/sh
 # will expect to find appropriate libraries in /lib and /libexec.
 #
 SRCDIR?=	${.CURDIR}
 .if defined(SUBDIR_OVERRIDE)
 SUBDIR=	${SUBDIR_OVERRIDE}
 .else
 SUBDIR=	share/info lib libexec
 SUBDIR+=bin
 .if ${MK_GAMES} != "no"
 SUBDIR+=games
 .endif
 .if ${MK_CDDL} != "no"
 SUBDIR+=cddl
 .endif
 SUBDIR+=gnu include
 .if ${MK_KERBEROS} != "no"
 SUBDIR+=kerberos5
 .endif
 .if ${MK_RESCUE} != "no"
 SUBDIR+=rescue
 .endif
 SUBDIR+=sbin
 .if ${MK_CRYPT} != "no"
 SUBDIR+=secure
 .endif
 .if !defined(NO_SHARE)
 SUBDIR+=share
 .endif
 SUBDIR+=sys usr.bin usr.sbin
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
 .endif
 .if ${MK_OFED} != "no"
 SUBDIR+=contrib/ofed
 .endif
 #
 # We must do etc/ last for install/distribute to work.
 #
 SUBDIR+=etc
 
 # These are last, since it is nice to at least get the base system
 # rebuilt before you do them.
 .for _DIR in ${LOCAL_LIB_DIRS} ${LOCAL_DIRS}
 .if exists(${.CURDIR}/${_DIR}/Makefile)
 SUBDIR+= ${_DIR}
 .endif
 .endfor
 .endif
 
 .if defined(NOCLEAN)
 NO_CLEAN=	${NOCLEAN}
 .endif
 .if defined(NO_CLEANDIR)
 CLEANDIR=	clean cleandepend
 .else
 CLEANDIR=	cleandir
 .endif
 
 LOCAL_TOOL_DIRS?=
 
 BUILDENV_SHELL?=/bin/sh
 
 SVN?=		/usr/local/bin/svn
 SVNFLAGS?=	-r HEAD
 
 MAKEOBJDIRPREFIX?=	/usr/obj
 .if !defined(OSRELDATE)
 .if exists(/usr/include/osreldate.h)
 OSRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
 		/usr/include/osreldate.h
 .else
 OSRELDATE=	0
 .endif
 .endif
 
 .if !defined(VERSION)
 REVISION!=	make -C ${SRCDIR}/release -V REVISION
 BRANCH!=	make -C ${SRCDIR}/release -V BRANCH
 SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
 		${SRCDIR}/sys/sys/param.h
 VERSION=	FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE}
 .endif
 
 KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
 .if ${TARGET} == ${TARGET_ARCH}
 _t=		${TARGET}
 .else
 _t=		${TARGET_ARCH}/${TARGET}
 .endif
 .for _t in ${_t}
 .if empty(KNOWN_ARCHES:M${_t})
 .error Unknown target ${TARGET_ARCH}:${TARGET}.
 .endif
 .endfor
 
 .if ${TARGET} == ${MACHINE}
 TARGET_CPUTYPE?=${CPUTYPE}
 .else
 TARGET_CPUTYPE?=
 .endif
 
 .if !empty(TARGET_CPUTYPE)
 _TARGET_CPUTYPE=${TARGET_CPUTYPE}
 .else
 _TARGET_CPUTYPE=dummy
 .endif
 _CPUTYPE!=	MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \
 		-f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE
 .if ${_CPUTYPE} != ${_TARGET_CPUTYPE}
 .error CPUTYPE global should be set with ?=.
 .endif
 .if make(buildworld)
 BUILD_ARCH!=	uname -p
 .if ${MACHINE_ARCH} != ${BUILD_ARCH}
 .error To cross-build, set TARGET_ARCH.
 .endif
 .endif
 .if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING)
 OBJTREE=	${MAKEOBJDIRPREFIX}
 .else
 OBJTREE=	${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
 .endif
 WORLDTMP=	${OBJTREE}${.CURDIR}/tmp
 # /usr/games added for fortune which depend on strfile
 BPATH=		${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin
 XPATH=		${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
 STRICTTMPPATH=	${BPATH}:${XPATH}
 TMPPATH=	${STRICTTMPPATH}:${PATH}
 
 #
 # Avoid running mktemp(1) unless actually needed.
 # It may not be functional, e.g., due to new ABI
 # when in the middle of installing over this system.
 #
 .if make(distributeworld) || make(installworld)
 INSTALLTMP!=	/usr/bin/mktemp -d -u -t install
 .endif
 
 #
 # Building a world goes through the following stages
 #
 # 1. legacy stage [BMAKE]
 #	This stage is responsible for creating compatibility
 #	shims that are needed by the bootstrap-tools,
 #	build-tools and cross-tools stages.
 # 1. bootstrap-tools stage [BMAKE]
 #	This stage is responsible for creating programs that
 #	are needed for backward compatibility reasons. They
 #	are not built as cross-tools.
 # 2. build-tools stage [TMAKE]
 #	This stage is responsible for creating the object
 #	tree and building any tools that are needed during
 #	the build process.
 # 3. cross-tools stage [XMAKE]
 #	This stage is responsible for creating any tools that
 #	are needed for cross-builds. A cross-compiler is one
 #	of them.
 # 4. world stage [WMAKE]
 #	This stage actually builds the world.
 # 5. install stage (optional) [IMAKE]
 #	This stage installs a previously built world.
 #
 
 BOOTSTRAPPING?=	0
 
 # Common environment for world related stages
 CROSSENV=	MAKEOBJDIRPREFIX=${OBJTREE} \
 		MACHINE_ARCH=${TARGET_ARCH} \
 		MACHINE=${TARGET} \
 		CPUTYPE=${TARGET_CPUTYPE}
 .if ${MK_GROFF} != "no"
 CROSSENV+=	GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \
 		GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \
 		GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
 .endif
 
 _BOOTSTRAP_MAKEINFO?=	${MK_INFO}
 # bootstrap-tools stage
 BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${BPATH}:${PATH} \
 		WORLDTMP=${WORLDTMP} \
 		VERSION="${VERSION}" \
 		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
 		COMPILER_TYPE=${COMPILER_TYPE}
 BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
 		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
 		_BOOTSTRAP_MAKEINFO=${_BOOTSTRAP_MAKEINFO} \
 		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD -DNO_TESTS
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		-DNO_LINT \
 		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD -DNO_TESTS
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		-DWITHOUT_GDB -DNO_TESTS
 
 # kernel-tools stage
 KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${BPATH}:${PATH} \
 		WORLDTMP=${WORLDTMP} \
 		VERSION="${VERSION}" \
 		COMPILER_TYPE=${COMPILER_TYPE}
 KTMAKE=		TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
 		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
 
 # world stage
 WMAKEENV=	${CROSSENV} \
 		_SHLIBDIRPREFIX=${WORLDTMP} \
 		_LDSCRIPTROOT= \
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
 
 # make hierarchy
 HMAKE=		PATH=${TMPPATH} ${MAKE} LOCAL_MTREE=${LOCAL_MTREE:Q}
 .if defined(NO_ROOT)
 HMAKE+=		PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT
 .endif
 
 .if ${MK_CDDL} == "no"
 WMAKEENV+=	NO_CTF=1
 .endif
 
 .if defined(CROSS_TOOLCHAIN_PREFIX)
 CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
 CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
 .endif
 XCOMPILERS=	CC CXX CPP
 .for COMPILER in ${XCOMPILERS}
 .if defined(CROSS_COMPILER_PREFIX)
 X${COMPILER}?=	${CROSS_COMPILER_PREFIX}${${COMPILER}}
 .else
 X${COMPILER}?=	${${COMPILER}}
 .endif
 .endfor
 XBINUTILS=	AS AR LD NM OBJDUMP RANLIB STRINGS
 .for BINUTIL in ${XBINUTILS}
 .if defined(CROSS_BINUTILS_PREFIX)
 X${BINUTIL}?=	${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
 .else
 X${BINUTIL}?=	${${BINUTIL}}
 .endif
 .endfor
 WMAKEENV+=	CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \
 		CPP="${XCPP} ${XFLAGS}" \
 		AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
 		OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
 
 .if ${XCC:T:Mgcc} == "gcc"
 WMAKE_COMPILER_TYPE=	gcc
 .elif ${XCC:T:Mclang} == "clang"
 WMAKE_COMPILER_TYPE=	clang
 .elif ${MK_CLANG_IS_CC} == "no"
 WMAKE_COMPILER_TYPE=	gcc
 .else
 WMAKE_COMPILER_TYPE=	clang
 .endif
 IMAKE_COMPILER_TYPE=	COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
 
 .if ${XCC:M/*}
 XFLAGS=		--sysroot=${WORLDTMP}
 .if defined(CROSS_BINUTILS_PREFIX)
 # In the case of xdev-build tools, CROSS_BINUTILS_PREFIX won't be a
 # directory, but the compiler will look in the right place for it's
 # tools so we don't need to tell it where to look.
 .if exists(${CROSS_BINUTILS_PREFIX})
 XFLAGS+=	-B${CROSS_BINUTILS_PREFIX}
 .endif
 .else
 XFLAGS+=	-B${WORLDTMP}/usr/bin
 .endif
 .if ${TARGET_ARCH} != ${MACHINE_ARCH} && ${WMAKE_COMPILER_TYPE} == "clang"
 .if (${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "armv6") && \
 ${MK_ARM_EABI} != "no"
 TARGET_ABI=	gnueabi
 .else
 TARGET_ABI=	unknown
 .endif
 TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0
 XFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 .endif
 
 WMAKEENV+=	COMPILER_TYPE=${WMAKE_COMPILER_TYPE}
 WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 # 32 bit world
 LIB32TMP=	${OBJTREE}${.CURDIR}/lib32
 
 .if ${TARGET_ARCH} == "amd64"
 .if empty(TARGET_CPUTYPE)
 LIB32CPUFLAGS=	-march=i686 -mmmx -msse -msse2
 .else
 LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
 .endif
 LIB32WMAKEENV=	MACHINE=i386 MACHINE_ARCH=i386 \
 		MACHINE_CPU="i686 mmx sse sse2"
 LIB32WMAKEFLAGS=	\
 		AS="${AS} --32" \
 		LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32"
 
 .elif ${TARGET_ARCH} == "powerpc64"
 .if empty(TARGET_CPUTYPE)
 LIB32CPUFLAGS=	-mcpu=powerpc
 .else
 LIB32CPUFLAGS=	-mcpu=${TARGET_CPUTYPE}
 .endif
 LIB32WMAKEENV=	MACHINE=powerpc MACHINE_ARCH=powerpc
 LIB32WMAKEFLAGS=	\
 		LD="${LD} -m elf32ppc_fbsd"
 .endif
 
 
 LIB32FLAGS=	-m32 ${LIB32CPUFLAGS} -DCOMPAT_32BIT \
 		-isystem ${LIB32TMP}/usr/include/ \
 		-L${LIB32TMP}/usr/lib32 \
 		-B${LIB32TMP}/usr/lib32
 .if ${XCC:M/*}
 LIB32FLAGS+=		--sysroot=${WORLDTMP}
 .endif
 
 # Yes, the flags are redundant.
 LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		_SHLIBDIRPREFIX=${LIB32TMP} \
 		_LDSCRIPTROOT=${LIB32TMP} \
 		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32 \
 		LIBPRIVATEDIR=/usr/lib32/private \
 		COMPILER_TYPE=${WMAKE_COMPILER_TYPE} \
 		DTRACE="${DTRACE} -32"
 LIB32WMAKEFLAGS+=	\
 		CC="${XCC} ${LIB32FLAGS}" \
 		CXX="${XCXX} ${LIB32FLAGS}" \
 		DESTDIR=${LIB32TMP} \
 		-DCOMPAT_32BIT \
 		-DLIBRARIES_ONLY \
 		-DNO_CPU_CFLAGS \
 		-DNO_CTF \
 		-DNO_LINT \
 		-DNO_TESTS
 
 LIB32WMAKE=	${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
 		-DWITHOUT_MAN -DWITHOUT_INFO -DWITHOUT_HTML
 LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} -DNO_INCS \
 		${IMAKE_INSTALL}
 .endif
 
 IMAKEENV=	${CROSSENV:N_LDSCRIPTROOT=*}
 IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1 \
 		${IMAKE_INSTALL} ${IMAKE_MTREE} ${IMAKE_COMPILER_TYPE}
 .if empty(.MAKEFLAGS:M-n)
 IMAKEENV+=	PATH=${STRICTTMPPATH}:${INSTALLTMP} \
 		LD_LIBRARY_PATH=${INSTALLTMP} \
 		PATH_LOCALE=${INSTALLTMP}/locale
 IMAKE+=		__MAKE_SHELL=${INSTALLTMP}/sh
 .else
 IMAKEENV+=	PATH=${TMPPATH}:${INSTALLTMP}
 .endif
 .if defined(DB_FROM_SRC)
 INSTALLFLAGS+=	-N ${.CURDIR}/etc
 MTREEFLAGS+=	-N ${.CURDIR}/etc
 .endif
 _INSTALL_DDIR=	${DESTDIR}/${DISTDIR}
 INSTALL_DDIR=	${_INSTALL_DDIR:S://:/:g:C:/$::}
 .if defined(NO_ROOT)
 METALOG?=	${DESTDIR}/${DISTDIR}/METALOG
 IMAKE+=		-DNO_ROOT METALOG=${METALOG}
 INSTALLFLAGS+=	-U -M ${METALOG} -D ${INSTALL_DDIR}
 MTREEFLAGS+=	-W
 .endif
 .if defined(DB_FROM_SRC) || defined(NO_ROOT)
 IMAKE_INSTALL=	INSTALL="install ${INSTALLFLAGS}"
 IMAKE_MTREE=	MTREE_CMD="nmtree ${MTREEFLAGS}"
 .endif
 
 # kernel stage
 KMAKEENV=	${WMAKEENV}
 KMAKE=		${KMAKEENV} ${MAKE} ${.MAKEFLAGS} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME}
 
 #
 # buildworld
 #
 # Attempt to rebuild the entire system, with reasonable chance of
 # success, regardless of how old your existing system is.
 #
 _worldtmp:
 .if ${.CURDIR:C/[^,]//g} != ""
 #	The m4 build of sendmail files doesn't like it if ',' is used
 #	anywhere in the path of it's files.
 	@echo
 	@echo "*** Error: path to source tree contains a comma ','"
 	@echo
 	false
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Rebuilding the temporary build tree"
 	@echo "--------------------------------------------------------------"
 .if !defined(NO_CLEAN)
 	rm -rf ${WORLDTMP}
 .if defined(LIB32TMP)
 	rm -rf ${LIB32TMP}
 .endif
 .else
 	rm -rf ${WORLDTMP}/legacy/usr/include
 #	XXX - These three can depend on any header file.
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
 .endif
 .for _dir in \
     lib usr legacy/bin legacy/usr
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${WORLDTMP}/legacy/usr >/dev/null
 .if ${MK_GROFF} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.groff.dist \
 	    -p ${WORLDTMP}/legacy/usr >/dev/null
 .endif
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${WORLDTMP}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${WORLDTMP}/usr/include >/dev/null
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
 .if ${MK_DEBUG_FILES} != "no"
 	# We could instead disable debug files for these build stages
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${WORLDTMP}/legacy/usr/lib >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${WORLDTMP}/usr/lib >/dev/null
 .endif
 .if ${MK_TESTS} != "no"
+	mkdir -p ${WORLDTMP}${TESTSBASE}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
-	    -p ${WORLDTMP}/usr >/dev/null
+	    -p ${WORLDTMP}${TESTSBASE} >/dev/null
 .endif
 .for _mtree in ${LOCAL_MTREE}
 	mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
 .endfor
 _legacy:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 1.1: legacy release compatibility shims"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${BMAKE} legacy
 _bootstrap-tools:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 1.2: bootstrap tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools
 _cleanobj:
 .if !defined(NO_CLEAN)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.1: cleaning up the object tree"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/}
 .if defined(LIB32TMP)
 	${_+_}cd ${.CURDIR}; ${LIB32WMAKE} -f Makefile.inc1 ${CLEANDIR:S/^/par-/}
 .endif
 .endif
 _obj:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.2: rebuilding the object tree"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} par-obj
 _build-tools:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.3: build tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${TMAKE} build-tools
 _cross-tools:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 3: cross tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${XMAKE} cross-tools
 	${_+_}cd ${.CURDIR}; ${XMAKE} kernel-tools
 _includes:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.1: building includes"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks par-includes
 _libraries:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.2: building libraries"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
 	    ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
 	    -DWITHOUT_MAN -DNO_PROFILE -DNO_TESTS libraries
 _depend:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.3: make dependencies"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} par-depend
 everything:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.4: building everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${WMAKE} par-all
 .if defined(LIB32TMP)
 build32:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 5.1: building 32 bit shim libraries"
 	@echo "--------------------------------------------------------------"
 	mkdir -p ${LIB32TMP}/usr/include
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${LIB32TMP}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${LIB32TMP}/usr/include >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${LIB32TMP}/usr/lib >/dev/null
 .endif
 	mkdir -p ${WORLDTMP}
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
 .for _t in obj includes
 	cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t}
 	cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t}
 .if ${MK_CDDL} != "no"
 	cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} DIRPRFX=cddl/lib/ ${_t}
 .endif
 	cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} DIRPRFX=gnu/lib/ ${_t}
 .if ${MK_CRYPT} != "no"
 	cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} DIRPRFX=secure/lib/ ${_t}
 .endif
 .if ${MK_KERBEROS} != "no"
 	cd ${.CURDIR}/kerberos5/lib; ${LIB32WMAKE} DIRPRFX=kerberos5/lib ${_t}
 .endif
 .endfor
 .for _dir in usr.bin/lex/lib
 	cd ${.CURDIR}/${_dir}; ${LIB32WMAKE} DIRPRFX=${_dir}/ obj
 .endfor
 .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
 	cd ${.CURDIR}/${_dir}; \
 	    WORLDTMP=${WORLDTMP} \
 	    MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
 	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
 	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \
 	    -DEARLY_BUILD build-tools
 .endfor
 	cd ${.CURDIR}; \
 	    ${LIB32WMAKE} -f Makefile.inc1 libraries
 .for _t in obj depend all
 	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} \
 	    DIRPRFX=libexec/rtld-elf/ ${_t}
 	cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} \
 	    DIRPRFX=usr.bin/ldd ${_t}
 .endfor
 
 distribute32 install32:
 	cd ${.CURDIR}/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .if ${MK_CDDL} != "no"
 	cd ${.CURDIR}/cddl/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .endif
 	cd ${.CURDIR}/gnu/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .if ${MK_CRYPT} != "no"
 	cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .endif
 .if ${MK_KERBEROS} != "no"
 	cd ${.CURDIR}/kerberos5/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .endif
 	cd ${.CURDIR}/libexec/rtld-elf; \
 	    PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//}
 	cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32IMAKE} ${.TARGET:S/32$//}
 .endif
 
 WMAKE_TGTS=
 .if !defined(SUBDIR_OVERRIDE)
 WMAKE_TGTS+=	_worldtmp _legacy _bootstrap-tools
 .endif
 WMAKE_TGTS+=	_cleanobj _obj _build-tools
 .if !defined(SUBDIR_OVERRIDE)
 WMAKE_TGTS+=	_cross-tools
 .endif
 WMAKE_TGTS+=	_includes _libraries _depend everything
 .if defined(LIB32TMP) && ${MK_LIB32} != "no"
 WMAKE_TGTS+=	build32
 .endif
 
 buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
 .ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue
 
 buildworld_prologue:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> World build started on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
 
 buildworld_epilogue:
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> World build completed on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
 
 #
 # We need to have this as a target because the indirection between Makefile
 # and Makefile.inc1 causes the correct PATH to be used, rather than a
 # modification of the current environment's PATH.  In addition, we need
 # to quote multiword values.
 #
 buildenvvars:
 	@echo ${WMAKEENV:Q}
 
 .if ${.TARGETS:Mbuildenv}
 .if ${.MAKEFLAGS:M-j}
 .error The buildenv target is incompatible with -j
 .endif
 .endif
 buildenv:
 	@echo Entering world for ${TARGET_ARCH}:${TARGET}
 	@cd ${.CURDIR} && env ${WMAKEENV} ${BUILDENV_SHELL} || true
 
 TOOLCHAIN_TGTS=	${WMAKE_TGTS:N_depend:Neverything:Nbuild32}
 toolchain: ${TOOLCHAIN_TGTS}
 kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries}
 
 #
 # installcheck
 #
 # Checks to be sure system is ready for installworld/installkernel.
 #
 installcheck: _installcheck_world _installcheck_kernel
 _installcheck_world:
 _installcheck_kernel:
 
 #
 # Require DESTDIR to be set if installing for a different architecture or
 # using the user/group database in the source tree.
 #
 .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${TARGET} != ${MACHINE} || \
     defined(DB_FROM_SRC)
 .if !make(distributeworld)
 _installcheck_world: __installcheck_DESTDIR
 _installcheck_kernel: __installcheck_DESTDIR
 __installcheck_DESTDIR:
 .if !defined(DESTDIR) || empty(DESTDIR)
 	@echo "ERROR: Please set DESTDIR!"; \
 	false
 .endif
 .endif
 .endif
 
 .if !defined(DB_FROM_SRC)
 #
 # Check for missing UIDs/GIDs.
 #
 CHECK_UIDS=	auditdistd
 CHECK_GIDS=	audit
 .if ${MK_SENDMAIL} != "no"
 CHECK_UIDS+=	smmsp
 CHECK_GIDS+=	smmsp
 .endif
 .if ${MK_PF} != "no"
 CHECK_UIDS+=	proxy
 CHECK_GIDS+=	proxy authpf
 .endif
 .if ${MK_UNBOUND} != "no"
 CHECK_UIDS+=	unbound
 CHECK_GIDS+=	unbound
 .endif
 _installcheck_world: __installcheck_UGID
 __installcheck_UGID:
 .for uid in ${CHECK_UIDS}
 	@if ! `id -u ${uid} >/dev/null 2>&1`; then \
 		echo "ERROR: Required ${uid} user is missing, see /usr/src/UPDATING."; \
 		false; \
 	fi
 .endfor
 .for gid in ${CHECK_GIDS}
 	@if ! `find / -prune -group ${gid} >/dev/null 2>&1`; then \
 		echo "ERROR: Required ${gid} group is missing, see /usr/src/UPDATING."; \
 		false; \
 	fi
 .endfor
 .endif
 
 #
 # Required install tools to be saved in a scratch dir for safety.
 #
 .if ${MK_INFO} != "no"
 _install-info=	install-info
 .endif
 .if ${MK_ZONEINFO} != "no"
 _zoneinfo=	zic tzsetup
 .endif
 
 .if exists(/usr/sbin/nmtree)
 _nmtree_itools=	nmtree
 .endif
 
 ITOOLS=	[ awk cap_mkdb cat chflags chmod chown \
 	date echo egrep find grep id install ${_install-info} \
 	ln lockf make mkdir mtree ${_nmtree_itools} mv pwd_mkdb \
 	rm sed sh strip sysctl test true uname wc ${_zoneinfo} \
 	${LOCAL_ITOOLS}
 
 # Needed for share/man
 .if ${MK_MAN} != "no"
 ITOOLS+=makewhatis
 .endif
 
 #
 # distributeworld
 #
 # Distributes everything compiled by a `buildworld'.
 #
 # installworld
 #
 # Installs everything compiled by a 'buildworld'.
 #
 
 # Non-base distributions produced by the base system
 EXTRA_DISTRIBUTIONS=	doc
 .if ${MK_GAMES} != "no"
 EXTRA_DISTRIBUTIONS+=	games
 .endif
 .if defined(LIB32TMP) && ${MK_LIB32} != "no"
 EXTRA_DISTRIBUTIONS+=	lib32
 .endif
 .if ${MK_TESTS} != "no"
 EXTRA_DISTRIBUTIONS+=	tests
 .endif
 
 MTREE_MAGIC?=	mtree 2.0
 
 distributeworld installworld: _installcheck_world
 	mkdir -p ${INSTALLTMP}
 	export PATH=${BPATH}:${PATH} ; \
 	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \
 			echo $$progpath; \
 		else \
 			echo "Required tool $$prog not found in PATH." >&2; \
 			exit 1; \
 		fi; \
 	    done); \
 	libs=$$(ldd -f "%o %p\n" -f "%o %p\n" $$progs 2>/dev/null | sort -u | \
 	    while read line; do \
 		set -- $$line; \
 		if [ "$$2 $$3" != "not found" ]; then \
 			echo $$2; \
 		else \
 			echo "Required library $$1 not found." >&2; \
 			exit 1; \
 		fi; \
 	    done); \
 	cp $$libs $$progs ${INSTALLTMP}
 	cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
 .if defined(NO_ROOT)
 	echo "#${MTREE_MAGIC}" > ${METALOG}
 .endif
 .if make(distributeworld)
 .for dist in ${EXTRA_DISTRIBUTIONS}
 	-mkdir ${DESTDIR}/${DISTDIR}/${dist}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist} >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/include >/dev/null
 .if ${MK_DEBUG_FILES} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib >/dev/null
 .endif
 .if ${MK_TESTS} != "no" && ${dist} == "tests"
+	-mkdir -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
-	    -p ${DESTDIR}/${DISTDIR}/${dist}/usr >/dev/null
+	    -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} >/dev/null
 .endif
 .if defined(NO_ROOT)
 	${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \
 	    sed -e 's#^\./#./${dist}/#' >> ${METALOG}
 	${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.usr.dist | \
 	    sed -e 's#^\./#./${dist}/usr/#' >> ${METALOG}
 	${IMAKEENV} nmtree -C -f ${.CURDIR}/etc/mtree/BSD.include.dist | \
 	    sed -e 's#^\./#./${dist}/usr/include/#' >> ${METALOG}
 .endif
 .endfor
 	-mkdir ${DESTDIR}/${DISTDIR}/base
 	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \
 	    DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \
 	    LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs
 .endif
 	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}
 .if make(distributeworld)
 .for dist in ${EXTRA_DISTRIBUTIONS}
 	find ${DESTDIR}/${DISTDIR}/${dist} -mindepth 1 -empty -delete
 .endfor
 .if defined(NO_ROOT)
 .for dist in base ${EXTRA_DISTRIBUTIONS}
 	@# For each file that exists in this dist, print the corresponding
 	@# line from the METALOG.  This relies on the fact that
 	@# a line containing only the filename will sort immediatly before
 	@# the relevant mtree line.
 	cd ${DESTDIR}/${DISTDIR}; \
 	find ./${dist} | sort -u ${METALOG} - | \
 	awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \
 	${DESTDIR}/${DISTDIR}/${dist}.meta
 .endfor
 .if ${MK_DEBUG_FILES} != "no"
 . for dist in base ${EXTRA_DISTRIBUTIONS}
 	@# For each file that exists in this dist, print the corresponding
 	@# line from the METALOG.  This relies on the fact that
 	@# a line containing only the filename will sort immediatly before
 	@# the relevant mtree line.
 	cd ${DESTDIR}/${DISTDIR}; \
 	find ./${dist}/usr/lib/debug | sort -u ${METALOG} - | \
 	awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \
 	${DESTDIR}/${DISTDIR}/${dist}.debug.meta
 . endfor
 .endif
 .endif
 .endif
 
 packageworld:
 .for dist in base ${EXTRA_DISTRIBUTIONS}
 .if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \
 	    --exclude usr/lib/debug \
 	    @${DESTDIR}/${DISTDIR}/${dist}.meta
 .else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \
 	    --exclude usr/lib/debug .
 .endif
 .endfor
 
 .if ${MK_DEBUG_FILES} != "no"
 . for dist in base ${EXTRA_DISTRIBUTIONS}
 .  if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \
 	    @${DESTDIR}/${DISTDIR}/${dist}.debug.meta
 .  else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \
 	    usr/lib/debug
 .  endif
 . endfor
 .endif
 
 #
 # reinstall
 #
 # If you have a build server, you can NFS mount the source and obj directories
 # and do a 'make reinstall' on the *client* to install new binaries from the
 # most recent server build.
 #
 reinstall: .MAKE
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Making hierarchy"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
 	    LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Installing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
 .if defined(LIB32TMP) && ${MK_LIB32} != "no"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
 .endif
 
 redistribute: .MAKE
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Distributing everything"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute
 .if defined(LIB32TMP) && ${MK_LIB32} != "no"
 	${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute32 \
 	    DISTRIBUTION=lib32
 .endif
 
 distrib-dirs distribution: .MAKE
 	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 
 #
 # buildkernel and installkernel
 #
 # Which kernels to build and/or install is specified by setting
 # KERNCONF. If not defined a GENERIC kernel is built/installed.
 # Only the existing (depending TARGET) config files are used
 # for building kernels and only the first of these is designated
 # as the one being installed.
 #
 # Note that we have to use TARGET instead of TARGET_ARCH when
 # we're in kernel-land. Since only TARGET_ARCH is (expected) to
 # be set to cross-build, we have to make sure TARGET is set
 # properly.
 
 .if defined(KERNFAST)
 NO_KERNELCLEAN=	t
 NO_KERNELCONFIG=	t
 NO_KERNELDEPEND=	t
 NO_KERNELOBJ=		t
 # Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah
 .if !defined(KERNCONF) && ${KERNFAST} != "1"
 KERNCONF=${KERNFAST}
 .endif
 .endif
 .if ${TARGET_ARCH} == "powerpc64"
 KERNCONF?=	GENERIC64
 .else
 KERNCONF?=	GENERIC
 .endif
 INSTKERNNAME?=	kernel
 
 KERNSRCDIR?=	${.CURDIR}/sys
 KRNLCONFDIR=	${KERNSRCDIR}/${TARGET}/conf
 KRNLOBJDIR=	${OBJTREE}${KERNSRCDIR}
 KERNCONFDIR?=	${KRNLCONFDIR}
 
 BUILDKERNELS=
 INSTALLKERNEL=
 .for _kernel in ${KERNCONF}
 .if exists(${KERNCONFDIR}/${_kernel})
 BUILDKERNELS+=	${_kernel}
 .if empty(INSTALLKERNEL)
 INSTALLKERNEL= ${_kernel}
 .endif
 .endif
 .endfor
 
 buildkernel ${WMAKE_TGTS} ${.ALLTARGETS:M_*}: .MAKE
 
 #
 # buildkernel
 #
 # Builds all kernels defined by BUILDKERNELS.
 #
 buildkernel:
 .if empty(BUILDKERNELS)
 	@echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; \
 	false
 .endif
 	@echo
 .for _kernel in ${BUILDKERNELS}
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Kernel build for ${_kernel} started on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
 	@echo "===> ${_kernel}"
 	mkdir -p ${KRNLOBJDIR}
 .if !defined(NO_KERNELCONFIG)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 1: configuring the kernel"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLCONFDIR}; \
 		PATH=${TMPPATH} \
 		    config ${CONFIGARGS} -d ${KRNLOBJDIR}/${_kernel} \
 			-I '${KERNCONFDIR}' '${KERNCONFDIR}/${_kernel}'
 .endif
 .if !defined(NO_CLEAN) && !defined(NO_KERNELCLEAN)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.1: cleaning up the object tree"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR}
 .endif
 .if !defined(NO_KERNELOBJ)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.2: rebuilding the object tree"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.3: build tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${KTMAKE} kernel-tools
 .if !defined(NO_KERNELDEPEND)
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 3.1: making dependencies"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} depend -DNO_MODULES_OBJ
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 3.2: building everything"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} all -DNO_MODULES_OBJ
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`"
 	@echo "--------------------------------------------------------------"
 .endfor
 
 #
 # installkernel, etc.
 #
 # Install the kernel defined by INSTALLKERNEL
 #
 installkernel installkernel.debug \
 reinstallkernel reinstallkernel.debug: _installcheck_kernel
 .if empty(INSTALLKERNEL)
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
 	false
 .endif
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Installing kernel ${INSTALLKERNEL}"
 	@echo "--------------------------------------------------------------"
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
 	    ${CROSSENV} PATH=${TMPPATH} \
 	    ${MAKE} ${IMAKE_INSTALL} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel//}
 
 distributekernel distributekernel.debug:
 .if empty(INSTALLKERNEL)
 	@echo "ERROR: No kernel \"${KERNCONF}\" to install."; \
 	false
 .endif
 	mkdir -p ${DESTDIR}/${DISTDIR}
 .if defined(NO_ROOT)
 	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.premeta
 .endif
 	cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
 	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.premeta/} \
 	    ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \
 	    DESTDIR=${INSTALL_DDIR}/kernel \
 	    ${.TARGET:S/distributekernel/install/}
 .if defined(NO_ROOT)
 	sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.meta
 .endif
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
 .if defined(NO_ROOT)
 	echo "#${MTREE_MAGIC}" > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta
 .endif
 	cd ${KRNLOBJDIR}/${_kernel}; \
 	    ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \
 	    ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} \
 	    KERNEL=${INSTKERNNAME}.${_kernel} \
 	    DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \
 	    ${.TARGET:S/distributekernel/install/}
 .if defined(NO_ROOT)
 	sed -e 's|^./kernel|.|' \
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \
 	    ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
 .endif
 .endfor
 
 packagekernel:
 .if defined(NO_ROOT)
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \
 	    @${DESTDIR}/${DISTDIR}/kernel.meta
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \
 	    @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
 .endfor
 .else
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz .
 .for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .
 .endfor
 .endif
 
 #
 # doxygen
 #
 # Build the API documentation with doxygen
 #
 doxygen:
 	@if [ ! -x `/usr/bin/which doxygen` ]; then \
 		echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \
 		exit 1; \
 	fi
 	cd ${.CURDIR}/tools/kerneldoc/subsys && ${MAKE} obj all
 
 #
 # update
 #
 # Update the source tree(s), by running svn/svnup to update to the
 # latest copy.
 #
 update:
 .if (defined(CVS_UPDATE) || defined(SUP_UPDATE)) && !defined(SVN_UPDATE)
 	@echo "--------------------------------------------------------------"
 	@echo "CVS_UPDATE and SUP_UPDATE are no longer supported."
 	@echo "Please see: https://wiki.freebsd.org/CvsIsDeprecated"
 	@echo "--------------------------------------------------------------"
 	@exit 1
 .endif
 .if defined(SVN_UPDATE)
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Updating ${.CURDIR} using Subversion"
 	@echo "--------------------------------------------------------------"
 	@(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS})
 .endif
 
 #
 # ------------------------------------------------------------------------
 #
 # From here onwards are utility targets used by the 'make world' and
 # related targets.  If your 'world' breaks, you may like to try to fix
 # the problem and manually run the following targets to attempt to
 # complete the build.  Beware, this is *not* guaranteed to work, you
 # need to have a pretty good grip on the current state of the system
 # to attempt to manually finish it.  If in doubt, 'make world' again.
 #
 
 #
 # legacy: Build compatibility shims for the next three targets
 #
 legacy:
 .if ${BOOTSTRAPPING} < 700055 && ${BOOTSTRAPPING} != 0
 	@echo "ERROR: Source upgrades from versions prior to 7.0 not supported."; \
 	false
 .endif
 .for _tool in tools/build
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
 	    cd ${.CURDIR}/${_tool} && \
 	    ${MAKE} DIRPRFX=${_tool}/ obj && \
 	    ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes && \
 	    ${MAKE} DIRPRFX=${_tool}/ depend && \
 	    ${MAKE} DIRPRFX=${_tool}/ all && \
 	    ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
 .endfor
 
 #
 # bootstrap-tools: Build tools needed for compatibility
 #
 .if ${MK_GAMES} != "no"
 _strfile=	games/fortune/strfile
 .endif
 
 .if ${MK_CXX} != "no"
 _gperf=		gnu/usr.bin/gperf
 .endif
 
 .if ${MK_GROFF} != "no"
 _groff=		gnu/usr.bin/groff
 .endif
 
 .if ${MK_VT} != "no"
 _vtfontcvt=	usr.bin/vtfontcvt
 .endif
 
 .if ${BOOTSTRAPPING} < 800022
 _ar=		usr.bin/ar
 .endif
 
 .if ${BOOTSTRAPPING} < 800013
 _mklocale=	usr.bin/mklocale
 .endif
 
 .if ${BOOTSTRAPPING} < 900002
 _sed=		usr.bin/sed
 .endif
 
 .if ${BOOTSTRAPPING} < 1000002
 _m4=		usr.bin/m4
 .endif
 
 .if ${BOOTSTRAPPING} < 1000013
 _yacc=		lib/liby \
 		usr.bin/yacc
 .endif
 
 .if ${BOOTSTRAPPING} < 1000014
 _crunch=	usr.sbin/crunch
 .endif
 
 .if ${BOOTSTRAPPING} < 1000026
 _nmtree=	lib/libnetbsd \
 		usr.sbin/nmtree
 .endif
 
 .if ${BOOTSTRAPPING} < 1000027
 _cat=		bin/cat
 .endif
 
 .if ${BOOTSTRAPPING} < 1000033
 _lex=		usr.bin/lex
 .endif
 
 .if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
 _awk=		usr.bin/awk
 .endif
 
 .if ${MK_BSNMP} != "no"
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
 
 .if ${MK_CLANG} != "no"
 _clang_tblgen= \
 	lib/clang/libllvmsupport \
 	lib/clang/libllvmtablegen \
 	usr.bin/clang/tblgen \
 	usr.bin/clang/clang-tblgen
 .endif
 
 # dtrace tools are required for older bootstrap env and cross-build
 .if ${MK_CDDL} != "no" && \
     ((${BOOTSTRAPPING} < 1000034 && \
           !(${BOOTSTRAPPING} >= 901505 && ${BOOTSTRAPPING} < 999999)) \
       || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH}))
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
 .endif
 
 # Default to building the GPL DTC, but build the BSDL one if users explicitly
 # request it.
 _dtc= usr.bin/dtc
 .if ${MK_GPL_DTC} != "no"
 _dtc= gnu/usr.bin/dtc
 .endif
 
 .if ${MK_KERBEROS} != "no"
 _kerberos5_bootstrap_tools= \
 	kerberos5/tools/make-roken \
 	kerberos5/lib/libroken \
 	kerberos5/lib/libvers \
 	kerberos5/tools/asn1_compile \
 	kerberos5/tools/slc \
 	usr.bin/compile_et
 .endif
 
 .if ${_BOOTSTRAP_MAKEINFO} != "no"
 _texinfo=	gnu/usr.bin/texinfo/libtxi \
 		gnu/usr.bin/texinfo/makeinfo \
 		gnu/usr.bin/texinfo/install-info
 .endif
 #	Please document (add comment) why something is in 'bootstrap-tools'.
 #	Try to bound the building of the bootstrap-tool to just the
 #	FreeBSD versions that need the tool built at this stage of the build.
 bootstrap-tools: .MAKE
 .for _tool in \
     ${_clang_tblgen} \
     ${_kerberos5_bootstrap_tools} \
     ${_dtrace_tools} \
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
     ${_ar} \
     ${_dtc} \
     ${_awk} \
     ${_cat} \
     usr.bin/lorder \
     usr.bin/makewhatis \
     ${_mklocale} \
     usr.bin/rpcgen \
     ${_sed} \
     ${_yacc} \
     ${_m4} \
     ${_lex} \
     lib/libmd \
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config \
     ${_crunch} \
     ${_nmtree} \
     ${_texinfo} \
     ${_vtfontcvt}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool} && \
 		${MAKE} DIRPRFX=${_tool}/ obj && \
 		${MAKE} DIRPRFX=${_tool}/ depend && \
 		${MAKE} DIRPRFX=${_tool}/ all && \
 		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install
 .endfor
 
 #
 # build-tools: Build special purpose build tools
 #
 .if !defined(NO_SHARE)
 _share=	share/syscons/scrnmaps
 .endif
 
 .if ${MK_GCC} != "no"
 _gcc_tools= gnu/usr.bin/cc/cc_tools
 .endif
 
 .if ${MK_RESCUE} != "no"
 _rescue= rescue/rescue
 .endif
 
 build-tools: .MAKE
 .for _tool in \
     bin/csh \
     bin/sh \
     ${_rescue} \
     ${LOCAL_TOOL_DIRS} \
     lib/ncurses/ncurses \
     lib/ncurses/ncursesw \
     ${_share} \
     usr.bin/awk \
     lib/libmagic \
     usr.bin/mkesdb_static \
     usr.bin/mkcsmapper_static \
     usr.bin/vi/catalog
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \
 		cd ${.CURDIR}/${_tool} && \
 		${MAKE} DIRPRFX=${_tool}/ obj && \
 		${MAKE} DIRPRFX=${_tool}/ build-tools
 .endfor
 .for _tool in \
     ${_gcc_tools}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
 		cd ${.CURDIR}/${_tool} && \
 		${MAKE} DIRPRFX=${_tool}/ obj && \
 		${MAKE} DIRPRFX=${_tool}/ depend && \
 		${MAKE} DIRPRFX=${_tool}/ all
 .endfor
 
 
 #
 # kernel-tools: Build kernel-building tools
 #
 kernel-tools: .MAKE
 	mkdir -p ${MAKEOBJDIRPREFIX}/usr
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${MAKEOBJDIRPREFIX}/usr >/dev/null
 
 #
 # cross-tools: Build cross-building tools
 #
 .if !defined(TARGET_ARCH) && defined(XDEV_ARCH)
 TARGET_ARCH=	${XDEV_ARCH}
 .endif
 .if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 _btxld=		usr.sbin/btxld
 .endif
 .endif
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
 .if ${MK_RESCUE} != "no" || defined(RELEASEDIR)
 _crunchide=	usr.sbin/crunch/crunchide
 .endif
 .if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR)
 _kgzip=		usr.sbin/kgzip
 .endif
 .endif
 
 .if ${XAS:M/*} == "" && ${MK_BINUTILS} != "no"
 _binutils=	gnu/usr.bin/binutils
 .endif
 
 # If an full path to an external cross compiler is given, don't build
 # a cross compiler.
 .if ${XCC:M/*} == "" && ${MK_CROSS_COMPILER} != "no"
 .if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
 _clang=		usr.bin/clang
 _clang_libs=	lib/clang
 .else
 _cc=		gnu/usr.bin/cc
 .endif
 
 # The boot2 for pc98 requires gcc.
 .if ${TARGET} == "pc98"
 _cc=		gnu/usr.bin/cc
 .endif
 .endif
 
 cross-tools: .MAKE
 .for _tool in \
     ${_clang_libs} \
     ${_clang} \
     ${_binutils} \
     ${_cc} \
     usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
     ${_btxld} \
     ${_crunchide} \
     ${_kgzip}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool} && \
 		${MAKE} DIRPRFX=${_tool}/ obj && \
 		${MAKE} DIRPRFX=${_tool}/ depend && \
 		${MAKE} DIRPRFX=${_tool}/ all && \
 		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
 .endfor
 
 #
 # hierarchy - ensure that all the needed directories are present
 #
 hierarchy hier: .MAKE
 	cd ${.CURDIR}/etc && ${HMAKE} distrib-dirs
 
 #
 # libraries - build all libraries, and install them under ${DESTDIR}.
 #
 # The list of libraries with dependents (${_prebuild_libs}) and their
 # interdependencies (__L) are built automatically by the
 # ${.CURDIR}/tools/make_libdeps.sh script.
 #
 libraries: .MAKE
 	cd ${.CURDIR} && \
 	    ${MAKE} -f Makefile.inc1 _prereq_libs && \
 	    ${MAKE} -f Makefile.inc1 _startup_libs && \
 	    ${MAKE} -f Makefile.inc1 _prebuild_libs && \
 	    ${MAKE} -f Makefile.inc1 _generic_libs
 
 #
 # static libgcc.a prerequisite for shared libc
 #
 _prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc lib/libcompiler_rt
 
 # These dependencies are not automatically generated:
 #
 # gnu/lib/csu, gnu/lib/libgcc, lib/csu and lib/libc must be built before
 # all shared libraries for ELF.
 #
 _startup_libs=	gnu/lib/csu
 .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf)
 _startup_libs+=	lib/csu/${MACHINE_ARCH}-elf
 .elif exists(${.CURDIR}/lib/csu/${MACHINE_ARCH})
 _startup_libs+=	lib/csu/${MACHINE_ARCH}
 .else
 _startup_libs+=	lib/csu/${MACHINE_CPUARCH}
 .endif
 _startup_libs+=	gnu/lib/libgcc
 _startup_libs+=	lib/libcompiler_rt
 _startup_libs+=	lib/libc
 _startup_libs+=	lib/libc_nonshared
 .if ${MK_LIBCPLUSPLUS} != "no"
 _startup_libs+=	lib/libcxxrt
 .endif
 
 gnu/lib/libgcc__L: lib/libc__L
 gnu/lib/libgcc__L: lib/libc_nonshared__L
 .if ${MK_LIBCPLUSPLUS} != "no"
 lib/libcxxrt__L: gnu/lib/libgcc__L
 .endif
 
 _prebuild_libs=	${_kerberos5_lib_libasn1} \
 		${_kerberos5_lib_libhdb} \
 		${_kerberos5_lib_libheimbase} \
 		${_kerberos5_lib_libheimntlm} \
 		${_kerberos5_lib_libheimsqlite} \
 		${_kerberos5_lib_libheimipcc} \
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
 		${_kerberos5_lib_libwind} \
 		${_lib_atf} \
 		lib/libbz2 ${_libcom_err} lib/libcrypt \
 		lib/libelf lib/libexpat \
 		lib/libfigpar \
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus \
 		lib/libgeom \
 		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
 		${_cddl_lib_libuutil} \
 		${_cddl_lib_libavl} \
 		${_cddl_lib_libzfs_core} \
 		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_lib_libldns} \
 		${_secure_lib_libssh} ${_secure_lib_libssl} \
 		gnu/lib/libdialog
 .if ${MK_GNUCXX} != no
 _prebuild_libs+= gnu/lib/libstdc++ gnu/lib/libsupc++
 gnu/lib/libstdc++__L: lib/msun__L
 .endif
 
 lib/libgeom__L: lib/libexpat__L
 
 .if defined(WITH_ATF) || ${MK_TESTS} != "no"
 .if !defined(WITH_ATF)
 # Ensure that the ATF libraries will be built during make libraries, even
 # though they will have -DNO_TESTS
 MAKE+=		-DWITH_ATF
 .endif
 _lib_atf=	lib/atf
 .endif
 
 .if ${MK_LIBTHR} != "no"
 _lib_libthr=	lib/libthr
 .endif
 
 .if ${MK_OFED} != "no"
 _ofed_lib=	contrib/ofed/usr.lib/
 .endif
 
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
 .for _DIR in ${LOCAL_LIB_DIRS}
 .if exists(${.CURDIR}/${_DIR}/Makefile)
 _generic_libs+= ${_DIR}
 .endif
 .endfor
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
 
 .if ${MK_CDDL} != "no"
 _cddl_lib_libumem= cddl/lib/libumem
 _cddl_lib_libnvpair= cddl/lib/libnvpair
 _cddl_lib_libavl= cddl/lib/libavl
 _cddl_lib_libuutil= cddl/lib/libuutil
 _cddl_lib_libzfs_core= cddl/lib/libzfs_core
 _cddl_lib= cddl/lib
 cddl/lib/libzfs_core__L: cddl/lib/libnvpair__L
 cddl/lib/libzfs__L: lib/libgeom__L
 .endif
 
 .if ${MK_CRYPT} != "no"
 .if ${MK_OPENSSL} != "no"
 _secure_lib_libcrypto= secure/lib/libcrypto
 _secure_lib_libssl= secure/lib/libssl
 lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
 .if ${MK_LDNS} != "no"
 _lib_libldns= lib/libldns
 lib/libldns__L: secure/lib/libcrypto__L
 .endif
 .if ${MK_OPENSSH} != "no"
 _secure_lib_libssh= secure/lib/libssh
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
 .if ${MK_LDNS} != "no"
 secure/lib/libssh__L: lib/libldns__L
 .endif
 .if ${MK_KERBEROS_SUPPORT} != "no"
 secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \
     lib/libmd__L kerberos5/lib/libroken__L
 .endif
 .endif
 .endif
 _secure_lib=	secure/lib
 .endif
 
 .if ${MK_KERBEROS} != "no"
 kerberos5/lib/libasn1__L: lib/libcom_err__L kerberos5/lib/libroken__L
 kerberos5/lib/libhdb__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
     kerberos5/lib/libkrb5__L kerberos5/lib/libroken__L \
     kerberos5/lib/libwind__L kerberos5/lib/libheimsqlite__L 
 kerberos5/lib/libheimntlm__L: secure/lib/libcrypto__L kerberos5/lib/libkrb5__L \
     kerberos5/lib/libroken__L lib/libcom_err__L
 kerberos5/lib/libhx509__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
     secure/lib/libcrypto__L kerberos5/lib/libroken__L kerberos5/lib/libwind__L
 kerberos5/lib/libkrb5__L: kerberos5/lib/libasn1__L lib/libcom_err__L \
     lib/libcrypt__L secure/lib/libcrypto__L kerberos5/lib/libhx509__L \
     kerberos5/lib/libroken__L kerberos5/lib/libwind__L \
     kerberos5/lib/libheimbase__L kerberos5/lib/libheimipcc__L
 kerberos5/lib/libroken__L: lib/libcrypt__L
 kerberos5/lib/libwind__L: kerberos5/lib/libroken__L lib/libcom_err__L
 kerberos5/lib/libheimbase__L: lib/libthr__L
 kerberos5/lib/libheimipcc__L: kerberos5/lib/libroken__L kerberos5/lib/libheimbase__L lib/libthr__L
 kerberos5/lib/libheimsqlite__L: lib/libthr__L
 .endif
 
 .if ${MK_GSSAPI} != "no"
 _lib_libgssapi=	lib/libgssapi
 .endif
 
 .if ${MK_IPX} != "no"
 _lib_libipx=	lib/libipx
 .endif
 
 .if ${MK_KERBEROS} != "no"
 _kerberos5_lib=	kerberos5/lib
 _kerberos5_lib_libasn1= kerberos5/lib/libasn1
 _kerberos5_lib_libhdb= kerberos5/lib/libhdb
 _kerberos5_lib_libheimbase= kerberos5/lib/libheimbase
 _kerberos5_lib_libkrb5= kerberos5/lib/libkrb5
 _kerberos5_lib_libhx509= kerberos5/lib/libhx509
 _kerberos5_lib_libroken= kerberos5/lib/libroken
 _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
 _kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite
 _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc
 _kerberos5_lib_libwind= kerberos5/lib/libwind
 _libcom_err= lib/libcom_err
 .endif
 
 .if ${MK_NIS} != "no"
 _lib_libypclnt=	lib/libypclnt
 .endif
 
 .if ${MK_OPENSSL} == "no"
 lib/libradius__L: lib/libmd__L
 .endif
 
 gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncursesw__L
 
 .for _lib in ${_prereq_libs}
 ${_lib}__PL: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib} && \
 		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
 		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
 		${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
 		    DIRPRFX=${_lib}/ all && \
 		${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
 		    DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
 .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
 ${_lib}__L: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib} && \
 		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
 		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
 		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ all && \
 		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
 # libpam is special: we need to build static PAM modules before
 # static PAM library, and dynamic PAM library before dynamic PAM
 # modules.
 lib/libpam__L: .PHONY .MAKE
 	${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
 		cd ${.CURDIR}/lib/libpam && \
 		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ obj && \
 		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ depend && \
 		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
 		    -D_NO_LIBPAM_SO_YET all && \
 		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
 		    -D_NO_LIBPAM_SO_YET install
 
 _prereq_libs: ${_prereq_libs:S/$/__PL/}
 _startup_libs: ${_startup_libs:S/$/__L/}
 _prebuild_libs: ${_prebuild_libs:S/$/__L/}
 _generic_libs: ${_generic_libs:S/$/__L/}
 
 .for __target in all clean cleandepend cleandir depend includes obj
 .for entry in ${SUBDIR}
 ${entry}.${__target}__D: .PHONY .MAKE
 	${_+_}@set -e; if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \
 		${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH} (${__target})"; \
 		edir=${entry}.${MACHINE_ARCH}; \
 		cd ${.CURDIR}/$${edir}; \
 	else \
 		${ECHODIR} "===> ${DIRPRFX}${entry} (${__target})"; \
 		edir=${entry}; \
 		cd ${.CURDIR}/$${edir}; \
 	fi; \
 	${MAKE} ${__target} DIRPRFX=${DIRPRFX}$${edir}/
 .endfor
 par-${__target}: ${SUBDIR:S/$/.${__target}__D/}
 .endfor
 
 .include <bsd.subdir.mk>
 
 .if make(check-old) || make(check-old-dirs) || \
     make(check-old-files) || make(check-old-libs) || \
     make(delete-old) || make(delete-old-dirs) || \
     make(delete-old-files) || make(delete-old-libs)
 
 #
 # check for / delete old files section
 #
 
 .include "ObsoleteFiles.inc"
 
 OLD_LIBS_MESSAGE="Please be sure no application still uses those libraries, \
 else you can not start such an application. Consult UPDATING for more \
 information regarding how to cope with the removal/revision bump of a \
 specific library."
 
 .if !defined(BATCH_DELETE_OLD_FILES)
 RM_I=-i
 .else
 RM_I=-v
 .endif
 
 delete-old-files:
 	@echo ">>> Removing old files (only deletes safe to delete libs)"
 # Ask for every old file if the user really wants to remove it.
 # It's annoying, but better safe than sorry.
 # NB: We cannot pass the list of OLD_FILES as a parameter because the
 # argument list will get too long. Using .for/.endfor make "loops" will make
 # the Makefile parser segfault.
 	@exec 3<&0; \
 	cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 			chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
 			rm ${RM_I} "${DESTDIR}/$${file}" <&3; \
 		fi; \
 	done
 # Remove catpages without corresponding manpages.
 	@exec 3<&0; \
 	find ${DESTDIR}/usr/share/man/cat* ! -type d | \
 	sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
 	while read catpage; do \
 		read manpage; \
 		if [ ! -e "$${manpage}" ]; then \
 			rm ${RM_I} $${catpage} <&3; \
 	        fi; \
 	done
 	@echo ">>> Old files removed"
 
 check-old-files:
 	@echo ">>> Checking for old files"
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 		 	echo "${DESTDIR}/$${file}"; \
 		fi; \
 	done
 # Check for catpages without corresponding manpages.
 	@find ${DESTDIR}/usr/share/man/cat* ! -type d | \
 	sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \
 	while read catpage; do \
 		read manpage; \
 		if [ ! -e "$${manpage}" ]; then \
 			echo $${catpage}; \
 	        fi; \
 	done
 
 delete-old-libs:
 	@echo ">>> Removing old libraries"
 	@echo "${OLD_LIBS_MESSAGE}" | fmt
 	@exec 3<&0; \
 	cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_LIBS | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 			chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
 			rm ${RM_I} "${DESTDIR}/$${file}" <&3; \
 		fi; \
 		for ext in debug symbols; do \
 		  if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \
 		      "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
 			  rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \
 			      <&3; \
 		  fi; \
 		done; \
 	done
 	@echo ">>> Old libraries removed"
 
 check-old-libs:
 	@echo ">>> Checking for old libraries"
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_LIBS | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 			echo "${DESTDIR}/$${file}"; \
 		fi; \
 		for ext in debug symbols; do \
 		  if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
 			  echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \
 		  fi; \
 		done; \
 	done
 
 delete-old-dirs:
 	@echo ">>> Removing old directories"
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_DIRS | xargs -n1 | sort -r | \
 	while read dir; do \
 		if [ -d "${DESTDIR}/$${dir}" ]; then \
 			rmdir -v "${DESTDIR}/$${dir}" || true; \
 		elif [ -L "${DESTDIR}/$${dir}" ]; then \
 			echo "${DESTDIR}/$${dir} is a link, please remove everything manually."; \
 		fi; \
 	done
 	@echo ">>> Old directories removed"
 
 check-old-dirs:
 	@echo ">>> Checking for old directories"
 	@cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_DIRS | xargs -n1 | \
 	while read dir; do \
 		if [ -d "${DESTDIR}/$${dir}" ]; then \
 			echo "${DESTDIR}/$${dir}"; \
 		elif [ -L "${DESTDIR}/$${dir}" ]; then \
 			echo "${DESTDIR}/$${dir} is a link, please remove everything manually."; \
 		fi; \
 	done
 
 delete-old: delete-old-files delete-old-dirs
 	@echo "To remove old libraries run '${MAKE} delete-old-libs'."
 
 check-old: check-old-files check-old-libs check-old-dirs
 	@echo "To remove old files and directories run '${MAKE} delete-old'."
 	@echo "To remove old libraries run '${MAKE} delete-old-libs'."
 
 .endif
 
 #
 # showconfig - show build configuration.
 #
 showconfig:
 	@${MAKE} -n -f bsd.own.mk -V dummy -dg1 2>&1 | grep ^MK_ | sort
 
 .if !empty(KRNLOBJDIR) && !empty(KERNCONF)
 DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
 
 .if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE)
 .if exists(${KERNCONFDIR}/${KERNCONF})
 FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \
 	'${KERNCONFDIR}/${KERNCONF}' ; echo
 .endif
 .endif
 
 .endif
 
 .if !defined(DTBOUTPUTPATH) || !exists(${DTBOUTPUTPATH})
 DTBOUTPUTPATH= ${.CURDIR}
 .endif
 
 #
 # Build 'standalone' Device Tree Blob
 #
 builddtb:
 	@PATH=${TMPPATH} MACHINE=${TARGET} \
 	${.CURDIR}/sys/tools/fdt/make_dtb.sh ${.CURDIR}/sys \
 	    "${FDT_DTS_FILE}" ${DTBOUTPUTPATH}
 
 ###############
 
 .if defined(XDEV) && defined(XDEV_ARCH)
 
 .if ${XDEV} == ${MACHINE} && ${XDEV_ARCH} == ${MACHINE_ARCH}
 XDEV_CPUTYPE?=${CPUTYPE}
 .else
 XDEV_CPUTYPE?=${TARGET_CPUTYPE}
 .endif
 
 NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
 	-DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE \
 	-DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_TESTS -DNO_WARNS \
 	TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
 	CPUTYPE=${XDEV_CPUTYPE}
 
 XDDIR=${XDEV_ARCH}-freebsd
 XDTP?=/usr/${XDDIR}
 .if ${XDTP:N/*}
 .error XDTP variable should be an absolute path
 .endif
 
 CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
 	INSTALL="sh ${.CURDIR}/tools/install.sh"
 CDENV= ${CDBENV} \
 	_SHLIBDIRPREFIX=${XDDESTDIR} \
 	TOOLS_PREFIX=${XDTP}
 CD2CFLAGS=-isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib \
 	--sysroot=${XDDESTDIR}/ -B${XDDESTDIR}/usr/libexec \
 	-B${XDDESTDIR}/usr/bin -B${XDDESTDIR}/usr/lib
 CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" CXX="${CXX} ${CD2CFLAGS}" \
 	CPP="${CPP} ${CD2CFLAGS}" \
 	MACHINE=${XDEV} MACHINE_ARCH=${XDEV_ARCH}
 
 CDTMP=	${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
 CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
 CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN}
 XDDESTDIR=${DESTDIR}/${XDTP}
 .if !defined(OSREL)
 OSREL!= uname -r | sed -e 's/[-(].*//'
 .endif
 
 .ORDER: xdev-build xdev-install
 xdev: xdev-build xdev-install
 
 .ORDER: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools
 xdev-build: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools
 
 _xb-worldtmp:
 	mkdir -p ${CDTMP}/usr
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${CDTMP}/usr >/dev/null
 
 _xb-bootstrap-tools:
 .for _tool in \
     ${_clang_tblgen}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 	cd ${.CURDIR}/${_tool} && \
 	${CDMAKE} DIRPRFX=${_tool}/ obj && \
 	${CDMAKE} DIRPRFX=${_tool}/ depend && \
 	${CDMAKE} DIRPRFX=${_tool}/ all && \
 	${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install
 .endfor
 
 _xb-build-tools:
 	${_+_}@cd ${.CURDIR}; \
 	${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools
 
 _xb-cross-tools:
 .for _tool in \
     ${_binutils} \
     usr.bin/ar \
     ${_clang_libs} \
     ${_clang} \
     ${_cc}
 	${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \
 	cd ${.CURDIR}/${_tool} && \
 	${CDMAKE} DIRPRFX=${_tool}/ obj && \
 	${CDMAKE} DIRPRFX=${_tool}/ depend && \
 	${CDMAKE} DIRPRFX=${_tool}/ all
 .endfor
 
 _xi-mtree:
 	${_+_}@${ECHODIR} "mtree populating ${XDDESTDIR}"
 	mkdir -p ${XDDESTDIR}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.root.dist \
 	    -p ${XDDESTDIR} >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${XDDESTDIR}/usr >/dev/null
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${XDDESTDIR}/usr/include >/dev/null
 .if ${MK_TESTS} != "no"
+	mkdir -p ${XDDESTDIR}${TESTSBASE}
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
-	    -p ${XDDESTDIR}/usr >/dev/null
+	    -p ${XDDESTDIR}${TESTSBASE} >/dev/null
 .endif
 
 .ORDER: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links
 xdev-install: xdev-build _xi-mtree _xi-cross-tools _xi-includes _xi-libraries _xi-links
 
 _xi-cross-tools:
 	@echo "_xi-cross-tools"
 .for _tool in \
     ${_binutils} \
     usr.bin/ar \
     ${_clang_libs} \
     ${_clang} \
     ${_cc}
 	${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \
 	cd ${.CURDIR}/${_tool}; \
 	${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR}
 .endfor
 
 _xi-includes:
 	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 par-includes \
 		DESTDIR=${XDDESTDIR}
 
 _xi-libraries:
 	${_+_}cd ${.CURDIR}; ${CD2MAKE} -f Makefile.inc1 libraries \
 		DESTDIR=${XDDESTDIR}
 
 _xi-links:
 	${_+_}cd ${XDDESTDIR}/usr/bin; \
        mkdir -p ../../../../usr/bin; \
 		for i in *; do \
 			ln -sf ../../${XDTP}/usr/bin/$$i \
 			    ../../../../usr/bin/${XDDIR}-$$i; \
 			ln -sf ../../${XDTP}/usr/bin/$$i \
 			    ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
 		done
 .else
 xdev xdev-build xdev-install:
 	@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target"
 .endif
Index: stable/10/etc/Makefile
===================================================================
--- stable/10/etc/Makefile	(revision 277456)
+++ stable/10/etc/Makefile	(revision 277457)
@@ -1,398 +1,400 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 .if ${MK_SENDMAIL} != "no"
 SUBDIR=	sendmail
 .endif
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=tests
 .endif
 
 BIN1=	auto_master \
 	crontab \
 	devd.conf \
 	devfs.conf \
 	ddb.conf \
 	dhclient.conf \
 	disktab \
 	fbtab \
 	ftpusers \
 	gettytab \
 	group \
 	hosts \
 	hosts.allow \
 	hosts.equiv \
 	inetd.conf \
 	libalias.conf \
 	libmap.conf \
 	login.access \
 	login.conf \
 	mac.conf \
 	motd \
 	netconfig \
 	network.subr \
 	networks \
 	newsyslog.conf \
 	nsswitch.conf \
 	phones \
 	profile \
 	protocols \
 	rc \
 	rc.bsdextended \
 	rc.firewall \
 	rc.initdiskless \
 	rc.sendmail \
 	rc.shutdown \
 	rc.subr \
 	remote \
 	rpc \
 	services \
 	shells \
 	sysctl.conf \
 	syslog.conf \
 	termcap.small
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
 BIN1+=	libmap32.conf
 .endif
 
 .if exists(${.CURDIR}/etc.${MACHINE}/ttys)
 BIN1+=	etc.${MACHINE}/ttys
 .elif exists(${.CURDIR}/etc.${MACHINE_ARCH}/ttys)
 BIN1+=	etc.${MACHINE_ARCH}/ttys
 .elif exists(${.CURDIR}/etc.${MACHINE_CPUARCH}/ttys)
 BIN1+=	etc.${MACHINE_CPUARCH}/ttys
 .else
 .error etc.MACHINE/ttys missing
 .endif
 
 OPENBSMDIR=			${.CURDIR}/../contrib/openbsm
 BSM_ETC_OPEN_FILES=		${OPENBSMDIR}/etc/audit_class \
 				${OPENBSMDIR}/etc/audit_event
 BSM_ETC_RESTRICTED_FILES=	${OPENBSMDIR}/etc/audit_control \
 				${OPENBSMDIR}/etc/audit_user
 BSM_ETC_EXEC_FILES=		${OPENBSMDIR}/etc/audit_warn
 BSM_ETC_DIR=			${DESTDIR}/etc/security
 
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_AMD} != "no"
 BIN1+= amd.map
 .endif
 
 .if ${MK_APM} != "no"
 BIN1+= apmd.conf
 .endif
 
 .if ${MK_BSNMP} != "no"
 BIN1+= snmpd.config
 .endif
 
 .if ${MK_FREEBSD_UPDATE} != "no"
 BIN1+= freebsd-update.conf
 .endif
 
 .if ${MK_LOCATE} != "no"
 BIN1+=	${.CURDIR}/../usr.bin/locate/locate/locate.rc
 .endif
 
 .if ${MK_LPR} != "no"
 BIN1+=	hosts.lpd printcap
 .endif
 
 .if ${MK_MAIL} != "no"
 BIN1+=	${.CURDIR}/../usr.bin/mail/misc/mail.rc
 .endif
 
 .if ${MK_NTP} != "no"
 BIN1+=	ntp.conf
 .endif
 
 .if ${MK_OPENSSH} != "no"
 SSH=	${.CURDIR}/../crypto/openssh/ssh_config \
 	${.CURDIR}/../crypto/openssh/sshd_config \
 	${.CURDIR}/../crypto/openssh/moduli
 .endif
 .if ${MK_OPENSSL} != "no"
 SSL=	${.CURDIR}/../crypto/openssl/apps/openssl.cnf
 .endif
 
 .if ${MK_NS_CACHING} != "no"
 BIN1+= nscd.conf
 .endif
 
 .if ${MK_PORTSNAP} != "no"
 BIN1+= portsnap.conf
 .endif
 
 .if ${MK_PF} != "no"
 BIN1+= pf.os
 .endif
 
 .if ${MK_TCSH} != "no"
 BIN1+= csh.cshrc csh.login csh.logout
 .endif
 
 .if ${MK_WIRELESS} != "no"
 BIN1+= regdomain.xml
 .endif
 
 # -rwxr-xr-x root:wheel, for the new cron root:wheel
 BIN2=	netstart pccard_ether rc.suspend rc.resume
 
 MTREE=	BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist
 .if ${MK_TESTS} != "no"
 MTREE+=	BSD.tests.dist
 .endif
 .if ${MK_SENDMAIL} != "no"
 MTREE+=	BSD.sendmail.dist
 .endif
 .if ${MK_DEBUG_FILES} != "no"
 MTREE+=	BSD.debug.dist
 .endif
 
 PPPCNF=	ppp.conf
 
 .if ${MK_SENDMAIL} == "no"
 ETCMAIL=mailer.conf aliases
 .else
 ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \
 	mailertable.sample aliases
 .endif
 
 # Special top level files for FreeBSD
 FREEBSD=COPYRIGHT
 
 # Sanitize DESTDIR
 DESTDIR:=	${DESTDIR:C://*:/:g}
 
 afterinstall:
 .if ${MK_MAN} != "no"
 	${_+_}cd ${.CURDIR}/../share/man; ${MAKE} makedb
 .endif
 
 distribute:
 	# Avoid installing tests here; "make distribution" will do this and
 	# correctly place them in the right location.
 	${_+_}cd ${.CURDIR} ; ${MAKE} -DNO_TESTS install \
 	    DESTDIR=${DISTDIR}/${DISTRIBUTION}
 	${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION}
 
 .include <bsd.endian.mk>
 .if ${TARGET_ENDIANNESS} == "1234"
 CAP_MKDB_ENDIAN?= -l
 PWD_MKDB_ENDIAN?= -L
 .elif ${TARGET_ENDIANNESS} == "4321"
 CAP_MKDB_ENDIAN?= -b
 PWD_MKDB_ENDIAN?= -B
 .else
 CAP_MKDB_ENDIAN?=
 PWD_MKDB_ENDIAN?=
 .endif
 
 .if defined(NO_ROOT)
 METALOG.add?=	cat -l >> ${METALOG}
 .endif
 
 distribution:
 .if !defined(DESTDIR)
 	@echo "set DESTDIR before running \"make ${.TARGET}\""
 	@false
 .endif
 	cd ${.CURDIR}; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		${BIN1} ${DESTDIR}/etc; \
 	    cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \
 		${BIN2} ${DESTDIR}/etc; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
 .if ${MK_AT} == "no"
 	sed -i "" -e 's;.*/usr/libexec/atrun;#&;' ${DESTDIR}/etc/crontab
 .endif
 .if ${MK_TCSH} == "no"
 	sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
 .endif
 	pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \
 	    ${DESTDIR}/etc/master.passwd
 .if defined(NO_ROOT)
 	( \
 		echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel"; \
 		echo "./etc/passwd type=file mode=0644 uname=root gname=wheel"; \
 		echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel"; \
 		echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
 	) | ${METALOG.add}
 .endif
 	${_+_}cd ${.CURDIR}/autofs; ${MAKE} install
 .if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
 .endif
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
 	${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
 	${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
 	${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
 	${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt
 	${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \
 	    ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR}
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0600 \
 	    ${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR}
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \
 	    ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR}
 .if ${MK_UNBOUND} != "no"
 	if [ ! -e ${DESTDIR}/etc/unbound ]; then \
 		${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
 	fi
 .endif
 .if ${MK_SENDMAIL} != "no"
 	${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution
 .endif
 .if ${MK_OPENSSH} != "no"
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${SSH} ${DESTDIR}/etc/ssh
 .endif
 .if ${MK_OPENSSL} != "no"
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${SSL} ${DESTDIR}/etc/ssl
 .endif
 .if ${MK_KERBEROS} != "no"
 	cd ${.CURDIR}/root; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.k5login ${DESTDIR}/root/.k5login;
 .endif
 	cd ${.CURDIR}/root; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.profile ${DESTDIR}/root/.profile; \
 	    rm -f ${DESTDIR}/.profile; \
 	    ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
 .if ${MK_TCSH} != "no"
 	cd ${.CURDIR}/root; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.cshrc ${DESTDIR}/root/.cshrc; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.login ${DESTDIR}/root/.login; \
 	    rm -f ${DESTDIR}/.cshrc; \
 	    ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
 .endif
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
 .if ${MK_PPP} != "no"
 	cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 	    ${PPPCNF} ${DESTDIR}/etc/ppp
 .endif
 .if ${MK_MAIL} != "no"
 	cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${ETCMAIL} ${DESTDIR}/etc/mail
 	if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \
 	      ! -f ${DESTDIR}/etc/aliases ]; then \
 		ln -s mail/aliases ${DESTDIR}/etc/aliases; \
 	fi
 .endif
 	${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
 	    ${DESTDIR}/etc/dumpdates
 	${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
 	    ${DESTDIR}/var/db/locate.database
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \
 	    ${DESTDIR}/var/crash
 	cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${FREEBSD} ${DESTDIR}/
 .if ${MK_BOOT} != "no"
 .if exists(${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints)
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \
 	    ${DESTDIR}/boot/device.hints
 .endif
 .endif
 .if ${MK_NIS} == "no"
 	sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \
 		${DESTDIR}/etc/nsswitch.conf
 .endif
 
 MTREE_CMD?=	mtree
 
 MTREES=		mtree/BSD.root.dist		/		\
 		mtree/BSD.var.dist		/var		\
 		mtree/BSD.usr.dist		/usr		\
 		mtree/BSD.include.dist		/usr/include
 .if ${MK_DEBUG_FILES} != "no"
 MTREES+=	mtree/BSD.debug.dist		/usr/lib
 .endif
 .if ${MK_GROFF} != "no"
 MTREES+=	mtree/BSD.groff.dist		/usr
 .endif
 .if ${MK_TESTS} != "no"
-MTREES+=	mtree/BSD.tests.dist		/usr
+MTREES+=	mtree/BSD.tests.dist		${TESTSBASE}
 .endif
 .if ${MK_SENDMAIL} != "no"
 MTREES+=	mtree/BSD.sendmail.dist		/
 .endif
 .for mtree in ${LOCAL_MTREE}
 MTREES+=	../${mtree}			/
 .endfor
 
 distrib-dirs: ${MTREES:N/*}
 	@set ${MTREES}; \
 	while test $$# -ge 2; do \
 		m=${.CURDIR}/$$1; \
 		shift; \
 		d=${DESTDIR}$$1; \
 		shift; \
+		test -d $$d || mkdir -p $$d; \
 		${ECHO} ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} \
 		    -f $$m -p $$d; \
 		${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
 	done; true
 .if defined(NO_ROOT)
 	@set ${MTREES}; \
 	while test $$# -ge 2; do \
 		m=${.CURDIR}/$$1; \
 		shift; \
 		d=$$1; \
 		test "$$d" == "/" && d=""; \
 		d=${DISTBASE}$$d; \
 		shift; \
+		test -d $$d || mkdir -p $$d; \
 		${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \
 		    "sed s#^\.#.$$d# | ${METALOG.add}" ; \
 		${MTREE_CMD:N-W} -C -f $$m -K uname,gname | sed s#^\.#.$$d# | \
 		    ${METALOG.add} ; \
 	done; true
 .endif
 	${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
 	cd ${DESTDIR}/usr/share/man; \
 	for mandir in man*; do \
 		${INSTALL_SYMLINK} ../$$mandir \
 		    ${DESTDIR}/usr/share/man/en.ISO8859-1/; \
 		${INSTALL_SYMLINK} ../$$mandir \
 		    ${DESTDIR}/usr/share/man/en.UTF-8/; \
 	done
 	cd ${DESTDIR}/usr/share/openssl/man; \
 	for mandir in man*; do \
 		${INSTALL_SYMLINK} ../$$mandir \
 		    ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \
 	done
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
 	while [ $$# -gt 0 ] ; do \
 		${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/man/$$1"; \
 		${INSTALL_SYMLINK} "$$2" \
 		    "${DESTDIR}/usr/share/openssl/man/$$1"; \
 		shift; shift; \
 	done
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
 	while [ $$# -gt 0 ] ; do \
 		${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/nls/$$1"; \
 		shift; shift; \
 	done
 
 etc-examples:
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${BIN1} ${BIN2} nsmb.conf opieaccess \
 	    ${DESTDIR}/usr/share/examples/etc
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \
 	    DESTDIR=${DESTDIR}/usr/share/examples
 
 .include <bsd.prog.mk>
Index: stable/10/etc/mtree/BSD.include.dist
===================================================================
--- stable/10/etc/mtree/BSD.include.dist	(revision 277456)
+++ stable/10/etc/mtree/BSD.include.dist	(revision 277457)
@@ -1,344 +1,348 @@
 # $FreeBSD$
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
     altq
     ..
     arpa
     ..
+    atf-c
+    ..
+    atf-c++
+    ..
     bsm
     ..
     bsnmp
     ..
     c++
         4.2
             backward
             ..
             bits
             ..
             debug
             ..
             ext
                 pb_ds
                     detail
                         basic_tree_policy
                         ..
                         bin_search_tree_
                         ..
                         binary_heap_
                         ..
                         binomial_heap_
                         ..
                         binomial_heap_base_
                         ..
                         cc_hash_table_map_
                         ..
                         eq_fn
                         ..
                         gp_hash_table_map_
                         ..
                         hash_fn
                         ..
                         left_child_next_sibling_heap_
                         ..
                         list_update_map_
                         ..
                         list_update_policy
                         ..
                         ov_tree_map_
                         ..
                         pairing_heap_
                         ..
                         pat_trie_
                         ..
                         rb_tree_map_
                         ..
                         rc_binomial_heap_
                         ..
                         resize_policy
                         ..
                         splay_tree_
                         ..
                         thin_heap_
                         ..
                         tree_policy
                         ..
                         trie_policy
                         ..
                         unordered_iterator
                         ..
                     ..
                 ..
             ..
             tr1
             ..
         ..
         v1
             experimental
             ..
             ext
             ..
             tr1
             ..
         ..
     ..
     cam
         ata
         ..
         scsi
         ..
     ..
     clang
         3.4.1
         ..
     ..
     crypto
     ..
     dev
         acpica
         ..
         agp
         ..
         an
         ..
         bktr
         ..
         ciss
         ..
         filemon
         ..
         firewire
         ..
         hwpmc
         ..
         ic
         ..
         ieee488
         ..
         iicbus
         ..
         io
         ..
         lmc
         ..
         mfi
         ..
         mpt
             mpilib
             ..
         ..
         nand
         ..
         nvme
         ..
         ofw
         ..
         pbio
         ..
         pci
         ..
         powermac_nvram
         ..
         ppbus
         ..
         smbus
         ..
         speaker
         ..
         usb
         ..
         utopia
         ..
         vkbd
         ..
         wi
         ..
     ..
     edit
         readline
         ..
     ..
     fs
         devfs
         ..
         fdescfs
         ..
         msdosfs
         ..
         nandfs
         ..
         nfs
         ..
         nullfs
         ..
         procfs
         ..
         smbfs
         ..
         udf
         ..
         unionfs
         ..
     ..
     gcc
         4.2
         ..
     ..
     geom
         cache
         ..
         concat
         ..
         eli
         ..
         gate
         ..
         journal
         ..
         label
         ..
         mirror
         ..
         mountver
         ..
         multipath
         ..
         nop
         ..
         raid
         ..
         raid3
         ..
         shsec
         ..
         stripe
         ..
         virstor
         ..
     ..
     gnu
         posix
         ..
     ..
     gpib
     ..
     gssapi
     ..
     infiniband
         complib 
         ..
         iba
         ..
         opensm
         ..
         vendor
         ..
     ..
     isofs
         cd9660
         ..
     ..
     kadm5
     ..
     krb5
     ..
     libmilter
     ..
     lzma
     ..
     machine
         pc
         ..
     ..
     net
     ..
     net80211
     ..
     netatalk
     ..
     netgraph
         atm
         ..
         bluetooth
             include
             ..
         ..
         netflow
         ..
     ..
     netinet
     ..
     netinet6
     ..
     netipsec
     ..
     netipx
     ..
     netnatm
         api
         ..
         msg
         ..
         saal
         ..
         sig
         ..
     ..
     netpfil
         pf
         ..
     ..
     netsmb
     ..
     nfs
     ..
     nfsclient
     ..
     nfsserver
     ..
     openssl
     ..
     pcap
     ..
     protocols
     ..
     rdma
     ..
     readline
     ..
     rpc
     ..
     rpcsvc
     ..
     security
         audit
         ..
         mac_biba
         ..
         mac_bsdextended
         ..
         mac_lomac
         ..
         mac_mls
         ..
         mac_partition
         ..
     ..
     ssp
     ..
     sys
     ..
     ufs
         ffs
         ..
         ufs
         ..
     ..
     vm
     ..
     xlocale
     ..
 ..
Index: stable/10/etc/mtree/BSD.tests.dist
===================================================================
--- stable/10/etc/mtree/BSD.tests.dist	(revision 277456)
+++ stable/10/etc/mtree/BSD.tests.dist	(revision 277457)
@@ -1,398 +1,382 @@
 # $FreeBSD$
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
-    include
-        atf-c
+    bin
+        chown
         ..
-        atf-c++
+        date
         ..
-    ..
-    share
-        atf
+        mv
         ..
-        doc
-            atf
-            ..
-            pjdfstest
-            ..
+        pax
         ..
-    ..
-    tests
-        bin
-            date
+        pkill
+        ..
+        sh
+            builtins
             ..
-            mv
+            errors
             ..
-            pax
+            execution
             ..
-            pkill
+            expansion
             ..
-            sh
-                builtins
-                ..
-                errors
-                ..
-                execution
-                ..
-                expansion
-                ..
-                parameters
-                ..
-                parser
-                ..
-                set-e
-                ..
+            parameters
             ..
-            sleep
+            parser
             ..
-            test
+            set-e
             ..
         ..
-        cddl
-            lib
-            ..
-            sbin
-            ..
-            usr.bin
-            ..
-            usr.sbin
-            ..
+        sleep
         ..
-        etc
+        test
         ..
-        games
+    ..
+    cddl
+        lib
         ..
-        gnu
-            lib
+        sbin
+        ..
+        usr.bin
+        ..
+        usr.sbin
+        ..
+    ..
+    etc
+    ..
+    games
+    ..
+    gnu
+        lib
+        ..
+        usr.bin
+            diff
             ..
-            usr.bin
-                diff
+        ..
+    ..
+    lib
+        atf
+            libatf-c
+                detail
                 ..
             ..
+            libatf-c++
+                detail
+                ..
+            ..
+            test-programs
+            ..
         ..
-        lib
-            atf
-                libatf-c
-                    detail
-                    ..
+        libc
+            c063
+            ..
+            db
+            ..
+            gen
+                execve
                 ..
-                libatf-c++
-                    detail
-                    ..
+                posix_spawn
                 ..
-                test-programs
-                ..
             ..
-            libc
-                c063
+            hash
+                data
                 ..
-                db
-                ..
-                gen
-                    execve
-                    ..
-                    posix_spawn
-                    ..
-                ..
-                hash
+            ..
+            inet
+            ..
+            locale
+            ..
+            net
+                getaddrinfo
                     data
                     ..
                 ..
-                inet
+            ..
+            regex
+                data
                 ..
-                locale
-                ..
-                net
-                    getaddrinfo
-                        data
-                        ..
-                    ..
-                ..
-                regex
-                    data
-                    ..
-                ..
-                ssp
-                ..
-                stdio
-                ..
-                stdlib
-                ..
-                string
-                ..
-                sys
-                ..
-                time
-                ..
-                tls
-                    dso
-                    ..
-                ..
-                termios
-                ..
-                ttyio
-                ..
             ..
-            libcrypt
+            ssp
             ..
-            libmp
+            stdio
             ..
-            librt
+            stdlib
             ..
-            libthr
-                dlopen
+            string
+            ..
+            sys
+            ..
+            time
+            ..
+            tls
+                dso
                 ..
             ..
-            libutil
+            termios
             ..
-            msun
+            ttyio
             ..
         ..
+        libcrypt
+        ..
+        libmp
+        ..
+        librt
+        ..
+        libthr
+            dlopen
+            ..
+        ..
+        libutil
+        ..
+        msun
+        ..
+    ..
+    libexec
+        atf
+            atf-check
+            ..
+            atf-sh
+            ..
+        ..
+    ..
+    sbin
+        dhclient
+        ..
+        devd
+        ..
+        growfs
+        ..
+        mdconfig
+        ..
+    ..
+    secure
+        lib
+        ..
         libexec
-            atf
-                atf-check
+        ..
+        usr.bin
+        ..
+        usr.sbin
+        ..
+    ..
+    share
+        examples
+            tests
+                atf
                 ..
-                atf-sh
+                plain
                 ..
             ..
         ..
-        sbin
-            dhclient
+    ..
+    sys
+        kern
+        ..
+        netinet
+        ..
+        pjdfstest
+            chflags
             ..
-            devd
+            chmod
             ..
-            growfs
+            chown
             ..
-            mdconfig
+            ftruncate
             ..
-        ..
-        secure
-            lib
+            granular
             ..
-            libexec
+            link
             ..
-            usr.bin
+            mkdir
             ..
-            usr.sbin
+            mkfifo
             ..
-        ..
-        share
-            examples
-                tests
-                    atf
-                    ..
-                    plain
-                    ..
-                ..
+            mknod
             ..
-        ..
-        sys
-            kern
+            open
             ..
-            netinet
+            rename
             ..
-            pjdfstest
-                chflags
+            rmdir
+            ..
+            symlink
+            ..
+            truncate
+            ..
+            unlink
+            ..
+        ..
+    ..
+    usr.bin
+        apply
+        ..
+        basename
+        ..
+        bmake
+            archives
+                fmt_44bsd
                 ..
-                chmod
+                fmt_44bsd_mod
                 ..
-                chown
+                fmt_oldbsd
                 ..
-                ftruncate
+            ..
+            basic
+                t0
                 ..
-                granular
+                t1
                 ..
-                link
+                t2
                 ..
-                mkdir
+                t3
                 ..
-                mkfifo
+            ..
+            execution
+                ellipsis
                 ..
-                mknod
+                empty
                 ..
-                open
+                joberr
                 ..
-                rename
+                plus
                 ..
-                rmdir
+            ..
+            shell
+                builtin
                 ..
-                symlink
+                meta
                 ..
-                truncate
+                path
                 ..
-                unlink
+                path_select
                 ..
+                replace
+                ..
+                select
+                ..
             ..
-        ..
-        usr.bin
-            apply
+            suffixes
+                basic
+                ..
+                src_wild1
+                ..
+                src_wild2
+                ..
             ..
-            basename
-            ..
-            bmake
-                archives
-                    fmt_44bsd
-                    ..
-                    fmt_44bsd_mod
-                    ..
-                    fmt_oldbsd
-                    ..
+            syntax
+                directive-t0
                 ..
-                basic
-                    t0
-                    ..
-                    t1
-                    ..
-                    t2
-                    ..
-                    t3
-                    ..
+                enl
                 ..
-                execution
-                    ellipsis
-                    ..
-                    empty
-                    ..
-                    joberr
-                    ..
-                    plus
-                    ..
+                funny-targets
                 ..
-                shell
-                    builtin
-                    ..
-                    meta
-                    ..
-                    path
-                    ..
-                    path_select
-                    ..
-                    replace
-                    ..
-                    select
-                    ..
+                semi
                 ..
-                suffixes
-                    basic
+            ..
+            sysmk
+                t0
+                    2
+                        1
+                        ..
                     ..
-                    src_wild1
+                    mk
                     ..
-                    src_wild2
-                    ..
                 ..
-                syntax
-                    directive-t0
+                t1
+                    2
+                        1
+                        ..
                     ..
-                    enl
+                    mk
                     ..
-                    funny-targets
-                    ..
-                    semi
-                    ..
                 ..
-                sysmk
-                    t0
-                        2
-                            1
-                            ..
+                t2
+                    2
+                        1
                         ..
-                        mk
-                        ..
                     ..
-                    t1
-                        2
-                            1
-                            ..
-                        ..
-                        mk
-                        ..
+                    mk
                     ..
-                    t2
-                        2
-                            1
-                            ..
-                        ..
-                        mk
-                        ..
-                    ..
                 ..
-                variables
-                    modifier_M
-                    ..
-                    modifier_t
-                    ..
-                    opt_V
-                    ..
-                    t0
-                    ..
-                ..
             ..
-            calendar
-            ..
-            cmp
-            ..
-            comm
-            ..
-            cut
-            ..
-            dirname
-            ..
-            file2c
-            ..
-            grep
-            ..
-            gzip
-            ..
-            join
-            ..
-            jot
-            ..
-            lastcomm
-            ..
-            m4
-            ..
-            ncal
-            ..
-            opensm
-            ..
-            printf
-            ..
-            sed
-                regress.multitest.out
+            variables
+                modifier_M
                 ..
-            ..
-            tr
-            ..
-            truncate
-            ..
-            uudecode
-            ..
-            uuencode
-            ..
-            xargs
-            ..
-            yacc
-                yacc
+                modifier_t
                 ..
+                opt_V
+                ..
+                t0
+                ..
             ..
         ..
-        usr.sbin
-            etcupdate
+        calendar
+        ..
+        cmp
+        ..
+        comm
+        ..
+        cut
+        ..
+        dirname
+        ..
+        file2c
+        ..
+        grep
+        ..
+        gzip
+        ..
+        join
+        ..
+        jot
+        ..
+        lastcomm
+        ..
+        m4
+        ..
+        ncal
+        ..
+        opensm
+        ..
+        printf
+        ..
+        sed
+            regress.multitest.out
             ..
-            newsyslog
+        ..
+        tr
+        ..
+        truncate
+        ..
+        uudecode
+        ..
+        uuencode
+        ..
+        xargs
+        ..
+        yacc
+            yacc
             ..
-            nmtree
-            ..
-            pw
-            ..
-            sa
-            ..
+        ..
+    ..
+    usr.sbin
+        etcupdate
+        ..
+        newsyslog
+        ..
+        nmtree
+        ..
+        pw
+        ..
+        sa
         ..
     ..
 ..
 
 # vim: set expandtab ts=4 sw=4:
Index: stable/10/etc/mtree/BSD.usr.dist
===================================================================
--- stable/10/etc/mtree/BSD.usr.dist	(revision 277456)
+++ stable/10/etc/mtree/BSD.usr.dist	(revision 277457)
@@ -1,1456 +1,1462 @@
 # $FreeBSD$
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
     bin
     ..
     games
     ..
     include
     ..
     lib
         aout
         ..
         compat
             aout
             ..
         ..
         dtrace
         ..
         engines
         ..
         i18n
         ..
         private
         ..
     ..
     lib32
         dtrace
         ..
         i18n
         ..
         private
         ..
     ..
     libdata
         gcc
         ..
         ldscripts
         ..
         lint
         ..
         pkgconfig
         ..
     ..
     libexec
         bsdconfig
             020.docsinstall
                 include
                 ..
             ..
             030.packages
                 include
                 ..
             ..
             040.password
                 include
                 ..
             ..
             050.diskmgmt
                 include
                 ..
             ..
             070.usermgmt
                 include
                 ..
             ..
             080.console
                 include
                 ..
             ..
             090.timezone
                 include
                 ..
             ..
             110.mouse
                 include
                 ..
             ..
             120.networking
                 include
                 ..
             ..
             130.security
                 include
                 ..
             ..
             140.startup
                 include
                 ..
             ..
             150.ttys
                 include
                 ..
             ..
             dot
                 include
                 ..
             ..
             include
             ..
             includes
                 include
                 ..
             ..
         ..
         bsdinstall
         ..
         hyperv
         ..
         lpr
             ru
             ..
         ..
         sendmail
         ..
         sm.bin
         ..
     ..
     local
     ..
     obj             nochange
     ..
     sbin
     ..
     share
+        atf
+        ..
         bsdconfig
             media
             ..
             networking
             ..
             packages
             ..
             password
             ..
             startup
             ..
             timezone
             ..
             usermgmt
             ..
         ..
         calendar
             de_AT.ISO_8859-15
             ..
             de_DE.ISO8859-1
             ..
             fr_FR.ISO8859-1
             ..
             hr_HR.ISO8859-2
             ..
             hu_HU.ISO8859-2
             ..
             pt_BR.ISO8859-1
             ..
             pt_BR.UTF-8
             ..
             ru_RU.KOI8-R
             ..
             ru_RU.UTF-8
             ..
             uk_UA.KOI8-U
             ..
         ..
         dict
         ..
         doc
             IPv6
             ..
+            atf
+            ..
             atm
             ..
             legal
                 intel_ipw
                 ..
                 intel_iwi
                 ..
                 intel_wpi
                 ..
             ..
             llvm
                 clang
                 ..
             ..
             ncurses
             ..
             ntp
             ..
             papers
+            ..
+            pjdfstest
             ..
             psd
                 01.cacm
                 ..
                 02.implement
                 ..
                 03.iosys
                 ..
                 04.uprog
                 ..
                 05.sysman
                 ..
                 06.Clang
                 ..
                 12.make
                 ..
                 13.rcs
                 ..
                 15.yacc
                 ..
                 16.lex
                 ..
                 17.m4
                 ..
                 18.gprof
                 ..
                 20.ipctut
                 ..
                 21.ipc
                 ..
                 22.rpcgen
                 ..
                 23.rpc
                 ..
                 24.xdr
                 ..
                 25.xdrrfc
                 ..
                 26.rpcrfc
                 ..
                 27.nfsrfc
                 ..
             ..
             smm
                 01.setup
                 ..
                 02.config
                 ..
                 03.fsck
                 ..
                 04.quotas
                 ..
                 05.fastfs
                 ..
                 06.nfs
                 ..
                 07.lpd
                 ..
                 08.sendmailop
                 ..
                 11.timedop
                 ..
                 12.timed
                 ..
                 18.net
                 ..
             ..
             usd
                 04.csh
                 ..
                 05.dc
                 ..
                 06.bc
                 ..
                 07.mail
                 ..
                 10.exref
                 ..
                 11.edit
                 ..
                 12.vi
                 ..
                 13.viref
                 ..
                 18.msdiffs
                 ..
                 19.memacros
                 ..
                 20.meref
                 ..
                 21.troff
                 ..
                 22.trofftut
                 ..
             ..
         ..
         dtrace
             toolkit
             ..
         ..
         examples
             BSD_daemon
             ..
             FreeBSD_version
             ..
             IPv6
             ..
             bhyve
             ..
             bootforth
             ..
             bsdconfig
             ..
             csh
             ..
             diskless
             ..
             drivers
             ..
             etc
                 defaults
                 ..
             ..
             find_interface
             ..
             hast
             ..
             hostapd
             ..
             ibcs2
             ..
             indent
             ..
             ipfilter
             ..
             ipfw
             ..
             iscsi
             ..
             jails
             ..
             kld
                 cdev
                     module
                     ..
                     test
                     ..
                 ..
                 dyn_sysctl
                 ..
                 firmware
                     fwconsumer
                     ..
                     fwimage
                     ..
                 ..
                 khelp
                 ..
                 syscall
                     module
                     ..
                     test
                     ..
                 ..
             ..
             libusb20
             ..
             libvgl
             ..
             mdoc
             ..
             netgraph
                 bluetooth
                 ..
             ..
             pc-sysinstall
             ..
             perfmon
             ..
             pf
             ..
             ppi
             ..
             ppp
             ..
             printing
             ..
             scsi_target
             ..
             ses
                 getencstat
                 ..
                 sesd
                 ..
                 setencstat
                 ..
                 setobjstat
                 ..
                 srcs
                 ..
             ..
             smbfs
                 print
                 ..
             ..
             sunrpc
                 dir
                 ..
                 msg
                 ..
                 sort
                 ..
             ..
             tcsh
             ..
         ..
         games
             fortune
             ..
         ..
         i18n
             csmapper
                 APPLE
                 ..
                 AST
                 ..
                 BIG5
                 ..
                 CNS
                 ..
                 CP
                 ..
                 EBCDIC
                 ..
                 GB
                 ..
                 GEORGIAN
                 ..
                 ISO-8859
                 ..
                 ISO646
                 ..
                 JIS
                 ..
                 KAZAKH
                 ..
                 KOI
                 ..
                 KS
                 ..
                 MISC
                 ..
                 TCVN
                 ..
             ..
             esdb
                 APPLE
                 ..
                 AST
                 ..
                 BIG5
                 ..
                 CP
                 ..
                 DEC
                 ..
                 EBCDIC
                 ..
                 EUC
                 ..
                 GB
                 ..
                 GEORGIAN
                 ..
                 ISO-2022
                 ..
                 ISO-8859
                 ..
                 ISO646
                 ..
                 KAZAKH
                 ..
                 KOI
                 ..
                 MISC
                 ..
                 TCVN
                 ..
                 UTF
                 ..
             ..
         ..
         info
         ..
         keys
             pkg
                 revoked
                 ..
                 trusted
                 ..
             ..
         ..
         locale
             UTF-8
             ..
             af_ZA.ISO8859-1
             ..
             af_ZA.ISO8859-15
             ..
             af_ZA.UTF-8
             ..
             am_ET.UTF-8
             ..
             be_BY.CP1131
             ..
             be_BY.CP1251
             ..
             be_BY.ISO8859-5
             ..
             be_BY.UTF-8
             ..
             bg_BG.CP1251
             ..
             bg_BG.UTF-8
             ..
             ca_AD.ISO8859-1
             ..
             ca_AD.ISO8859-15
             ..
             ca_AD.UTF-8
             ..
             ca_ES.ISO8859-1
             ..
             ca_ES.ISO8859-15
             ..
             ca_ES.UTF-8
             ..
             ca_FR.ISO8859-1
             ..
             ca_FR.ISO8859-15
             ..
             ca_FR.UTF-8
             ..
             ca_IT.ISO8859-1
             ..
             ca_IT.ISO8859-15
             ..
             ca_IT.UTF-8
             ..
             cs_CZ.ISO8859-2
             ..
             cs_CZ.UTF-8
             ..
             da_DK.ISO8859-1
             ..
             da_DK.ISO8859-15
             ..
             da_DK.UTF-8
             ..
             de_AT.ISO8859-1
             ..
             de_AT.ISO8859-15
             ..
             de_AT.UTF-8
             ..
             de_CH.ISO8859-1
             ..
             de_CH.ISO8859-15
             ..
             de_CH.UTF-8
             ..
             de_DE.ISO8859-1
             ..
             de_DE.ISO8859-15
             ..
             de_DE.UTF-8
             ..
             el_GR.ISO8859-7
             ..
             el_GR.UTF-8
             ..
             en_AU.ISO8859-1
             ..
             en_AU.ISO8859-15
             ..
             en_AU.US-ASCII
             ..
             en_AU.UTF-8
             ..
             en_CA.ISO8859-1
             ..
             en_CA.ISO8859-15
             ..
             en_CA.US-ASCII
             ..
             en_CA.UTF-8
             ..
             en_GB.ISO8859-1
             ..
             en_GB.ISO8859-15
             ..
             en_GB.US-ASCII
             ..
             en_GB.UTF-8
             ..
             en_IE.UTF-8
             ..
             en_NZ.ISO8859-1
             ..
             en_NZ.ISO8859-15
             ..
             en_NZ.US-ASCII
             ..
             en_NZ.UTF-8
             ..
             en_US.ISO8859-1
             ..
             en_US.ISO8859-15
             ..
             en_US.US-ASCII
             ..
             en_US.UTF-8
             ..
             es_ES.ISO8859-1
             ..
             es_ES.ISO8859-15
             ..
             es_ES.UTF-8
             ..
             et_EE.ISO8859-15
             ..
             et_EE.UTF-8
             ..
             eu_ES.ISO8859-1
             ..
             eu_ES.ISO8859-15
             ..
             eu_ES.UTF-8
             ..
             fi_FI.ISO8859-1
             ..
             fi_FI.ISO8859-15
             ..
             fi_FI.UTF-8
             ..
             fr_BE.ISO8859-1
             ..
             fr_BE.ISO8859-15
             ..
             fr_BE.UTF-8
             ..
             fr_CA.ISO8859-1
             ..
             fr_CA.ISO8859-15
             ..
             fr_CA.UTF-8
             ..
             fr_CH.ISO8859-1
             ..
             fr_CH.ISO8859-15
             ..
             fr_CH.UTF-8
             ..
             fr_FR.ISO8859-1
             ..
             fr_FR.ISO8859-15
             ..
             fr_FR.UTF-8
             ..
             he_IL.UTF-8
             ..
             hi_IN.ISCII-DEV
             ..
             hr_HR.ISO8859-2
             ..
             hr_HR.UTF-8
             ..
             hu_HU.ISO8859-2
             ..
             hu_HU.UTF-8
             ..
             hy_AM.ARMSCII-8
             ..
             hy_AM.UTF-8
             ..
             is_IS.ISO8859-1
             ..
             is_IS.ISO8859-15
             ..
             is_IS.UTF-8
             ..
             it_CH.ISO8859-1
             ..
             it_CH.ISO8859-15
             ..
             it_CH.UTF-8
             ..
             it_IT.ISO8859-1
             ..
             it_IT.ISO8859-15
             ..
             it_IT.UTF-8
             ..
             ja_JP.SJIS
             ..
             ja_JP.UTF-8
             ..
             ja_JP.eucJP
             ..
             kk_KZ.PT154
             ..
             kk_KZ.UTF-8
             ..
             ko_KR.CP949
             ..
             ko_KR.UTF-8
             ..
             ko_KR.eucKR
             ..
             la_LN.ISO8859-1
             ..
             la_LN.ISO8859-13
             ..
             la_LN.ISO8859-15
             ..
             la_LN.ISO8859-2
             ..
             la_LN.ISO8859-4
             ..
             la_LN.US-ASCII
             ..
             lt_LT.ISO8859-13
             ..
             lt_LT.ISO8859-4
             ..
             lt_LT.UTF-8
             ..
             lv_LV.ISO8859-13
             ..
             lv_LV.UTF-8
             ..
             mn_MN.UTF-8
             ..
             nb_NO.ISO8859-1
             ..
             nb_NO.ISO8859-15
             ..
             nb_NO.UTF-8
             ..
             nl_BE.ISO8859-1
             ..
             nl_BE.ISO8859-15
             ..
             nl_BE.UTF-8
             ..
             nl_NL.ISO8859-1
             ..
             nl_NL.ISO8859-15
             ..
             nl_NL.UTF-8
             ..
             nn_NO.ISO8859-1
             ..
             nn_NO.ISO8859-15
             ..
             nn_NO.UTF-8
             ..
             no_NO.ISO8859-1
             ..
             no_NO.ISO8859-15
             ..
             no_NO.UTF-8
             ..
             pl_PL.ISO8859-2
             ..
             pl_PL.UTF-8
             ..
             pt_BR.ISO8859-1
             ..
             pt_BR.UTF-8
             ..
             pt_PT.ISO8859-1
             ..
             pt_PT.ISO8859-15
             ..
             pt_PT.UTF-8
             ..
             ro_RO.ISO8859-2
             ..
             ro_RO.UTF-8
             ..
             ru_RU.CP1251
             ..
             ru_RU.CP866
             ..
             ru_RU.ISO8859-5
             ..
             ru_RU.KOI8-R
             ..
             ru_RU.UTF-8
             ..
             sk_SK.ISO8859-2
             ..
             sk_SK.UTF-8
             ..
             sl_SI.ISO8859-2
             ..
             sl_SI.UTF-8
             ..
             sr_YU.ISO8859-2
             ..
             sr_YU.ISO8859-5
             ..
             sr_YU.UTF-8
             ..
             sv_SE.ISO8859-1
             ..
             sv_SE.ISO8859-15
             ..
             sv_SE.UTF-8
             ..
             tr_TR.ISO8859-9
             ..
             tr_TR.UTF-8
             ..
             uk_UA.CP1251
             ..
             uk_UA.ISO8859-5
             ..
             uk_UA.KOI8-U
             ..
             uk_UA.UTF-8
             ..
             zh_CN.GB18030
             ..
             zh_CN.GB2312
             ..
             zh_CN.GBK
             ..
             zh_CN.UTF-8
             ..
             zh_CN.eucCN
             ..
             zh_HK.Big5HKSCS
             ..
             zh_HK.UTF-8
             ..
             zh_TW.Big5
             ..
             zh_TW.UTF-8
             ..
         ..
         man
 /set uname=man
             cat1
             ..
             cat2
             ..
             cat3
             ..
             cat4
                 amd64
                 ..
                 arm
                 ..
                 i386
                 ..
                 powerpc
                 ..
                 sparc64
                 ..
             ..
             cat5
             ..
             cat6
             ..
             cat7
             ..
             cat8
                 amd64
                 ..
                 i386
                 ..
                 powerpc
                 ..
                 sparc64
                 ..
             ..
             cat9
             ..
             en.ISO8859-1    uname=root
                 cat1
                 ..
                 cat2
                 ..
                 cat3
                 ..
                 cat4
                     amd64
                     ..
                     arm
                     ..
                     i386
                     ..
                     powerpc
                     ..
                     sparc64
                     ..
                 ..
                 cat5
                 ..
                 cat6
                 ..
                 cat7
                 ..
                 cat8
                     amd64
                     ..
                     i386
                     ..
                     powerpc
                     ..
                     sparc64
                     ..
                 ..
                 cat9
                 ..
             ..
             en.UTF-8        uname=root
                 cat1
                 ..
                 cat2
                 ..
                 cat3
                 ..
                 cat4
                     amd64
                     ..
                     arm
                     ..
                     i386
                     ..
                     powerpc
                     ..
                     sparc64
                     ..
                 ..
                 cat5
                 ..
                 cat6
                 ..
                 cat7
                 ..
                 cat8
                     amd64
                     ..
                     i386
                     ..
                     powerpc
                     ..
                     sparc64
                     ..
                 ..
                 cat9
                 ..
             ..
             ja              uname=root
                 cat1
                 ..
                 cat2
                 ..
                 cat3
                 ..
                 cat4
                 ..
                 cat5
                 ..
                 cat6
                 ..
                 cat7
                 ..
                 cat8
                 ..
                 cat9
                 ..
 /set uname=root
                 man1
                 ..
                 man2
                 ..
                 man3
                 ..
                 man4
                 ..
                 man5
                 ..
                 man6
                 ..
                 man7
                 ..
                 man8
                 ..
                 man9
                 ..
             ..
             man1
             ..
             man2
             ..
             man3
             ..
             man4
                 amd64
                 ..
                 arm
                 ..
                 i386
                 ..
                 powerpc
                 ..
                 sparc64
                 ..
             ..
             man5
             ..
             man6
             ..
             man7
             ..
             man8
                 amd64
                 ..
                 i386
                 ..
                 powerpc
                 ..
                 sparc64
                 ..
             ..
             man9
             ..
         ..
         mdocml
         ..
         misc
             fonts
             ..
         ..
         mk
         ..
         nls
             C
             ..
             af_ZA.ISO8859-1
             ..
             af_ZA.ISO8859-15
             ..
             af_ZA.UTF-8
             ..
             am_ET.UTF-8
             ..
             be_BY.CP1131
             ..
             be_BY.CP1251
             ..
             be_BY.ISO8859-5
             ..
             be_BY.UTF-8
             ..
             bg_BG.CP1251
             ..
             bg_BG.UTF-8
             ..
             ca_ES.ISO8859-1
             ..
             ca_ES.ISO8859-15
             ..
             ca_ES.UTF-8
             ..
             cs_CZ.ISO8859-2
             ..
             cs_CZ.UTF-8
             ..
             da_DK.ISO8859-1
             ..
             da_DK.ISO8859-15
             ..
             da_DK.UTF-8
             ..
             de_AT.ISO8859-1
             ..
             de_AT.ISO8859-15
             ..
             de_AT.UTF-8
             ..
             de_CH.ISO8859-1
             ..
             de_CH.ISO8859-15
             ..
             de_CH.UTF-8
             ..
             de_DE.ISO8859-1
             ..
             de_DE.ISO8859-15
             ..
             de_DE.UTF-8
             ..
             el_GR.ISO8859-7
             ..
             el_GR.UTF-8
             ..
             en_AU.ISO8859-1
             ..
             en_AU.ISO8859-15
             ..
             en_AU.US-ASCII
             ..
             en_AU.UTF-8
             ..
             en_CA.ISO8859-1
             ..
             en_CA.ISO8859-15
             ..
             en_CA.US-ASCII
             ..
             en_CA.UTF-8
             ..
             en_GB.ISO8859-1
             ..
             en_GB.ISO8859-15
             ..
             en_GB.US-ASCII
             ..
             en_GB.UTF-8
             ..
             en_IE.UTF-8
             ..
             en_NZ.ISO8859-1
             ..
             en_NZ.ISO8859-15
             ..
             en_NZ.US-ASCII
             ..
             en_NZ.UTF-8
             ..
             en_US.ISO8859-1
             ..
             en_US.ISO8859-15
             ..
             en_US.UTF-8
             ..
             es_ES.ISO8859-1
             ..
             es_ES.ISO8859-15
             ..
             es_ES.UTF-8
             ..
             et_EE.ISO8859-15
             ..
             et_EE.UTF-8
             ..
             fi_FI.ISO8859-1
             ..
             fi_FI.ISO8859-15
             ..
             fi_FI.UTF-8
             ..
             fr_BE.ISO8859-1
             ..
             fr_BE.ISO8859-15
             ..
             fr_BE.UTF-8
             ..
             fr_CA.ISO8859-1
             ..
             fr_CA.ISO8859-15
             ..
             fr_CA.UTF-8
             ..
             fr_CH.ISO8859-1
             ..
             fr_CH.ISO8859-15
             ..
             fr_CH.UTF-8
             ..
             fr_FR.ISO8859-1
             ..
             fr_FR.ISO8859-15
             ..
             fr_FR.UTF-8
             ..
             gl_ES.ISO8859-1
             ..
             he_IL.UTF-8
             ..
             hi_IN.ISCII-DEV
             ..
             hr_HR.ISO8859-2
             ..
             hr_HR.UTF-8
             ..
             hu_HU.ISO8859-2
             ..
             hu_HU.UTF-8
             ..
             hy_AM.ARMSCII-8
             ..
             hy_AM.UTF-8
             ..
             is_IS.ISO8859-1
             ..
             is_IS.ISO8859-15
             ..
             is_IS.UTF-8
             ..
             it_CH.ISO8859-1
             ..
             it_CH.ISO8859-15
             ..
             it_CH.UTF-8
             ..
             it_IT.ISO8859-1
             ..
             it_IT.ISO8859-15
             ..
             it_IT.UTF-8
             ..
             ja_JP.SJIS
             ..
             ja_JP.UTF-8
             ..
             ja_JP.eucJP
             ..
             kk_KZ.PT154
             ..
             kk_KZ.UTF-8
             ..
             ko_KR.CP949
             ..
             ko_KR.UTF-8
             ..
             ko_KR.eucKR
             ..
             la_LN.ISO8859-1
             ..
             la_LN.ISO8859-13
             ..
             la_LN.ISO8859-15
             ..
             la_LN.ISO8859-2
             ..
             la_LN.ISO8859-4
             ..
             la_LN.US-ASCII
             ..
             lt_LT.ISO8859-13
             ..
             lt_LT.ISO8859-4
             ..
             lt_LT.UTF-8
             ..
             lv_LV.ISO8859-13
             ..
             lv_LV.UTF-8
             ..
             mn_MN.UTF-8
             ..
             nl_BE.ISO8859-1
             ..
             nl_BE.ISO8859-15
             ..
             nl_BE.UTF-8
             ..
             nl_NL.ISO8859-1
             ..
             nl_NL.ISO8859-15
             ..
             nl_NL.UTF-8
             ..
             no_NO.ISO8859-1
             ..
             no_NO.ISO8859-15
             ..
             no_NO.UTF-8
             ..
             pl_PL.ISO8859-2
             ..
             pl_PL.UTF-8
             ..
             pt_BR.ISO8859-1
             ..
             pt_BR.UTF-8
             ..
             pt_PT.ISO8859-1
             ..
             pt_PT.ISO8859-15
             ..
             pt_PT.UTF-8
             ..
             ro_RO.ISO8859-2
             ..
             ro_RO.UTF-8
             ..
             ru_RU.CP1251
             ..
             ru_RU.CP866
             ..
             ru_RU.ISO8859-5
             ..
             ru_RU.KOI8-R
             ..
             ru_RU.UTF-8
             ..
             sk_SK.ISO8859-2
             ..
             sk_SK.UTF-8
             ..
             sl_SI.ISO8859-2
             ..
             sl_SI.UTF-8
             ..
             sr_YU.ISO8859-2
             ..
             sr_YU.ISO8859-5
             ..
             sr_YU.UTF-8
             ..
             sv_SE.ISO8859-1
             ..
             sv_SE.ISO8859-15
             ..
             sv_SE.UTF-8
             ..
             tr_TR.ISO8859-9
             ..
             tr_TR.UTF-8
             ..
             uk_UA.ISO8859-5
             ..
             uk_UA.KOI8-U
             ..
             uk_UA.UTF-8
             ..
             zh_CN.GB18030
             ..
             zh_CN.GB2312
             ..
             zh_CN.GBK
             ..
             zh_CN.UTF-8
             ..
             zh_CN.eucCN
             ..
             zh_HK.Big5HKSCS
             ..
             zh_HK.UTF-8
             ..
             zh_TW.Big5
             ..
             zh_TW.UTF-8
             ..
         ..
         openssl
             man
 /set uname=man
                 cat1
                 ..
                 cat3
                 ..
                 en.ISO8859-1    uname=root
                     cat1
                     ..
                     cat3
                     ..
                 ..
 /set uname=root
                 man1
                 ..
                 man3
                 ..
             ..
         ..
         pc-sysinstall
             backend
             ..
             backend-partmanager
             ..
             backend-query
             ..
             conf
                 license
                 ..
             ..
             doc
             ..
         ..
         security
         ..
         sendmail
         ..
         skel
         ..
         snmp
             defs
             ..
             mibs
             ..
         ..
         syscons
             fonts
             ..
             keymaps
             ..
             scrnmaps
             ..
         ..
         tabset
         ..
         vi
             catalog
             ..
         ..
         vt
             fonts
             ..
             keymaps
             ..
         ..
         zoneinfo
             Africa
             ..
             America
                 Argentina
                 ..
                 Indiana
                 ..
                 Kentucky
                 ..
                 North_Dakota
                 ..
             ..
             Antarctica
             ..
             Arctic
             ..
             Asia
             ..
             Atlantic
             ..
             Australia
             ..
             Etc
             ..
             Europe
             ..
             Indian
             ..
             Pacific
             ..
             SystemV
             ..
         ..
     ..
     src             nochange
     ..
 ..
Index: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	(revision 277456)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	(revision 277457)
@@ -1,4705 +1,4705 @@
 #
 # $FreeBSD$
 #
 # This file add support for the WITHOUT_* and WITH_* knobs in src.conf(5) to
 # the check-old and delete-old* targets.
 #
 
 .if ${MK_ACCT} == no
 OLD_FILES+=etc/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
 .endif
 
 .if ${MK_ACPI} == no
 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_AMD} == no
 OLD_FILES+=etc/amd.map
 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/info/am-utils.info.gz
 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
 .endif
 
 .if ${MK_APM} == no
 OLD_FILES+=etc/apmd.conf
 OLD_FILES+=usr/sbin/apm
 OLD_FILES+=usr/share/examples/etc/apmd.conf
 OLD_FILES+=usr/share/man/man8/amd64/apm.8.gz
 OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz
 .endif
 
 .if ${MK_AT} == no
 OLD_FILES+=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+=rescue/atmconfig
 OLD_FILES+=sbin/atmconfig
 OLD_FILES+=usr/bin/sscop
 OLD_FILES+=usr/include/bsnmp/snmp_atm.h
 OLD_FILES+=usr/include/netnatm/addr.h
 OLD_FILES+=usr/include/netnatm/api/atmapi.h
 OLD_FILES+=usr/include/netnatm/api/ccatm.h
 OLD_FILES+=usr/include/netnatm/api/unisap.h
 OLD_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_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_FILES+=usr/include/netnatm/sig/uni.h
 OLD_FILES+=usr/include/netnatm/sig/unidef.h
 OLD_FILES+=usr/include/netnatm/sig/unisig.h
 OLD_FILES+=usr/include/netnatm/unimsg.h
 OLD_FILES+=usr/lib/libngatm.a
 OLD_FILES+=usr/lib/libngatm.so
 OLD_LIBS+=usr/lib/libngatm.so.4
 OLD_FILES+=usr/lib/libngatm_p.a
 OLD_FILES+=usr/lib/snmp_atm.so
 OLD_LIBS+=usr/lib/snmp_atm.so.6
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libngatm.a
 OLD_FILES+=usr/lib32/libngatm.so
 OLD_LIBS+=usr/lib32/libngatm.so.4
 OLD_FILES+=usr/lib32/libngatm_p.a
 .endif
 OLD_FILES+=usr/share/doc/atm/atmconfig.help
 OLD_FILES+=usr/share/doc/atm/atmconfig_device.help
 OLD_FILES+=usr/share/man/man1/sscop.1.gz
 OLD_FILES+=usr/share/man/man3/libngatm.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_atm.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/man8/atmconfig.8.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
 .endif
 
 .if ${MK_AUDIT} == no
 OLD_FILES+=usr/sbin/audit
 OLD_FILES+=usr/sbin/auditd
 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/man8/audit.8.gz
 OLD_FILES+=usr/share/man/man8/auditd.8.gz
 .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_BLUETOOTH} == no
 OLD_FILES+=etc/bluetooth/hcsecd.conf
 OLD_FILES+=etc/bluetooth/hosts
 OLD_FILES+=etc/bluetooth/protocols
 OLD_FILES+=usr/bin/bthost
 OLD_FILES+=usr/bin/btsockstat
 OLD_FILES+=usr/bin/rfcomm_sppd
 OLD_FILES+=usr/include/bluetooth.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_bluetooth.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_bt3c.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_l2cap.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_btsocket_sco.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_h4.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_hci.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_l2cap.h
 OLD_FILES+=usr/include/netgraph/bluetooth/include/ng_ubt.h
 OLD_DIRS+=usr/include/netgraph/bluetooth/include
 OLD_DIRS+=usr/include/netgraph/bluetooth
 OLD_FILES+=usr/include/sdp.h
 OLD_FILES+=usr/lib/libbluetooth.a
 OLD_FILES+=usr/lib/libbluetooth.so
 OLD_LIBS+=usr/lib/libbluetooth.so.4
 OLD_FILES+=usr/lib/libbluetooth_p.a
 OLD_FILES+=usr/lib/libsdp.a
 OLD_FILES+=usr/lib/libsdp.so
 OLD_LIBS+=usr/lib/libsdp.so.4
 OLD_FILES+=usr/lib/libsdp_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libbluetooth.a
 OLD_FILES+=usr/lib32/libbluetooth.so
 OLD_LIBS+=usr/lib32/libbluetooth.so.4
 OLD_FILES+=usr/lib32/libbluetooth_p.a
 OLD_FILES+=usr/lib32/libsdp.a
 OLD_FILES+=usr/lib32/libsdp.so
 OLD_LIBS+=usr/lib32/libsdp.so.4
 OLD_FILES+=usr/lib32/libsdp_p.a
 .endif
 OLD_FILES+=usr/sbin/bcmfw
 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/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/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/man5/hcsecd.conf.5.gz
 OLD_FILES+=usr/share/man/man8/bcmfw.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/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
 # to be filled in
 #.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.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_DIRS+=usr/share/calendar/de_AT.ISO_8859-15
 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/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_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_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/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.msk
 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/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_FILES+=usr/share/man/man1/calendar.1.gz
 .endif
 
 .if ${MK_CDDL} == no
 OLD_LIBS+=lib/libavl.so.2
 OLD_LIBS+=lib/libctf.so.2
 OLD_LIBS+=lib/libdtrace.so.2
 OLD_LIBS+=lib/libnvpair.so.2
 OLD_LIBS+=lib/libumem.so.2
 OLD_LIBS+=lib/libuutil.so.2
 OLD_FILES+=usr/bin/ctfconvert
 OLD_FILES+=usr/bin/ctfdump
 OLD_FILES+=usr/bin/ctfmerge
 OLD_FILES+=usr/bin/sgsmsg
 OLD_FILES+=usr/lib/dtrace/drti.o
 OLD_FILES+=usr/lib/dtrace/errno.d
 OLD_FILES+=usr/lib/dtrace/psinfo.d
 OLD_FILES+=usr/lib/dtrace/signal.d
 OLD_FILES+=usr/lib/dtrace/unistd.d
 OLD_FILES+=usr/lib/libavl.a
 OLD_FILES+=usr/lib/libavl.so
 OLD_FILES+=usr/lib/libavl_p.a
 OLD_FILES+=usr/lib/libctf.a
 OLD_FILES+=usr/lib/libctf.so
 OLD_FILES+=usr/lib/libctf_p.a
 OLD_FILES+=usr/lib/libdtrace.a
 OLD_FILES+=usr/lib/libdtrace.so
 OLD_FILES+=usr/lib/libdtrace_p.a
 OLD_FILES+=usr/lib/libnvpair.a
 OLD_FILES+=usr/lib/libnvpair.so
 OLD_FILES+=usr/lib/libnvpair_p.a
 OLD_FILES+=usr/lib/libumem.a
 OLD_FILES+=usr/lib/libumem.so
 OLD_FILES+=usr/lib/libumem_p.a
 OLD_FILES+=usr/lib/libuutil.a
 OLD_FILES+=usr/lib/libuutil.so
 OLD_FILES+=usr/lib/libuutil_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/dtrace/drti.o
 OLD_FILES+=usr/lib32/libavl.a
 OLD_FILES+=usr/lib32/libavl.so
 OLD_LIBS+=usr/lib32/libavl.so.2
 OLD_FILES+=usr/lib32/libavl_p.a
 OLD_FILES+=usr/lib32/libctf.a
 OLD_FILES+=usr/lib32/libctf.so
 OLD_LIBS+=usr/lib32/libctf.so.2
 OLD_FILES+=usr/lib32/libctf_p.a
 OLD_FILES+=usr/lib32/libdtrace.a
 OLD_FILES+=usr/lib32/libdtrace.so
 OLD_LIBS+=usr/lib32/libdtrace.so.2
 OLD_FILES+=usr/lib32/libdtrace_p.a
 OLD_FILES+=usr/lib32/libnvpair.a
 OLD_FILES+=usr/lib32/libnvpair.so
 OLD_LIBS+=usr/lib32/libnvpair.so.2
 OLD_FILES+=usr/lib32/libnvpair_p.a
 OLD_FILES+=usr/lib32/libumem.a
 OLD_FILES+=usr/lib32/libumem.so
 OLD_LIBS+=usr/lib32/libumem.so.2
 OLD_FILES+=usr/lib32/libumem_p.a
 OLD_FILES+=usr/lib32/libuutil.a
 OLD_FILES+=usr/lib32/libuutil.so
 OLD_LIBS+=usr/lib32/libuutil.so.2
 OLD_FILES+=usr/lib32/libuutil_p.a
 .endif
 OLD_FILES+=usr/sbin/dtrace
 OLD_FILES+=usr/sbin/lockstat
 OLD_FILES+=usr/share/man/man1/dtrace.1.gz
 .endif
 
 .if ${MK_ZFS} == no
 OLD_FILES+=boot/gptzfsboot
 OLD_FILES+=boot/zfsboot
 OLD_FILES+=boot/zfsloader
 OLD_FILES+=etc/periodic/daily/404.status-zfs
 OLD_FILES+=etc/periodic/daily/800.scrub-zfs
 OLD_LIBS+=lib/libzfs.so.2
 OLD_LIBS+=lib/libzpool.so.2
 OLD_FILES+=rescue/zfs
 OLD_FILES+=rescue/zpool
 OLD_FILES+=sbin/zfs
 OLD_FILES+=sbin/zpool
 OLD_FILES+=usr/bin/zinject
 OLD_FILES+=usr/bin/ztest
 OLD_FILES+=usr/lib/libzfs.a
 OLD_FILES+=usr/lib/libzfs.so
 OLD_FILES+=usr/lib/libzfs_p.a
 OLD_FILES+=usr/lib/libzpool.a
 OLD_FILES+=usr/lib/libzpool.so
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libzfs.a
 OLD_FILES+=usr/lib32/libzfs.so
 OLD_LIBS+=usr/lib32/libzfs.so.2
 OLD_FILES+=usr/lib32/libzfs_p.a
 OLD_FILES+=usr/lib32/libzpool.a
 OLD_FILES+=usr/lib32/libzpool.so
 OLD_LIBS+=usr/lib32/libzpool.so.2
 .endif
 OLD_FILES+=usr/sbin/zdb
 OLD_FILES+=usr/share/man/man8/zdb.8.gz
 OLD_FILES+=usr/share/man/man8/zfs.8.gz
 OLD_FILES+=usr/share/man/man8/zpool.8.gz
 .endif
 
 .if ${MK_CLANG} == no
 OLD_FILES+=usr/bin/clang
 OLD_FILES+=usr/bin/clang++
 OLD_FILES+=usr/bin/clang-cpp
 OLD_FILES+=usr/bin/clang-tblgen
 OLD_FILES+=usr/bin/tblgen
 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
 OLD_DIRS+=usr/include/clang
 OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm/clang
 OLD_FILES+=usr/share/doc/llvm/COPYRIGHT.regex
 OLD_FILES+=usr/share/doc/llvm/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm
 OLD_FILES+=usr/share/man/man1/clang.1.gz
 OLD_FILES+=usr/share/man/man1/clang++.1.gz
 OLD_FILES+=usr/share/man/man1/clang-cpp.1.gz
 OLD_FILES+=usr/share/man/man1/tblgen.1.gz
 .endif
 
 .if ${MK_CLANG_EXTRAS} == no
 OLD_FILES+=usr/bin/bugpoint
 OLD_FILES+=usr/bin/llc
 OLD_FILES+=usr/bin/lli
 OLD_FILES+=usr/bin/llvm-ar
 OLD_FILES+=usr/bin/llvm-as
 OLD_FILES+=usr/bin/llvm-bcanalyzer
 OLD_FILES+=usr/bin/llvm-diff
 OLD_FILES+=usr/bin/llvm-dis
 OLD_FILES+=usr/bin/llvm-extract
 OLD_FILES+=usr/bin/llvm-ld
 OLD_FILES+=usr/bin/llvm-link
 OLD_FILES+=usr/bin/llvm-mc
 OLD_FILES+=usr/bin/llvm-nm
 OLD_FILES+=usr/bin/llvm-objdump
 OLD_FILES+=usr/bin/llvm-rtdyld
 OLD_FILES+=usr/bin/llvm-stub
 OLD_FILES+=usr/bin/macho-dump
 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-ar.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-extract.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-ld.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-link.1.gz
 OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz
 OLD_FILES+=usr/share/man/man1/opt.1.gz
 .endif
 
 .if ${MK_CPP} == no
 OLD_FILES+=usr/bin/cpp
 OLD_FILES+=usr/share/man/man1/cpp.1.gz
 .endif
 
 #.if ${MK_CRYPT} == no
 # to be filled in
 #.endif
 
 .if ${MK_CTM} == no
 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
 .endif
 
 # devd(8) and gperf(1) not listed here on purpose
 .if ${MK_CXX} == no
 OLD_FILES+=usr/bin/CC
 OLD_FILES+=usr/bin/c++
 OLD_FILES+=usr/bin/c++filt
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/libexec/cc1plus
 .endif
 
 .if ${MK_FMTREE} == no
 OLD_FILES+=usr/sbin/fmtree
 OLD_FILES+=usr/share/man/man8/fmtree.8.gz
 .endif
 
 .if ${MK_GNUCXX} == no
 OLD_FILES+=usr/bin/g++
 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
 OLD_FILES+=usr/lib/libstdc++.a
 OLD_FILES+=usr/lib/libstdc++.so
 OLD_LIBS+=usr/lib/libstdc++.so.6
 OLD_FILES+=usr/lib/libstdc++_p.a
 OLD_FILES+=usr/lib/libsupc++.a
 OLD_FILES+=usr/lib/libsupc++.so
 OLD_LIBS+=usr/lib/libsupc++.so.1
 OLD_FILES+=usr/lib/libsupc++_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libstdc++.a
 OLD_FILES+=usr/lib32/libstdc++.so
 OLD_LIBS+=usr/lib32/libstdc++.so.6
 OLD_FILES+=usr/lib32/libstdc++_p.a
 OLD_FILES+=usr/lib32/libsupc++.a
 OLD_FILES+=usr/lib32/libsupc++.so
 OLD_LIBS+=usr/lib32/libsupc++.so.1
 OLD_FILES+=usr/lib32/libsupc++_p.a
 .endif
 OLD_FILES+=usr/libexec/cc1plus
 .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
 .endif
 
 #.if ${MK_EXAMPLES} == no
 # to be filled in
 #.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_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_GAMES} == no
 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_FILES+=usr/share/games/fortune/fortunes
 OLD_FILES+=usr/share/games/fortune/fortunes-o
 OLD_FILES+=usr/share/games/fortune/fortunes-o.dat
 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_FILES+=usr/share/man/man6/bcd.6.gz
 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/ppt.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_GCC} == no
 OLD_FILES+=usr/bin/c++filt
 OLD_FILES+=usr/bin/g++
 OLD_FILES+=usr/bin/gcc
 OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/bin/gcpp
 .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} == "ia64"
 OLD_FILES+=usr/include/gcc/4.2/ia64intrin.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/libexec/cc1
 OLD_FILES+=usr/libexec/cc1plus
 OLD_FILES+=usr/share/info/cpp.info.gz
 OLD_FILES+=usr/share/info/cppinternals.info.gz
 OLD_FILES+=usr/share/info/gcc.info.gz
 OLD_FILES+=usr/share/info/gccint.info.gz
 OLD_FILES+=usr/share/man/man1/g++.1.gz
 OLD_FILES+=usr/share/man/man1/gcc.1.gz
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
 OLD_FILES+=usr/share/man/man1/gcpp.1.gz
 .endif
 
 .if ${MK_GCOV} == no
 OLD_FILES+=usr/bin/gcov
 OLD_FILES+=usr/share/man/man1/gcov.1.gz
 .endif
 
 .if ${MK_GDB} == no
 OLD_FILES+=usr/bin/gdb
 OLD_FILES+=usr/bin/gdbserver
 OLD_FILES+=usr/bin/gdbtui
 OLD_FILES+=usr/bin/kgdb
 OLD_FILES+=usr/share/info/gdb.info.gz
 OLD_FILES+=usr/share/info/gdbint.info.gz
 OLD_FILES+=usr/share/info/stabs.info.gz
 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
 .endif
 
 .if ${MK_GPIB} == no
 OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h
 OLD_FILES+=usr/include/dev/ieee488/ugpib.h
 OLD_FILES+=usr/include/dev/ieee488/upd7210.h
 OLD_FILES+=usr/include/gpib/gpib.h
 OLD_FILES+=usr/lib/libgpib.a
 OLD_FILES+=usr/lib/libgpib.so
 OLD_LIBS+=usr/lib/libgpib.so.3
 OLD_FILES+=usr/lib/libgpib_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libgpib.a
 OLD_FILES+=usr/lib32/libgpib.so
 OLD_LIBS+=usr/lib32/libgpib.so.3
 OLD_FILES+=usr/lib32/libgpib_p.a
 .endif
 .endif
 
 .if ${MK_GPIO} == no
 OLD_FILES+=usr/sbin/gpioctl
 OLD_FILES+=usr/share/man/man8/gpioctl.8.gz
 .endif
 
 # Also includes vgrind(1)
 .if ${MK_GROFF} == no
 OLD_FILES+=usr/bin/addftinfo
 OLD_FILES+=usr/bin/afmtodit
 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/soelim
 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/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/info/groff.info.gz
 OLD_FILES+=usr/share/man/man1/addftinfo.1.gz
 OLD_FILES+=usr/share/man/man1/afmtodit.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/soelim.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/man.7.gz
 OLD_FILES+=usr/share/man/man7/mdoc.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/man/man7/roff.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
 .endif
 
 .if ${MK_GSSAPI} == no
 OLD_FILES+=usr/include/gssapi/gssapi.h
 OLD_DIRS+=usr/include/gssapi
 OLD_FILES+=usr/include/gssapi.h
 OLD_FILES+=usr/lib/libgssapi.a
 OLD_FILES+=usr/lib/libgssapi.so
 OLD_LIBS+=usr/lib/libgssapi.so.10
 OLD_FILES+=usr/lib/libgssapi_p.a
 OLD_FILES+=usr/lib/librpcsec_gss.a
 OLD_FILES+=usr/lib/librpcsec_gss.so
 OLD_LIBS+=usr/lib/librpcsec_gss.so.1
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libgssapi.a
 OLD_FILES+=usr/lib32/libgssapi.so
 OLD_LIBS+=usr/lib32/libgssapi.so.10
 OLD_FILES+=usr/lib32/libgssapi_p.a
 OLD_FILES+=usr/lib32/librpcsec_gss.a
 OLD_FILES+=usr/lib32/librpcsec_gss.so
 OLD_LIBS+=usr/lib32/librpcsec_gss.so.1
 .endif
 OLD_FILES+=usr/sbin/gssd
 OLD_FILES+=usr/share/man/man3/gss_accept_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_acquire_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_add_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_add_oid_set_member.3.gz
 OLD_FILES+=usr/share/man/man3/gss_canonicalize_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_compare_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_context_time.3.gz
 OLD_FILES+=usr/share/man/man3/gss_create_empty_oid_set.3.gz
 OLD_FILES+=usr/share/man/man3/gss_delete_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_display_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_display_status.3.gz
 OLD_FILES+=usr/share/man/man3/gss_duplicate_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_export_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_export_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_get_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_import_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_import_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_indicate_mechs.3.gz
 OLD_FILES+=usr/share/man/man3/gss_init_sec_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_context.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_cred_by_mech.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_mechs_for_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_inquire_names_for_mech.3.gz
 OLD_FILES+=usr/share/man/man3/gss_process_context_token.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_cred.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_name.3.gz
 OLD_FILES+=usr/share/man/man3/gss_release_oid_set.3.gz
 OLD_FILES+=usr/share/man/man3/gss_seal.3.gz
 OLD_FILES+=usr/share/man/man3/gss_sign.3.gz
 OLD_FILES+=usr/share/man/man3/gss_test_oid_set_member.3.gz
 OLD_FILES+=usr/share/man/man3/gss_unseal.3.gz
 OLD_FILES+=usr/share/man/man3/gss_unwrap.3.gz
 OLD_FILES+=usr/share/man/man3/gss_verify.3.gz
 OLD_FILES+=usr/share/man/man3/gss_verify_mic.3.gz
 OLD_FILES+=usr/share/man/man3/gss_wrap.3.gz
 OLD_FILES+=usr/share/man/man3/gss_wrap_size_limit.3.gz
 OLD_FILES+=usr/share/man/man3/gssapi.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_error.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_mech_info.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_mechanisms.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_principal_name.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_get_versions.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_getcred.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_is_installed.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_max_data_length.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_mech_to_oid.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_oid_to_mech.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_qop_to_num.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_seccreate.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_callback.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_defaults.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_set_svc_name.3.gz
 OLD_FILES+=usr/share/man/man3/rpc_gss_svc_max_data_length.3.gz
 OLD_FILES+=usr/share/man/man3/rpcsec_gss.3.gz
 OLD_FILES+=usr/share/man/man5/mech.5.gz
 OLD_FILES+=usr/share/man/man5/qop.5.gz
 OLD_FILES+=usr/share/man/man8/gssd.8.gz
 .endif
 
 .if ${MK_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
 # to be filled in
 #.endif
 
 .if ${MK_ICONV} == no
 OLD_FILES+=usr/bin/iconv
 OLD_FILES+=usr/bin/mkcsmapper
 OLD_FILES+=usr/bin/mkesdb
 OLD_FILES+=usr/include/_libiconv_compat.h
 OLD_FILES+=usr/include/iconv.h
 OLD_FILES+=usr/share/man/man1/iconv.1.gz
 OLD_FILES+=usr/share/man/man1/mkcsmapper.1.gz
 OLD_FILES+=usr/share/man/man1/mkesdb.1.gz
 OLD_FILES+=usr/share/man/man3/__iconv.3.gz
 OLD_FILES+=usr/share/man/man3/__iconv_free_list.3.gz	
 OLD_FILES+=usr/share/man/man3/__iconv_get_list.3.gz
 OLD_FILES+=usr/share/man/man3/iconv.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_canonicalize.3.gz	
 OLD_FILES+=usr/share/man/man3/iconv_close.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_open.3.gz
 OLD_FILES+=usr/share/man/man3/iconv_open_into.3.gz
 OLD_FILES+=usr/share/man/man3/iconvctl.3.gz
 OLD_FILES+=usr/share/man/man3/iconvlist.3.gz	
 .endif
 
 .if ${MK_INET6} == no
 OLD_FILES+=sbin/ping6
 OLD_FILES+=sbin/rtsol
 OLD_FILES+=usr/sbin/faithd
 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/rtadvd
 OLD_FILES+=usr/sbin/rtsold
 OLD_FILES+=usr/sbin/traceroute6
 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/ping6.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/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
 .endif
 
 #.if ${MK_INFO} == no
 # to be filled in
 #.endif
 
 .if ${MK_IPFILTER} == no
 OLD_FILES+=etc/periodic/security/510.ipfdenied
 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/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/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
 OLD_FILES+=etc/periodic/security/510.ipfdenied
 OLD_FILES+=etc/periodic/security/610.ipf6denied
 .endif
 
 .if ${MK_IPFW} == no
 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_IPX} == no
 OLD_LIBS+=lib/libipx.so.5
 OLD_FILES+=usr/lib/libipx.a
 OLD_FILES+=usr/lib/libipx.so
 OLD_FILES+=usr/lib/libipx_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libipx.a
 OLD_FILES+=usr/lib32/libipx.so
 OLD_LIBS+=usr/lib32/libipx.so.5
 OLD_FILES+=usr/lib32/libipx_p.a
 .endif
 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/man8/IPXrouted.8.gz
 .endif
 
 .if ${MK_JAIL} == no
 OLD_FILES+=usr/sbin/jail
 OLD_FILES+=usr/sbin/jexec
 OLD_FILES+=usr/sbin/jls
 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_KERBEROS} == no
 OLD_FILES+=usr/bin/compile_et
 OLD_FILES+=usr/bin/hxtool
 OLD_FILES+=usr/bin/kadmin
 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/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_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_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/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.5
 OLD_FILES+=usr/lib/pam_ksu.so
 OLD_LIBS+=usr/lib/pam_ksu.so.5
 OLD_FILES+=usr/lib/private/libheimipcc.a
 OLD_FILES+=usr/lib/private/libheimipcc.so
 OLD_LIBS+=usr/lib/private/libheimipcc.so.11
 OLD_FILES+=usr/lib/private/libheimipcc_p.a
 OLD_FILES+=usr/lib/private/libheimipcs.a
 OLD_FILES+=usr/lib/private/libheimipcs.so
 OLD_LIBS+=usr/lib/private/libheimipcs.so.11
 OLD_FILES+=usr/lib/private/libheimipcs_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libasn1.a
 OLD_FILES+=usr/lib32/libasn1.so
 OLD_LIBS+=usr/lib32/libasn1.so.11
 OLD_FILES+=usr/lib32/libasn1_p.a
 OLD_FILES+=usr/lib32/libgssapi_krb5.a
 OLD_FILES+=usr/lib32/libgssapi_krb5.so
 OLD_LIBS+=usr/lib32/libgssapi_krb5.so.10
 OLD_FILES+=usr/lib32/libgssapi_krb5_p.a
 OLD_FILES+=usr/lib32/libgssapi_ntlm.a
 OLD_FILES+=usr/lib32/libgssapi_ntlm.so
 OLD_LIBS+=usr/lib32/libgssapi_ntlm.so.10
 OLD_FILES+=usr/lib32/libgssapi_ntlm_p.a
 OLD_FILES+=usr/lib32/libgssapi_spnego.a
 OLD_FILES+=usr/lib32/libgssapi_spnego.so
 OLD_LIBS+=usr/lib32/libgssapi_spnego.so.10
 OLD_FILES+=usr/lib32/libgssapi_spnego_p.a
 OLD_FILES+=usr/lib32/libhdb.a
 OLD_FILES+=usr/lib32/libhdb.so
 OLD_LIBS+=usr/lib32/libhdb.so.11
 OLD_FILES+=usr/lib32/libhdb_p.a
 OLD_FILES+=usr/lib32/libheimbase.a
 OLD_FILES+=usr/lib32/libheimbase.so
 OLD_LIBS+=usr/lib32/libheimbase.so.11
 OLD_FILES+=usr/lib32/libheimbase_p.a
 OLD_FILES+=usr/lib32/libheimntlm.a
 OLD_FILES+=usr/lib32/libheimntlm.so
 OLD_LIBS+=usr/lib32/libheimntlm.so.11
 OLD_FILES+=usr/lib32/libheimntlm_p.a
 OLD_FILES+=usr/lib32/libheimsqlite.a
 OLD_FILES+=usr/lib32/libheimsqlite.so
 OLD_LIBS+=usr/lib32/libheimsqlite.so.11
 OLD_FILES+=usr/lib32/libheimsqlite_p.a
 OLD_FILES+=usr/lib32/libhx509.a
 OLD_FILES+=usr/lib32/libhx509.so
 OLD_LIBS+=usr/lib32/libhx509.so.11
 OLD_FILES+=usr/lib32/libhx509_p.a
 OLD_FILES+=usr/lib32/libkadm5clnt.a
 OLD_FILES+=usr/lib32/libkadm5clnt.so
 OLD_LIBS+=usr/lib32/libkadm5clnt.so.11
 OLD_FILES+=usr/lib32/libkadm5clnt_p.a
 OLD_FILES+=usr/lib32/libkadm5srv.a
 OLD_FILES+=usr/lib32/libkadm5srv.so
 OLD_LIBS+=usr/lib32/libkadm5srv.so.11
 OLD_FILES+=usr/lib32/libkadm5srv_p.a
 OLD_FILES+=usr/lib32/libkafs5.a
 OLD_FILES+=usr/lib32/libkafs5.so
 OLD_LIBS+=usr/lib32/libkafs5.so.11
 OLD_FILES+=usr/lib32/libkafs5_p.a
 OLD_FILES+=usr/lib32/libkdc.a
 OLD_FILES+=usr/lib32/libkdc.so
 OLD_LIBS+=usr/lib32/libkdc.so.11
 OLD_FILES+=usr/lib32/libkdc_p.a
 OLD_FILES+=usr/lib32/libkrb5.a
 OLD_FILES+=usr/lib32/libkrb5.so
 OLD_LIBS+=usr/lib32/libkrb5.so.11
 OLD_FILES+=usr/lib32/libkrb5_p.a
 OLD_FILES+=usr/lib32/libroken.a
 OLD_FILES+=usr/lib32/libroken.so
 OLD_LIBS+=usr/lib32/libroken.so.11
 OLD_FILES+=usr/lib32/libroken_p.a
 OLD_FILES+=usr/lib32/libwind.a
 OLD_FILES+=usr/lib32/libwind.so
 OLD_LIBS+=usr/lib32/libwind.so.11
 OLD_FILES+=usr/lib32/libwind_p.a
 OLD_FILES+=usr/lib32/pam_krb5.so
 OLD_LIBS+=usr/lib32/pam_krb5.so.5
 OLD_FILES+=usr/lib32/pam_ksu.so
 OLD_LIBS+=usr/lib32/pam_ksu.so.5
 OLD_FILES+=usr/lib32/private/libheimipcc.a
 OLD_FILES+=usr/lib32/private/libheimipcc.so
 OLD_LIBS+=usr/lib32/private/libheimipcc.so.11
 OLD_FILES+=usr/lib32/private/libheimipcc_p.a
 OLD_FILES+=usr/lib32/private/libheimipcs.a
 OLD_FILES+=usr/lib32/private/libheimipcs.so
 OLD_LIBS+=usr/lib32/private/libheimipcs.so.11
 OLD_FILES+=usr/lib32/private/libheimipcs_p.a
 .endif
 OLD_FILES+=usr/libexec/digest-service
 OLD_FILES+=usr/libexec/hprop
 OLD_FILES+=usr/libexec/hpropd
 OLD_FILES+=usr/libexec/ipropd-master
 OLD_FILES+=usr/libexec/ipropd-slave
 OLD_FILES+=usr/libexec/kadmind
 OLD_FILES+=usr/libexec/kcm
 OLD_FILES+=usr/libexec/kdc
 OLD_FILES+=usr/libexec/kdigest
 OLD_FILES+=usr/libexec/kfd
 OLD_FILES+=usr/libexec/kimpersonate
 OLD_FILES+=usr/libexec/kpasswdd
 OLD_FILES+=usr/sbin/kstash
 OLD_FILES+=usr/sbin/ktutil
 OLD_FILES+=usr/sbin/iprop-log
 OLD_FILES+=usr/share/info/heimdal.info.gz
 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_afs_cell_of_file.3.gz
 OLD_FILES+=usr/share/man/man3/k_hasafs.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_pioctl.3.gz
 OLD_FILES+=usr/share/man/man3/k_setpag.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/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/kafs.3.gz
 OLD_FILES+=usr/share/man/man3/kafs5.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_set_verbose.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken.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_settoken5.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken_rxkad.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.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_afslog_uid.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_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_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_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_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.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_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_princ_set_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.3.gz
 OLD_FILES+=usr/share/man/man3/krb_afslog_uid.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
 OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz
 .endif
 
 .if ${MK_LDNS} == no
 OLD_FILES+=usr/lib/private/libldns.a
 OLD_FILES+=usr/lib/private/libldns.so
 OLD_LIBS+=usr/lib/private/libldns.so.5
 OLD_FILES+=usr/lib/private/libldns_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/private/libldns.a
 OLD_FILES+=usr/lib32/private/libldns.so
 OLD_LIBS+=usr/lib32/private/libldns.so.5
 OLD_FILES+=usr/lib32/private/libldns_p.a
 .endif
 .endif
 
 .if ${MK_LDNS_UTILS} == no
 OLD_FILES+=usr/bin/drill
 OLD_FILES+=usr/share/man/man1/drill.1.gz
 OLD_FILES+=usr/bin/host
 OLD_FILES+=usr/share/man/man1/host.1.gz
 .endif
 
 #.if ${MK_LIB32} == no
 # to be filled in
 #.endif
 
 .if ${MK_LIBCPLUSPLUS} == no
 OLD_LIBS+=lib/libcxxrt.so.1
 OLD_FILES+=usr/lib/libc++.a
 OLD_FILES+=usr/lib/libc++_p.a
 OLD_FILES+=usr/lib/libc++.so
 OLD_LIBS+=usr/lib/libc++.so.1
 OLD_FILES+=usr/lib/libcxxrt.a
 OLD_FILES+=usr/lib/libcxxrt.so
 OLD_FILES+=usr/lib/libcxxrt_p.a
 OLD_FILES+=usr/include/c++/v1/__bit_reference
 OLD_FILES+=usr/include/c++/v1/__config
 OLD_FILES+=usr/include/c++/v1/__debug
 OLD_FILES+=usr/include/c++/v1/__functional_03
 OLD_FILES+=usr/include/c++/v1/__functional_base
 OLD_FILES+=usr/include/c++/v1/__functional_base_03
 OLD_FILES+=usr/include/c++/v1/__hash_table
 OLD_FILES+=usr/include/c++/v1/__locale
 OLD_FILES+=usr/include/c++/v1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/__split_buffer
 OLD_FILES+=usr/include/c++/v1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/__std_stream
 OLD_FILES+=usr/include/c++/v1/__tree
 OLD_FILES+=usr/include/c++/v1/__tuple
 OLD_FILES+=usr/include/c++/v1/__tuple_03
 OLD_FILES+=usr/include/c++/v1/__undef_min_max
 OLD_FILES+=usr/include/c++/v1/algorithm
 OLD_FILES+=usr/include/c++/v1/array
 OLD_FILES+=usr/include/c++/v1/atomic
 OLD_FILES+=usr/include/c++/v1/bitset
 OLD_FILES+=usr/include/c++/v1/cassert
 OLD_FILES+=usr/include/c++/v1/ccomplex
 OLD_FILES+=usr/include/c++/v1/cctype
 OLD_FILES+=usr/include/c++/v1/cerrno
 OLD_FILES+=usr/include/c++/v1/cfenv
 OLD_FILES+=usr/include/c++/v1/cfloat
 OLD_FILES+=usr/include/c++/v1/chrono
 OLD_FILES+=usr/include/c++/v1/cinttypes
 OLD_FILES+=usr/include/c++/v1/ciso646
 OLD_FILES+=usr/include/c++/v1/climits
 OLD_FILES+=usr/include/c++/v1/clocale
 OLD_FILES+=usr/include/c++/v1/cmath
 OLD_FILES+=usr/include/c++/v1/codecvt
 OLD_FILES+=usr/include/c++/v1/complex
 OLD_FILES+=usr/include/c++/v1/complex.h
 OLD_FILES+=usr/include/c++/v1/condition_variable
 OLD_FILES+=usr/include/c++/v1/csetjmp
 OLD_FILES+=usr/include/c++/v1/csignal
 OLD_FILES+=usr/include/c++/v1/cstdarg
 OLD_FILES+=usr/include/c++/v1/cstdbool
 OLD_FILES+=usr/include/c++/v1/cstddef
 OLD_FILES+=usr/include/c++/v1/cstdint
 OLD_FILES+=usr/include/c++/v1/cstdio
 OLD_FILES+=usr/include/c++/v1/cstdlib
 OLD_FILES+=usr/include/c++/v1/cstring
 OLD_FILES+=usr/include/c++/v1/ctgmath
 OLD_FILES+=usr/include/c++/v1/ctime
 OLD_FILES+=usr/include/c++/v1/cwchar
 OLD_FILES+=usr/include/c++/v1/cwctype
 OLD_FILES+=usr/include/c++/v1/cxxabi.h
 OLD_FILES+=usr/include/c++/v1/deque
 OLD_FILES+=usr/include/c++/v1/exception
 OLD_FILES+=usr/include/c++/v1/experimental/dynarray
 OLD_FILES+=usr/include/c++/v1/experimental/optional
 OLD_FILES+=usr/include/c++/v1/ext/__hash
 OLD_FILES+=usr/include/c++/v1/ext/hash_map
 OLD_FILES+=usr/include/c++/v1/ext/hash_set
 OLD_FILES+=usr/include/c++/v1/forward_list
 OLD_FILES+=usr/include/c++/v1/fstream
 OLD_FILES+=usr/include/c++/v1/functional
 OLD_FILES+=usr/include/c++/v1/future
 OLD_FILES+=usr/include/c++/v1/initializer_list
 OLD_FILES+=usr/include/c++/v1/iomanip
 OLD_FILES+=usr/include/c++/v1/ios
 OLD_FILES+=usr/include/c++/v1/iosfwd
 OLD_FILES+=usr/include/c++/v1/iostream
 OLD_FILES+=usr/include/c++/v1/istream
 OLD_FILES+=usr/include/c++/v1/iterator
 OLD_FILES+=usr/include/c++/v1/limits
 OLD_FILES+=usr/include/c++/v1/list
 OLD_FILES+=usr/include/c++/v1/locale
 OLD_FILES+=usr/include/c++/v1/map
 OLD_FILES+=usr/include/c++/v1/memory
 OLD_FILES+=usr/include/c++/v1/mutex
 OLD_FILES+=usr/include/c++/v1/new
 OLD_FILES+=usr/include/c++/v1/numeric
 OLD_FILES+=usr/include/c++/v1/ostream
 OLD_FILES+=usr/include/c++/v1/queue
 OLD_FILES+=usr/include/c++/v1/random
 OLD_FILES+=usr/include/c++/v1/ratio
 OLD_FILES+=usr/include/c++/v1/regex
 OLD_FILES+=usr/include/c++/v1/scoped_allocator
 OLD_FILES+=usr/include/c++/v1/set
 OLD_FILES+=usr/include/c++/v1/sstream
 OLD_FILES+=usr/include/c++/v1/stack
 OLD_FILES+=usr/include/c++/v1/stdexcept
 OLD_FILES+=usr/include/c++/v1/streambuf
 OLD_FILES+=usr/include/c++/v1/string
 OLD_FILES+=usr/include/c++/v1/strstream
 OLD_FILES+=usr/include/c++/v1/system_error
 OLD_FILES+=usr/include/c++/v1/tgmath.h
 OLD_FILES+=usr/include/c++/v1/thread
 OLD_FILES+=usr/include/c++/v1/tuple
 OLD_FILES+=usr/include/c++/v1/type_traits
 OLD_FILES+=usr/include/c++/v1/typeindex
 OLD_FILES+=usr/include/c++/v1/typeinfo
 OLD_FILES+=usr/include/c++/v1/unordered_map
 OLD_FILES+=usr/include/c++/v1/unordered_set
 OLD_FILES+=usr/include/c++/v1/unwind-arm.h
 OLD_FILES+=usr/include/c++/v1/unwind-itanium.h
 OLD_FILES+=usr/include/c++/v1/unwind.h
 OLD_FILES+=usr/include/c++/v1/utility
 OLD_FILES+=usr/include/c++/v1/valarray
 OLD_FILES+=usr/include/c++/v1/vector
 OLD_DIRS+=usr/include/c++/v1/experimental
 OLD_DIRS+=usr/include/c++/v1/ext
 OLD_DIRS+=usr/include/c++/v1
 .endif
 
 #.if ${MK_LIBTHR} == no
 # to be filled in
 #.endif
 
 #.if ${MK_LOCALES} == no
 # to be filled in
 #.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+=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_FILES+=usr/libexec/lpr/lpf
 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_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/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
 .if ${MK_SENDMAIL} == no
 OLD_FILES+=usr/sbin/mailwrapper
 .endif
 OLD_FILES+=usr/share/man/man8/mailwrapper.8.gz
 .endif
 
 #.if ${MK_MAN} == no
 # This should add a dependency to a special target which removes all man pages.
 # Listing all of them here is overkill.
 #.endif
 
 .if ${MK_NDIS} == no
 OLD_FILES+=usr/sbin/ndiscvt
 OLD_FILES+=usr/sbin/ndisgen
 OLD_FILES+=usr/share/man/man8/ndiscvt.8.gz
 OLD_FILES+=usr/share/man/man8/ndisgen.8.gz
 OLD_FILES+=usr/share/misc/windrv_stub.c
 .endif
 
 .if ${MK_NETCAT} == no
 OLD_FILES+=usr/bin/nc
 OLD_FILES+=usr/share/man/man1/nc.1.gz
 .endif
 
 .if ${MK_NIS} == no
 OLD_FILES+=usr/bin/ypcat
 OLD_FILES+=usr/bin/ypchfn
 OLD_FILES+=usr/bin/ypchpass
 OLD_FILES+=usr/bin/ypchsh
 OLD_FILES+=usr/bin/ypmatch
 OLD_FILES+=usr/bin/yppasswd
 OLD_FILES+=usr/bin/ypwhich
 OLD_FILES+=usr/include/ypclnt.h
 OLD_FILES+=usr/lib/libypclnt.a
 OLD_FILES+=usr/lib/libypclnt.so
 OLD_LIBS+=usr/lib/libypclnt.so.4
 OLD_FILES+=usr/lib/libypclnt_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libypclnt.a
 OLD_FILES+=usr/lib32/libypclnt.so
 OLD_LIBS+=usr/lib32/libypclnt.so.4
 OLD_FILES+=usr/lib32/libypclnt_p.a
 .endif
 OLD_FILES+=usr/libexec/mknetid
 OLD_FILES+=usr/libexec/yppwupdate
 OLD_FILES+=usr/libexec/ypxfr
 OLD_FILES+=usr/sbin/rpc.yppasswdd
 OLD_FILES+=usr/sbin/rpc.ypupdated
 OLD_FILES+=usr/sbin/rpc.ypxfrd
 OLD_FILES+=usr/sbin/yp_mkdb
 OLD_FILES+=usr/sbin/ypbind
 OLD_FILES+=usr/sbin/ypinit
 OLD_FILES+=usr/sbin/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/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/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/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
 .endif
 
 .if ${MK_NLS} == no
 OLD_FILES+=usr/tests/bin/sh/builtins/locale1.0
 # to be filled in
 .endif
 
 .if ${MK_NTP} == no
 OLD_FILES+=etc/ntp.conf
 OLD_FILES+=etc/periodic/daily/480.status-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/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
 OLD_FILES+=usr/share/examples/etc/ntp.conf
 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_OBJC} == no
 # to be filled in
 #.endif
 
 .if ${MK_OPENSSH} == no
 OLD_FILES+=usr/bin/sftp
 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/private/libssh.a
 OLD_FILES+=usr/lib/private/libssh.so
 OLD_LIBS+=usr/lib/private/libssh.so.5
 OLD_FILES+=usr/lib/private/libssh_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/private/libssh.a
 OLD_FILES+=usr/lib32/private/libssh.so
 OLD_LIBS+=usr/lib32/private/libssh.so.5
 OLD_FILES+=usr/lib32/private/libssh_p.a
 .endif
 OLD_FILES+=usr/libexec/sftp-server
 OLD_FILES+=usr/libexec/ssh-keysign
 OLD_FILES+=usr/libexec/ssh-pkcs11-helper
 OLD_FILES+=usr/sbin/sshd
 .endif
 
 #.if ${MK_OPENSSL} == no
 # to be filled in
 #.endif
 
 .if ${MK_PC_SYSINSTALL} == no
 # backend-partmanager
 OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/create-part.sh
 OLD_FILES+=usr/share/pc-sysinstall/backend-partmanager/delete-part.sh
 # backend-query
 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
 # backend
 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
 # conf
 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
 # doc
 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
 # examples
 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
 # pc-sysinstall
 OLD_FILES+=usr/sbin/pc-sysinstall
 OLD_FILES+=usr/share/man/man8/pc-sysinstall.8.gz
 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
 OLD_DIRS+=usr/share/examples/pc-sysinstall
 .endif
 
 .if ${MK_PF} == no
 OLD_FILES+=etc/periodic/security/520.pfdenied
 OLD_FILES+=etc/pf.os
 OLD_FILES+=sbin/pfctl
 OLD_FILES+=sbin/pflogd
 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_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
 .endif
 
 .if ${MK_PKGBOOTSTRAP} == no
 OLD_FILES+=usr/sbin/pkg
 OLD_FILES+=usr/share/man/man7/pkg.7.gz
 .endif
 
 .if ${MK_PKGTOOLS} == no
 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/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/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
 .endif
 
 .if ${MK_PORTSNAP} == no
 OLD_FILES+=etc/portsnap.conf
 OLD_FILES+=usr/libexec/make_index
 OLD_FILES+=usr/libexec/phttpget
 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/ppp/ppp.conf
 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/libalias_cuseeme_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/libbegemot_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/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/libcrypt_p.a
 OLD_FILES+=usr/lib/libcrypto_p.a
 OLD_FILES+=usr/lib/libcurses_p.a
 OLD_FILES+=usr/lib/libcursesw_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/libedit_p.a
 OLD_FILES+=usr/lib/libelf_p.a
 OLD_FILES+=usr/lib/libfetch_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/libftpio_p.a
 OLD_FILES+=usr/lib/libgcc_p.a
 OLD_FILES+=usr/lib/libgeom_p.a
 OLD_FILES+=usr/lib/libgnuregex_p.a
 OLD_FILES+=usr/lib/libgpib_p.a
 OLD_FILES+=usr/lib/libgssapi_krb5_p.a
 OLD_FILES+=usr/lib/libgssapi_p.a
 OLD_FILES+=usr/lib/libhdb_p.a
 OLD_FILES+=usr/lib/libheimbase_p.a
 OLD_FILES+=usr/lib/libheimsqlite_p.a
 OLD_FILES+=usr/lib/libhistory_p.a
 OLD_FILES+=usr/lib/libipsec_p.a
 OLD_FILES+=usr/lib/libipx_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/liblwres_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/libncp_p.a
 OLD_FILES+=usr/lib/libncurses_p.a
 OLD_FILES+=usr/lib/libncursesw_p.a
 OLD_FILES+=usr/lib/libnetgraph_p.a
 OLD_FILES+=usr/lib/libngatm_p.a
 OLD_FILES+=usr/lib/libobjc_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/libpcap_p.a
 OLD_FILES+=usr/lib/libpmc_p.a
 OLD_FILES+=usr/lib/libpthread_p.a
 OLD_FILES+=usr/lib/libradius_p.a
 OLD_FILES+=usr/lib/libreadline_p.a
 OLD_FILES+=usr/lib/libroken_p.a
 OLD_FILES+=usr/lib/librpcsvc_p.a
 OLD_FILES+=usr/lib/librt_p.a
 OLD_FILES+=usr/lib/libsbuf_p.a
 OLD_FILES+=usr/lib/libsdp_p.a
 OLD_FILES+=usr/lib/libsmb_p.a
 OLD_FILES+=usr/lib/libssl_p.a
 OLD_FILES+=usr/lib/libstdc++_p.a
 OLD_FILES+=usr/lib/libsupc++_p.a
 OLD_FILES+=usr/lib/libtacplus_p.a
 OLD_FILES+=usr/lib/libtermcap_p.a
 OLD_FILES+=usr/lib/libtermcapw_p.a
 OLD_FILES+=usr/lib/libtermlib_p.a
 OLD_FILES+=usr/lib/libtermlibw_p.a
 OLD_FILES+=usr/lib/libthr_p.a
 OLD_FILES+=usr/lib/libthread_db_p.a
 OLD_FILES+=usr/lib/libtinfo_p.a
 OLD_FILES+=usr/lib/libtinfow_p.a
 OLD_FILES+=usr/lib/libufs_p.a
 OLD_FILES+=usr/lib/libugidfw_p.a
 OLD_FILES+=usr/lib/libusbhid_p.a
 OLD_FILES+=usr/lib/libutil_p.a
 OLD_FILES+=usr/lib/libvgl_p.a
 OLD_FILES+=usr/lib/libwind_p.a
 OLD_FILES+=usr/lib/libwrap_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/private/libldns_p.a
 OLD_FILES+=usr/lib/private/libssh_p.a
 .endif
 
 .if ${MK_RCMDS} == no
 OLD_FILES+=bin/rcp
 OLD_FILES+=etc/periodic/daily/140.clean-rwho 
 OLD_FILES+=etc/periodic/daily/430.status-rwho
 OLD_FILES+=rescue/rcp
 OLD_FILES+=usr/bin/rlogin
 OLD_FILES+=usr/bin/rsh
 OLD_FILES+=usr/bin/ruptime
 OLD_FILES+=usr/bin/rwho
 OLD_FILES+=usr/libexec/rlogind
 OLD_FILES+=usr/libexec/rshd
 OLD_FILES+=usr/sbin/rwhod
 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/man1/ruptime.1.gz
 OLD_FILES+=usr/share/man/man1/rwho.1.gz
 OLD_FILES+=usr/share/man/man8/rlogind.8.gz
 OLD_FILES+=usr/share/man/man8/rshd.8.gz
 OLD_FILES+=usr/share/man/man8/rwhod.8.gz
 .endif
 
 .if ${MK_RCS} == no
 OLD_FILES+=usr/bin/ci
 OLD_FILES+=usr/bin/co
 OLD_FILES+=usr/bin/ident
 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/man/man1/ci.1.gz
 OLD_FILES+=usr/share/man/man1/co.1.gz
 OLD_FILES+=usr/share/man/man1/ident.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
 .endif
 
 #.if ${MK_RESCUE} == no
 # to be filled in or replaced with a special target
 #.endif
 
 .if ${MK_ROUTED} == no
 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/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
 .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_FILES+=usr/lib/libmilter.a
 OLD_LIBS+=usr/lib/libmilter.so.5
 OLD_FILES+=usr/lib/libmilter_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libmilter.a
 OLD_LIBS+=usr/lib32/libmilter.so.5
 OLD_FILES+=usr/lib32/libmilter_p.a
 .endif
 OLD_FILES+=usr/libexec/mail.local
 OLD_FILES+=usr/libexec/sendmail/sendmail
 OLD_FILES+=usr/libexec/smrsh
 OLD_FILES+=usr/sbin/editmap
 OLD_FILES+=usr/sbin/mailstats
 OLD_FILES+=usr/sbin/makemap
 OLD_FILES+=usr/sbin/praliases
 OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz
 OLD_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_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_FILES+=usr/share/sendmail/cf/feature/accept_unqualified_senders.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/accept_unresolvable_domains.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/access_db.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/allmasquerade.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/always_add_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/authinfo.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/badmx.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/bestmx_is_local.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/bitdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/blacklist_recipients.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/block_bad_helo.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/compat_check.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/conncontrol.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/delay_checks.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/dnsbl.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/domaintable.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/enhdnsbl.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/generics_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/genericstable.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/greet_pause.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/ldap_routing.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/limited_masquerade.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/local_lmtp.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/local_no_masquerade.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/local_procmail.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/lookupdotdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/loose_relay_check.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/mailertable.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/masquerade_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/masquerade_envelope.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/msp.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/mtamark.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/no_default_msa.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/nocanonify.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/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/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/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_FILES+=usr/share/sendmail/cf/hack/cssubdomain.m4
 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_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_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/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_FILES+=usr/share/sendmail/cf/sendmail.schema
 OLD_FILES+=usr/share/sendmail/cf/sh/makeinfo.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
 .endif
 
 .if ${MK_SHAREDOCS} == no
 OLD_FILES+=usr/share/doc/pjdfstest/README
 OLD_DIRS+=usr/share/doc/pjdfstest
 .endif
 
 #.if ${MK_SYSCONS} == no
 # to be filled in
 #.endif
 
 .if ${MK_TCSH} == no
 OLD_FILES+=bin/csh
 OLD_FILES+=bin/tcsh
 OLD_FILES+=rescue/csh
 OLD_FILES+=rescue/tcsh
 OLD_FILES+=usr/share/examples/tcsh/complete.tcsh
 OLD_FILES+=usr/share/examples/tcsh/csh-mode.el
 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_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/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/el_GR.ISO8859-7/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/et_EE.ISO8859-15/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/fr_BE.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/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_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/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/it_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-15/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/ja_JP.eucJP/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/tcsh.cat
 .endif
 
 .if ${MK_TELNET} == no
 OLD_FILES+=usr/bin/telnet
 OLD_FILES+=usr/libexec/telnetd
 OLD_FILES+=usr/share/man/man1/telnet.1.gz
 OLD_FILES+=usr/share/man/man8/telnetd.8.gz
 .endif
 
 .if ${MK_TESTS} == yes
 OLD_FILES+=usr/bin/atf-sh
 OLD_FILES+=usr/include/atf-c++/config.hpp
 OLD_FILES+=usr/include/atf-c/config.h
 OLD_LIBS+=usr/lib/libatf-c++.a
 OLD_LIBS+=usr/lib/libatf-c++.so
 OLD_LIBS+=usr/lib/libatf-c++.so.1
 OLD_LIBS+=usr/lib/libatf-c++.so.2
 OLD_LIBS+=usr/lib/libatf-c++_p.a
 OLD_LIBS+=usr/lib/libatf-c.a
 OLD_LIBS+=usr/lib/libatf-c.so
 OLD_LIBS+=usr/lib/libatf-c.so.1
 OLD_LIBS+=usr/lib/libatf-c_p.a
 OLD_LIBS+=usr/lib/private/libatf-c.so.0
 OLD_LIBS+=usr/lib/private/libatf-c++.so.1
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_LIBS+=usr/lib32/libatf-c++.a
 OLD_LIBS+=usr/lib32/libatf-c++.so
 OLD_LIBS+=usr/lib32/libatf-c++.so.1
 OLD_LIBS+=usr/lib32/libatf-c++.so.2
 OLD_LIBS+=usr/lib32/libatf-c++_p.a
 OLD_LIBS+=usr/lib32/libatf-c.a
 OLD_LIBS+=usr/lib32/libatf-c.so
 OLD_LIBS+=usr/lib32/libatf-c.so.1
 OLD_LIBS+=usr/lib32/libatf-c_p.a
 OLD_LIBS+=usr/lib32/private/libatf-c.so.0
 OLD_LIBS+=usr/lib32/private/libatf-c++.so.1
 .endif
 OLD_FILES+=usr/libdata/pkgconfig/atf-c++.pc
 OLD_FILES+=usr/libdata/pkgconfig/atf-c.pc
 OLD_FILES+=usr/libdata/pkgconfig/atf-sh.pc
 OLD_FILES+=usr/share/aclocal/atf-c++.m4
 OLD_FILES+=usr/share/aclocal/atf-c.m4
 OLD_FILES+=usr/share/aclocal/atf-common.m4
 OLD_FILES+=usr/share/aclocal/atf-sh.m4
 OLD_DIRS+=usr/share/aclocal
 OLD_FILES+=usr/tests/bin/date/legacy_test
 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
 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
 .if ${MK_MAKE} == yes && ${MK_BMAKE} == 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+=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_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/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/man4/atf-test-case.4.gz
 OLD_FILES+=usr/share/mk/atf.test.mk
 
 # Test suite.
-. if(exists(${DESTDIR}/usr/tests/))
-TESTS_DIRS!=find ${DESTDIR}/usr/tests -type d | sed -e 's,^${DESTDIR}/,,'; echo
+. if exists(${DESTDIR}${TESTSBASE})
+TESTS_DIRS!=find ${DESTDIR}${TESTSBASE} -type d | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_DIRS+=${TESTS_DIRS}
-TESTS_FILES!=find ${DESTDIR}/usr/tests \! -type d | sed -e 's,^${DESTDIR}/,,'; echo
+TESTS_FILES!=find ${DESTDIR}${TESTSBASE} \! -type d | sed -e 's,^${DESTDIR}/,,'; echo
 OLD_FILES+=${TESTS_FILES}
 . endif
 .endif	# Test suite.
 
 #.if ${MK_TOOLCHAIN} == no
 # to be filled in
 #.endif
 
 .if ${MK_UNBOUND} == no
 OLD_FILES+=etc/rc.d/local_unbound
 OLD_FILES+=usr/lib/private/libunbound.a
 OLD_FILES+=usr/lib/private/libunbound.so
 OLD_LIBS+=usr/lib/private/libunbound.so.5
 OLD_FILES+=usr/lib/private/libunbound_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/private/libunbound.a
 OLD_FILES+=usr/lib32/private/libunbound.so
 OLD_LIBS+=usr/lib32/private/libunbound.so.5
 OLD_FILES+=usr/lib32/private/libunbound_p.a
 .endif
 OLD_FILES+=usr/sbin/local-unbound-setup
 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/sbin/unbound-control-setup
 .endif
 
 #.if ${MK_USB} == no
 # to be filled in
 #.endif
 
 .if ${MK_UTMPX} == no
 OLD_FILES+=etc/periodic/monthly/200.accounting
 OLD_FILES+=usr/bin/last
 OLD_FILES+=usr/bin/users
 OLD_FILES+=usr/bin/who
 OLD_FILES+=usr/bin/wtmpcvt
 OLD_FILES+=usr/sbin/ac
 OLD_FILES+=usr/sbin/lastlogin
 OLD_FILES+=usr/sbin/utx
 OLD_FILES+=usr/sbin/utxrm
 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/man1/wtmpcvt.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
 OLD_FILES+=usr/share/man/man8/utxrm.8.gz
 .endif
 
 .if ${MK_WIRELESS} == no
 OLD_FILES+=etc/regdomain.xml
 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/wlconfig
 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_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/i386/wlconfig.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
 .endif
 
 .if ${MK_SVNLITE} == no || ${MK_SVN} == yes
 OLD_FILES+=usr/bin/svnlite
 OLD_FILES+=usr/bin/svnliteadmin
 OLD_FILES+=usr/bin/svnlitedumpfilter
 OLD_FILES+=usr/bin/svnlitelook
 OLD_FILES+=usr/bin/svnlitemucc
 OLD_FILES+=usr/bin/svnliterdump
 OLD_FILES+=usr/bin/svnliteserve
 OLD_FILES+=usr/bin/svnlitesync
 OLD_FILES+=usr/bin/svnliteversion
 OLD_FILES+=usr/share/man/man1/svnlite.1.gz
 .endif
 
 .if ${MK_SVN} == no
 OLD_FILES+=usr/bin/svn
 OLD_FILES+=usr/bin/svnadmin
 OLD_FILES+=usr/bin/svndumpfilter
 OLD_FILES+=usr/bin/svnlook
 OLD_FILES+=usr/bin/svnmucc
 OLD_FILES+=usr/bin/svnrdump
 OLD_FILES+=usr/bin/svnserve
 OLD_FILES+=usr/bin/svnsync
 OLD_FILES+=usr/bin/svnversion
 .endif
 
 .if ${MK_HYPERV} == no
 OLD_FILES+=etc/devd/hyperv.conf
 OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig
 OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info
 OLD_FILES+=usr/libexec/hyperv/hv_get_dhcp_info
 OLD_FILES+=usr/sbin/hv_kvp_daemon
 OLD_FILES+=usr/share/man/man8/hv_kvp_daemon.8.gz
 .endif
Index: stable/10
===================================================================
--- stable/10	(revision 277456)
+++ stable/10	(revision 277457)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r275907