Partial merge of rev. 1.396:

Remove lint support and Windows binaries.

1 files changed, 132 insertions, 25 deletions

diff --git a/Makefile b/Makefile
index 0e9e422a..3aebaab7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
 .PHONY: 	 clean install installwww
 .SUFFIXES:	 .sgml .html .md5 .h .h.html
 .SUFFIXES:	 .1       .3       .7       .8
+.SUFFIXES:	 .1.txt   .3.txt   .7.txt   .8.txt
+.SUFFIXES:	 .1.pdf   .3.pdf   .7.pdf   .8.pdf
+.SUFFIXES:	 .1.ps    .3.ps    .7.ps    .8.ps
 .SUFFIXES:	 .1.html  .3.html  .7.html  .8.html
+.SUFFIXES:	 .1.xhtml .3.xhtml .7.xhtml .8.xhtml
 
 # Specify this if you want to hard-code the operating system to appear
 # in the lower-left hand corner of -mdoc manuals.
@@ -20,8 +24,9 @@ VDATE		 = 23 March 2012
 CFLAGS	 	+= -DUSE_WCHAR
 
 # If your system has manpath(1), uncomment this.  This is most any
-# system that's not OpenBSD or NetBSD.  If uncommented, manpage(1) and
-# mandocdb(8) will use manpath(1) to get the MANPATH variable.
+# system that's not OpenBSD or NetBSD.  If uncommented, apropos(1),
+# mandocdb(8), and man.cgi will popen(3) manpath(1) to get the MANPATH
+# variable.
 #CFLAGS		+= -DUSE_MANPATH
 
 # If your system supports static binaries only, uncomment this.  This
@@ -29,7 +34,7 @@ CFLAGS	 	+= -DUSE_WCHAR
 # requires -pthreads for static libdb).
 STATIC		 = -static
 
-CFLAGS		+= -I/usr/local/include -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+CFLAGS		+= -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
 CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX		 = /usr/local
 WWWPREFIX	 = /var/www
@@ -47,17 +52,29 @@ INSTALL_LIB	 = $(INSTALL) -m 0644
 INSTALL_SOURCE	 = $(INSTALL) -m 0644
 INSTALL_MAN	 = $(INSTALL_DATA)
 
-DBLIB		 = -L/usr/local/lib -lsqlite3
-DBBIN		 = mandocdb manpage apropos
+# Non-BSD systems (Linux, etc.) need -ldb to compile mandocdb and
+# apropos.
+# However, if you don't have -ldb at all (or it's not native), then
+# comment out apropos and mandocdb. 
+#
+#DBLIB		 = -ldb
+DBBIN		 = apropos mandocdb man.cgi catman whatis
+DBLN		 = llib-lapropos.ln llib-lmandocdb.ln llib-lman.cgi.ln llib-lcatman.ln
 
 all: mandoc preconv demandoc $(DBBIN)
 
 SRCS		 = Makefile \
 		   TODO \
+		   apropos.1 \
+		   apropos.c \
+		   apropos_db.c \
+		   apropos_db.h \
 		   arch.c \
 		   arch.in \
 		   att.c \
 		   att.in \
+		   catman.8 \
+		   catman.c \
 		   cgi.c \
 		   chars.c \
 		   chars.in \
@@ -89,6 +106,7 @@ SRCS		 = Makefile \
 		   main.h \
 		   man.7 \
 		   man.c \
+		   man.cgi.7 \
 		   man-cgi.css \
 		   man.h \
 		   man_hash.c \
@@ -103,6 +121,7 @@ SRCS		 = Makefile \
 		   mandoc_char.7 \
 		   mandocdb.8 \
 		   mandocdb.c \
+		   mandocdb.h \
 		   manpath.c \
 		   manpath.h \
 		   mdoc.7 \
@@ -142,13 +161,13 @@ SRCS		 = Makefile \
 		   test-fgetln.c \
 		   test-getsubopt.c \
 		   test-mmap.c \
-		   test-ohash.c \
 		   test-strlcat.c \
 		   test-strlcpy.c \
 		   test-strptime.c \
 		   tree.c \
 		   vol.c \
-		   vol.in
+		   vol.in \
+		   whatis.1
 
 LIBMAN_OBJS	 = man.o \
 		   man_hash.o \
@@ -183,7 +202,6 @@ LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 
 COMPAT_OBJS	 = compat_fgetln.o \
 		   compat_getsubopt.o \
-		   compat_ohash.o \
 		   compat_strlcat.o \
 		   compat_strlcpy.o
 
@@ -200,7 +218,7 @@ $(LIBMAN_OBJS): libman.h
 $(LIBMDOC_OBJS): libmdoc.h
 $(LIBROFF_OBJS): libroff.h
 $(LIBMANDOC_OBJS): mandoc.h mdoc.h man.h libmandoc.h config.h
-$(COMPAT_OBJS): config.h compat_ohash.h
+$(COMPAT_OBJS): config.h
 
 MANDOC_HTML_OBJS = eqn_html.o \
 		   html.o \
@@ -229,31 +247,105 @@ MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
 $(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h
 
 MANDOCDB_OBJS	 = mandocdb.o manpath.o
-$(MANDOCDB_OBJS): mansearch.h mandoc.h mdoc.h man.h config.h manpath.h
+$(MANDOCDB_OBJS): mandocdb.h mandoc.h mdoc.h man.h config.h manpath.h
 
 PRECONV_OBJS	 = preconv.o
 $(PRECONV_OBJS): config.h
 
-APROPOS_OBJS	 = apropos.o mansearch.o manpath.o
-$(APROPOS_OBJS): config.h manpath.h mansearch.h
+APROPOS_OBJS	 = apropos.o apropos_db.o manpath.o
+$(APROPOS_OBJS): config.h mandoc.h apropos_db.h manpath.h mandocdb.h
 
-MANPAGE_OBJS	 = manpage.o mansearch.o manpath.o
-$(MANPAGE_OBJS): config.h manpath.h mansearch.h
+CGI_OBJS	 = $(MANDOC_HTML_OBJS) \
+		   $(MANDOC_MAN_OBJS) \
+		   $(MANDOC_TERM_OBJS) \
+		   cgi.o \
+		   apropos_db.o \
+		   manpath.o \
+		   out.o \
+		   tree.o
+$(CGI_OBJS): main.h mdoc.h man.h out.h config.h mandoc.h apropos_db.h manpath.h mandocdb.h
+
+CATMAN_OBJS	 = catman.o manpath.o
+$(CATMAN_OBJS): config.h mandoc.h manpath.h mandocdb.h
 
 DEMANDOC_OBJS	 = demandoc.o
 $(DEMANDOC_OBJS): config.h
 
-INDEX_MANS	 = demandoc.1.html \
+INDEX_MANS	 = apropos.1.html \
+		   apropos.1.xhtml \
+		   apropos.1.ps \
+		   apropos.1.pdf \
+		   apropos.1.txt \
+		   catman.8.html \
+		   catman.8.xhtml \
+		   catman.8.ps \
+		   catman.8.pdf \
+		   catman.8.txt \
+		   demandoc.1.html \
+		   demandoc.1.xhtml \
+		   demandoc.1.ps \
+		   demandoc.1.pdf \
+		   demandoc.1.txt \
 		   mandoc.1.html \
+		   mandoc.1.xhtml \
+		   mandoc.1.ps \
+		   mandoc.1.pdf \
+		   mandoc.1.txt \
+		   whatis.1.html \
+		   whatis.1.xhtml \
+		   whatis.1.ps \
+		   whatis.1.pdf \
+		   whatis.1.txt \
 		   mandoc.3.html \
+		   mandoc.3.xhtml \
+		   mandoc.3.ps \
+		   mandoc.3.pdf \
+		   mandoc.3.txt \
 		   eqn.7.html \
+		   eqn.7.xhtml \
+		   eqn.7.ps \
+		   eqn.7.pdf \
+		   eqn.7.txt \
 		   man.7.html \
+		   man.7.xhtml \
+		   man.7.ps \
+		   man.7.pdf \
+		   man.7.txt \
+		   man.cgi.7.html \
+		   man.cgi.7.xhtml \
+		   man.cgi.7.ps \
+		   man.cgi.7.pdf \
+		   man.cgi.7.txt \
 		   mandoc_char.7.html \
+		   mandoc_char.7.xhtml \
+		   mandoc_char.7.ps \
+		   mandoc_char.7.pdf \
+		   mandoc_char.7.txt \
 		   mdoc.7.html \
+		   mdoc.7.xhtml \
+		   mdoc.7.ps \
+		   mdoc.7.pdf \
+		   mdoc.7.txt \
 		   preconv.1.html \
+		   preconv.1.xhtml \
+		   preconv.1.ps \
+		   preconv.1.pdf \
+		   preconv.1.txt \
 		   roff.7.html \
+		   roff.7.xhtml \
+		   roff.7.ps \
+		   roff.7.pdf \
+		   roff.7.txt \
 		   tbl.7.html \
-		   mandocdb.8.html
+		   tbl.7.xhtml \
+		   tbl.7.ps \
+		   tbl.7.pdf \
+		   tbl.7.txt \
+		   mandocdb.8.html \
+		   mandocdb.8.xhtml \
+		   mandocdb.8.ps \
+		   mandocdb.8.pdf \
+		   mandocdb.8.txt
 
 $(INDEX_MANS): mandoc
 
@@ -268,10 +360,11 @@ www: index.html
 
 clean:
 	rm -f libmandoc.a $(LIBMANDOC_OBJS)
-	rm -f apropos $(APROPOS_OBJS)
 	rm -f mandocdb $(MANDOCDB_OBJS)
 	rm -f preconv $(PRECONV_OBJS)
-	rm -f manpage $(MANPAGE_OBJS)
+	rm -f apropos whatis $(APROPOS_OBJS)
+	rm -f man.cgi $(CGI_OBJS)
+	rm -f catman $(CATMAN_OBJS)
 	rm -f demandoc $(DEMANDOC_OBJS)
 	rm -f mandoc $(MANDOC_OBJS)
 	rm -f config.h config.log $(COMPAT_OBJS)
@@ -298,7 +391,7 @@ install: all
 installcgi: all
 	mkdir -p $(DESTDIR)$(CGIBINDIR)
 	mkdir -p $(DESTDIR)$(HTDOCDIR)
-	#$(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
+	$(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
 	$(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
 	$(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
 
@@ -325,12 +418,18 @@ mandocdb: $(MANDOCDB_OBJS) libmandoc.a
 preconv: $(PRECONV_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
 
-manpage: $(MANPAGE_OBJS) libmandoc.a
-	$(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB)
+whatis: apropos
+	cp -f apropos whatis
 
 apropos: $(APROPOS_OBJS) libmandoc.a
 	$(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a $(DBLIB)
 
+catman: $(CATMAN_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(CATMAN_OBJS) libmandoc.a $(DBLIB)
+
+man.cgi: $(CGI_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB)
+
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
 	$(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
 
@@ -349,10 +448,6 @@ config.h: config.h.pre config.h.post
 	rm -f config.log
 	( cat config.h.pre; \
 	  echo; \
-	  if $(CC) $(CFLAGS) -Werror -o test-ohash test-ohash.c >> config.log 2>&1; then \
-		echo '#define HAVE_OHASH'; \
-		rm test-ohash; \
-	  fi; \
 	  if $(CC) $(CFLAGS) -Werror -o test-fgetln test-fgetln.c >> config.log 2>&1; then \
 		echo '#define HAVE_FGETLN'; \
 		rm test-fgetln; \
@@ -384,9 +479,21 @@ config.h: config.h.pre config.h.post
 .h.h.html:
 	highlight -I $< >$@
 
+.1.1.txt .3.3.txt .7.7.txt .8.8.txt:
+	./mandoc -Tascii -Wall,stop $< | col -b >$@
+
 .1.1.html .3.3.html .7.7.html .8.8.html:
 	./mandoc -Thtml -Wall,stop -Ostyle=style.css,man=%N.%S.html,includes=%I.html $< >$@
 
+.1.1.ps .3.3.ps .7.7.ps .8.8.ps:
+	./mandoc -Tps -Wall,stop $< >$@
+
+.1.1.xhtml .3.3.xhtml .7.7.xhtml .8.8.xhtml:
+	./mandoc -Txhtml -Wall,stop -Ostyle=style.css,man=%N.%S.xhtml,includes=%I.html $< >$@
+
+.1.1.pdf .3.3.pdf .7.7.pdf .8.8.pdf:
+	./mandoc -Tpdf -Wall,stop $< >$@
+
 .sgml.html:
 	validate --warn $<
 	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< >$@