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/0f15f63abce5
branches: trunk
changeset: 342350:0f15f63abce5
user: christos <christos%NetBSD.org@localhost>
date: Thu Dec 17 22:31:01 2015 +0000
description:
merge conflicts.
diffstat:
external/bsd/mdocml/Makefile.inc | 7 +-
external/bsd/mdocml/bin/mandoc/Makefile | 4 +-
external/bsd/mdocml/dist/Makefile | 4 +-
external/bsd/mdocml/dist/apropos.c | 122 -
external/bsd/mdocml/dist/arch.c | 39 -
external/bsd/mdocml/dist/arch.in | 111 -
external/bsd/mdocml/dist/att.in | 40 -
external/bsd/mdocml/dist/compat_fgetln.c | 9 +-
external/bsd/mdocml/dist/compat_strnlen.c | 43 -
external/bsd/mdocml/dist/config.h.post | 39 -
external/bsd/mdocml/dist/config.h.pre | 9 -
external/bsd/mdocml/dist/configure | 6 +
external/bsd/mdocml/dist/external.png.uu | 7 -
external/bsd/mdocml/dist/lib.in | 3 +-
external/bsd/mdocml/dist/libmandoc.h | 70 +-
external/bsd/mdocml/dist/man.c | 4 +-
external/bsd/mdocml/dist/man.cgi.7 | 122 -
external/bsd/mdocml/dist/man_term.c | 574 ++---
external/bsd/mdocml/dist/mandoc.h | 356 +-
external/bsd/mdocml/dist/mandocdb.8 | 177 -
external/bsd/mdocml/dist/mansearch.c | 4 +-
external/bsd/mdocml/dist/mdoc_argv.c | 290 +-
external/bsd/mdocml/dist/mdoc_term.c | 1152 +++++-----
external/bsd/mdocml/dist/mdoc_validate.c | 2760 +++++++++++++--------------
external/bsd/mdocml/dist/msec.in | 6 +-
external/bsd/mdocml/dist/preconv.1 | 157 -
external/bsd/mdocml/dist/read.c | 802 ++++---
external/bsd/mdocml/dist/roff.c | 2402 +++++++++++++++++-------
external/bsd/mdocml/dist/st.in | 98 +-
external/bsd/mdocml/dist/tbl.c | 128 +-
external/bsd/mdocml/dist/tbl_data.c | 172 +-
external/bsd/mdocml/dist/tbl_layout.c | 486 ++--
external/bsd/mdocml/dist/tbl_opts.c | 316 +--
external/bsd/mdocml/dist/test-strnlen.c | 8 -
external/bsd/mdocml/dist/vol.c | 39 -
external/bsd/mdocml/dist/vol.in | 35 -
external/bsd/mdocml/include/config.h | 54 +
external/bsd/mdocml/lib/libmandoc/Makefile | 8 +-
external/bsd/mdocml/prepare-import.sh | 3 -
39 files changed, 5267 insertions(+), 5399 deletions(-)
diffs (truncated from 15981 to 300 lines):
diff -r 8f8c0f90c69a -r 0f15f63abce5 external/bsd/mdocml/Makefile.inc
--- a/external/bsd/mdocml/Makefile.inc Thu Dec 17 21:58:47 2015 +0000
+++ b/external/bsd/mdocml/Makefile.inc Thu Dec 17 22:31:01 2015 +0000
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.16 2014/01/05 19:49:57 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.17 2015/12/17 22:31:01 christos Exp $
.include <bsd.own.mk>
.if (${HOSTPROG:U} == "")
-CPPFLAGS+= -DHAVE_FGETLN -DHAVE_MMAP -DHAVE_GETSUBOPT \
- -DHAVE_STRCASESTR -DHAVE_STRLCAT -DHAVE_STRLCPY \
- -DHAVE_STRNLEN -DHAVE_STRPTIME -DHAVE_STRSEP
VERSION!= cd ${.PARSEDIR}/dist && ${MAKE} -V VERSION
-CPPFLAGS+= -DVERSION=\"${VERSION}\"
+CPPFLAGS+= -DVERSION=\"${VERSION}\" -I${DISTDIR}/../include
.endif
DISTDIR:= ${.PARSEDIR}/dist
diff -r 8f8c0f90c69a -r 0f15f63abce5 external/bsd/mdocml/bin/mandoc/Makefile
--- a/external/bsd/mdocml/bin/mandoc/Makefile Thu Dec 17 21:58:47 2015 +0000
+++ b/external/bsd/mdocml/bin/mandoc/Makefile Thu Dec 17 22:31:01 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/13 09:13:32 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2015/12/17 22:31:01 christos Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@
SRCS= chars.c main.c out.c tree.c \
eqn_html.c eqn_term.c \
html.c man_html.c mdoc_html.c tbl_html.c \
- man_term.c mdoc_term.c term.c term_ascii.c \
+ manpath.c man_term.c mdoc_term.c term.c term_ascii.c \
term_ps.c tbl_term.c
.ifndef HOSTPROG
diff -r 8f8c0f90c69a -r 0f15f63abce5 external/bsd/mdocml/dist/Makefile
--- a/external/bsd/mdocml/dist/Makefile Thu Dec 17 21:58:47 2015 +0000
+++ b/external/bsd/mdocml/dist/Makefile Thu Dec 17 22:31:01 2015 +0000
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.15 2015/12/17 21:58:47 christos Exp $
+# $Id: Makefile,v 1.2 2015/12/17 22:31:12 christos Exp $
#
# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
# Copyright (c) 2011, 2013, 2014, 2015 Ingo Schwarze <schwarze%openbsd.org@localhost>
@@ -269,7 +269,7 @@
# === USER CONFIGURATION ===============================================
-include Makefile.local
+-include Makefile.local
# === DEPENDENCY HANDLING ==============================================
diff -r 8f8c0f90c69a -r 0f15f63abce5 external/bsd/mdocml/dist/apropos.c
--- a/external/bsd/mdocml/dist/apropos.c Thu Dec 17 21:58:47 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-/* Id: apropos.c,v 1.36 2013/12/31 03:41:14 schwarze Exp */
-/*
- * Copyright (c) 2012 Kristaps Dzonsons <kristaps%bsd.lv@localhost>
- * Copyright (c) 2013 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.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <sys/param.h>
-
-#include <assert.h>
-#include <getopt.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "manpath.h"
-#include "mansearch.h"
-
-int
-main(int argc, char *argv[])
-{
- int ch, whatis;
- struct mansearch search;
- size_t i, sz;
- struct manpage *res;
- struct manpaths paths;
- char *defpaths, *auxpaths;
- char *conf_file;
- char *progname;
- char *outkey;
- extern char *optarg;
- extern int optind;
-
- progname = strrchr(argv[0], '/');
- if (progname == NULL)
- progname = argv[0];
- else
- ++progname;
-
- whatis = (0 == strncmp(progname, "whatis", 6));
-
- memset(&paths, 0, sizeof(struct manpaths));
- memset(&search, 0, sizeof(struct mansearch));
-
- auxpaths = defpaths = NULL;
- conf_file = NULL;
- outkey = NULL;
-
- while (-1 != (ch = getopt(argc, argv, "C:M:m:O:S:s:")))
- switch (ch) {
- case ('C'):
- conf_file = optarg;
- break;
- case ('M'):
- defpaths = optarg;
- break;
- case ('m'):
- auxpaths = optarg;
- break;
- case ('O'):
- outkey = optarg;
- break;
- case ('S'):
- search.arch = optarg;
- break;
- case ('s'):
- search.sec = optarg;
- break;
- default:
- goto usage;
- }
-
- argc -= optind;
- argv += optind;
-
- if (0 == argc)
- goto usage;
-
- search.deftype = whatis ? TYPE_Nm : TYPE_Nm | TYPE_Nd;
- search.flags = whatis ? MANSEARCH_WHATIS : 0;
-
- manpath_parse(&paths, conf_file, defpaths, auxpaths);
- ch = mansearch(&search, &paths, argc, argv, outkey, &res, &sz);
- manpath_free(&paths);
-
- if (0 == ch)
- goto usage;
-
- for (i = 0; i < sz; i++) {
- printf("%s - %s\n", res[i].names,
- NULL == outkey ? res[i].desc :
- NULL == res[i].output ? "" : res[i].output);
- free(res[i].file);
- free(res[i].names);
- free(res[i].desc);
- free(res[i].output);
- }
-
- free(res);
- return(sz ? EXIT_SUCCESS : EXIT_FAILURE);
-usage:
- fprintf(stderr, "usage: %s [-C file] [-M path] [-m path] "
- "[-O outkey] "
- "[-S arch] [-s section]%s ...\n", progname,
- whatis ? " name" : "\n expression");
- return(EXIT_FAILURE);
-}
diff -r 8f8c0f90c69a -r 0f15f63abce5 external/bsd/mdocml/dist/arch.c
--- a/external/bsd/mdocml/dist/arch.c Thu Dec 17 21:58:47 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/* Id: arch.c,v 1.9 2011/03/22 14:33:05 kristaps Exp */
-/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps%bsd.lv@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.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "mdoc.h"
-#include "mandoc.h"
-#include "libmdoc.h"
-
-#define LINE(x, y) \
- if (0 == strcmp(p, x)) return(y);
-
-const char *
-mdoc_a2arch(const char *p)
-{
-
-#include "arch.in"
-
- return(NULL);
-}
diff -r 8f8c0f90c69a -r 0f15f63abce5 external/bsd/mdocml/dist/arch.in
--- a/external/bsd/mdocml/dist/arch.in Thu Dec 17 21:58:47 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/* Id: arch.in,v 1.14 2013/09/16 22:12:57 schwarze Exp */
-/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps%bsd.lv@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.
- */
-
-/*
- * This file defines the architecture token of the .Dt prologue macro.
- * All architectures that your system supports (or the manuals of your
- * system) should be included here. The right-hand-side is the
- * formatted output.
- *
- * Be sure to escape strings.
- *
- * REMEMBER TO ADD NEW ARCHITECTURES TO MDOC.7!
- */
-
-LINE("acorn26", "Acorn26")
-LINE("acorn32", "Acorn32")
-LINE("algor", "Algor")
-LINE("alpha", "Alpha")
-LINE("amd64", "AMD64")
-LINE("amiga", "Amiga")
-LINE("amigappc", "AmigaPPC")
-LINE("arc", "ARC")
-LINE("arm", "ARM")
-LINE("arm26", "ARM26")
-LINE("arm32", "ARM32")
-LINE("armish", "ARMISH")
-LINE("armv7", "ARMv7")
-LINE("aviion", "AViiON")
-LINE("atari", "ATARI")
-LINE("bebox", "BeBox")
-LINE("cats", "cats")
-LINE("cesfic", "CESFIC")
-LINE("cobalt", "Cobalt")
-LINE("dreamcast", "Dreamcast")
-LINE("emips", "EMIPS")
-LINE("evbarm", "evbARM")
-LINE("evbmips", "evbMIPS")
-LINE("evbppc", "evbPPC")
-LINE("evbsh3", "evbSH3")
-LINE("ews4800mips", "EWS4800MIPS")
-LINE("hp300", "HP300")
-LINE("hpcarm", "HPCARM")
-LINE("hpcmips", "HPCMIPS")
-LINE("hpcsh", "HPCSH")
-LINE("hppa", "HPPA")
-LINE("hppa64", "HPPA64")
-LINE("ia64", "ia64")
-LINE("i386", "i386")
-LINE("ibmnws", "IBMNWS")
-LINE("iyonix", "Iyonix")
-LINE("landisk", "LANDISK")
-LINE("loongson", "Loongson")
-LINE("luna68k", "Luna68k")
-LINE("luna88k", "Luna88k")
-LINE("m68k", "m68k")
-LINE("mac68k", "Mac68k")
-LINE("macppc", "MacPPC")
Home |
Main Index |
Thread Index |
Old Index