===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.395.2.22
retrieving revision 1.397
diff -u -p -r1.395.2.22 -r1.397
--- mandoc/Makefile	2014/08/05 01:46:07	1.395.2.22
+++ mandoc/Makefile	2012/06/09 11:00:13	1.397
@@ -1,31 +1,20 @@
-# $Id: Makefile,v 1.395.2.22 2014/08/05 01:46:07 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.
+.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
 
-VERSION		 = 1.12.4
-
-# === USER SETTINGS ====================================================
-
-# --- user settings relevant for all builds ----------------------------
-
 # 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.5\""
+# CFLAGS	+= -DOSNAME="\"OpenBSD 4.5\""
 
+VERSION		 = 1.12.1
+VDATE		 = 23 March 2012
+
 # 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
@@ -34,84 +23,54 @@ VERSION		 = 1.12.4
 #
 CFLAGS	 	+= -DUSE_WCHAR
 
-CFLAGS		+= -g -DHAVE_CONFIG_H
+# 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.
+#CFLAGS		+= -DUSE_MANPATH
+
+# If your system supports static binaries only, uncomment this.  This
+# appears only to be BSD UNIX systems (Mac OS X has no support and Linux
+# requires -pthreads for static libdb).
+STATIC		 = -static
+
+CFLAGS		+= -I/usr/local/include -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
 CFLAGS     	+= -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX		 = /usr/local
+WWWPREFIX	 = /var/www
+HTDOCDIR	 = $(WWWPREFIX)/htdocs
+CGIBINDIR	 = $(WWWPREFIX)/cgi-bin
 BINDIR		 = $(PREFIX)/bin
 INCLUDEDIR	 = $(PREFIX)/include/mandoc
 LIBDIR		 = $(PREFIX)/lib/mandoc
 MANDIR		 = $(PREFIX)/man
 EXAMPLEDIR	 = $(PREFIX)/share/examples/mandoc
-
 INSTALL		 = install
-INSTALL_PROGRAM	 = $(INSTALL) -m 0555
+INSTALL_PROGRAM	 = $(INSTALL) -m 0755
 INSTALL_DATA	 = $(INSTALL) -m 0444
-INSTALL_LIB	 = $(INSTALL) -m 0444
+INSTALL_LIB	 = $(INSTALL) -m 0644
 INSTALL_SOURCE	 = $(INSTALL) -m 0644
 INSTALL_MAN	 = $(INSTALL_DATA)
 
-# --- user settings related to database support ------------------------
+DBLIB		 = -L/usr/local/lib -lsqlite3
+DBBIN		 = mandocdb manpage apropos
 
-# If you want to build without database support, for example to avoid
-# the dependency on Berkeley DB, comment the following line.
-#
-DBBIN		 = apropos mandocdb whatis
+all: mandoc preconv demandoc $(DBBIN)
 
-# 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.
-#
-#CFLAGS		+= -DUSE_MANPATH
-
-WWWPREFIX	 = /var/www
-HTDOCDIR	 = $(WWWPREFIX)/htdocs
-
-# === END OF USER SETTINGS =============================================
-
-ALLBIN		 = mandoc preconv demandoc $(DBBIN)
-
-all: $(ALLBIN)
-
-TESTSRCS	 = test-betoh64.c \
-		   test-fgetln.c \
-		   test-getsubopt.c \
-		   test-mmap.c \
-		   test-reallocarray.c \
-		   test-strcasestr.c \
-		   test-strlcat.c \
-		   test-strlcpy.c \
-		   test-strptime.c \
-		   test-strsep.c
-
-SRCS		 = LICENSE \
-		   Makefile \
-		   NEWS \
+SRCS		 = Makefile \
 		   TODO \
-		   apropos.1 \
-		   apropos.c \
-		   apropos_db.c \
-		   apropos_db.h \
 		   arch.c \
 		   arch.in \
 		   att.c \
 		   att.in \
+		   cgi.c \
 		   chars.c \
 		   chars.in \
 		   compat_fgetln.c \
 		   compat_getsubopt.c \
-		   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 \
@@ -119,9 +78,11 @@ SRCS		 = LICENSE \
 		   eqn_html.c \
 		   eqn_term.c \
 		   example.style.css \
-		   gmdiff \
+		   external.png \
 		   html.c \
 		   html.h \
+		   index.css \
+		   index.sgml \
 		   lib.c \
 		   lib.in \
 		   libman.h \
@@ -132,6 +93,7 @@ SRCS		 = LICENSE \
 		   main.h \
 		   man.7 \
 		   man.c \
+		   man-cgi.css \
 		   man.h \
 		   man_hash.c \
 		   man_html.c \
@@ -142,10 +104,7 @@ SRCS		 = LICENSE \
 		   mandoc.3 \
 		   mandoc.c \
 		   mandoc.h \
-		   mandoc_aux.c \
-		   mandoc_aux.h \
 		   mandoc_char.7 \
-		   mandoc_html.3 \
 		   mandocdb.8 \
 		   mandocdb.c \
 		   mandocdb.h \
@@ -174,7 +133,6 @@ SRCS		 = LICENSE \
 		   st.c \
 		   st.in \
 		   style.css \
-		   tbl.3 \
 		   tbl.7 \
 		   tbl.c \
 		   tbl_data.c \
@@ -186,11 +144,16 @@ SRCS		 = LICENSE \
 		   term.h \
 		   term_ascii.c \
 		   term_ps.c \
+		   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 \
-		   whatis.1 \
-		   $(TESTSRCS)
+		   vol.in
 
 LIBMAN_OBJS	 = man.o \
 		   man_hash.o \
@@ -220,20 +183,15 @@ 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_reallocarray.o \
-		   compat_strcasestr.o \
+		   compat_ohash.o \
 		   compat_strlcat.o \
-		   compat_strlcpy.o \
-		   compat_strsep.o
+		   compat_strlcpy.o
 
-# === DEPENDENCY HANDLING ==============================================
-
 arch.o: arch.in
 att.o: att.in
 chars.o: chars.in
@@ -246,8 +204,8 @@ vol.o: vol.in
 $(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
+$(LIBMANDOC_OBJS): mandoc.h mdoc.h man.h libmandoc.h config.h
+$(COMPAT_OBJS): config.h compat_ohash.h
 
 MANDOC_HTML_OBJS = eqn_html.o \
 		   html.o \
@@ -273,59 +231,101 @@ 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
+$(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h
 
 MANDOCDB_OBJS	 = mandocdb.o manpath.o
-$(MANDOCDB_OBJS): mandocdb.h mandoc.h mandoc_aux.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 apropos_db.o manpath.o
-$(APROPOS_OBJS): config.h mandoc.h mandoc_aux.h manpath.h \
-		 apropos_db.h mandocdb.h
+APROPOS_OBJS	 = apropos.o mansearch.o manpath.o
+$(APROPOS_OBJS): config.h manpath.h mandocdb.h mansearch.h
 
+MANPAGE_OBJS	 = manpage.o mansearch.o manpath.o
+$(MANPAGE_OBJS): config.h manpath.h mandocdb.h mansearch.h
+
 DEMANDOC_OBJS	 = demandoc.o
-$(DEMANDOC_OBJS): config.h mandoc.h man.h mdoc.h
+$(DEMANDOC_OBJS): config.h
 
-WWW_MANS	 = apropos.1.html \
-		   demandoc.1.html \
+INDEX_MANS	 = demandoc.1.html \
+		   demandoc.1.xhtml \
+		   demandoc.1.ps \
+		   demandoc.1.pdf \
+		   demandoc.1.txt \
 		   mandoc.1.html \
-		   preconv.1.html \
-		   whatis.1.html \
+		   mandoc.1.xhtml \
+		   mandoc.1.ps \
+		   mandoc.1.pdf \
+		   mandoc.1.txt \
 		   mandoc.3.html \
-		   mandoc_html.3.html \
-		   tbl.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 \
 		   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 \
+		   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
+
+INDEX_OBJS	 = $(INDEX_MANS) \
 		   man.h.html \
 		   mandoc.h.html \
-		   mandoc_aux.h.html \
-		   manpath.h.html \
-		   mdoc.h.html
+		   mdoc.h.html \
+		   mdocml.tar.gz \
+		   mdocml.md5
 
-WWW_OBJS	 = mdocml.tar.gz \
-		   mdocml.sha256
+www: index.html
 
-www: $(WWW_OBJS) $(WWW_MANS)
-
-# === TARGETS CONTAINING SHELL COMMANDS ================================
-
 clean:
 	rm -f libmandoc.a $(LIBMANDOC_OBJS)
-	rm -f apropos whatis $(APROPOS_OBJS)
+	rm -f apropos $(APROPOS_OBJS)
 	rm -f mandocdb $(MANDOCDB_OBJS)
 	rm -f preconv $(PRECONV_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_MANS) $(WWW_OBJS)
+	rm -f mdocml.tar.gz
+	rm -f index.html $(INDEX_OBJS)
 	rm -rf *.dSYM
 
 install: all
@@ -340,19 +340,27 @@ install: all
 	$(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 $(DESTDIR)$(MANDIR)/man3
+	$(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_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
+	$(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
+
 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
+	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
 
 libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
 	$(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
@@ -366,8 +374,8 @@ 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)
@@ -375,27 +383,71 @@ apropos: $(APROPOS_OBJS) libmandoc.a
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
 	$(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
 
-mdocml.sha256: mdocml.tar.gz
-	sha256 mdocml.tar.gz > $@
+mdocml.md5: mdocml.tar.gz
+	md5 mdocml.tar.gz >$@
 
 mdocml.tar.gz: $(SRCS)
 	mkdir -p .dist/mdocml-$(VERSION)/
 	$(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION)
-	chmod 755 .dist/mdocml-$(VERSION)/configure
-	( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
+	( cd .dist/ && tar zcf ../$@ ./ )
 	rm -rf .dist/
 
-config.h: configure config.h.pre config.h.post $(TESTSRCS)
+index.html: $(INDEX_OBJS)
+
+config.h: config.h.pre config.h.post
 	rm -f config.log
-	CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
+	( 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; \
+	  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; \
+	  echo; \
+	  cat config.h.post \
+	) > $@
 
-.PHONY: 	 clean install 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 .5.5.html .7.7.html .8.8.html: mandoc
-	./mandoc -Thtml -Wall,stop \
-		-Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@
+.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)!" $< >$@