Author: bapt
Date: Sat Mar 11 06:51:21 2017
New Revision: 315057
URL: https://svnweb.freebsd.org/changeset/base/315057
Log:
Remove the WITHOUT_MANDOCDB option
mandoc database is activated since FreeBSD 11.0, let's remove the previous
database format for FreeBSD 12.0
Deleted:
head/tools/build/options/WITHOUT_MANDOCDB
head/usr.bin/makewhatis/
head/usr.bin/man/apropos.1
Modified:
head/Makefile.inc1
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.bin/Makefile
head/usr.bin/man/Makefile
head/usr.bin/mandoc/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Sat Mar 11 06:31:16 2017 (r315056)
+++ head/Makefile.inc1 Sat Mar 11 06:51:21 2017 (r315057)
@@ -1696,11 +1696,9 @@ _kerberos5_bootstrap_tools= \
.endif
# r283777 makewhatis(1) replaced with mandoc version which builds a database.
-.if ${MK_MANDOCDB} != "no"
_libopenbsd?= lib/libopenbsd
_makewhatis= usr.bin/mandoc
${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd
-.endif
bootstrap-tools: .PHONY
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Mar 11 06:31:16
2017 (r315056)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Mar 11 06:51:21
2017 (r315057)
@@ -6671,10 +6671,6 @@ OLD_FILES+=usr/share/man/whatis
OLD_FILES+=usr/share/openssl/man/whatis
.endif
-.if ${MK_MANDOCDB} != no
-OLD_FILES+=usr/share/man/man1/makewhatis.1.gz
-.endif
-
.if ${MK_NDIS} == no
OLD_FILES+=usr/sbin/ndiscvt
OLD_FILES+=usr/sbin/ndisgen
Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile Sat Mar 11 06:31:16 2017 (r315056)
+++ head/usr.bin/Makefile Sat Mar 11 06:51:21 2017 (r315057)
@@ -237,9 +237,6 @@ SUBDIR.${MK_MAIL}+= mail
SUBDIR.${MK_MAIL}+= msgs
SUBDIR.${MK_MAKE}+= bmake
SUBDIR.${MK_MAN_UTILS}+= catman
-.if ${MK_MANDOCDB} == "no" # AND
-SUBDIR.${MK_MAN_UTILS}+= makewhatis
-.endif
SUBDIR.${MK_MAN_UTILS}+= man
SUBDIR.${MK_NETCAT}+= nc
SUBDIR.${MK_NIS}+= ypcat
Modified: head/usr.bin/man/Makefile
==============================================================================
--- head/usr.bin/man/Makefile Sat Mar 11 06:31:16 2017 (r315056)
+++ head/usr.bin/man/Makefile Sat Mar 11 06:51:21 2017 (r315057)
@@ -1,17 +1,8 @@
# $FreeBSD$
-.include <src.opts.mk>
-
SCRIPTS= man.sh
LINKS= ${BINDIR}/man ${BINDIR}/manpath
MAN= man.1 manpath.1 man.conf.5
-.if ${MK_MANDOCDB} == no
-LINKS+= ${BINDIR}/man ${BINDIR}/apropos \
- ${BINDIR}/man ${BINDIR}/whatis
-MAN+= apropos.1
-MLINKS= apropos.1 whatis.1
-.endif
-
.include <bsd.prog.mk>
Modified: head/usr.bin/mandoc/Makefile
==============================================================================
--- head/usr.bin/mandoc/Makefile Sat Mar 11 06:31:16 2017
(r315056)
+++ head/usr.bin/mandoc/Makefile Sat Mar 11 06:51:21 2017
(r315057)
@@ -8,7 +8,7 @@ MDOCMLDIR= ${.CURDIR}/../../contrib/mdoc
PROG= mandoc
MAN= mandoc.1 eqn.7 mandoc_char.7 tbl.7 man.7 mdoc.7 # roff.7
MLINKS= mandoc.1 mdocml.1
-.if ${MK_MANDOCDB} != no && ${MK_MAN_UTILS} != no
+.if ${MK_MAN_UTILS} != no
MAN+= apropos.1 makewhatis.8
MLINKS+= apropos.1 whatis.1
LINKS= ${BINDIR}/mandoc ${BINDIR}/whatis \
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
