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/6563f1095173
branches: trunk
changeset: 346501:6563f1095173
user: christos <christos%NetBSD.org@localhost>
date: Fri Jul 15 19:40:42 2016 +0000
description:
merge conflicts
diffstat:
external/bsd/mdocml/bin/mandoc/Makefile | 6 +-
external/bsd/mdocml/dist/Makefile | 115 +-
external/bsd/mdocml/dist/chars.in | 404 ---------
external/bsd/mdocml/dist/compat_fgetln.c | 94 --
external/bsd/mdocml/dist/compat_ohash.c | 7 +-
external/bsd/mdocml/dist/configure | 176 ++-
external/bsd/mdocml/dist/eqn.c | 44 +-
external/bsd/mdocml/dist/example.style.css | 114 --
external/bsd/mdocml/dist/lib.in | 2 +-
external/bsd/mdocml/dist/libmandoc.h | 44 +-
external/bsd/mdocml/dist/main.c | 630 ++++++++------
external/bsd/mdocml/dist/main.h | 2 +
external/bsd/mdocml/dist/man-cgi.css | 13 -
external/bsd/mdocml/dist/man.c | 501 ++---------
external/bsd/mdocml/dist/man_hash.c | 1 +
external/bsd/mdocml/dist/man_macro.c | 298 ++----
external/bsd/mdocml/dist/man_term.c | 291 +++---
external/bsd/mdocml/dist/mandoc.h | 35 +-
external/bsd/mdocml/dist/mandoc_aux.h | 9 +-
external/bsd/mdocml/dist/mandocdb.c | 5 +-
external/bsd/mdocml/dist/manpath.h | 34 -
external/bsd/mdocml/dist/mansearch.c | 200 ++--
external/bsd/mdocml/dist/mdoc_argv.c | 209 ++--
external/bsd/mdocml/dist/mdoc_hash.c | 1 +
external/bsd/mdocml/dist/mdoc_term.c | 540 ++++++------
external/bsd/mdocml/dist/mdoc_validate.c | 1146 ++++++++++++---------------
external/bsd/mdocml/dist/msec.in | 2 +-
external/bsd/mdocml/dist/preconv.c | 20 +-
external/bsd/mdocml/dist/read.c | 303 ++----
external/bsd/mdocml/dist/roff.c | 796 ++++++++++++++----
external/bsd/mdocml/dist/roff.h | 164 ++++
external/bsd/mdocml/dist/st.in | 2 +-
external/bsd/mdocml/dist/tbl.c | 18 +-
external/bsd/mdocml/dist/tbl_data.c | 13 +-
external/bsd/mdocml/dist/tbl_layout.c | 9 +-
external/bsd/mdocml/dist/tbl_opts.c | 3 +-
external/bsd/mdocml/dist/term.c | 128 +-
external/bsd/mdocml/dist/test-fgetln.c | 11 -
external/bsd/mdocml/include/config.h | 36 +-
external/bsd/mdocml/lib/libmandoc/Makefile | 38 +-
external/bsd/mdocml/man/Makefile | 4 +-
41 files changed, 2942 insertions(+), 3526 deletions(-)
diffs (truncated from 12784 to 300 lines):
diff -r c000bc9972bc -r 6563f1095173 external/bsd/mdocml/bin/mandoc/Makefile
--- a/external/bsd/mdocml/bin/mandoc/Makefile Fri Jul 15 15:23:43 2016 +0000
+++ b/external/bsd/mdocml/bin/mandoc/Makefile Fri Jul 15 19:40:42 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/12/18 14:33:54 christos Exp $
+# $NetBSD: Makefile,v 1.11 2016/07/15 19:40:42 christos Exp $
.include <bsd.own.mk>
@@ -11,8 +11,8 @@
term_ps.c tbl_term.c
.ifndef HOSTPROG
-DPADD+= ${MDOCMLLIB.mandoc}
-LDADD+= -L${MDOCMLOBJDIR.mandoc} -lmandoc
+DPADD+= ${MDOCMLLIB.mandoc} ${LIBZ}
+LDADD+= -L${MDOCMLOBJDIR.mandoc} -lmandoc -lz
CPPFLAGS+= -DUSE_WCHAR
.else
SRCS.libmandoc!=cd ${.PARSEDIR}/../../lib/libmandoc && ${MAKE} -V '$${SRCS}'
diff -r c000bc9972bc -r 6563f1095173 external/bsd/mdocml/dist/Makefile
--- a/external/bsd/mdocml/dist/Makefile Fri Jul 15 15:23:43 2016 +0000
+++ b/external/bsd/mdocml/dist/Makefile Fri Jul 15 19:40:42 2016 +0000
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.2 2015/12/17 22:31:12 christos Exp $
+# Id: Makefile,v 1.488 2016/07/12 05:18:38 kristaps Exp
#
# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
-# Copyright (c) 2011, 2013, 2014, 2015 Ingo Schwarze <schwarze%openbsd.org@localhost>
+# Copyright (c) 2011, 2013-2016 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,41 +15,57 @@
# 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
+VERSION = 1.13.4
# === LIST OF FILES ====================================================
TESTSRCS = test-dirent-namlen.c \
- test-fgetln.c \
+ test-err.c \
test-fts.c \
+ test-getline.c \
test-getsubopt.c \
+ test-isblank.c \
+ test-mkdtemp.c \
test-mmap.c \
test-ohash.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 \
test-strlcpy.c \
test-strptime.c \
test-strsep.c \
test-strtonum.c \
+ test-vasprintf.c \
test-wchar.c
SRCS = att.c \
cgi.c \
chars.c \
- compat_fgetln.c \
+ compat_err.c \
compat_fts.c \
+ compat_getline.c \
compat_getsubopt.c \
+ compat_isblank.c \
+ compat_mkdtemp.c \
compat_ohash.c \
+ compat_progname.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 \
@@ -65,6 +81,7 @@
man_validate.c \
mandoc.c \
mandoc_aux.c \
+ mandoc_ohash.c \
mandocdb.c \
manpage.c \
manpath.c \
@@ -76,6 +93,7 @@
mdoc_html.c \
mdoc_macro.c \
mdoc_man.c \
+ mdoc_state.c \
mdoc_term.c \
mdoc_validate.c \
msec.c \
@@ -83,7 +101,9 @@
preconv.c \
read.c \
roff.c \
+ soelim.c \
st.c \
+ tag.c \
tbl.c \
tbl_data.c \
tbl_html.c \
@@ -93,8 +113,7 @@
term.c \
term_ascii.c \
term_ps.c \
- tree.c \
- $(TESTSRCS)
+ tree.c
DISTFILES = INSTALL \
LICENSE \
@@ -104,14 +123,13 @@
TODO \
apropos.1 \
cgi.h.example \
- chars.in \
compat_fts.h \
compat_ohash.h \
+ compat_stringlist.h \
configure \
configure.local.example \
demandoc.1 \
eqn.7 \
- example.style.css \
gmdiff \
html.h \
lib.in \
@@ -121,13 +139,16 @@
libroff.h \
main.h \
makewhatis.8 \
- man-cgi.css \
man.1 \
man.7 \
+ man.cgi.3 \
man.cgi.8 \
+ man.conf.5 \
man.h \
+ manconf.h \
mandoc.1 \
mandoc.3 \
+ mandoc.css \
mandoc.db.5 \
mandoc.h \
mandoc_aux.h \
@@ -136,7 +157,7 @@
mandoc_headers.3 \
mandoc_html.3 \
mandoc_malloc.3 \
- manpath.h \
+ mandoc_ohash.h \
mansearch.3 \
mansearch.h \
mchars_alloc.3 \
@@ -146,12 +167,16 @@
out.h \
predefs.in \
roff.7 \
+ roff.h \
+ roff_int.h \
+ soelim.1 \
st.in \
- style.css \
+ tag.h \
tbl.3 \
tbl.7 \
term.h \
- $(SRCS)
+ $(SRCS) \
+ $(TESTSRCS)
LIBMAN_OBJS = man.o \
man_hash.o \
@@ -164,6 +189,7 @@
mdoc_argv.o \
mdoc_hash.o \
mdoc_macro.o \
+ mdoc_state.o \
mdoc_validate.o \
st.o
@@ -180,21 +206,27 @@
chars.o \
mandoc.o \
mandoc_aux.o \
+ mandoc_ohash.o \
msec.o \
preconv.o \
read.o
-COMPAT_OBJS = compat_fgetln.o \
+COMPAT_OBJS = compat_err.o \
compat_fts.o \
+ compat_getline.o \
compat_getsubopt.o \
+ compat_isblank.o \
+ compat_mkdtemp.o \
compat_ohash.o \
+ compat_progname.o \
compat_reallocarray.o \
compat_sqlite3_errstr.o \
compat_strcasestr.o \
compat_strlcat.o \
compat_strlcpy.o \
compat_strsep.o \
- compat_strtonum.o
+ compat_strtonum.o \
+ compat_vasprintf.o
MANDOC_HTML_OBJS = eqn_html.o \
html.o \
@@ -218,6 +250,7 @@
main.o \
manpath.o \
out.o \
+ tag.o \
tree.o
MAIN_OBJS = $(BASE_OBJS)
@@ -236,10 +269,18 @@
DEMANDOC_OBJS = demandoc.o
+SOELIM_OBJS = soelim.o \
+ compat_err.o \
+ compat_getline.o \
+ compat_progname.o \
+ compat_reallocarray.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 \
@@ -248,6 +289,7 @@
mansearch.3.html \
mchars_alloc.3.html \
tbl.3.html \
+ man.conf.5.html \
mandoc.db.5.html \
eqn.7.html \
man.7.html \
@@ -256,13 +298,15 @@
roff.7.html \
tbl.7.html \
makewhatis.8.html \
+ man.cgi.3.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
@@ -275,7 +319,7 @@
all: base-build $(BUILD_TARGETS) Makefile.local
-base-build: mandoc demandoc
+base-build: mandoc demandoc soelim
cgi-build: man.cgi
@@ -301,33 +345,36 @@
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
Home |
Main Index |
Thread Index |
Old Index