Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/mdocml merge conflicts.
details: https://anonhg.NetBSD.org/src/rev/5b1c486bf912
branches: trunk
changeset: 822391:5b1c486bf912
user: christos <christos%NetBSD.org@localhost>
date: Sat Mar 18 15:24:17 2017 +0000
description:
merge conflicts.
diffstat:
external/bsd/mdocml/dist/Makefile | 240 +++-
external/bsd/mdocml/dist/compat_ohash.c | 6 +-
external/bsd/mdocml/dist/compat_sqlite3_errstr.c | 16 -
external/bsd/mdocml/dist/configure | 262 +++--
external/bsd/mdocml/dist/eqn.c | 2 +-
external/bsd/mdocml/dist/lib.in | 2 +-
external/bsd/mdocml/dist/libmandoc.h | 8 +-
external/bsd/mdocml/dist/main.c | 170 +-
external/bsd/mdocml/dist/main.h | 4 +-
external/bsd/mdocml/dist/man.c | 10 +-
external/bsd/mdocml/dist/man_hash.c | 5 +-
external/bsd/mdocml/dist/man_macro.c | 12 +-
external/bsd/mdocml/dist/man_term.c | 26 +-
external/bsd/mdocml/dist/mandoc.h | 12 +-
external/bsd/mdocml/dist/mandoc_aux.h | 8 +-
external/bsd/mdocml/dist/mandocdb.c | 930 +++++++-----------
external/bsd/mdocml/dist/mansearch.c | 1068 +++++++++------------
external/bsd/mdocml/dist/mansearch_const.c | 33 -
external/bsd/mdocml/dist/mdoc_argv.c | 5 +-
external/bsd/mdocml/dist/mdoc_hash.c | 5 +-
external/bsd/mdocml/dist/mdoc_macro.c | 153 +-
external/bsd/mdocml/dist/mdoc_term.c | 325 ++----
external/bsd/mdocml/dist/mdoc_validate.c | 629 ++++++++----
external/bsd/mdocml/dist/preconv.c | 6 +-
external/bsd/mdocml/dist/read.c | 97 +-
external/bsd/mdocml/dist/roff.c | 54 +-
external/bsd/mdocml/dist/roff.h | 28 +-
external/bsd/mdocml/dist/tag.c | 69 +-
external/bsd/mdocml/dist/term.c | 24 +-
external/bsd/mdocml/dist/test-mmap.c | 9 -
external/bsd/mdocml/dist/test-sqlite3.c | 47 -
external/bsd/mdocml/dist/test-sqlite3_errstr.c | 8 -
external/bsd/mdocml/include/config.h | 20 +-
33 files changed, 2087 insertions(+), 2206 deletions(-)
diffs (truncated from 7313 to 300 lines):
diff -r d607ded95c3d -r 5b1c486bf912 external/bsd/mdocml/dist/Makefile
--- a/external/bsd/mdocml/dist/Makefile Sat Mar 18 15:06:47 2017 +0000
+++ b/external/bsd/mdocml/dist/Makefile Sat Mar 18 15:24:17 2017 +0000
@@ -1,7 +1,7 @@
-# Id: Makefile,v 1.488 2016/07/12 05:18:38 kristaps Exp
+# Id: Makefile,v 1.504 2017/02/18 15:29:39 schwarze Exp
#
# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
-# Copyright (c) 2011, 2013-2016 Ingo Schwarze <schwarze%openbsd.org@localhost>
+# Copyright (c) 2011, 2013-2017 Ingo Schwarze <schwarze%openbsd.org@localhost>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
@@ -15,27 +15,32 @@
# 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.4
+VERSION = 1.14.1
# === LIST OF FILES ====================================================
-TESTSRCS = test-dirent-namlen.c \
+TESTSRCS = test-be32toh.c \
+ test-cmsg.c \
+ 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-ntohl.c \
+ test-O_DIRECTORY.c \
test-ohash.c \
+ test-PATH_MAX.c \
test-pledge.c \
test-progname.c \
+ test-recvmsg.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 \
@@ -47,6 +52,7 @@
test-wchar.c
SRCS = att.c \
+ catman.c \
cgi.c \
chars.c \
compat_err.c \
@@ -58,7 +64,6 @@
compat_ohash.c \
compat_progname.c \
compat_reallocarray.c \
- compat_sqlite3_errstr.c \
compat_strcasestr.c \
compat_stringlist.c \
compat_strlcat.c \
@@ -66,6 +71,12 @@
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 \
@@ -82,11 +93,11 @@
mandoc.c \
mandoc_aux.c \
mandoc_ohash.c \
+ mandocd.c \
mandocdb.c \
manpage.c \
manpath.c \
mansearch.c \
- mansearch_const.c \
mdoc.c \
mdoc_argv.c \
mdoc_hash.c \
@@ -122,12 +133,18 @@
NEWS \
TODO \
apropos.1 \
+ catman.8 \
cgi.h.example \
compat_fts.h \
compat_ohash.h \
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 \
@@ -145,6 +162,7 @@
man.cgi.8 \
man.conf.5 \
man.h \
+ man.options.1 \
manconf.h \
mandoc.1 \
mandoc.3 \
@@ -158,6 +176,7 @@
mandoc_html.3 \
mandoc_malloc.3 \
mandoc_ohash.h \
+ mandocd.8 \
mansearch.3 \
mansearch.h \
mchars_alloc.3 \
@@ -220,7 +239,6 @@
compat_ohash.o \
compat_progname.o \
compat_reallocarray.o \
- compat_sqlite3_errstr.o \
compat_strcasestr.o \
compat_strlcat.o \
compat_strlcpy.o \
@@ -244,28 +262,41 @@
term_ps.o \
tbl_term.o
-BASE_OBJS = $(MANDOC_HTML_OBJS) \
+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 \
manpath.o \
out.o \
tag.o \
tree.o
-MAIN_OBJS = $(BASE_OBJS)
-
-DB_OBJS = mandocdb.o \
- mansearch.o \
- mansearch_const.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
+MANDOCD_OBJS = $(MANDOC_HTML_OBJS) \
+ $(MANDOC_TERM_OBJS) \
+ mandocd.o \
+ out.o \
+ tag.o
+
+MANPAGE_OBJS = $(DBM_OBJS) \
+ manpage.o \
+ manpath.o
DEMANDOC_OBJS = demandoc.o
@@ -281,6 +312,7 @@
man.1.html \
mandoc.1.html \
soelim.1.html \
+ man.cgi.3.html \
mandoc.3.html \
mandoc_escape.3.html \
mandoc_headers.3.html \
@@ -294,11 +326,12 @@
eqn.7.html \
man.7.html \
mandoc_char.7.html \
+ mandocd.8.html \
mdoc.7.html \
roff.7.html \
tbl.7.html \
+ catman.8.html \
makewhatis.8.html \
- man.cgi.3.html \
man.cgi.8.html \
man.h.html \
manconf.h.html \
@@ -317,11 +350,7 @@
# === DEPENDENCY HANDLING ==============================================
-all: base-build $(BUILD_TARGETS) Makefile.local
-
-base-build: mandoc demandoc soelim
-
-cgi-build: man.cgi
+all: mandoc demandoc soelim $(BUILD_TARGETS) Makefile.local
install: base-install $(INSTALL_TARGETS)
@@ -329,7 +358,7 @@
$(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
@@ -341,67 +370,120 @@
clean:
rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_OBJS)
- rm -f mandoc $(BASE_OBJS) $(DB_OBJS)
+ rm -f mandoc $(MAIN_OBJS)
rm -f man.cgi $(CGI_OBJS)
+ rm -f mandocd catman $(MANDOCD_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
-base-install: base-build
+base-install: mandoc demandoc soelim
mkdir -p $(DESTDIR)$(BINDIR)
- mkdir -p $(DESTDIR)$(LIBDIR)
- mkdir -p $(DESTDIR)$(INCLUDEDIR)
+ mkdir -p $(DESTDIR)$(SBINDIR)
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)
- 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 roff.h \
- $(DESTDIR)$(INCLUDEDIR)
+ $(LN) $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN)
+ $(LN) $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_APROPOS)
+ $(LN) $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_WHATIS)
+ $(LN) $(DESTDIR)$(BINDIR)/mandoc \
+ $(DESTDIR)$(SBINDIR)/$(BINM_MAKEWHATIS)
$(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) apropos.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1
+ $(LN) $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1 \
+ $(DESTDIR)$(MANDIR)/man1/$(BINM_WHATIS).1
+ $(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
-
-db-install: base-build
- 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
- ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_APROPOS)
- ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_WHATIS)
Home |
Main Index |
Thread Index |
Old Index