===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.488.2.11
retrieving revision 1.489
diff -u -p -r1.488.2.11 -r1.489
--- mandoc/Makefile	2017/03/04 16:44:43	1.488.2.11
+++ mandoc/Makefile	2016/07/19 21:31:55	1.489
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.488.2.11 2017/03/04 16:44:43 schwarze Exp $
+# $Id: Makefile,v 1.489 2016/07/19 21:31:55 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
-# Copyright (c) 2011, 2013-2017 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2011, 2013-2016 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
@@ -15,30 +15,24 @@
 # 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.5
+VERSION = 1.14.0
 
 # === LIST OF FILES ====================================================
 
 TESTSRCS	 = test-dirent-namlen.c \
-		   test-EFTYPE.c \
 		   test-err.c \
 		   test-fts.c \
 		   test-getline.c \
 		   test-getsubopt.c \
 		   test-isblank.c \
 		   test-mkdtemp.c \
-		   test-mmap.c \
-		   test-nanosleep.c \
 		   test-ohash.c \
-		   test-PATH_MAX.c \
 		   test-pledge.c \
 		   test-progname.c \
 		   test-reallocarray.c \
 		   test-rewb-bsd.c \
 		   test-rewb-sysv.c \
 		   test-sandbox_init.c \
-		   test-sqlite3.c \
-		   test-sqlite3_errstr.c \
 		   test-strcasestr.c \
 		   test-stringlist.c \
 		   test-strlcat.c \
@@ -61,7 +55,6 @@ SRCS		 = att.c \
 		   compat_ohash.c \
 		   compat_progname.c \
 		   compat_reallocarray.c \
-		   compat_sqlite3_errstr.c \
 		   compat_strcasestr.c \
 		   compat_stringlist.c \
 		   compat_strlcat.c \
@@ -69,6 +62,12 @@ SRCS		 = att.c \
 		   compat_strsep.c \
 		   compat_strtonum.c \
 		   compat_vasprintf.c \
+		   dba.c \
+		   dba_array.c \
+		   dba_read.c \
+		   dba_write.c \
+		   dbm.c \
+		   dbm_map.c \
 		   demandoc.c \
 		   eqn.c \
 		   eqn_html.c \
@@ -89,7 +88,6 @@ SRCS		 = att.c \
 		   manpage.c \
 		   manpath.c \
 		   mansearch.c \
-		   mansearch_const.c \
 		   mdoc.c \
 		   mdoc_argv.c \
 		   mdoc_hash.c \
@@ -131,6 +129,11 @@ DISTFILES	 = INSTALL \
 		   compat_stringlist.h \
 		   configure \
 		   configure.local.example \
+		   dba.h \
+		   dba_array.h \
+		   dba_write.h \
+		   dbm.h \
+		   dbm_map.h \
 		   demandoc.1 \
 		   eqn.7 \
 		   gmdiff \
@@ -148,7 +151,6 @@ DISTFILES	 = INSTALL \
 		   man.cgi.8 \
 		   man.conf.5 \
 		   man.h \
-		   man.options.1 \
 		   manconf.h \
 		   mandoc.1 \
 		   mandoc.3 \
@@ -224,7 +226,6 @@ COMPAT_OBJS	 = compat_err.o \
 		   compat_ohash.o \
 		   compat_progname.o \
 		   compat_reallocarray.o \
-		   compat_sqlite3_errstr.o \
 		   compat_strcasestr.o \
 		   compat_strlcat.o \
 		   compat_strlcpy.o \
@@ -248,25 +249,35 @@ MANDOC_TERM_OBJS = eqn_term.o \
 		   term_ps.o \
 		   tbl_term.o
 
+DBM_OBJS	 = dbm.o \
+		   dbm_map.o \
+		   mansearch.o
+
+DBA_OBJS	 = dba.o \
+		   dba_array.o \
+		   dba_read.o \
+		   dba_write.o \
+		   mandocdb.o
+
 MAIN_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   $(MANDOC_MAN_OBJS) \
 		   $(MANDOC_TERM_OBJS) \
+		   $(DBM_OBJS) \
+		   $(DBA_OBJS) \
 		   main.o \
-		   mandocdb.o \
 		   manpath.o \
-		   mansearch.o \
-		   mansearch_const.o \
 		   out.o \
 		   tag.o \
 		   tree.o
 
 CGI_OBJS	 = $(MANDOC_HTML_OBJS) \
+		   $(DBM_OBJS) \
 		   cgi.o \
-		   mansearch.o \
-		   mansearch_const.o \
 		   out.o
 
-MANPAGE_OBJS	 = manpage.o mansearch.o mansearch_const.o manpath.o
+MANPAGE_OBJS	 = $(DBM_OBJS) \
+		   manpage.o \
+		   manpath.o
 
 DEMANDOC_OBJS	 = demandoc.o
 
@@ -282,7 +293,6 @@ WWW_MANS	 = apropos.1.html \
 		   man.1.html \
 		   mandoc.1.html \
 		   soelim.1.html \
-		   man.cgi.3.html \
 		   mandoc.3.html \
 		   mandoc_escape.3.html \
 		   mandoc_headers.3.html \
@@ -300,6 +310,7 @@ WWW_MANS	 = apropos.1.html \
 		   roff.7.html \
 		   tbl.7.html \
 		   makewhatis.8.html \
+		   man.cgi.3.html \
 		   man.cgi.8.html \
 		   man.h.html \
 		   manconf.h.html \
@@ -318,15 +329,19 @@ include Makefile.local
 
 # === DEPENDENCY HANDLING ==============================================
 
-all: mandoc demandoc soelim $(BUILD_TARGETS) Makefile.local
+all: base-build $(BUILD_TARGETS) Makefile.local
 
+base-build: mandoc demandoc soelim
+
+cgi-build: man.cgi
+
 install: base-install $(INSTALL_TARGETS)
 
 www: $(WWW_OBJS) $(WWW_MANS)
 
 $(WWW_MANS): mandoc
 
-.PHONY: base-install cgi-install db-install install www-install
+.PHONY: base-install cgi-install install www-install
 .PHONY: clean distclean depend
 
 include Makefile.depend
@@ -346,103 +361,52 @@ clean:
 	rm -f $(WWW_MANS) $(WWW_OBJS)
 	rm -rf *.dSYM
 
-base-install: mandoc demandoc soelim
+base-install: base-build
 	mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(SBINDIR)
 	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
+	mkdir -p $(DESTDIR)$(MANDIR)/man8
 	$(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
 	$(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
-	cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_MAN)
+	ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN)
+	ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_APROPOS)
+	ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_WHATIS)
+	ln -f $(DESTDIR)$(BINDIR)/mandoc \
+		$(DESTDIR)$(SBINDIR)/$(BINM_MAKEWHATIS)
 	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
 	$(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \
 		$(DESTDIR)$(INCLUDEDIR)
 	$(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
 	$(INSTALL_MAN) soelim.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_SOELIM).1
 	$(INSTALL_MAN) man.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1
-	$(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
-		mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
-	$(INSTALL_MAN) man.conf.5 $(DESTDIR)$(MANDIR)/man5/$(MANM_MANCONF).5
-	$(INSTALL_MAN) man.7 $(DESTDIR)$(MANDIR)/man7/$(MANM_MAN).7
-	$(INSTALL_MAN) mdoc.7 $(DESTDIR)$(MANDIR)/man7/$(MANM_MDOC).7
-	$(INSTALL_MAN) roff.7 $(DESTDIR)$(MANDIR)/man7/$(MANM_ROFF).7
-	$(INSTALL_MAN) eqn.7 $(DESTDIR)$(MANDIR)/man7/$(MANM_EQN).7
-	$(INSTALL_MAN) tbl.7 $(DESTDIR)$(MANDIR)/man7/$(MANM_TBL).7
-	$(INSTALL_MAN) mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
-
-db-install: mandoc demandoc soelim
-	mkdir -p $(DESTDIR)$(BINDIR)
-	mkdir -p $(DESTDIR)$(SBINDIR)
-	mkdir -p $(DESTDIR)$(MANDIR)/man1
-	mkdir -p $(DESTDIR)$(MANDIR)/man3
-	mkdir -p $(DESTDIR)$(MANDIR)/man5
-	mkdir -p $(DESTDIR)$(MANDIR)/man8
-	cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_APROPOS)
-	cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_WHATIS)
-	cd $(DESTDIR)$(SBINDIR) && \
-		$(LN) ${BIN_FROM_SBIN}/mandoc $(BINM_MAKEWHATIS)
 	$(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1
-	cd $(DESTDIR)$(MANDIR)/man1 && $(LN) $(BINM_APROPOS).1 $(BINM_WHATIS).1
-	$(INSTALL_MAN) mansearch.3 $(DESTDIR)$(MANDIR)/man3
+	ln -f $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1 \
+		$(DESTDIR)$(MANDIR)/man1/$(BINM_WHATIS).1
+	$(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
+		mansearch.3 mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
+	$(INSTALL_MAN) man.conf.5 $(DESTDIR)$(MANDIR)/man5/${MANM_MANCONF}.5
 	$(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
+	$(INSTALL_MAN) man.7 $(DESTDIR)$(MANDIR)/man7/${MANM_MAN}.7
+	$(INSTALL_MAN) mdoc.7 $(DESTDIR)$(MANDIR)/man7/${MANM_MDOC}.7
+	$(INSTALL_MAN) roff.7 $(DESTDIR)$(MANDIR)/man7/${MANM_ROFF}.7
+	$(INSTALL_MAN) eqn.7 $(DESTDIR)$(MANDIR)/man7/${MANM_EQN}.7
+	$(INSTALL_MAN) tbl.7 $(DESTDIR)$(MANDIR)/man7/${MANM_TBL}.7
+	$(INSTALL_MAN) mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
 	$(INSTALL_MAN) makewhatis.8 \
 		$(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
 
-cgi-install: man.cgi
+cgi-install: cgi-build
 	mkdir -p $(DESTDIR)$(CGIBINDIR)
 	mkdir -p $(DESTDIR)$(HTDOCDIR)
 	$(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
 	$(INSTALL_DATA) mandoc.css $(DESTDIR)$(HTDOCDIR)
 
-uninstall:
-	rm -f $(DESTDIR)$(BINDIR)/mandoc
-	rm -f $(DESTDIR)$(BINDIR)/demandoc
-	rm -f $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
-	rm -f $(DESTDIR)$(BINDIR)/$(BINM_MAN)
-	rm -f $(DESTDIR)$(BINDIR)/$(BINM_APROPOS)
-	rm -f $(DESTDIR)$(BINDIR)/$(BINM_WHATIS)
-	rm -f $(DESTDIR)$(SBINDIR)/$(BINM_MAKEWHATIS)
-	rm -f $(DESTDIR)$(MANDIR)/man1/mandoc.1
-	rm -f $(DESTDIR)$(MANDIR)/man1/demandoc.1
-	rm -f $(DESTDIR)$(MANDIR)/man1/$(BINM_SOELIM).1
-	rm -f $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1
-	rm -f $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1
-	rm -f $(DESTDIR)$(MANDIR)/man1/$(BINM_WHATIS).1
-	rm -f $(DESTDIR)$(MANDIR)/man5/$(MANM_MANCONF).5
-	rm -f $(DESTDIR)$(MANDIR)/man5/mandoc.db.5
-	rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_MAN).7
-	rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_MDOC).7
-	rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_ROFF).7
-	rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_EQN).7
-	rm -f $(DESTDIR)$(MANDIR)/man7/$(MANM_TBL).7
-	rm -f $(DESTDIR)$(MANDIR)/man7/mandoc_char.7
-	rm -f $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
-	rm -f $(DESTDIR)$(CGIBINDIR)/man.cgi
-	rm -f $(DESTDIR)$(HTDOCDIR)/mandoc.css
-	rm -f $(DESTDIR)$(LIBDIR)/libmandoc.a
-	rm -f $(DESTDIR)$(MANDIR)/man3/mandoc.3
-	rm -f $(DESTDIR)$(MANDIR)/man3/mandoc_escape.3
-	rm -f $(DESTDIR)$(MANDIR)/man3/mandoc_malloc.3
-	rm -f $(DESTDIR)$(MANDIR)/man3/mansearch.3
-	rm -f $(DESTDIR)$(MANDIR)/man3/mchars_alloc.3
-	rm -f $(DESTDIR)$(MANDIR)/man3/tbl.3
-	rm -f $(DESTDIR)$(INCLUDEDIR)/man.h
-	rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc.h
-	rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_aux.h
-	rm -f $(DESTDIR)$(INCLUDEDIR)/mdoc.h
-	rm -f $(DESTDIR)$(INCLUDEDIR)/roff.h
-	[ ! -e $(DESTDIR)$(INCLUDEDIR) ] || rmdir $(DESTDIR)$(INCLUDEDIR)
-
-regress: all
-	cd regress && ./regress.pl
-
-regress-clean:
-	cd regress && ./regress.pl . clean
-
-Makefile.local config.h: configure $(TESTSRCS)
+Makefile.local config.h: configure ${TESTSRCS}
 	@echo "$@ is out of date; please run ./configure"
 	@exit 1
 
@@ -482,40 +446,14 @@ depend: config.h
 		Makefile.depend > Makefile.tmp
 	mv Makefile.tmp Makefile.depend
 
-regress-distclean:
-	@find regress \
-		-name '.#*' -o \
-		-name '*.orig' -o \
-		-name '*.rej' -o \
-		-name '*.core' \
-		-exec rm -i {} \;
-
-regress-distcheck:
-	@find regress ! -type d ! -type f
-	@find regress -type f \
-		! -path '*/CVS/*' \
-		! -name Makefile \
-		! -name Makefile.inc \
-		! -name '*.in' \
-		! -name '*.out_ascii' \
-		! -name '*.out_utf8' \
-		! -name '*.out_html' \
-		! -name '*.out_lint' \
-		! -path regress/regress.pl \
-		! -path regress/regress.pl.1
-
 dist: mdocml.sha256
 
 mdocml.sha256: mdocml.tar.gz
 	sha256 mdocml.tar.gz > $@
 
 mdocml.tar.gz: $(DISTFILES)
-	ls regress/*/*/*.mandoc_* && exit 1 || true
 	mkdir -p .dist/mdocml-$(VERSION)/
 	$(INSTALL) -m 0644 $(DISTFILES) .dist/mdocml-$(VERSION)
-	cp -pR regress .dist/mdocml-$(VERSION)
-	find .dist/mdocml-$(VERSION)/regress \
-	    -type d -name CVS -print0 | xargs -0 rm -rf
 	chmod 755 .dist/mdocml-$(VERSION)/configure
 	( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
 	rm -rf .dist/