d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to mandoc's version of makewhatis(8), whatis(1), apropos(1) utilities.

Browse Source 
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
This commit is contained in:
Baptiste Daroussin 2015-05-30 17:41:37 +00:00
parent b1621f22b3
commit 8faa40d1a0
6 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.inc1
View File

@ -1363,6 +1363,16 @@ _kerberos5_bootstrap_tools= \
.ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g} .ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
.endif .endif
.if ${MK_MANDOCDB} != "no"
_makewhatis= lib/libohash \
lib/libsqlite3 \
lib/libmandoc \
usr.bin/mandoc
${_bt}-usr.bin/mandoc: ${_bt}-lib/libohash ${_bt}-lib/libsqlite3
.else
_makewhatis=usr.bin/makewhatis
.endif
# Rebuild up-to-date libmd for xinstall # Rebuild up-to-date libmd for xinstall
${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd ${_bt}-usr.bin/xinstall: ${_bt}-lib/libmd
@ -1383,7 +1393,7 @@ bootstrap-tools: .PHONY
${_awk} \ ${_awk} \
${_cat} \ ${_cat} \
usr.bin/lorder \ usr.bin/lorder \
usr.bin/makewhatis \ ${_makewhatis} \
usr.bin/rpcgen \ usr.bin/rpcgen \
${_sed} \ ${_sed} \
${_yacc} \ ${_yacc} \

1
share/mk/src.opts.mk
View File

@ -126,6 +126,7 @@ __DEFAULT_YES_OPTIONS = \
MAIL \ MAIL \
MAILWRAPPER \ MAILWRAPPER \
MAKE \ MAKE \
MANDOCDB \
NDIS \ NDIS \
NETCAT \ NETCAT \
NETGRAPH \ NETGRAPH \

6
tools/build/options/WITHOUT_MANDOCDB Normal file
View File

@ -0,0 +1,6 @@
.\" $FreeBSD$
Use the
.Xr mandoc 1
version of
.Xr makewhatis 8
database and utilities.

2
usr.bin/Makefile
View File

@ -317,7 +317,9 @@ SUBDIR+= bmake
.if ${MK_MAN_UTILS} != "no" .if ${MK_MAN_UTILS} != "no"
SUBDIR+= catman SUBDIR+= catman
.if ${MK_MANDOCDB} == "no"
_makewhatis= makewhatis _makewhatis= makewhatis
.endif
_man= man _man= man
.endif .endif

16
usr.bin/man/Makefile
View File

@ -1,11 +1,17 @@
# $FreeBSD$ # $FreeBSD$
SCRIPTS= man.sh .include <src.opts.mk>
LINKS= ${BINDIR}/man ${BINDIR}/apropos \
${BINDIR}/man ${BINDIR}/manpath \
${BINDIR}/man ${BINDIR}/whatis
MAN= man.1 manpath.1 apropos.1 man.conf.5 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 MLINKS= apropos.1 whatis.1
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

11
usr.bin/mandoc/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$ # $FreeBSD$
.include <src.opts.mk>
MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml
.PATH: ${MDOCMLDIR} .PATH: ${MDOCMLDIR}
@ -7,7 +9,14 @@ PROG= mandoc
FILES= example.style.css style.css FILES= example.style.css style.css
FILESDIR= ${SHAREDIR}/mdocml FILESDIR= ${SHAREDIR}/mdocml
MAN= mandoc.1 eqn.7 mandoc_char.7 tbl.7 man.7 mdoc.7 # roff.7 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 \ LIBMAN_SRCS= man.c \
man_hash.c \ man_hash.c \