diff options
| author | bapt <bapt@FreeBSD.org> | 2015-05-30 17:41:37 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-05-30 17:41:37 +0000 |
| commit | d9be45055a40b403e13e26332073697cb0a765f7 (patch) | |
| tree | e1acd6b92dd5579ff70cbe33a2e9d5c34def606a /usr.bin | |
| parent | 65c0ca1d1a58a9c61cc3fbeb20703a307c2dc475 (diff) | |
| download | FreeBSD-src-d9be45055a40b403e13e26332073697cb0a765f7.zip FreeBSD-src-d9be45055a40b403e13e26332073697cb0a765f7.tar.gz | |
Switch to mandoc's version of makewhatis(8), whatis(1), apropos(1) utilities.
This change among other things improve search capabilities over the manpages
allowing fine grain query.
A new build option WITHOUT_MANDOCDB has been added to keep the ancient version
of the database and the tools. The plan is to entirely remove this option before
11.0-RELEASE.
Differential Revision: https://reviews.freebsd.org/D2603
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/man/Makefile | 14 | ||||
| -rw-r--r-- | usr.bin/mandoc/Makefile | 11 |
3 files changed, 22 insertions, 5 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index af9b471..c77f89a 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -317,7 +317,9 @@ SUBDIR+= bmake .if ${MK_MAN_UTILS} != "no" SUBDIR+= catman +.if ${MK_MANDOCDB} == "no" _makewhatis= makewhatis +.endif _man= man .endif diff --git a/usr.bin/man/Makefile b/usr.bin/man/Makefile index 3e37b59..7057b2e 100644 --- a/usr.bin/man/Makefile +++ b/usr.bin/man/Makefile @@ -1,11 +1,17 @@ # $FreeBSD$ +.include <src.opts.mk> + SCRIPTS= man.sh -LINKS= ${BINDIR}/man ${BINDIR}/apropos \ - ${BINDIR}/man ${BINDIR}/manpath \ - ${BINDIR}/man ${BINDIR}/whatis +LINKS= ${BINDIR}/man ${BINDIR}/manpath -MAN= man.1 manpath.1 apropos.1 man.conf.5 +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> diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile index cdb512b..e2c59cf 100644 --- a/usr.bin/mandoc/Makefile +++ b/usr.bin/mandoc/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <src.opts.mk> + MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml .PATH: ${MDOCMLDIR} @@ -7,7 +9,14 @@ PROG= mandoc FILES= example.style.css style.css FILESDIR= ${SHAREDIR}/mdocml MAN= mandoc.1 eqn.7 mandoc_char.7 tbl.7 man.7 mdoc.7 # roff.7 -MLINKS= mandoc.1 mdocml.1 +MLINKS= mandoc.1 mdocml.1 +.if ${MK_MANDOCDB} != no +MAN+= apropos.1 makewhatis.8 +MLINKS+= apropos.1 whatis.1 +LINKS= ${BINDIR}/mandoc ${BINDIR}/whatis \ + ${BINDIR}/mandoc ${BINDIR}/makewhatis \ + ${BINDIR}/mandoc ${BINDIR}/apropos +.endif LIBMAN_SRCS= man.c \ man_hash.c \ |
