From 64308922dfa092ac669da8955b6018bbc3cab184 Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons
Date: Thu, 14 Jul 2011 10:57:02 +0000
Subject: Rename makewhatis [back] into mandocdb. This is to maintain
consistency with OpenBSD, which is sandboxing the code for merge. It makes
sense because it doesn't really make a `makewhatis' file in the traditional
sense, so it may be confusing.
---
Makefile | 32 +-
index.sgml | 26 +-
mandocdb.1 | 191 +++++++++++
mandocdb.c | 1105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 1325 insertions(+), 29 deletions(-)
create mode 100644 mandocdb.1
create mode 100644 mandocdb.c
diff --git a/Makefile b/Makefile
index 4570e44f..cc3e7a16 100644
--- a/Makefile
+++ b/Makefile
@@ -73,8 +73,8 @@ SRCS = Makefile \
mandoc.3 \
mandoc.c \
mandoc.h \
- makewhatis.1 \
- makewhatis.c \
+ mandocdb.1 \
+ mandocdb.c \
mandoc_char.7 \
mdoc.h \
mdoc.7 \
@@ -227,21 +227,21 @@ $(MANDOC_OBJS) $(MANDOC_LNS): main.h mandoc.h mdoc.h man.h config.h out.h
compat.o compat.ln: config.h
-MAKEWHATIS_OBJS = makewhatis.o
-MAKEWHATIS_LNS = makewhatis.ln
+MANDOCDB_OBJS = mandocdb.o
+MANDOCDB_LNS = mandocdb.ln
-$(MAKEWHATIS_OBJS) $(MAKEWHATIS_LNS): mandoc.h mdoc.h man.h config.h
+$(MANDOCDB_OBJS) $(MANDOCDB_LNS): mandoc.h mdoc.h man.h config.h
PRECONV_OBJS = preconv.o
PRECONV_LNS = preconv.ln
$(PRECONV_OBJS) $(PRECONV_LNS): config.h
-INDEX_MANS = makewhatis.1.html \
- makewhatis.1.xhtml \
- makewhatis.1.ps \
- makewhatis.1.pdf \
- makewhatis.1.txt \
+INDEX_MANS = mandocdb.1.html \
+ mandocdb.1.xhtml \
+ mandocdb.1.ps \
+ mandocdb.1.pdf \
+ mandocdb.1.txt \
mandoc.1.html \
mandoc.1.xhtml \
mandoc.1.ps \
@@ -304,8 +304,8 @@ lint: llib-llibmandoc.ln llib-lmandoc.ln llib-lpreconv.ln
clean:
rm -f libmandoc.a $(LIBMANDOC_OBJS)
rm -f llib-llibmandoc.ln $(LIBMANDOC_LNS)
- rm -f makewhatis $(MAKEWHATIS_OBJS)
- rm -f llib-lmakewhatis.ln $(MAKEWHATIS_LNS)
+ rm -f mandocdb $(MANDOCDB_OBJS)
+ rm -f llib-lmandocdb.ln $(MANDOCDB_LNS)
rm -f preconv $(PRECONV_OBJS)
rm -f llib-lpreconv.ln $(PRECONV_LNS)
rm -f mandoc $(MANDOC_OBJS)
@@ -353,11 +353,11 @@ llib-lmandoc.ln: $(MANDOC_LNS)
$(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS)
# You'll need -ldb for Linux.
-makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a
- $(CC) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a
+mandocdb: $(MANDOCDB_OBJS) libmandoc.a
+ $(CC) -o $@ $(MANDOCDB_OBJS) libmandoc.a
-llib-lmakewhatis.ln: $(MAKEWHATIS_LNS)
- $(LINT) $(LINTFLAGS) -Cmakewhatis $(MAKEWHATIS_LNS)
+llib-lmandocdb.ln: $(MANDOCDB_LNS)
+ $(LINT) $(LINTFLAGS) -Cmandocdb $(MANDOCDB_LNS)
preconv: $(PRECONV_OBJS)
$(CC) -o $@ $(PRECONV_OBJS)
diff --git a/index.sgml b/index.sgml
index 34941005..2308aa64 100644
--- a/index.sgml
+++ b/index.sgml
@@ -29,7 +29,7 @@
HREF="mandoc.1.html">mandoc, which interfaces with the compiler library to format output for UNIX terminals (with
support for wide-character locales), XHTML, HTML, PostScript, and PDF.
It also includes preconv, for recoding multibyte manuals; and makewhatis, for indexing manuals.
+ HREF="mandocdb.1.html">mandocdb, for indexing manuals.
It is a BSD.lv project.
@@ -40,15 +40,15 @@
mdocml is in plain-old ANSI C and should build and run on any UNIX system, although makewhatis requires mandocdb requires Berkeley Database (this is
installed by default on all BSD operating systems).
To compile mdocml, run make
, then make install
to install into
/usr/local.
Be aware: if you have an existing groff installation,
this may overwrite its preconv binary.
- The makewhatis utility is not yet linked to the build. You must run make
- makewhatis
to build it (it does not install).
+ The mandocdb utility is not yet linked to the build. You must run make
+ mandocdb
to build it (it does not install).
The most current version of mdocml is @VERSION@, dated
- makewhatis(1) |
+ mandocdb(1) |
index UNIX manuals
- (text |
- xhtml |
- pdf |
- postscript)
+ (text |
+ xhtml |
+ pdf |
+ postscript)
|
@@ -314,8 +314,8 @@
12-07-2011: version 1.11.4
- Bug-fixes and clean-ups across all systems, especially in makewhatis (note: still not
- connected to the general build and must be compiled with make makewhatis
) and the mandocdb makewhatis (note: still not
+ connected to the general build and must be compiled with make mandocdb
make makewhatis
) and the man parser. This release was significantly assisted by participants in OpenBSD's c2k11. Thanks!
@@ -341,7 +341,7 @@
Corrected some installation issues in version 1.11.1.
Further migration to libmandoc.
- Initial public release (this utility is very much under development) of makewhatis,
+ Initial public release (this utility is very much under development) of mandocdbmakewhatis,
initially named mandoc-db.
This utility produces keyword databases of manual content
mandoc-cgi,
@@ -356,7 +356,7 @@
Copyright © 2008–2011
Kristaps Dzonsons,
- $Date: 2011/07/12 10:04:36 $
+ $Date: 2011/07/14 10:57:02 $