aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-02-25 15:04:19 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-02-25 15:04:19 +0000
commitd630701f86adb26b17d423fab6699c649552f9f4 (patch)
tree55999625ac3af71bc159850464e30ee8041da5f2 /tools
parentbc93f188f634b3aa4b74de9bf8f5096b20e733c4 (diff)
parent845ab1f5a05dfdac317dbc607a01a8b54bc8f885 (diff)
downloadsrc-d630701f86adb26b17d423fab6699c649552f9f4.tar.gz
src-d630701f86adb26b17d423fab6699c649552f9f4.zip
Notes
Diffstat (limited to 'tools')
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc31
1 files changed, 17 insertions, 14 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index bdaebf35627a..e60b344dc5eb 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1197,6 +1197,7 @@ OLD_FILES+=usr/share/man/man8/casperd.8.gz
.if ${MK_CCD} == no
OLD_FILES+=etc/rc.d/ccd
+OLD_FILES+=rescue/ccdconfig
OLD_FILES+=sbin/ccdconfig
OLD_FILES+=usr/share/man/man4/ccd.4.gz
OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz
@@ -1520,10 +1521,6 @@ 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
@@ -4836,9 +4833,12 @@ 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_LIBTHR} == no
+OLD_LIBS+=lib/libthr.so.3
+OLD_FILES+=usr/lib/libthr.a
+OLD_FILES+=usr/lib/libthr_p.a
+OLD_FILES+=usr/share/man/man3/libthr.3.gz
+.endif
.if ${MK_LLD} == no
OLD_FILES+=usr/bin/ld.lld
@@ -7041,10 +7041,6 @@ 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+=etc/rc.d/sshd
OLD_FILES+=etc/ssh/moduli
@@ -7485,11 +7481,18 @@ OLD_FILES+=usr/share/man/man8/rshd.8.gz
OLD_FILES+=usr/share/man/man8/rwhod.8.gz
.endif
-#.if ${MK_RESCUE} == no
-# to be filled in or replaced with a special target
-#.endif
+.if ${MK_RESCUE} == no
+. if exists(${DESTDIR}${TESTSBASE})
+RESCUE_DIRS!=find ${DESTDIR}/rescue -type d | sed -e 's,^${DESTDIR}/,,'; echo
+OLD_DIRS+=${RESCUE_DIRS}
+RESCUE_FILES!=find ${DESTDIR}/rescue \! -type d | sed -e 's,^${DESTDIR}/,,'; echo
+OLD_FILES+=${RESCUE_FILES}
+. endif
+.endif
.if ${MK_ROUTED} == no
+OLD_FILES+=rescue/routed
+OLD_FILES+=rescue/rtquery
OLD_FILES+=sbin/routed
OLD_FILES+=sbin/rtquery
OLD_FILES+=usr/share/man/man8/routed.8.gz