===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.395.2.4
retrieving revision 1.420
diff -u -p -r1.395.2.4 -r1.420
--- mandoc/Makefile	2013/09/29 23:28:48	1.395.2.4
+++ mandoc/Makefile	2014/06/20 02:55:49	1.420
@@ -1,16 +1,29 @@
-.PHONY: 	 clean install installwww
-.SUFFIXES:	 .sgml .html .md5 .h .h.html
-.SUFFIXES:	 .1       .3       .7       .8
-.SUFFIXES:	 .1.html  .3.html  .7.html  .8.html
+# $Id: Makefile,v 1.420 2014/06/20 02:55:49 schwarze Exp $
+#
+# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
+# Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+VERSION		 = 1.13.0
+
+# === USER SETTINGS ====================================================
+
 # Specify this if you want to hard-code the operating system to appear
 # in the lower-left hand corner of -mdoc manuals.
 #
-# CFLAGS	+= -DOSNAME="\"OpenBSD 5.4\""
+# CFLAGS	+= -DOSNAME="\"OpenBSD 5.5\""
 
-VERSION		 = 1.12.2beta1
-VDATE		 = 30 September 2013
-
 # IFF your system supports multi-byte functions (setlocale(), wcwidth(),
 # 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
@@ -20,9 +33,8 @@ VDATE		 = 30 September 2013
 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
+# makewhatis(8) will use manpath(1) to get the MANPATH variable.
 #CFLAGS		+= -DUSE_MANPATH
 
 # If your system does not support static binaries, comment this,
@@ -31,7 +43,7 @@ STATIC		 = -static
 # Linux requires -pthread to statically link with libdb.
 #STATIC		+= -pthread
 
-CFLAGS		+= -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+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
@@ -49,38 +61,57 @@ 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		 = makewhatis manpage apropos
 
-all: mandoc preconv demandoc $(DBBIN)
+# OpenBSD has the ohash functions in libutil.
+# Comment the following line if your system doesn't.
+DBLIB		+= -lutil
 
-SRCS		 = Makefile \
+# === END OF USER SETTINGS =============================================
+
+ALLBIN		 = mandoc preconv demandoc $(DBBIN)
+
+all: $(ALLBIN)
+
+TESTSRCS	 = test-fgetln.c \
+		   test-getsubopt.c \
+		   test-mmap.c \
+		   test-ohash.c \
+		   test-reallocarray.c \
+		   test-strlcat.c \
+		   test-strlcpy.c \
+		   test-strnlen.c \
+		   test-strptime.c
+
+SRCS		 = LICENSE \
+		   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_ohash.c \
+		   compat_ohash.h \
+		   compat_reallocarray.c \
+		   compat_strcasestr.c \
 		   compat_strlcat.c \
 		   compat_strlcpy.c \
+		   compat_strnlen.c \
+		   compat_strsep.c \
 		   config.h.post \
 		   config.h.pre \
+		   configure \
 		   demandoc.1 \
 		   demandoc.c \
 		   eqn.7 \
@@ -88,12 +119,9 @@ SRCS		 = Makefile \
 		   eqn_html.c \
 		   eqn_term.c \
 		   example.style.css \
-		   external.png \
 		   gmdiff \
 		   html.c \
 		   html.h \
-		   index.css \
-		   index.sgml \
 		   lib.c \
 		   lib.in \
 		   libman.h \
@@ -102,9 +130,9 @@ SRCS		 = Makefile \
 		   libroff.h \
 		   main.c \
 		   main.h \
+		   makewhatis.8 \
 		   man.7 \
 		   man.c \
-		   man.cgi.7 \
 		   man-cgi.css \
 		   man.h \
 		   man_hash.c \
@@ -115,13 +143,19 @@ SRCS		 = Makefile \
 		   mandoc.1 \
 		   mandoc.3 \
 		   mandoc.c \
+		   mandoc.db.5 \
 		   mandoc.h \
+		   mandoc_aux.c \
+		   mandoc_aux.h \
 		   mandoc_char.7 \
-		   mandocdb.8 \
 		   mandocdb.c \
-		   mandocdb.h \
+		   manpage.c \
 		   manpath.c \
 		   manpath.h \
+		   mansearch.3 \
+		   mansearch.c \
+		   mansearch.h \
+		   mansearch_const.c \
 		   mdoc.7 \
 		   mdoc.c \
 		   mdoc.h \
@@ -157,17 +191,10 @@ SRCS		 = Makefile \
 		   term.h \
 		   term_ascii.c \
 		   term_ps.c \
-		   test-betoh64.c \
-		   test-fgetln.c \
-		   test-getsubopt.c \
-		   test-mmap.c \
-		   test-strlcat.c \
-		   test-strlcpy.c \
-		   test-strptime.c \
 		   tree.c \
 		   vol.c \
 		   vol.in \
-		   whatis.1
+		   $(TESTSRCS)
 
 LIBMAN_OBJS	 = man.o \
 		   man_hash.o \
@@ -197,14 +224,22 @@ LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 		   $(LIBROFF_OBJS) \
 		   chars.o \
 		   mandoc.o \
+		   mandoc_aux.o \
 		   msec.o \
 		   read.o
 
 COMPAT_OBJS	 = compat_fgetln.o \
 		   compat_getsubopt.o \
+		   compat_ohash.o \
+		   compat_reallocarray.o \
+		   compat_strcasestr.o \
 		   compat_strlcat.o \
-		   compat_strlcpy.o
+		   compat_strlcpy.o \
+		   compat_strnlen.o \
+		   compat_strsep.o
 
+# === DEPENDENCY HANDLING ==============================================
+
 arch.o: arch.in
 att.o: att.in
 chars.o: chars.in
@@ -217,8 +252,8 @@ vol.o: vol.in
 $(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
+$(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 \
@@ -244,73 +279,63 @@ MANDOC_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   main.o \
 		   out.o \
 		   tree.o
-$(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h
+$(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 mdoc.h man.h config.h manpath.h
+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): 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 mandoc.h mandoc_aux.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
+MANPAGE_OBJS	 = manpage.o mansearch.o mansearch_const.o manpath.o
+$(MANPAGE_OBJS): config.h mandoc.h mandoc_aux.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
+$(DEMANDOC_OBJS): config.h mandoc.h man.h mdoc.h
 
-INDEX_MANS	 = apropos.1.html \
-		   catman.8.html \
+WWW_MANS	 = apropos.1.html \
 		   demandoc.1.html \
 		   mandoc.1.html \
-		   whatis.1.html \
+		   preconv.1.html \
 		   mandoc.3.html \
+		   mansearch.3.html \
 		   tbl.3.html \
+		   mandoc.db.5.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
-
-$(INDEX_MANS): mandoc
-
-INDEX_OBJS	 = $(INDEX_MANS) \
+		   makewhatis.8.html \
 		   man.h.html \
 		   mandoc.h.html \
-		   mdoc.h.html \
-		   mdocml.tar.gz \
-		   mdocml.md5
+		   mandoc_aux.h.html \
+		   manpath.h.html \
+		   mansearch.h.html \
+		   mdoc.h.html
 
-www: index.html
+WWW_OBJS	 = mdocml.tar.gz \
+		   mdocml.sha256
 
+www: $(WWW_OBJS) $(WWW_MANS)
+
+# === TARGETS CONTAINING SHELL COMMANDS ================================
+
 clean:
 	rm -f libmandoc.a $(LIBMANDOC_OBJS)
-	rm -f mandocdb $(MANDOCDB_OBJS)
+	rm -f apropos $(APROPOS_OBJS)
+	rm -f makewhatis $(MAKEWHATIS_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)
-	rm -f mdocml.tar.gz
-	rm -f index.html $(INDEX_OBJS)
+	rm -f $(WWW_MANS) $(WWW_OBJS)
 	rm -rf *.dSYM
 
 install: all
@@ -320,32 +345,33 @@ install: all
 	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) 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
-	$(INSTALL_MAN) mandoc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
-	$(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
+	$(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)
 
 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)
 
 installwww: www
-	mkdir -p $(PREFIX)/snapshots
-	mkdir -p $(PREFIX)/binaries
-	$(INSTALL_DATA) index.html external.png index.css $(PREFIX)
-	$(INSTALL_DATA) $(INDEX_MANS) style.css $(PREFIX)
-	$(INSTALL_DATA) mandoc.h.html man.h.html mdoc.h.html $(PREFIX)
-	$(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots
-	$(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots
-	$(INSTALL_DATA) mdocml.tar.gz $(PREFIX)/snapshots/mdocml-$(VERSION).tar.gz
-	$(INSTALL_DATA) mdocml.md5 $(PREFIX)/snapshots/mdocml-$(VERSION).md5
+	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)
@@ -353,80 +379,42 @@ 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)
 
-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
 
-mdocml.md5: mdocml.tar.gz
-	md5 mdocml.tar.gz >$@
+mdocml.sha256: mdocml.tar.gz
+	sha256 mdocml.tar.gz > $@
 
 mdocml.tar.gz: $(SRCS)
 	mkdir -p .dist/mdocml-$(VERSION)/
 	$(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION)
-	( cd .dist/ && tar zcf ../$@ ./ )
+	chmod 755 .dist/mdocml-$(VERSION)/configure
+	( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
 	rm -rf .dist/
 
-index.html: $(INDEX_OBJS)
-
-config.h: config.h.pre config.h.post
+config.h: configure config.h.pre config.h.post $(TESTSRCS)
 	rm -f config.log
-	( cat config.h.pre; \
-	  echo; \
-	  if $(CC) $(CFLAGS) -Werror -o test-fgetln test-fgetln.c >> config.log 2>&1; then \
-		echo '#define HAVE_FGETLN'; \
-		rm test-fgetln; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -o test-strptime test-strptime.c >> config.log 2>&1; then \
-		echo '#define HAVE_STRPTIME'; \
-		rm test-strptime; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -o test-getsubopt test-getsubopt.c >> config.log 2>&1; then \
-		echo '#define HAVE_GETSUBOPT'; \
-		rm test-getsubopt; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -o test-strlcat test-strlcat.c >> config.log 2>&1; then \
-		echo '#define HAVE_STRLCAT'; \
-		rm test-strlcat; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -o test-mmap test-mmap.c >> config.log 2>&1; then \
-		echo '#define HAVE_MMAP'; \
-		rm test-mmap; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \
-		echo '#define HAVE_STRLCPY'; \
-		rm test-strlcpy; \
-	  fi; \
-	  if $(CC) $(CFLAGS) -Werror -o test-betoh64 test-betoh64.c >> config.log 2>&1; then \
-		echo '#define HAVE_BETOH64'; \
-		rm test-betoh64; \
-	  fi; \
-	  echo; \
-	  cat config.h.post \
-	) > $@
+	CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
 
+.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 $< >$@
+	highlight -I $< > $@
 
-.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 $< >$@
-
-.sgml.html:
-	validate --warn $<
-	sed -e "s!@VERSION@!$(VERSION)!" -e "s!@VDATE@!$(VDATE)!" $< >$@
+.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 $< > $@