===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.395.2.29
retrieving revision 1.427
diff -u -p -r1.395.2.29 -r1.427
--- mandoc/Makefile	2014/08/14 20:43:22	1.395.2.29
+++ mandoc/Makefile	2014/08/05 01:45:02	1.427
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.395.2.29 2014/08/14 20:43:22 schwarze Exp $
+# $Id: Makefile,v 1.427 2014/08/05 01:45:02 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,7 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-VERSION		 = 1.12.4
+VERSION		 = 1.13.0
 
 # === USER SETTINGS ====================================================
 
@@ -30,12 +30,12 @@ VERSION		 = 1.12.4
 # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
 # UCS-4 value) should you define USE_WCHAR.  If you define it and your
 # system DOESN'T support this, -Tlocale will produce garbage.
-# If you don't define it, -Tlocale is a synonym for -Tascii.
+# If you don't define it, -Tlocale is a synonym for -Tacsii.
 #
 CFLAGS	 	+= -DUSE_WCHAR
 
-CFLAGS		+= -g -W -Wall -Wstrict-prototypes
-CFLAGS     	+= -Wno-unused-parameter -Wwrite-strings
+CFLAGS		+= -g -DHAVE_CONFIG_H
+CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX		 = /usr/local
 BINDIR		 = $(PREFIX)/bin
 INCLUDEDIR	 = $(PREFIX)/include/mandoc
@@ -53,37 +53,58 @@ INSTALL_MAN	 = $(INSTALL_DATA)
 # --- user settings related to database support ------------------------
 
 # If you want to build without database support, for example to avoid
-# the dependency on Berkeley DB, comment the following line.
-# However, you won't get apropos(1) and makewhatis(8) in that case.
+# the dependency on SQLite3, comment the following line.
 #
-BUILD_TARGETS	+= db-build
+DBBIN		 = makewhatis manpage apropos
 
-# The remaining settings in this section
-# are only relevant if db-build is enabled.
-# Otherwise, they have no effect either way.
-
-# Non-BSD systems (Linux, etc.) need -ldb to compile mandocdb and
-# apropos.
-#
-#DBLIB		 = -ldb
-
 # If your system has manpath(1), uncomment this.  This is most any
 # system that's not OpenBSD or NetBSD.  If uncommented, apropos(1)
-# and mandocdb(8) will use manpath(1) to get the MANPATH variable.
+# and makewhatis(8) will use manpath(1) to get the MANPATH variable.
 #
 #CFLAGS		+= -DUSE_MANPATH
 
+# On some systems, SQLite3 may be installed below /usr/local.
+# In that case, uncomment the following two lines.
+#
+#CFLAGS		+= -I/usr/local/include
+#DBLIB		+= -L/usr/local/lib
+
+# OpenBSD has the ohash functions in libutil.
+# Comment the following line if your system doesn't.
+#
+DBLIB		+= -lutil
+
+# --- user settings related to man.cgi ---------------------------------
+
+# To build man.cgi, copy cgi.h.example to cgi.h, edit it,
+# and enable the following line.
+#
+#DBBIN		+= man.cgi
+
+# If your system does not support static binaries, comment this,
+# for example on Mac OS X.
+#
+STATIC		 = -static
+
+# Linux requires -pthread for statical linking.
+#
+#STATIC		+= -pthread
+
+WWWPREFIX	 = /var/www
+HTDOCDIR	 = $(WWWPREFIX)/htdocs
+CGIBINDIR	 = $(WWWPREFIX)/cgi-bin
+
 # === END OF USER SETTINGS =============================================
 
-INSTALL_TARGETS	 = $(BUILD_TARGETS:-build=-install)
+ALLBIN		 = mandoc preconv demandoc $(DBBIN)
+DBLIB		+= -lsqlite3
 
-BASEBIN		 = mandoc preconv demandoc
-DBBIN		 = apropos mandocdb
+all: $(ALLBIN)
 
-TESTSRCS	 = test-betoh64.c \
-		   test-fgetln.c \
+TESTSRCS	 = test-fgetln.c \
 		   test-getsubopt.c \
 		   test-mmap.c \
+		   test-ohash.c \
 		   test-reallocarray.c \
 		   test-strcasestr.c \
 		   test-strlcat.c \
@@ -91,36 +112,81 @@ TESTSRCS	 = test-betoh64.c \
 		   test-strptime.c \
 		   test-strsep.c
 
-SRCS		 = apropos.c \
-		   apropos_db.c \
+SRCS		 = LICENSE \
+		   Makefile \
+		   NEWS \
+		   TODO \
+		   apropos.1 \
+		   apropos.c \
 		   arch.c \
+		   arch.in \
 		   att.c \
+		   att.in \
+		   cgi.c \
+		   cgi.h.example \
 		   chars.c \
+		   chars.in \
 		   compat_fgetln.c \
 		   compat_getsubopt.c \
+		   compat_ohash.c \
+		   compat_ohash.h \
 		   compat_reallocarray.c \
 		   compat_strcasestr.c \
 		   compat_strlcat.c \
 		   compat_strlcpy.c \
 		   compat_strsep.c \
+		   config.h.post \
+		   config.h.pre \
+		   configure \
+		   demandoc.1 \
 		   demandoc.c \
+		   eqn.7 \
 		   eqn.c \
 		   eqn_html.c \
 		   eqn_term.c \
+		   example.style.css \
+		   gmdiff \
 		   html.c \
+		   html.h \
 		   lib.c \
+		   lib.in \
+		   libman.h \
+		   libmandoc.h \
+		   libmdoc.h \
+		   libroff.h \
 		   main.c \
+		   main.h \
+		   makewhatis.8 \
+		   man.7 \
 		   man.c \
+		   man.cgi.8 \
+		   man-cgi.css \
+		   man.h \
 		   man_hash.c \
 		   man_html.c \
 		   man_macro.c \
 		   man_term.c \
 		   man_validate.c \
+		   mandoc.1 \
+		   mandoc.3 \
 		   mandoc.c \
+		   mandoc.db.5 \
+		   mandoc.h \
 		   mandoc_aux.c \
+		   mandoc_aux.h \
+		   mandoc_char.7 \
+		   mandoc_html.3 \
 		   mandocdb.c \
+		   manpage.c \
 		   manpath.c \
+		   manpath.h \
+		   mansearch.3 \
+		   mansearch.c \
+		   mansearch.h \
+		   mansearch_const.c \
+		   mdoc.7 \
 		   mdoc.c \
+		   mdoc.h \
 		   mdoc_argv.c \
 		   mdoc_hash.c \
 		   mdoc_html.c \
@@ -129,11 +195,20 @@ SRCS		 = apropos.c \
 		   mdoc_term.c \
 		   mdoc_validate.c \
 		   msec.c \
+		   msec.in \
 		   out.c \
+		   out.h \
+		   preconv.1 \
 		   preconv.c \
+		   predefs.in \
 		   read.c \
+		   roff.7 \
 		   roff.c \
 		   st.c \
+		   st.in \
+		   style.css \
+		   tbl.3 \
+		   tbl.7 \
 		   tbl.c \
 		   tbl_data.c \
 		   tbl_html.c \
@@ -141,67 +216,14 @@ SRCS		 = apropos.c \
 		   tbl_opts.c \
 		   tbl_term.c \
 		   term.c \
+		   term.h \
 		   term_ascii.c \
 		   term_ps.c \
 		   tree.c \
 		   vol.c \
+		   vol.in \
 		   $(TESTSRCS)
 
-DISTFILES	 = INSTALL \
-		   LICENSE \
-		   Makefile \
-		   Makefile.depend \
-		   NEWS \
-		   TODO \
-		   apropos.1 \
-		   apropos_db.h \
-		   arch.in \
-		   att.in \
-		   chars.in \
-		   config.h.post \
-		   config.h.pre \
-		   configure \
-		   demandoc.1 \
-		   eqn.7 \
-		   example.style.css \
-		   gmdiff \
-		   html.h \
-		   lib.in \
-		   libman.h \
-		   libmandoc.h \
-		   libmdoc.h \
-		   libroff.h \
-		   main.h \
-		   man.7 \
-		   man.h \
-		   mandoc.1 \
-		   mandoc.3 \
-		   mandoc.h \
-		   mandoc_aux.h \
-		   mandoc_char.7 \
-		   mandoc_escape.3 \
-		   mandoc_html.3 \
-		   mandoc_malloc.3 \
-		   mandocdb.8 \
-		   mandocdb.h \
-		   manpath.h \
-		   mchars_alloc.3 \
-		   mdoc.7 \
-		   mdoc.h \
-		   msec.in \
-		   out.h \
-		   preconv.1 \
-		   predefs.in \
-		   roff.7 \
-		   st.in \
-		   style.css \
-		   tbl.3 \
-		   tbl.7 \
-		   term.h \
-		   vol.in \
-		   whatis.1 \
-		   $(SRCS)
-
 LIBMAN_OBJS	 = man.o \
 		   man_hash.o \
 		   man_macro.o \
@@ -236,17 +258,37 @@ LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 
 COMPAT_OBJS	 = compat_fgetln.o \
 		   compat_getsubopt.o \
+		   compat_ohash.o \
 		   compat_reallocarray.o \
 		   compat_strcasestr.o \
 		   compat_strlcat.o \
 		   compat_strlcpy.o \
 		   compat_strsep.o
 
+# === DEPENDENCY HANDLING ==============================================
+
+arch.o: arch.in
+att.o: att.in
+chars.o: chars.in
+lib.o: lib.in
+msec.o: msec.in
+roff.o: predefs.in
+st.o: st.in
+vol.o: vol.in
+cgi.o: cgi.h
+
+$(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_ohash.h
+
 MANDOC_HTML_OBJS = eqn_html.o \
 		   html.o \
 		   man_html.o \
 		   mdoc_html.o \
 		   tbl_html.o
+$(MANDOC_HTML_OBJS): html.h
 
 MANDOC_MAN_OBJS  = mdoc_man.o
 
@@ -257,6 +299,7 @@ MANDOC_TERM_OBJS = eqn_term.o \
 		   term_ascii.o \
 		   term_ps.o \
 		   tbl_term.o
+$(MANDOC_TERM_OBJS): term.h
 
 MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   $(MANDOC_MAN_OBJS) \
@@ -264,78 +307,114 @@ MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   main.o \
 		   out.o \
 		   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
+MAKEWHATIS_OBJS	 = mandocdb.o mansearch_const.o manpath.o
+$(MAKEWHATIS_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	 = apropos.o mansearch.o mansearch_const.o manpath.o
+$(APROPOS_OBJS): config.h mandoc.h mandoc_aux.h manpath.h mansearch.h
 
+CGI_OBJS	 = $(MANDOC_HTML_OBJS) \
+		   cgi.o \
+		   mansearch.o \
+		   mansearch_const.o \
+		   out.o
+$(CGI_OBJS): main.h out.h config.h mandoc.h mandoc_aux.h \
+	     manpath.h mansearch.h
+
+MANPAGE_OBJS	 = manpage.o mansearch.o mansearch_const.o manpath.o
+$(MANPAGE_OBJS): config.h mandoc.h mandoc_aux.h manpath.h mansearch.h
+
 DEMANDOC_OBJS	 = demandoc.o
+$(DEMANDOC_OBJS): config.h mandoc.h man.h mdoc.h
 
+WWW_MANS	 = apropos.1.html \
+		   demandoc.1.html \
+		   mandoc.1.html \
+		   preconv.1.html \
+		   mandoc.3.html \
+		   mandoc_html.3.html \
+		   mansearch.3.html \
+		   tbl.3.html \
+		   mandoc.db.5.html \
+		   eqn.7.html \
+		   man.7.html \
+		   mandoc_char.7.html \
+		   mdoc.7.html \
+		   roff.7.html \
+		   tbl.7.html \
+		   makewhatis.8.html \
+		   man.cgi.8.html \
+		   man.h.html \
+		   mandoc.h.html \
+		   mandoc_aux.h.html \
+		   manpath.h.html \
+		   mansearch.h.html \
+		   mdoc.h.html
+
 WWW_OBJS	 = mdocml.tar.gz \
 		   mdocml.sha256
 
-# === DEPENDENCY HANDLING ==============================================
+www: $(WWW_OBJS) $(WWW_MANS)
 
-all: base-build $(BUILD_TARGETS)
-
-base-build: $(BASEBIN)
-
-db-build: $(DBBIN)
-
-install: base-install $(INSTALL_TARGETS)
-
-www: $(WWW_OBJS)
-
-include Makefile.depend
-
 # === TARGETS CONTAINING SHELL COMMANDS ================================
 
 clean:
 	rm -f libmandoc.a $(LIBMANDOC_OBJS)
 	rm -f apropos $(APROPOS_OBJS)
-	rm -f mandocdb $(MANDOCDB_OBJS)
+	rm -f makewhatis $(MAKEWHATIS_OBJS)
 	rm -f preconv $(PRECONV_OBJS)
+	rm -f man.cgi $(CGI_OBJS)
+	rm -f manpage $(MANPAGE_OBJS)
 	rm -f demandoc $(DEMANDOC_OBJS)
 	rm -f mandoc $(MANDOC_OBJS)
 	rm -f config.h config.log $(COMPAT_OBJS)
-	rm -f $(WWW_OBJS)
+	rm -f $(WWW_MANS) $(WWW_OBJS)
 	rm -rf *.dSYM
 
-base-install: base-build
+install: all
 	mkdir -p $(DESTDIR)$(BINDIR)
 	mkdir -p $(DESTDIR)$(EXAMPLEDIR)
 	mkdir -p $(DESTDIR)$(LIBDIR)
 	mkdir -p $(DESTDIR)$(INCLUDEDIR)
 	mkdir -p $(DESTDIR)$(MANDIR)/man1
 	mkdir -p $(DESTDIR)$(MANDIR)/man3
+	mkdir -p $(DESTDIR)$(MANDIR)/man5
 	mkdir -p $(DESTDIR)$(MANDIR)/man7
-	$(INSTALL_PROGRAM) $(BASEBIN) $(DESTDIR)$(BINDIR)
+	$(INSTALL_PROGRAM) $(ALLBIN) $(DESTDIR)$(BINDIR)
 	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
-	$(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \
-		$(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
 	$(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
-	$(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
-		mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
+	$(INSTALL_MAN) mandoc.3 mansearch.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
+	$(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
 	$(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 \
 		$(DESTDIR)$(MANDIR)/man7
 	$(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
 
-db-install: db-build
-	mkdir -p $(DESTDIR)$(BINDIR)
-	mkdir -p $(DESTDIR)$(MANDIR)/man1
-	mkdir -p $(DESTDIR)$(MANDIR)/man8
-	$(INSTALL_PROGRAM) $(DBBIN) $(DESTDIR)$(BINDIR)
-	ln -f $(DESTDIR)$(BINDIR)/apropos $(DESTDIR)$(BINDIR)/whatis
-	$(INSTALL_MAN) apropos.1 whatis.1 $(DESTDIR)$(MANDIR)/man1
-	$(INSTALL_MAN) mandocdb.8 $(DESTDIR)$(MANDIR)/man8
+installcgi: all
+	mkdir -p $(DESTDIR)$(CGIBINDIR)
+	mkdir -p $(DESTDIR)$(HTDOCDIR)
+	mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1
+	mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8
+	$(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
+	$(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
+	$(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
+	$(INSTALL_MAN) apropos.1 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1/
+	$(INSTALL_MAN) man.cgi.8 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8/
 
-depend: config.h
-	mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
-	perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \
-		s|\\\n||g; s|  +| |g; print;' Makefile.depend > Makefile.tmp
-	mv Makefile.tmp Makefile.depend
+installwww: www
+	mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots
+	$(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR)
+	$(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots
+	$(INSTALL_DATA) mdocml.tar.gz \
+		$(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
+	$(INSTALL_DATA) mdocml.sha256 \
+		$(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256
 
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 	$(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
@@ -343,24 +422,30 @@ libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 mandoc: $(MANDOC_OBJS) libmandoc.a
 	$(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a
 
-mandocdb: $(MANDOCDB_OBJS) libmandoc.a
-	$(CC) $(LDFLAGS) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB)
+makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a
+	$(CC) $(LDFLAGS) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a $(DBLIB)
 
 preconv: $(PRECONV_OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
 
+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)
 
+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
 
 mdocml.sha256: mdocml.tar.gz
 	sha256 mdocml.tar.gz > $@
 
-mdocml.tar.gz: $(DISTFILES)
+mdocml.tar.gz: $(SRCS)
 	mkdir -p .dist/mdocml-$(VERSION)/
-	$(INSTALL_SOURCE) $(DISTFILES) .dist/mdocml-$(VERSION)
+	$(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION)
 	chmod 755 .dist/mdocml-$(VERSION)/configure
 	( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
 	rm -rf .dist/
@@ -369,5 +454,13 @@ config.h: configure config.h.pre config.h.post $(TESTS
 	rm -f config.log
 	CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
 
-.PHONY: 	 base-install db-install install
-.PHONY: 	 clean depend
+.PHONY: 	 clean install installcgi installwww
+.SUFFIXES:	 .1       .3       .5       .7       .8       .h
+.SUFFIXES:	 .1.html  .3.html  .5.html  .7.html  .8.html  .h.html
+
+.h.h.html:
+	highlight -I $< > $@
+
+.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
+	./mandoc -Thtml -Wall,stop \
+		-Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@