Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/mdocml resolve conflicts
details: https://anonhg.NetBSD.org/src/rev/70a9d8aa4fd0
branches: trunk
changeset: 449567:70a9d8aa4fd0
user: christos <christos%NetBSD.org@localhost>
date: Mon Mar 11 00:15:38 2019 +0000
description:
resolve conflicts
diffstat:
external/bsd/mdocml/Makefile.inc | 6 +-
external/bsd/mdocml/dist/Makefile | 60 +-
external/bsd/mdocml/dist/arch.c | 54 +
external/bsd/mdocml/dist/configure | 141 +-
external/bsd/mdocml/dist/eqn.c | 93 +-
external/bsd/mdocml/dist/lib.in | 3 +-
external/bsd/mdocml/dist/libmandoc.h | 54 +-
external/bsd/mdocml/dist/libroff.h | 80 -
external/bsd/mdocml/dist/main.c | 223 +--
external/bsd/mdocml/dist/main.h | 25 +-
external/bsd/mdocml/dist/man.c | 170 +-
external/bsd/mdocml/dist/man_macro.c | 214 ++-
external/bsd/mdocml/dist/man_term.c | 325 +++--
external/bsd/mdocml/dist/mandoc.h | 241 +---
external/bsd/mdocml/dist/mandocdb.c | 72 +-
external/bsd/mdocml/dist/mansearch.c | 18 +-
external/bsd/mdocml/dist/mdoc.7 | 1523 ++++++++++++---------------
external/bsd/mdocml/dist/mdoc_argv.c | 54 +-
external/bsd/mdocml/dist/mdoc_macro.c | 272 +++-
external/bsd/mdocml/dist/mdoc_term.c | 149 +-
external/bsd/mdocml/dist/mdoc_validate.c | 559 ++++-----
external/bsd/mdocml/dist/out.c | 340 ++++-
external/bsd/mdocml/dist/preconv.c | 5 +-
external/bsd/mdocml/dist/read.c | 738 ++++--------
external/bsd/mdocml/dist/roff.c | 1322 +++++++++++++++--------
external/bsd/mdocml/dist/roff.h | 86 +-
external/bsd/mdocml/dist/st.in | 78 -
external/bsd/mdocml/dist/tag.c | 45 +-
external/bsd/mdocml/dist/tbl.c | 78 +-
external/bsd/mdocml/dist/tbl_data.c | 113 +-
external/bsd/mdocml/dist/tbl_html.c | 2 +-
external/bsd/mdocml/dist/tbl_layout.c | 34 +-
external/bsd/mdocml/dist/tbl_opts.c | 22 +-
external/bsd/mdocml/dist/term.c | 513 +++++---
external/bsd/mdocml/dist/term_ascii.c | 13 +-
external/bsd/mdocml/include/config.h | 21 +-
external/bsd/mdocml/lib/libmandoc/Makefile | 4 +-
37 files changed, 4007 insertions(+), 3743 deletions(-)
diffs (truncated from 14686 to 300 lines):
diff -r 5547f936c3d7 -r 70a9d8aa4fd0 external/bsd/mdocml/Makefile.inc
--- a/external/bsd/mdocml/Makefile.inc Mon Mar 11 00:14:44 2019 +0000
+++ b/external/bsd/mdocml/Makefile.inc Mon Mar 11 00:15:38 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2018/08/14 08:53:06 christos Exp $
+# $NetBSD: Makefile.inc,v 1.19 2019/03/11 00:15:38 christos Exp $
.include <bsd.own.mk>
@@ -6,8 +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\"
+#CPPFLAGS+= -D_OPENBSD_SOURCE
+#CPPFLAGS+= -DMANPATH_BASE=\"/usr/share/man:/usr/X11R7/man\"
.endif
DISTDIR:= ${.PARSEDIR}/dist
diff -r 5547f936c3d7 -r 70a9d8aa4fd0 external/bsd/mdocml/dist/Makefile
--- a/external/bsd/mdocml/dist/Makefile Mon Mar 11 00:14:44 2019 +0000
+++ b/external/bsd/mdocml/dist/Makefile Mon Mar 11 00:15:38 2019 +0000
@@ -1,7 +1,7 @@
-# Id: Makefile,v 1.519 2018/07/31 15:34:00 schwarze Exp
+# Id: Makefile,v 1.530 2019/03/06 16:08:41 schwarze Exp
#
# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
-# Copyright (c) 2011, 2013-2018 Ingo Schwarze <schwarze%openbsd.org@localhost>
+# Copyright (c) 2011, 2013-2019 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.4
+VERSION = 1.14.5
# === LIST OF FILES ====================================================
@@ -37,9 +37,9 @@
test-PATH_MAX.c \
test-pledge.c \
test-progname.c \
- test-recvmsg.c \
test-reallocarray.c \
test-recallocarray.c \
+ test-recvmsg.c \
test-rewb-bsd.c \
test-rewb-sysv.c \
test-sandbox_init.c \
@@ -54,7 +54,8 @@
test-vasprintf.c \
test-wchar.c
-SRCS = att.c \
+SRCS = arch.c \
+ att.c \
catman.c \
cgi.c \
chars.c \
@@ -96,6 +97,7 @@
man_validate.c \
mandoc.c \
mandoc_aux.c \
+ mandoc_msg.c \
mandoc_ohash.c \
mandoc_xr.c \
mandocd.c \
@@ -155,13 +157,14 @@
dbm_map.h \
demandoc.1 \
eqn.7 \
+ eqn.h \
+ eqn_parse.h \
gmdiff \
html.h \
lib.in \
libman.h \
libmandoc.h \
libmdoc.h \
- libroff.h \
main.h \
makewhatis.8 \
man.1 \
@@ -184,6 +187,7 @@
mandoc_html.3 \
mandoc_malloc.3 \
mandoc_ohash.h \
+ mandoc_parse.h \
mandoc_xr.h \
mandocd.8 \
mansearch.3 \
@@ -198,10 +202,12 @@
roff.h \
roff_int.h \
soelim.1 \
- st.in \
tag.h \
tbl.3 \
tbl.7 \
+ tbl.h \
+ tbl_int.h \
+ tbl_parse.h \
term.h \
$(SRCS) \
$(TESTSRCS)
@@ -230,9 +236,11 @@
LIBMANDOC_OBJS = $(LIBMAN_OBJS) \
$(LIBMDOC_OBJS) \
$(LIBROFF_OBJS) \
+ arch.o \
chars.o \
mandoc.o \
mandoc_aux.o \
+ mandoc_msg.o \
mandoc_ohash.o \
mandoc_xr.o \
msec.o \
@@ -320,6 +328,7 @@
WWW_MANS = apropos.1.html \
demandoc.1.html \
man.1.html \
+ man.options.1.html \
mandoc.1.html \
soelim.1.html \
man.cgi.3.html \
@@ -336,20 +345,27 @@
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.8.html \
+ mandocd.8.html
+
+WWW_INCS = eqn.h.html \
+ html.h.html \
man.h.html \
manconf.h.html \
mandoc.h.html \
mandoc_aux.h.html \
+ mandoc_parse.h.html \
mansearch.h.html \
mdoc.h.html \
- roff.h.html
+ roff.h.html \
+ tbl.h.html \
+ tbl_int.h.html \
+ tbl_parse.h.html
# === USER CONFIGURATION ===============================================
@@ -361,9 +377,9 @@
install: base-install $(INSTALL_TARGETS)
-www: $(WWW_MANS)
+www: $(WWW_MANS) $(WWW_INCS)
-$(WWW_MANS): mandoc
+$(WWW_MANS) $(WWW_INCS): mandoc
.PHONY: base-install cgi-install install www-install
.PHONY: clean distclean depend
@@ -382,7 +398,7 @@
rm -f mandocd catman catman.o $(MANDOCD_OBJS)
rm -f demandoc $(DEMANDOC_OBJS)
rm -f soelim $(SOELIM_OBJS)
- rm -f $(WWW_MANS) mandoc.tar.gz mandoc.sha256
+ rm -f $(WWW_MANS) $(WWW_INCS) mandoc*.tar.gz mandoc*.sha256
rm -rf *.dSYM
base-install: mandoc demandoc soelim
@@ -420,8 +436,8 @@
mkdir -p $(DESTDIR)$(INCLUDEDIR)
mkdir -p $(DESTDIR)$(MANDIR)/man3
$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
- $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \
- $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_LIB) eqn.h man.h mandoc.h mandoc_aux.h mandoc_parse.h \
+ mdoc.h roff.h tbl.h $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
mansearch.3 mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
@@ -475,11 +491,14 @@
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)/eqn.h
rm -f $(DESTDIR)$(INCLUDEDIR)/man.h
rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc.h
rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_aux.h
+ rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_parse.h
rm -f $(DESTDIR)$(INCLUDEDIR)/mdoc.h
rm -f $(DESTDIR)$(INCLUDEDIR)/roff.h
+ rm -f $(DESTDIR)$(INCLUDEDIR)/tbl.h
[ ! -e $(DESTDIR)$(INCLUDEDIR) ] || rmdir $(DESTDIR)$(INCLUDEDIR)
regress: all
@@ -516,7 +535,9 @@
# --- maintainer targets ---
www-install: www
- $(INSTALL_DATA) $(WWW_MANS) mandoc.css $(HTDOCDIR)
+ $(INSTALL_DATA) mandoc.css $(HTDOCDIR)
+ $(INSTALL_DATA) $(WWW_MANS) $(HTDOCDIR)/man
+ $(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes
depend: config.h
mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
@@ -564,6 +585,10 @@
( cd .dist/ && tar zcf ../$@ mandoc-$(VERSION) )
rm -rf .dist/
+dist-install: dist
+ $(INSTALL_DATA) mandoc-$(VERSION).tar.gz mandoc-$(VERSION).sha256 \
+ $(HTDOCDIR)/snapshots
+
# === SUFFIX RULES =====================================================
.SUFFIXES: .1 .3 .5 .7 .8 .h
@@ -573,5 +598,6 @@
highlight -I $< > $@
.1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
- ./mandoc -Thtml -Wall,stop \
- -Ostyle=mandoc.css,man=%N.%S.html,includes=%I.html $< > $@
+ mandoc -Thtml -Wwarning,stop \
+ -O 'style=/mandoc.css,man=/man/%N.%S.html;https://man.openbsd.org/%N.%S,includes=/includes/%I.html' \
+ $< > $@
diff -r 5547f936c3d7 -r 70a9d8aa4fd0 external/bsd/mdocml/dist/arch.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/mdocml/dist/arch.c Mon Mar 11 00:15:38 2019 +0000
@@ -0,0 +1,54 @@
+/* Id: arch.c,v 1.14 2019/03/04 13:01:57 schwarze Exp */
+/*
+ * Copyright (c) 2017, 2019 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
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include "config.h"
+
+#include <string.h>
+
+#include "roff.h"
+
+int
+arch_valid(const char *arch, enum mandoc_os os)
+{
+ const char *openbsd_arch[] = {
+ "alpha", "amd64", "arm64", "armv7", "hppa", "i386",
+ "landisk", "loongson", "luna88k", "macppc", "mips64",
+ "octeon", "sgi", "socppc", "sparc64", NULL
+ };
+ const char *netbsd_arch[] = {
+ "acorn26", "acorn32", "algor", "alpha", "amiga",
+ "arc", "atari",
+ "bebox", "cats", "cesfic", "cobalt", "dreamcast",
+ "emips", "evbarm", "evbmips", "evbppc", "evbsh3", "evbsh5",
+ "hp300", "hpcarm", "hpcmips", "hpcsh", "hppa",
+ "i386", "ibmnws", "luna68k",
+ "mac68k", "macppc", "mipsco", "mmeye", "mvme68k", "mvmeppc",
+ "netwinder", "news68k", "newsmips", "next68k",
+ "pc532", "playstation2", "pmax", "pmppc", "prep",
+ "sandpoint", "sbmips", "sgimips", "shark",
+ "sparc", "sparc64", "sun2", "sun3",
+ "vax", "walnut", "x68k", "x86", "x86_64", "xen", NULL
+ };
+ const char **arches[] = { NULL, netbsd_arch, openbsd_arch };
+ const char **arch_p;
+
+ if ((arch_p = arches[os]) == NULL)
+ return 1;
+ for (; *arch_p != NULL; arch_p++)
+ if (strcmp(*arch_p, arch) == 0)
+ return 1;
+ return 0;
+}
diff -r 5547f936c3d7 -r 70a9d8aa4fd0 external/bsd/mdocml/dist/configure
--- a/external/bsd/mdocml/dist/configure Mon Mar 11 00:14:44 2019 +0000
+++ b/external/bsd/mdocml/dist/configure Mon Mar 11 00:15:38 2019 +0000
@@ -1,8 +1,8 @@
#!/bin/sh
Home |
Main Index |
Thread Index |
Old Index