Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src merge expat-2.2.0 and document
details: https://anonhg.NetBSD.org/src/rev/2fabdba97257
branches: trunk
changeset: 821414:2fabdba97257
user: spz <spz%NetBSD.org@localhost>
date: Sat Feb 04 10:56:10 2017 +0000
description:
merge expat-2.2.0 and document
diffstat:
doc/3RDPARTY | 4 +-
external/mit/expat/dist/conftools/config.guess | 13 +-
external/mit/expat/dist/conftools/config.sub | 20 +-
external/mit/expat/dist/doc/xmlwf.sgml | 467 -------------------------
external/mit/expat/dist/lib/xmlparse.c | 66 ++-
external/mit/expat/dist/lib/xmltok.c | 111 ++++-
external/mit/expat/dist/lib/xmltok_impl.c | 216 +++++-----
external/mit/expat/dist/tests/xmltest.sh | 6 +-
external/mit/expat/lib/libexpat/expat_config.h | 9 +-
9 files changed, 275 insertions(+), 637 deletions(-)
diffs (truncated from 1763 to 300 lines):
diff -r 4471f2800766 -r 2fabdba97257 doc/3RDPARTY
--- a/doc/3RDPARTY Sat Feb 04 10:15:47 2017 +0000
+++ b/doc/3RDPARTY Sat Feb 04 10:56:10 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1406 2017/01/31 23:56:41 christos Exp $
+# $NetBSD: 3RDPARTY,v 1.1407 2017/02/04 10:56:10 spz Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -413,7 +413,7 @@
Notes:
Package: expat
-Version: 2.1.1
+Version: 2.2.0
Current Vers: 2.2.0
Maintainer: Expat Project
Archive Site: http://sourceforge.net/projects/expat/files/expat/
diff -r 4471f2800766 -r 2fabdba97257 external/mit/expat/dist/conftools/config.guess
--- a/external/mit/expat/dist/conftools/config.guess Sat Feb 04 10:15:47 2017 +0000
+++ b/external/mit/expat/dist/conftools/config.guess Sat Feb 04 10:56:10 2017 +0000
@@ -1057,7 +1057,18 @@
echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ eval $set_cc_for_build
+ X86_64_ABI=
+ # If there is a compiler, see if it is configured for 32-bit objects.
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_X32 >/dev/null
+ then
+ X86_64_ABI=x32
+ fi
+ fi
+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}${X86_64_ABI}
exit ;;
xtensa*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
diff -r 4471f2800766 -r 2fabdba97257 external/mit/expat/dist/conftools/config.sub
--- a/external/mit/expat/dist/conftools/config.sub Sat Feb 04 10:15:47 2017 +0000
+++ b/external/mit/expat/dist/conftools/config.sub Sat Feb 04 10:56:10 2017 +0000
@@ -838,6 +838,24 @@
basic_machine=m68k-atari
os=-mint
;;
+ mipsEE* | ee | ps2)
+ basic_machine=mips64r5900el-scei
+ case $os in
+ -linux*)
+ ;;
+ *)
+ os=-elf
+ ;;
+ esac
+ ;;
+ iop)
+ basic_machine=mipsel-scei
+ os=-irx
+ ;;
+ dvp)
+ basic_machine=dvp-scei
+ os=-elf
+ ;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
@@ -1404,7 +1422,7 @@
| -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
diff -r 4471f2800766 -r 2fabdba97257 external/mit/expat/dist/doc/xmlwf.sgml
--- a/external/mit/expat/dist/doc/xmlwf.sgml Sat Feb 04 10:15:47 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,467 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
- page: `docbook-to-man manpage.sgml > manpage.1'. You may view
- the manual page with: `docbook-to-man manpage.sgml | nroff -man |
- less'. A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
- docbook-to-man $< > $@
- -->
-
- <!-- Fill in your name for FIRSTNAME and SURNAME. -->
- <!ENTITY dhfirstname "<firstname>Scott</firstname>">
- <!ENTITY dhsurname "<surname>Bronson</surname>">
- <!-- Please adjust the date whenever revising the manpage. -->
- <!ENTITY dhdate "<date>March 11, 2016</date>">
- <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
- allowed: see man(7), man(1). -->
- <!ENTITY dhsection "<manvolnum>1</manvolnum>">
- <!ENTITY dhemail "<email>bronson%rinspin.com@localhost</email>">
- <!ENTITY dhusername "Scott Bronson">
- <!ENTITY dhucpackage "<refentrytitle>XMLWF</refentrytitle>">
- <!ENTITY dhpackage "xmlwf">
-
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY gnu "<acronym>GNU</acronym>">
-]>
-
-<refentry>
- <refentryinfo>
- <address>
- &dhemail;
- </address>
- <author>
- &dhfirstname;
- &dhsurname;
- </author>
- <copyright>
- <year>2001</year>
- <holder>&dhusername;</holder>
- </copyright>
- &dhdate;
- </refentryinfo>
- <refmeta>
- &dhucpackage;
-
- &dhsection;
- </refmeta>
- <refnamediv>
- <refname>&dhpackage;</refname>
-
- <refpurpose>Determines if an XML document is well-formed</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>&dhpackage;</command>
- <arg><option>-s</option></arg>
- <arg><option>-n</option></arg>
- <arg><option>-p</option></arg>
- <arg><option>-x</option></arg>
-
- <arg><option>-e <replaceable>encoding</replaceable></option></arg>
- <arg><option>-w</option></arg>
-
- <arg><option>-d <replaceable>output-dir</replaceable></option></arg>
- <arg><option>-c</option></arg>
- <arg><option>-m</option></arg>
-
- <arg><option>-r</option></arg>
- <arg><option>-t</option></arg>
-
- <arg><option>-v</option></arg>
-
- <arg>file ...</arg>
- </cmdsynopsis>
- </refsynopsisdiv>
-
- <refsect1>
- <title>DESCRIPTION</title>
-
- <para>
- <command>&dhpackage;</command> uses the Expat library to
- determine if an XML document is well-formed. It is
- non-validating.
- </para>
-
- <para>
- If you do not specify any files on the command-line, and you
- have a recent version of <command>&dhpackage;</command>, the
- input file will be read from standard input.
- </para>
-
- </refsect1>
-
- <refsect1>
- <title>WELL-FORMED DOCUMENTS</title>
-
- <para>
- A well-formed document must adhere to the
- following rules:
- </para>
-
- <itemizedlist>
- <listitem><para>
- The file begins with an XML declaration. For instance,
- <literal><?xml version="1.0" standalone="yes"?></literal>.
- <emphasis>NOTE:</emphasis>
- <command>&dhpackage;</command> does not currently
- check for a valid XML declaration.
- </para></listitem>
- <listitem><para>
- Every start tag is either empty (<tag/>)
- or has a corresponding end tag.
- </para></listitem>
- <listitem><para>
- There is exactly one root element. This element must contain
- all other elements in the document. Only comments, white
- space, and processing instructions may come after the close
- of the root element.
- </para></listitem>
- <listitem><para>
- All elements nest properly.
- </para></listitem>
- <listitem><para>
- All attribute values are enclosed in quotes (either single
- or double).
- </para></listitem>
- </itemizedlist>
-
- <para>
- If the document has a DTD, and it strictly complies with that
- DTD, then the document is also considered <emphasis>valid</emphasis>.
- <command>&dhpackage;</command> is a non-validating parser --
- it does not check the DTD. However, it does support
- external entities (see the <option>-x</option> option).
- </para>
- </refsect1>
-
- <refsect1>
- <title>OPTIONS</title>
-
-<para>
-When an option includes an argument, you may specify the argument either
-separately ("<option>-d</option> output") or concatenated with the
-option ("<option>-d</option>output"). <command>&dhpackage;</command>
-supports both.
-</para>
-
- <variablelist>
-
- <varlistentry>
- <term><option>-c</option></term>
- <listitem>
- <para>
- If the input file is well-formed and <command>&dhpackage;</command>
- doesn't encounter any errors, the input file is simply copied to
- the output directory unchanged.
- This implies no namespaces (turns off <option>-n</option>) and
- requires <option>-d</option> to specify an output file.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-d output-dir</option></term>
- <listitem>
- <para>
- Specifies a directory to contain transformed
- representations of the input files.
- By default, <option>-d</option> outputs a canonical representation
- (described below).
- You can select different output formats using <option>-c</option>
- and <option>-m</option>.
- </para>
- <para>
- The output filenames will
- be exactly the same as the input filenames or "STDIN" if the input is
- coming from standard input. Therefore, you must be careful that the
- output file does not go into the same directory as the input
- file. Otherwise, <command>&dhpackage;</command> will delete the
- input file before it generates the output file (just like running
- <literal>cat < file > file</literal> in most shells).
- </para>
- <para>
- Two structurally equivalent XML documents have a byte-for-byte
- identical canonical XML representation.
- Note that ignorable white space is considered significant and
- is treated equivalently to data.
- More on canonical XML can be found at
- http://www.jclark.com/xml/canonxml.html .
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-e encoding</option></term>
- <listitem>
- <para>
- Specifies the character encoding for the document, overriding
- any document encoding declaration. <command>&dhpackage;</command>
- supports four built-in encodings:
- <literal>US-ASCII</literal>,
- <literal>UTF-8</literal>,
- <literal>UTF-16</literal>, and
- <literal>ISO-8859-1</literal>.
- Also see the <option>-w</option> option.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-m</option></term>
- <listitem>
- <para>
- Outputs some strange sort of XML file that completely
- describes the input file, including character positions.
- Requires <option>-d</option> to specify an output file.
- </para>
Home |
Main Index |
Thread Index |
Old Index