===================================================================
RCS file: /cvs/mandoc/Makefile,v
retrieving revision 1.453
retrieving revision 1.464
diff -u -p -r1.453 -r1.464
--- mandoc/Makefile	2014/12/09 09:14:33	1.453
+++ mandoc/Makefile	2015/07/14 23:16:29	1.464
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.453 2014/12/09 09:14:33 schwarze Exp $
+# $Id: Makefile,v 1.464 2015/07/14 23:16:29 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
-# Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2011, 2013, 2014, 2015 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,22 +15,29 @@
 # 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.3
+
 # === LIST OF FILES ====================================================
 
 TESTSRCS	 = test-dirent-namlen.c \
 		   test-fgetln.c \
 		   test-fts.c \
 		   test-getsubopt.c \
+		   test-isblank.c \
+		   test-mkdtemp.c \
 		   test-mmap.c \
 		   test-ohash.c \
 		   test-reallocarray.c \
 		   test-sqlite3.c \
 		   test-sqlite3_errstr.c \
 		   test-strcasestr.c \
+		   test-stringlist.c \
 		   test-strlcat.c \
 		   test-strlcpy.c \
 		   test-strptime.c \
 		   test-strsep.c \
+		   test-strtonum.c \
+		   test-vasprintf.c \
 		   test-wchar.c
 
 SRCS		 = att.c \
@@ -39,13 +46,18 @@ SRCS		 = att.c \
 		   compat_fgetln.c \
 		   compat_fts.c \
 		   compat_getsubopt.c \
+		   compat_isblank.c \
+		   compat_mkdtemp.c \
 		   compat_ohash.c \
 		   compat_reallocarray.c \
 		   compat_sqlite3_errstr.c \
 		   compat_strcasestr.c \
+		   compat_stringlist.c \
 		   compat_strlcat.c \
 		   compat_strlcpy.c \
 		   compat_strsep.c \
+		   compat_strtonum.c \
+		   compat_vasprintf.c \
 		   demandoc.c \
 		   eqn.c \
 		   eqn_html.c \
@@ -79,6 +91,7 @@ SRCS		 = att.c \
 		   preconv.c \
 		   read.c \
 		   roff.c \
+		   soelim.c \
 		   st.c \
 		   tbl.c \
 		   tbl_data.c \
@@ -89,8 +102,7 @@ SRCS		 = att.c \
 		   term.c \
 		   term_ascii.c \
 		   term_ps.c \
-		   tree.c \
-		   $(TESTSRCS)
+		   tree.c
 
 DISTFILES	 = INSTALL \
 		   LICENSE \
@@ -103,6 +115,7 @@ DISTFILES	 = INSTALL \
 		   chars.in \
 		   compat_fts.h \
 		   compat_ohash.h \
+		   compat_stringlist.h \
 		   configure \
 		   configure.local.example \
 		   demandoc.1 \
@@ -121,7 +134,9 @@ DISTFILES	 = INSTALL \
 		   man.1 \
 		   man.7 \
 		   man.cgi.8 \
+		   man.conf.5 \
 		   man.h \
+		   manconf.h \
 		   mandoc.1 \
 		   mandoc.3 \
 		   mandoc.db.5 \
@@ -132,7 +147,6 @@ DISTFILES	 = INSTALL \
 		   mandoc_headers.3 \
 		   mandoc_html.3 \
 		   mandoc_malloc.3 \
-		   manpath.h \
 		   mansearch.3 \
 		   mansearch.h \
 		   mchars_alloc.3 \
@@ -142,12 +156,15 @@ DISTFILES	 = INSTALL \
 		   out.h \
 		   predefs.in \
 		   roff.7 \
+		   roff.h \
+		   soelim.1 \
 		   st.in \
 		   style.css \
 		   tbl.3 \
 		   tbl.7 \
 		   term.h \
-		   $(SRCS)
+		   $(SRCS) \
+		   $(TESTSRCS)
 
 LIBMAN_OBJS	 = man.o \
 		   man_hash.o \
@@ -183,13 +200,17 @@ LIBMANDOC_OBJS	 = $(LIBMAN_OBJS) \
 COMPAT_OBJS	 = compat_fgetln.o \
 		   compat_fts.o \
 		   compat_getsubopt.o \
+		   compat_isblank.o \
+		   compat_mkdtemp.o \
 		   compat_ohash.o \
 		   compat_reallocarray.o \
 		   compat_sqlite3_errstr.o \
 		   compat_strcasestr.o \
 		   compat_strlcat.o \
 		   compat_strlcpy.o \
-		   compat_strsep.o
+		   compat_strsep.o \
+		   compat_strtonum.o \
+		   compat_vasprintf.o
 
 MANDOC_HTML_OBJS = eqn_html.o \
 		   html.o \
@@ -211,6 +232,7 @@ BASE_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   $(MANDOC_MAN_OBJS) \
 		   $(MANDOC_TERM_OBJS) \
 		   main.o \
+		   manpath.o \
 		   out.o \
 		   tree.o
 
@@ -218,8 +240,7 @@ MAIN_OBJS	 = $(BASE_OBJS)
 
 DB_OBJS		 = mandocdb.o \
 		   mansearch.o \
-		   mansearch_const.o \
-		   manpath.o
+		   mansearch_const.o
 
 CGI_OBJS	 = $(MANDOC_HTML_OBJS) \
 		   cgi.o \
@@ -231,10 +252,13 @@ MANPAGE_OBJS	 = manpage.o mansearch.o mansearch_const.
 
 DEMANDOC_OBJS	 = demandoc.o
 
+SOELIM_OBJS	 = soelim.o compat_stringlist.o
+
 WWW_MANS	 = apropos.1.html \
 		   demandoc.1.html \
 		   man.1.html \
 		   mandoc.1.html \
+		   soelim.1.html \
 		   mandoc.3.html \
 		   mandoc_escape.3.html \
 		   mandoc_headers.3.html \
@@ -243,6 +267,7 @@ WWW_MANS	 = apropos.1.html \
 		   mansearch.3.html \
 		   mchars_alloc.3.html \
 		   tbl.3.html \
+		   man.conf.5.html \
 		   mandoc.db.5.html \
 		   eqn.7.html \
 		   man.7.html \
@@ -253,11 +278,12 @@ WWW_MANS	 = apropos.1.html \
 		   makewhatis.8.html \
 		   man.cgi.8.html \
 		   man.h.html \
+		   manconf.h.html \
 		   mandoc.h.html \
 		   mandoc_aux.h.html \
-		   manpath.h.html \
 		   mansearch.h.html \
-		   mdoc.h.html
+		   mdoc.h.html \
+		   roff.h.html
 
 WWW_OBJS	 = mdocml.tar.gz \
 		   mdocml.sha256
@@ -270,7 +296,7 @@ include Makefile.local
 
 all: base-build $(BUILD_TARGETS) Makefile.local
 
-base-build: mandoc demandoc
+base-build: mandoc demandoc soelim
 
 cgi-build: man.cgi
 
@@ -296,6 +322,7 @@ clean:
 	rm -f man.cgi $(CGI_OBJS)
 	rm -f manpage $(MANPAGE_OBJS)
 	rm -f demandoc $(DEMANDOC_OBJS)
+	rm -f soelim $(SOELIM_OBJS)
 	rm -f $(WWW_MANS) $(WWW_OBJS)
 	rm -rf *.dSYM
 
@@ -306,14 +333,18 @@ base-install: base-build
 	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 demandoc $(DESTDIR)$(BINDIR)
+	$(INSTALL_PROGRAM) mandoc demandoc soelim $(DESTDIR)$(BINDIR)
+	ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN)
 	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
-	$(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \
+	$(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) mandoc.1 demandoc.1 soelim.1 $(DESTDIR)$(MANDIR)/man1
+	$(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
@@ -330,12 +361,10 @@ db-install: base-build
 	mkdir -p $(DESTDIR)$(MANDIR)/man5
 	mkdir -p $(DESTDIR)$(MANDIR)/man8
 	ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_APROPOS)
-	ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN)
 	ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_WHATIS)
 	ln -f $(DESTDIR)$(BINDIR)/mandoc \
 		$(DESTDIR)$(SBINDIR)/$(BINM_MAKEWHATIS)
 	$(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1
-	$(INSTALL_MAN) man.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1
 	ln -f $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1 \
 		$(DESTDIR)$(MANDIR)/man1/$(BINM_WHATIS).1
 	$(INSTALL_MAN) mansearch.3 $(DESTDIR)$(MANDIR)/man3
@@ -372,6 +401,9 @@ man.cgi: $(CGI_OBJS) libmandoc.a
 
 demandoc: $(DEMANDOC_OBJS) libmandoc.a
 	$(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
+
+soelim: $(SOELIM_OBJS) compat_reallocarray.o
+	$(CC) $(LDFLAGS) -o $@ $(SOELIM_OBJS) compat_reallocarray.o
 
 # --- maintainer targets ---