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/8a6fde28b5ce
branches: trunk
changeset: 363884:8a6fde28b5ce
user: christos <christos%NetBSD.org@localhost>
date: Tue Aug 14 08:53:06 2018 +0000
description:
merge conflicts
diffstat:
external/bsd/mdocml/Makefile.inc | 4 +-
external/bsd/mdocml/bin/mandoc/Makefile | 29 +-
external/bsd/mdocml/dist/Makefile | 93 +-
external/bsd/mdocml/dist/configure | 145 +-
external/bsd/mdocml/dist/eqn.c | 867 +++++------
external/bsd/mdocml/dist/lib.in | 24 +-
external/bsd/mdocml/dist/libmandoc.h | 17 +-
external/bsd/mdocml/dist/main.c | 308 +++-
external/bsd/mdocml/dist/main.h | 3 +-
external/bsd/mdocml/dist/man.c | 114 +-
external/bsd/mdocml/dist/man_hash.c | 103 -
external/bsd/mdocml/dist/man_macro.c | 63 +-
external/bsd/mdocml/dist/man_term.c | 317 +--
external/bsd/mdocml/dist/mandoc.h | 88 +-
external/bsd/mdocml/dist/mandoc_aux.h | 5 +-
external/bsd/mdocml/dist/mandocdb.c | 210 +-
external/bsd/mdocml/dist/manpage.c | 195 --
external/bsd/mdocml/dist/mansearch.c | 192 ++-
external/bsd/mdocml/dist/mdoc.7 | 114 +-
external/bsd/mdocml/dist/mdoc_argv.c | 38 +-
external/bsd/mdocml/dist/mdoc_hash.c | 95 -
external/bsd/mdocml/dist/mdoc_macro.c | 145 +-
external/bsd/mdocml/dist/mdoc_term.c | 386 ++--
external/bsd/mdocml/dist/mdoc_validate.c | 765 ++++++++-
external/bsd/mdocml/dist/msec.in | 2 +-
external/bsd/mdocml/dist/out.c | 2 +-
external/bsd/mdocml/dist/read.c | 263 +-
external/bsd/mdocml/dist/roff.c | 2034 ++++++++++++++++-----------
external/bsd/mdocml/dist/roff.h | 428 +++++-
external/bsd/mdocml/dist/st.in | 92 +-
external/bsd/mdocml/dist/tag.c | 5 +-
external/bsd/mdocml/dist/tbl.c | 22 +-
external/bsd/mdocml/dist/tbl_data.c | 114 +-
external/bsd/mdocml/dist/tbl_layout.c | 26 +-
external/bsd/mdocml/dist/term.c | 490 ++++--
external/bsd/mdocml/dist/term_ascii.c | 39 +-
external/bsd/mdocml/include/config.h | 1 +
external/bsd/mdocml/lib/libmandoc/Makefile | 5 +-
38 files changed, 4603 insertions(+), 3240 deletions(-)
diffs (truncated from 13516 to 300 lines):
diff -r 5ba840c0c46e -r 8a6fde28b5ce external/bsd/mdocml/Makefile.inc
--- a/external/bsd/mdocml/Makefile.inc Tue Aug 14 08:41:01 2018 +0000
+++ b/external/bsd/mdocml/Makefile.inc Tue Aug 14 08:53:06 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.17 2015/12/17 22:31:01 christos Exp $
+# $NetBSD: Makefile.inc,v 1.18 2018/08/14 08:53:06 christos Exp $
.include <bsd.own.mk>
@@ -6,6 +6,8 @@
.if (${HOSTPROG:U} == "")
VERSION!= cd ${.PARSEDIR}/dist && ${MAKE} -V VERSION
CPPFLAGS+= -DVERSION=\"${VERSION}\" -I${DISTDIR}/../include
+CPPFLAGS+= -D_OPENBSD_SOURCE
+CPPFLAGS+= -DMANPATH_BASE=\"/usr/share/man:/usr/X11R7/man\"
.endif
DISTDIR:= ${.PARSEDIR}/dist
diff -r 5ba840c0c46e -r 8a6fde28b5ce external/bsd/mdocml/bin/mandoc/Makefile
--- a/external/bsd/mdocml/bin/mandoc/Makefile Tue Aug 14 08:41:01 2018 +0000
+++ b/external/bsd/mdocml/bin/mandoc/Makefile Tue Aug 14 08:53:06 2018 +0000
@@ -1,14 +1,31 @@
-# $NetBSD: Makefile,v 1.12 2017/06/19 20:12:34 christos Exp $
+# $NetBSD: Makefile,v 1.13 2018/08/14 08:53:06 christos Exp $
.include <bsd.own.mk>
PROG= mandoc
-SRCS= main.c out.c tree.c \
- eqn_html.c eqn_term.c \
- html.c man_html.c mdoc_html.c tbl_html.c \
- manpath.c man_term.c mdoc_term.c term.c term_ascii.c \
- term_ps.c tbl_term.c
+SRCS= \
+eqn_html.c \
+eqn_term.c \
+html.c \
+main.c \
+man_html.c \
+man_term.c \
+mandoc_xr.c \
+manpath.c \
+mdoc_html.c \
+mdoc_markdown.c \
+mdoc_term.c \
+out.c \
+roff_html.c \
+roff_term.c \
+tbl_html.c \
+tbl_term.c \
+term.c \
+term_ascii.c \
+term_ps.c \
+term_tab.c \
+tree.c
.ifndef HOSTPROG
DPADD+= ${MDOCMLLIB.mandoc} ${LIBZ}
diff -r 5ba840c0c46e -r 8a6fde28b5ce external/bsd/mdocml/dist/Makefile
--- a/external/bsd/mdocml/dist/Makefile Tue Aug 14 08:41:01 2018 +0000
+++ b/external/bsd/mdocml/dist/Makefile Tue Aug 14 08:53:06 2018 +0000
@@ -1,7 +1,7 @@
-# Id: Makefile,v 1.504 2017/02/18 15:29:39 schwarze Exp
+# Id: Makefile,v 1.519 2018/07/31 15:34:00 schwarze Exp
#
# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
-# Copyright (c) 2011, 2013-2017 Ingo Schwarze <schwarze%openbsd.org@localhost>
+# Copyright (c) 2011, 2013-2018 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,7 +15,7 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-VERSION = 1.14.1
+VERSION = 1.14.4
# === LIST OF FILES ====================================================
@@ -30,6 +30,7 @@
test-isblank.c \
test-mkdtemp.c \
test-nanosleep.c \
+ test-noop.c \
test-ntohl.c \
test-O_DIRECTORY.c \
test-ohash.c \
@@ -38,6 +39,7 @@
test-progname.c \
test-recvmsg.c \
test-reallocarray.c \
+ test-recallocarray.c \
test-rewb-bsd.c \
test-rewb-sysv.c \
test-sandbox_init.c \
@@ -45,6 +47,7 @@
test-stringlist.c \
test-strlcat.c \
test-strlcpy.c \
+ test-strndup.c \
test-strptime.c \
test-strsep.c \
test-strtonum.c \
@@ -64,10 +67,12 @@
compat_ohash.c \
compat_progname.c \
compat_reallocarray.c \
+ compat_recallocarray.c \
compat_strcasestr.c \
compat_stringlist.c \
compat_strlcat.c \
compat_strlcpy.c \
+ compat_strndup.c \
compat_strsep.c \
compat_strtonum.c \
compat_vasprintf.c \
@@ -85,7 +90,6 @@
lib.c \
main.c \
man.c \
- man_hash.c \
man_html.c \
man_macro.c \
man_term.c \
@@ -93,17 +97,17 @@
mandoc.c \
mandoc_aux.c \
mandoc_ohash.c \
+ mandoc_xr.c \
mandocd.c \
mandocdb.c \
- manpage.c \
manpath.c \
mansearch.c \
mdoc.c \
mdoc_argv.c \
- mdoc_hash.c \
mdoc_html.c \
mdoc_macro.c \
mdoc_man.c \
+ mdoc_markdown.c \
mdoc_state.c \
mdoc_term.c \
mdoc_validate.c \
@@ -112,6 +116,9 @@
preconv.c \
read.c \
roff.c \
+ roff_html.c \
+ roff_term.c \
+ roff_validate.c \
soelim.c \
st.c \
tag.c \
@@ -124,6 +131,7 @@
term.c \
term_ascii.c \
term_ps.c \
+ term_tab.c \
tree.c
DISTFILES = INSTALL \
@@ -176,6 +184,7 @@
mandoc_html.3 \
mandoc_malloc.3 \
mandoc_ohash.h \
+ mandoc_xr.h \
mandocd.8 \
mansearch.3 \
mansearch.h \
@@ -198,7 +207,6 @@
$(TESTSRCS)
LIBMAN_OBJS = man.o \
- man_hash.o \
man_macro.o \
man_validate.o
@@ -206,7 +214,6 @@
lib.o \
mdoc.o \
mdoc_argv.o \
- mdoc_hash.o \
mdoc_macro.o \
mdoc_state.o \
mdoc_validate.o \
@@ -214,6 +221,7 @@
LIBROFF_OBJS = eqn.o \
roff.o \
+ roff_validate.o \
tbl.o \
tbl_data.o \
tbl_layout.o \
@@ -226,6 +234,7 @@
mandoc.o \
mandoc_aux.o \
mandoc_ohash.o \
+ mandoc_xr.o \
msec.o \
preconv.o \
read.o
@@ -239,9 +248,11 @@
compat_ohash.o \
compat_progname.o \
compat_reallocarray.o \
+ compat_recallocarray.o \
compat_strcasestr.o \
compat_strlcat.o \
compat_strlcpy.o \
+ compat_strndup.o \
compat_strsep.o \
compat_strtonum.o \
compat_vasprintf.o
@@ -250,16 +261,17 @@
html.o \
man_html.o \
mdoc_html.o \
+ roff_html.o \
tbl_html.o
-MANDOC_MAN_OBJS = mdoc_man.o
-
MANDOC_TERM_OBJS = eqn_term.o \
man_term.o \
mdoc_term.o \
+ roff_term.o \
term.o \
term_ascii.o \
term_ps.o \
+ term_tab.o \
tbl_term.o
DBM_OBJS = dbm.o \
@@ -279,6 +291,8 @@
$(DBA_OBJS) \
main.o \
manpath.o \
+ mdoc_man.o \
+ mdoc_markdown.o \
out.o \
tag.o \
tree.o
@@ -294,10 +308,6 @@
out.o \
tag.o
-MANPAGE_OBJS = $(DBM_OBJS) \
- manpage.o \
- manpath.o
-
DEMANDOC_OBJS = demandoc.o
SOELIM_OBJS = soelim.o \
@@ -341,9 +351,6 @@
mdoc.h.html \
roff.h.html
-WWW_OBJS = mdocml.tar.gz \
- mdocml.sha256
-
# === USER CONFIGURATION ===============================================
-include Makefile.local
@@ -354,7 +361,7 @@
install: base-install $(INSTALL_TARGETS)
-www: $(WWW_OBJS) $(WWW_MANS)
+www: $(WWW_MANS)
$(WWW_MANS): mandoc
@@ -372,11 +379,10 @@
rm -f libmandoc.a $(LIBMANDOC_OBJS) $(COMPAT_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 mandocd catman catman.o $(MANDOCD_OBJS)
rm -f demandoc $(DEMANDOC_OBJS)
rm -f soelim $(SOELIM_OBJS)
- rm -f $(WWW_MANS) $(WWW_OBJS)
+ rm -f $(WWW_MANS) mandoc.tar.gz mandoc.sha256
rm -rf *.dSYM
base-install: mandoc demandoc soelim
@@ -388,17 +394,16 @@
mkdir -p $(DESTDIR)$(MANDIR)/man8
$(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
$(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
- $(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)
+ cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_MAN)
+ cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_APROPOS)
Home |
Main Index |
Thread Index |
Old Index