===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.395.2.17
retrieving revision 1.414
diff -u -p -r1.395.2.17 -r1.414
--- mandoc/Makefile	2014/04/23 21:31:38	1.395.2.17
+++ mandoc/Makefile	2014/03/23 11:25:25	1.414
@@ -3,7 +3,7 @@
 .SUFFIXES:	 .1       .3       .7       .8
 .SUFFIXES:	 .1.html  .3.html  .7.html  .8.html
 
-VERSION		 = 1.12.3
+VERSION		 = 1.13.0
 
 # === USER SETTINGS ====================================================
 
@@ -21,9 +21,8 @@ VERSION		 = 1.12.3
 CFLAGS	 	+= -DUSE_WCHAR
 
 # If your system has manpath(1), uncomment this.  This is most any
-# 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.
+# system that's not OpenBSD or NetBSD.  If uncommented, manpage(1) and
+# mandocdb(8) will use manpath(1) to get the MANPATH variable.
 #CFLAGS		+= -DUSE_MANPATH
 
 # If your system does not support static binaries, comment this,
@@ -32,7 +31,7 @@ STATIC		 = -static
 # Linux requires -pthread to statically link with libdb.
 #STATIC		+= -pthread
 
-CFLAGS		+= -g -DHAVE_CONFIG_H
+CFLAGS		+= -I/usr/local/include -g -DHAVE_CONFIG_H
 CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX		 = /usr/local
 WWWPREFIX	 = /var/www
@@ -50,47 +49,42 @@ INSTALL_LIB	 = $(INSTALL) -m 0644
 INSTALL_SOURCE	 = $(INSTALL) -m 0644
 INSTALL_MAN	 = $(INSTALL_DATA)
 
-# 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
+# If you want to build without database support, for example to avoid
+# the dependency on SQLite3, comment the following two lines.
+DBLIB		 = -L/usr/local/lib -lsqlite3
+DBBIN		 = mandocdb manpage apropos
 
-all: mandoc preconv demandoc $(DBBIN)
+# === END OF USER SETTINGS =============================================
 
-TESTSRCS	 = test-betoh64.c \
-		   test-fgetln.c \
+ALLBIN		 = mandoc preconv demandoc $(DBBIN)
+
+all: $(ALLBIN)
+
+TESTSRCS	 = test-fgetln.c \
 		   test-getsubopt.c \
 		   test-mmap.c \
-		   test-reallocarray.c \
+		   test-ohash.c \
 		   test-strlcat.c \
 		   test-strlcpy.c \
 		   test-strnlen.c \
 		   test-strptime.c
 
-SRCS		 = LICENSE \
-		   Makefile \
+SRCS		 = Makefile \
 		   NEWS \
 		   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 \
 		   compat_fgetln.c \
 		   compat_getsubopt.c \
-		   compat_reallocarray.c \
+		   compat_ohash.c \
+		   compat_ohash.h \
 		   compat_strcasestr.c \
 		   compat_strlcat.c \
 		   compat_strlcpy.c \
@@ -119,7 +113,6 @@ SRCS		 = LICENSE \
 		   main.h \
 		   man.7 \
 		   man.c \
-		   man.cgi.7 \
 		   man-cgi.css \
 		   man.h \
 		   man_hash.c \
@@ -136,9 +129,12 @@ SRCS		 = LICENSE \
 		   mandoc_char.7 \
 		   mandocdb.8 \
 		   mandocdb.c \
-		   mandocdb.h \
+		   manpage.c \
 		   manpath.c \
 		   manpath.h \
+		   mansearch.c \
+		   mansearch.h \
+		   mansearch_const.c \
 		   mdoc.7 \
 		   mdoc.c \
 		   mdoc.h \
@@ -177,7 +173,6 @@ SRCS		 = LICENSE \
 		   tree.c \
 		   vol.c \
 		   vol.in \
-		   whatis.1 \
 		   $(TESTSRCS)
 
 LIBMAN_OBJS	 = man.o \
@@ -214,7 +209,7 @@ LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 
 COMPAT_OBJS	 = compat_fgetln.o \
 		   compat_getsubopt.o \
-		   compat_reallocarray.o \
+		   compat_ohash.o \
 		   compat_strcasestr.o \
 		   compat_strlcat.o \
 		   compat_strlcpy.o \
@@ -234,7 +229,7 @@ $(LIBMAN_OBJS): libman.h
 $(LIBMDOC_OBJS): libmdoc.h
 $(LIBROFF_OBJS): libroff.h
 $(LIBMANDOC_OBJS): mandoc.h mandoc_aux.h mdoc.h man.h libmandoc.h config.h
-$(COMPAT_OBJS): config.h
+$(COMPAT_OBJS): config.h compat_ohash.h
 
 MANDOC_HTML_OBJS = eqn_html.o \
 		   html.o \
@@ -262,46 +257,32 @@ MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   tree.o
 $(MANDOC_OBJS): main.h mandoc.h mandoc_aux.h mdoc.h man.h config.h out.h
 
-MANDOCDB_OBJS	 = mandocdb.o manpath.o
-$(MANDOCDB_OBJS): mandocdb.h mandoc.h mandoc_aux.h \
+MANDOCDB_OBJS	 = mandocdb.o mansearch_const.o manpath.o
+$(MANDOCDB_OBJS): mansearch.h mandoc.h mandoc_aux.h \
 		  mdoc.h man.h config.h manpath.h
 
 PRECONV_OBJS	 = preconv.o
 $(PRECONV_OBJS): config.h
 
-APROPOS_OBJS	 = apropos.o apropos_db.o manpath.o
-$(APROPOS_OBJS): config.h mandoc.h apropos_db.h manpath.h mandocdb.h
+APROPOS_OBJS	 = apropos.o mansearch.o mansearch_const.o manpath.o
+$(APROPOS_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 mandoc_aux.h \
-	     apropos_db.h manpath.h mandocdb.h
+MANPAGE_OBJS	 = manpage.o mansearch.o mansearch_const.o manpath.o
+$(MANPAGE_OBJS): config.h manpath.h mansearch.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
 
 WWW_MANS	 = apropos.1.html \
-		   catman.8.html \
 		   demandoc.1.html \
 		   mandoc.1.html \
-		   whatis.1.html \
+		   preconv.1.html \
 		   mandoc.3.html \
 		   tbl.3.html \
 		   eqn.7.html \
 		   man.7.html \
-		   man.cgi.7.html \
 		   mandoc_char.7.html \
 		   mdoc.7.html \
-		   preconv.1.html \
 		   roff.7.html \
 		   tbl.7.html \
 		   mandocdb.8.html \
@@ -316,11 +297,10 @@ WWW_OBJS	 = mdocml.tar.gz \
 
 clean:
 	rm -f libmandoc.a $(LIBMANDOC_OBJS)
+	rm -f apropos $(APROPOS_OBJS)
 	rm -f mandocdb $(MANDOCDB_OBJS)
 	rm -f preconv $(PRECONV_OBJS)
-	rm -f apropos whatis $(APROPOS_OBJS)
-	rm -f man.cgi $(CGI_OBJS)
-	rm -f catman $(CATMAN_OBJS)
+	rm -f manpage $(MANPAGE_OBJS)
 	rm -f demandoc $(DEMANDOC_OBJS)
 	rm -f mandoc $(MANDOC_OBJS)
 	rm -f config.h config.log $(COMPAT_OBJS)
@@ -335,7 +315,7 @@ install: all
 	mkdir -p $(DESTDIR)$(MANDIR)/man1
 	mkdir -p $(DESTDIR)$(MANDIR)/man3
 	mkdir -p $(DESTDIR)$(MANDIR)/man7
-	$(INSTALL_PROGRAM) mandoc preconv demandoc $(DESTDIR)$(BINDIR)
+	$(INSTALL_PROGRAM) $(ALLBIN) $(DESTDIR)$(BINDIR)
 	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
 	$(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
 	$(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
@@ -346,7 +326,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)
 
@@ -371,17 +351,11 @@ mandocdb: $(MANDOCDB_OBJS) libmandoc.a
 preconv: $(PRECONV_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
 
-whatis: apropos
-	cp -f apropos whatis
+manpage: $(MANPAGE_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB)
 
 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