Remove the WITHOUT_MANDOCDB option
mandoc database is activated since FreeBSD 11.0, let's remove the previous database format for FreeBSD 12.0
This commit is contained in:
Baptiste Daroussin
parent
6970ca8f1e
commit
97ab006d51
@ -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
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
.\" $FreeBSD$
|
||||
Use the version of
|
||||
.Xr makewhatis 1
|
||||
introduced in
|
||||
.Fx 2.1 ,
|
||||
instead of the
|
||||
.Xr makewhatis 8
|
||||
database and utilities from
|
||||
.Xr mandoc 1 .
|
||||
@ -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
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PROG= makewhatis
|
||||
LIBADD= z
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
@ -1,19 +0,0 @@
|
||||
# $FreeBSD$
|
||||
# Autogenerated - do NOT edit!
|
||||
|
||||
DIRDEPS = \
|
||||
gnu/lib/csu \
|
||||
gnu/lib/libgcc \
|
||||
include \
|
||||
include/xlocale \
|
||||
lib/${CSU_DIR} \
|
||||
lib/libc \
|
||||
lib/libcompiler_rt \
|
||||
lib/libz \
|
||||
|
||||
|
||||
.include <dirdeps.mk>
|
||||
|
||||
.if ${DEP_RELDIR} == ${_DEP_RELDIR}
|
||||
# local dependencies - needed for -jN in clean tree
|
||||
.endif
|
||||
@ -1,136 +0,0 @@
|
||||
.\" Copyright (c) 2002 John Rochester
|
||||
.\" All rights reserved.
|
||||
.\"
|
||||
.\" Redistribution and use in source and binary forms, with or without
|
||||
.\" modification, are permitted provided that the following conditions
|
||||
.\" are met:
|
||||
.\" 1. Redistributions of source code must retain the above copyright
|
||||
.\" notice, this list of conditions and the following disclaimer.
|
||||
.\" 2. Redistributions in binary form must reproduce the above copyright
|
||||
.\" notice, this list of conditions and the following disclaimer in the
|
||||
.\" documentation and/or other materials provided with the distribution.
|
||||
.\"
|
||||
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" $FreeBSD$
|
||||
.\"
|
||||
.Dd December 3, 2005
|
||||
.Dt MAKEWHATIS 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
.Nm makewhatis
|
||||
.Nd "create whatis database"
|
||||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
.Op Fl a
|
||||
.Op Fl i Ar column
|
||||
.Op Fl n Ar name
|
||||
.Op Fl o Ar file
|
||||
.Op Fl v
|
||||
.Op Fl L
|
||||
.Op Ar directories ...
|
||||
.Sh DESCRIPTION
|
||||
The
|
||||
.Nm
|
||||
utility collects the names and short descriptions from all the unformatted
|
||||
man pages in the
|
||||
.Ar directories
|
||||
and puts them into a file used by the
|
||||
.Xr whatis 1
|
||||
and
|
||||
.Xr apropos 1
|
||||
commands.
|
||||
Directories may be separated by colons instead of spaces.
|
||||
If no
|
||||
.Ar directories
|
||||
are specified, the contents of the
|
||||
.Ev MANPATH
|
||||
environment variable will be used, or if that is not set, the default directory
|
||||
.Pa /usr/share/man
|
||||
will be processed.
|
||||
.Pp
|
||||
The options are as follows:
|
||||
.Bl -tag -width ".Fl i Ar column"
|
||||
.It Fl a
|
||||
Appends to the output file(s) instead of replacing them.
|
||||
The output
|
||||
will be sorted with duplicate lines removed, but may have obsolete
|
||||
entries.
|
||||
.It Fl i Ar column
|
||||
Indents the description by
|
||||
.Ar column
|
||||
characters.
|
||||
The default value is 24.
|
||||
.It Fl n Ar name
|
||||
Uses
|
||||
.Ar name
|
||||
instead of
|
||||
.Pa whatis .
|
||||
.It Fl o Ar file
|
||||
Outputs all lines to the
|
||||
.Ar file
|
||||
instead of
|
||||
.Pa */man/whatis .
|
||||
.It Fl v
|
||||
Makes
|
||||
.Nm
|
||||
more verbose about what it is doing.
|
||||
.It Fl L
|
||||
Process only localized subdirectories corresponding to the locale specified
|
||||
in the standard environment variables.
|
||||
.El
|
||||
.Sh ENVIRONMENT
|
||||
.Bl -tag -width ".Ev MANPATH"
|
||||
.It Ev LC_ALL , LC_CTYPE , LANG
|
||||
These variables control what subdirectories will be processed if the
|
||||
.Fl L
|
||||
option is used.
|
||||
.It Ev MACHINE
|
||||
If set, its value is used to override the current
|
||||
machine type when searching machine specific subdirectories.
|
||||
.It Ev MACHINE_ARCH
|
||||
If set, its value is used to override the current
|
||||
architecture when searching architecture specific subdirectories.
|
||||
.It Ev MANPATH
|
||||
Determines the set of directories to be processed if none are given on
|
||||
the command line.
|
||||
.El
|
||||
.Sh FILES
|
||||
.Bl -tag -width ".Pa /usr/share/man" -compact
|
||||
.It Pa /usr/share/man
|
||||
Default directory to process if the
|
||||
.Ev MANPATH
|
||||
environment variable is not set.
|
||||
.It Pa */man/whatis
|
||||
The default output file.
|
||||
.El
|
||||
.Sh EXIT STATUS
|
||||
.Ex -std
|
||||
.Sh SEE ALSO
|
||||
.Xr apropos 1 ,
|
||||
.Xr whatis 1
|
||||
.Sh HISTORY
|
||||
The
|
||||
.Nm
|
||||
command appeared in
|
||||
.Fx 2.1 .
|
||||
.Sh AUTHORS
|
||||
.An -nosplit
|
||||
The
|
||||
.Nm
|
||||
program was originally written in Perl and was contributed by
|
||||
.An Wolfram Schneider .
|
||||
The current version of
|
||||
.Nm
|
||||
was rewritten in C by
|
||||
.An John Rochester .
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,83 +0,0 @@
|
||||
.\" Copyright (c) April 1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
|
||||
.\" All rights reserved.
|
||||
.\"
|
||||
.\" Redistribution and use in source and binary forms, with or without
|
||||
.\" modification, are permitted provided that the following conditions
|
||||
.\" are met:
|
||||
.\" 1. Redistributions of source code must retain the above copyright
|
||||
.\" notice, this list of conditions and the following disclaimer.
|
||||
.\" 2. Redistributions in binary form must reproduce the above copyright
|
||||
.\" notice, this list of conditions and the following disclaimer in the
|
||||
.\" documentation and/or other materials provided with the distribution.
|
||||
.\"
|
||||
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" $FreeBSD$
|
||||
.Dd April 26, 1996
|
||||
.Dt MAKEWHATIS.LOCAL 8
|
||||
.Os
|
||||
.Sh NAME
|
||||
.Nm makewhatis.local , catman.local
|
||||
.Nd start makewhatis or catman for local file systems
|
||||
.Sh SYNOPSIS
|
||||
.Nm /usr/libexec/makewhatis.local
|
||||
.Op options
|
||||
.Ar directories ...
|
||||
.Nm /usr/libexec/catman.local
|
||||
.Op options
|
||||
.Ar directories ...
|
||||
.Sh DESCRIPTION
|
||||
The
|
||||
.Nm
|
||||
utility starts
|
||||
.Xr makewhatis 1
|
||||
only for file systems physically mounted on the system
|
||||
where the
|
||||
.Nm
|
||||
is being executed.
|
||||
Running makewhatis
|
||||
by
|
||||
.Pa periodic weekly
|
||||
for rw nfs-mounted /usr may kill
|
||||
your NFS server -- all NFS clients start makewhatis at the same time!
|
||||
So use this wrapper for
|
||||
.Xr cron 8
|
||||
instead of calling makewhatis directly.
|
||||
The
|
||||
.Nm catman.local
|
||||
utility is using for same purposes as
|
||||
.Nm
|
||||
but for
|
||||
.Xr catman 1 .
|
||||
.Sh FILES
|
||||
.Bl -tag -width /etc/periodic/weekly/320.whatis.XXX -compact
|
||||
.It Pa /etc/periodic/weekly/320.whatis
|
||||
run
|
||||
.Nm
|
||||
every week
|
||||
.It Pa /etc/periodic/weekly/330.catman
|
||||
run
|
||||
.Nm catman.local
|
||||
every week
|
||||
.El
|
||||
.Sh SEE ALSO
|
||||
.Xr catman 1 ,
|
||||
.Xr find 1 ,
|
||||
.Xr makewhatis 1 ,
|
||||
.Xr cron 8 ,
|
||||
.Xr periodic 8
|
||||
.Sh HISTORY
|
||||
The
|
||||
.Nm
|
||||
utility appeared in
|
||||
.Fx 2.2 .
|
||||
@ -1,58 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) April 1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the distribution.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
# SUCH DAMAGE.
|
||||
#
|
||||
# makewhatis.local - start makewhatis(1) only for file systems
|
||||
# physically mounted on the system
|
||||
#
|
||||
# Running makewhatis from /etc/periodic/weekly/320.whatis for rw nfs-mounted
|
||||
# /usr may kill your NFS server -- all clients start makewhatis at the same
|
||||
# time! So use this wrapper instead calling makewhatis directly.
|
||||
#
|
||||
# PS: this wrapper works also for catman(1)
|
||||
#
|
||||
# $FreeBSD$
|
||||
|
||||
PATH=/bin:/usr/bin:$PATH; export PATH
|
||||
opt= dirs= localdirs=
|
||||
|
||||
for arg
|
||||
do
|
||||
case "$arg" in
|
||||
-*) opt="$opt $arg";;
|
||||
*) dirs="$dirs $arg";;
|
||||
esac
|
||||
done
|
||||
|
||||
dirs=`echo $dirs | sed 's/:/ /g'`
|
||||
case X"$dirs" in X) echo "usage: $0 [options] directories ..."; exit 1;; esac
|
||||
|
||||
localdirs=`find -H $dirs -fstype local -type d -prune -print`
|
||||
|
||||
case X"$localdirs" in
|
||||
X) echo "$0: no local-mounted manual directories found: $dirs"
|
||||
exit 1;;
|
||||
*) exec `basename $0 .local` $opt $localdirs;;
|
||||
esac
|
||||
@ -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>
|
||||
|
||||
@ -1,88 +0,0 @@
|
||||
.\"-
|
||||
.\" Copyright (c) 2010 Gordon Tetlow
|
||||
.\" All rights reserved.
|
||||
.\"
|
||||
.\" Redistribution and use in source and binary forms, with or without
|
||||
.\" modification, are permitted provided that the following conditions
|
||||
.\" are met:
|
||||
.\" 1. Redistributions of source code must retain the above copyright
|
||||
.\" notice, this list of conditions and the following disclaimer.
|
||||
.\" 2. Redistributions in binary form must reproduce the above copyright
|
||||
.\" notice, this list of conditions and the following disclaimer in the
|
||||
.\" documentation and/or other materials provided with the distribution.
|
||||
.\"
|
||||
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" $FreeBSD$
|
||||
.\"
|
||||
.Dd September 1, 2010
|
||||
.Dt APROPOS 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
.Nm apropos ,
|
||||
.Nm whatis
|
||||
.Nd keyword search whatis documentation databases
|
||||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
.Op Fl d
|
||||
.Ar keyword ...
|
||||
.Nm whatis
|
||||
.Op Fl d
|
||||
.Ar keyword ...
|
||||
.Sh DESCRIPTION
|
||||
The
|
||||
.Nm
|
||||
utility searches a set of databases looking for documentation matching each
|
||||
.Ar keyword
|
||||
and displays the results.
|
||||
The
|
||||
.Nm whatis
|
||||
utility does the same search but only on complete words.
|
||||
.Bl -tag -width ".Fl d"
|
||||
.It Fl d
|
||||
Print extra debugging information.
|
||||
.El
|
||||
.Pp
|
||||
The
|
||||
.Ar keyword
|
||||
is simply passed to
|
||||
.Xr grep 1
|
||||
allowing for extended regular expression matches.
|
||||
.Sh ENVIRONMENT
|
||||
The following environment variables affect the execution of
|
||||
.Nm :
|
||||
.Bl -tag -width ".Ev PAGER"
|
||||
.It Ev MANLOCALES , MANPATH , PATH
|
||||
Used to find the location of the
|
||||
.Nm whatis
|
||||
database files. See
|
||||
.Xr manpath 1
|
||||
for additional information.
|
||||
.It Ev PAGER
|
||||
Program used to display files.
|
||||
If unset,
|
||||
.Ic "more -s"
|
||||
is used.
|
||||
.El
|
||||
.Sh DIAGNOSTICS
|
||||
The
|
||||
.Nm
|
||||
utility exits 0 if a keyword matched and 1 if no keywords are matched or no
|
||||
.Nm whatis
|
||||
databases are found.
|
||||
.Sh SEE ALSO
|
||||
.Xr grep 1 ,
|
||||
.Xr makewhatis 1 ,
|
||||
.Xr man 1 ,
|
||||
.Xr manpath 1 ,
|
||||
.Xr man.conf 5
|
||||
@ -8,7 +8,7 @@ MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml
|
||||
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 \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user