Update to 4.0.0.

- Get rid of most of our patches: all the build fix patches are now
  unneeded, and the only ones we still have in files/ are there to either
  rename the xsd binary or install files into the right locations.

- Get rid of most bundled dependencies: use devel/build instead of the
  bundled copy, and libcutl via devel/libcutl. The only exception is
  libxsd-frontend, simply because its upstream is too horrible: it does not
  even contain a `make install' target.

- Expand the LICENSE part: the port is GPLv2-licensed, but also contains
  exceptions to allow its use with most free software licenses.

- Set CPPFLAGS, not CXXFLAGS, as the former's where we normally pass
  additional include paths.
This commit is contained in:
Raphael Kubo da Costa 2015-09-06 22:14:55 +00:00
parent bcde9b96ca
commit f484b5cb28
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=396237
30 changed files with 291 additions and 689 deletions

View file

@ -1,52 +1,48 @@
# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
# $FreeBSD$
PORTNAME= xsd
PORTVERSION= 3.3.0
PORTREVISION= 1
DISTVERSIONSUFFIX= -2+dep
PORTVERSION= 4.0.0
DISTVERSIONSUFFIX= +dep
CATEGORIES= devel
MASTER_SITES= http://www.codesynthesis.com/download/${PORTNAME}/${PORTVERSION:R}/
MAINTAINER= kde@FreeBSD.org
COMMENT= W3C XML Schema to C++ translator
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/xsd/LICENSE
LICENSE= FLOSSE GPLv2
LICENSE_COMB= dual
LICENSE_NAME_FLOSSE= FLOSS Exception
LICENSE_FILE_FLOSSE= ${WRKSRC}/xsd/FLOSSE
LICENSE_PERMS_FLOSSE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
# FIXME: One could patch all the `#!/usr/bin/env bash' invocations in the build scripts and
# check if things still work to get rid of the shells/bash dependency.
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS= libboost_filesystem.so:${PORTSDIR}/devel/boost-libs \
libxerces-c.so.3:${PORTSDIR}/textproc/xerces-c3
ALL_TARGET= # no default target should be passed to gmake.
CXXFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKEFILE= makefile
MAKE_ARGS= install_prefix=${STAGEDIR}${PREFIX} \
verbose=1
USES= gmake tar:bzip2
BUILD_DEPENDS= ${LOCALBASE}/include/build-0.3/abspath.make:${PORTSDIR}/devel/build
# libxsd-frontend should come from a separate port as well, but at the moment
# its distribution as a separate tarball is so poor that it does not even have
# a `make install'.
LIB_DEPENDS= libcutl.so:${PORTSDIR}/devel/libcutl \
libxerces-c.so:${PORTSDIR}/textproc/xerces-c3
OPTIONS_DEFINE= DOCS EXAMPLES
.include <bsd.port.options.mk>
ALL_TARGET= # no default target should be passed to gmake.
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKEFILE= makefile
MAKE_ARGS= EXTERNAL_LIBCUTL=y \
install_prefix=${STAGEDIR}${PREFIX} \
install_man_dir=${STAGEDIR}${MANPREFIX}/man \
verbose=1
USES= gmake tar:bzip2
post-patch:
# Use devel/build instead of the port's bundled copy.
${RM} -fr ${WRKSRC}/build-0.3
${LN} -s ${LOCALBASE}/include/build-0.3 ${WRKSRC}/build-0.3
post-install:
${INSTALL_MAN} ${WRKSRC}/xsd/documentation/xsd.1 ${STAGEDIR}${MANPREFIX}/man/man1/xsdcxx.1
.if ${PORT_OPTIONS:MDOCS}
(cd ${WRKSRC}/xsd/documentation && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
${INSTALL_DATA} ${WRKSRC}/xsd/FLOSSE ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/xsd/NEWS ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/xsd/README ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/xsd/dist/README-UNIX ${STAGEDIR}${DOCSDIR}
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
${FIND} ${WRKSRC}/xsd/examples -type f -name makefile -delete
(cd ${WRKSRC}/xsd/examples && ${COPYTREE_SHARE} cxx ${STAGEDIR}${EXAMPLESDIR})
.endif
# Install examples into the right directory.
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR}
${RMDIR} ${STAGEDIR}${DOCSDIR}/examples
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
SHA256 (xsd-3.3.0-2+dep.tar.bz2) = d9da367b4d101242990c6ae06d9dc3232e2603dde29d827f9186041c4275e0dc
SIZE (xsd-3.3.0-2+dep.tar.bz2) = 1199833
SHA256 (xsd-4.0.0+dep.tar.bz2) = eca52a9c8f52cdbe2ae4e364e4a909503493a0d51ea388fc6c9734565a859817
SIZE (xsd-4.0.0+dep.tar.bz2) = 1642625

View file

@ -1,13 +0,0 @@
Use gm4 from devel/m4, as base m4 lacks some features needed by this build
system.
--- build-0.3/m4/m4.make~ 2012-08-10 22:56:20.000000000 -0300
+++ build-0.3/m4/m4.make 2012-08-10 22:56:27.000000000 -0300
@@ -3,7 +3,7 @@
# copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
# license : GNU GPL v2; see accompanying LICENSE file
-$(out_base)/%: m4 := m4
+$(out_base)/%: m4 := gm4
$(out_base)/%: m4_options +=
ifeq ($(out_base),$(src_base))

View file

@ -1,78 +0,0 @@
--- build-0.3/c/gnu/dep 2010-04-27 14:22:22.000000000 -0400
+++ build-0.3/c/gnu/dep 2014-12-12 16:10:56.000000000 -0500
@@ -1,3 +1,3 @@
-#! /usr/bin/env bash
+#!/bin/sh
# file : build/c/gnu/dep
@@ -21,5 +21,5 @@
script=
-function gen_script ()
+gen_script ()
{
while [ "$1" ]; do
@@ -34,10 +34,10 @@
#
script="$script"\
-"s \\ $prefix \\ $path$prefix g;"\
-"s \\ /usr/include/$prefix \\ $path$prefix g;"\
-"s \\ /usr/local/include/$prefix \\ $path$prefix g;"\
-"s ^$prefix $path$prefix ;"\
-"s ^/usr/include/$prefix $path$prefix ;"\
-"s ^/usr/local/include/$prefix $path$prefix ;"
+" -e 's| $prefix| $path$prefix|g'"\
+" -e 's| /usr/include/$prefix| $path$prefix|g'"\
+" -e 's| /usr/local/include/$prefix| $path$prefix|g'"\
+" -e 's|^$prefix|$path$prefix|'"\
+" -e 's|^/usr/include/$prefix|$path$prefix|'"\
+" -e 's|^/usr/local/include/$prefix|$path$prefix|'"
done
}
@@ -54,5 +54,4 @@
# some other place (e.g., /usr/include).
#
-epilogue="s% \([^/. \\\\]\)% $out_base/\1%g;s%^\([^/. ].*:\)%$out_base/\1%"
-
-exec sed -e "$script$epilogue"
+script="${script} -e 's% \([^/. \\\\]\)% $out_base/\1%g;s%^\([^/. ].*:\)%$out_base/\1%'"
+eval exec sed $script
--- build-0.3/c/intel/dep 2010-04-27 14:22:22.000000000 -0400
+++ build-0.3/c/intel/dep 2014-12-12 16:10:56.000000000 -0500
@@ -1,3 +1,3 @@
-#! /usr/bin/env bash
+#!/bin/sh
# file : build/c/intel/dep
@@ -21,5 +21,5 @@
script=
-function gen_script ()
+gen_script ()
{
while [ "$1" ]; do
@@ -34,10 +34,10 @@
#
script="$script"\
-"s \\ $prefix \\ $path$prefix g;"\
-"s \\ /usr/include/$prefix \\ $path$prefix g;"\
-"s \\ /usr/local/include/$prefix \\ $path$prefix g;"\
-"s ^$prefix $path$prefix ;"\
-"s ^/usr/include/$prefix $path$prefix ;"\
-"s ^/usr/local/include/$prefix $path$prefix ;"
+" -e 's| $prefix| $path$prefix|g'"\
+" -e 's| /usr/include/$prefix| $path$prefix|g'"\
+" -e 's| /usr/local/include/$prefix| $path$prefix|g'"\
+" -e 's|^$prefix|$path$prefix|'"\
+" -e 's|^/usr/include/$prefix|$path$prefix|'"\
+" -e 's|^/usr/local/include/$prefix|$path$prefix|'"
done
}
@@ -54,5 +54,4 @@
# some other place (e.g., /usr/include).
#
-epilogue="s% \([^/. \\\\]\)% $out_base/\1%g;s%^\([^/. ].*:\)%$out_base/\1%"
-
-exec sed -e "$script$epilogue"
+script="${script} -e 's% \([^/. \\\\]\)% $out_base/\1%g;s%^\([^/. ].*:\)%$out_base/\1%'"
+eval exec sed $script

View file

@ -1,18 +0,0 @@
C++11 build fix.
Operations such as insert() and erase() in sequential vectors such as
std::vector now take a const_iterator instead of an iterator in C++11, and
implicitly converting a Container::Vector::Iterator into a const_iterator
fails. We thus resort to just passing the wrapped std::$CONTAINER::iterator
which can then be converted as expected.
--- libbackend-elements/backend-elements/indentation/cxx.hxx~ 2010-01-01 09:17:20.000000000 -0200
+++ libbackend-elements/backend-elements/indentation/cxx.hxx 2012-08-10 23:36:46.000000000 -0300
@@ -580,7 +580,7 @@
if (*i == '}')
{
++i;
- hold_.erase (i);
+ hold_.erase (i.base ());
break;
}
}

View file

@ -1,18 +0,0 @@
C++11 build fix.
Operations such as insert() and erase() in sequential vectors such as
std::vector now take a const_iterator instead of an iterator in C++11, and
implicitly converting a Container::Vector::Iterator into a const_iterator
fails. We thus resort to just passing the wrapped std::$CONTAINER::iterator
which can then be converted as expected.
--- libcult/cult/cli/file-arguments.hxx~ 2012-08-10 23:14:36.000000000 -0300
+++ libcult/cult/cli/file-arguments.hxx 2012-08-10 23:12:30.000000000 -0300
@@ -47,7 +47,7 @@
if (i >= size ())
throw Bounds ();
- args_.erase (args_.begin () + i);
+ args_.erase (args_.begin ().base () + i);
}
private:

View file

@ -1,15 +0,0 @@
Also build when GNU keyword extensions are turned off.
This is the case when, for example, `-std=c++0x' is passed to a recent GCC or
`-std=c++11' is passed to clang.
--- libcult/cult/cli/mapper.hxx.m4~ 2012-08-10 20:06:09.000000000 -0300
+++ libcult/cult/cli/mapper.hxx.m4 2012-08-10 20:06:20.000000000 -0300
@@ -35,7 +35,7 @@
template <char const* x>
struct Selector
{
- typedef typeof (Mapper::f ((Tag<x>*) (0))) Type;
+ typedef __typeof__ (Mapper::f ((Tag<x>*) (0))) Type;
};
`#else'
template <char const* x>

View file

@ -1,18 +0,0 @@
C++11 build fix.
Operations such as insert() and erase() in sequential vectors such as
std::vector now take a const_iterator instead of an iterator in C++11, and
implicitly converting a Container::Vector::Iterator into a const_iterator
fails. We thus resort to just passing the wrapped std::$CONTAINER::iterator
which can then be converted as expected.
--- libcult/cult/containers/graph.txx~ 2010-04-15 03:52:59.000000000 -0300
+++ libcult/cult/containers/graph.txx 2012-08-10 23:21:50.000000000 -0300
@@ -307,7 +307,7 @@
edge.clear_right_node (r);
edge.clear_left_node (l);
- edges_.erase (i);
+ edges_.erase (i.base ());
}
}
}

View file

@ -1,23 +0,0 @@
clang build fix: cult/mm/evptr.hxx has
using Base::p_;
using Base::cp_;
using Base::c_;
in a public section, but these members are private here.
--- libcult/cult/mm/bits/evptr.hxx~ 2012-08-06 20:07:10.000000000 -0300
+++ libcult/cult/mm/bits/evptr.hxx 2012-08-06 20:11:24.000000000 -0300
@@ -227,6 +227,7 @@
template <typename>
friend class Transfer;
+ protected:
mutable X* p_;
mutable X const* cp_;
mutable Counter* c_;
@@ -337,6 +338,7 @@
template <typename>
friend class Transfer;
+ protected:
mutable X const* p_;
mutable X const* cp_;
mutable Counter* c_;

View file

@ -1,14 +0,0 @@
clang build fix. It complained about using a function declaration as the object
for the placement new call.
--- libcult/cult/mm/static-ptr.hxx~ 2012-08-06 19:57:49.000000000 -0300
+++ libcult/cult/mm/static-ptr.hxx 2012-08-06 19:58:19.000000000 -0300
@@ -60,7 +60,8 @@
static X*
instance_ ()
{
- static X* i = new (KeyList ()) X;
+ KeyList k;
+ static X* i = new (k) X;
return i;
}

View file

@ -1,18 +0,0 @@
C++11 build fix.
Operations such as insert() and erase() in sequential vectors such as
std::vector now take a const_iterator instead of an iterator in C++11, and
implicitly converting a Container::Vector::Iterator into a const_iterator
fails. We thus resort to just passing the wrapped std::$CONTAINER::iterator
which can then be converted as expected.
--- libfrontend-elements/frontend-elements/context.hxx~ 2012-08-10 23:30:34.000000000 -0300
+++ libfrontend-elements/frontend-elements/context.hxx 2012-08-10 23:30:49.000000000 -0300
@@ -122,7 +122,7 @@
if (i == map_.end ())
throw NoEntry ();
- map_.erase (i);
+ map_.erase (i.base ());
}
private:

View file

@ -1,18 +0,0 @@
C++11 build fix.
Operations such as insert() and erase() in sequential vectors such as
std::vector now take a const_iterator instead of an iterator in C++11, and
implicitly converting a Container::Vector::Iterator into a const_iterator
fails. We thus resort to just passing the wrapped std::$CONTAINER::iterator
which can then be converted as expected.
--- libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx~ 2012-06-03 06:02:29.000000000 -0300
+++ libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx 2012-08-10 23:45:53.000000000 -0300
@@ -43,7 +43,7 @@
std::find (argumented_.begin (), argumented_.end (), &a));
assert (i != argumented_.end ());
- argumented_.erase (i);
+ argumented_.erase (i.base ());
}
namespace RTTI = Cult::RTTI;

View file

@ -1,27 +0,0 @@
C++11 build fix.
Operations such as insert() and erase() in sequential vectors such as
std::vector now take a const_iterator instead of an iterator in C++11, and
implicitly converting a Container::Vector::Iterator into a const_iterator
fails. We thus resort to just passing the wrapped std::$CONTAINER::iterator
which can then be converted as expected.
--- libxsd-frontend/xsd-frontend/semantic-graph/elements.hxx~ 2010-04-27 16:31:24.000000000 -0300
+++ libxsd-frontend/xsd-frontend/semantic-graph/elements.hxx 2012-08-10 23:18:42.000000000 -0300
@@ -553,7 +553,7 @@
assert (i != iterator_map_.end ());
names_.erase (i->second);
- iterator_map_.erase (i);
+ iterator_map_.erase (i.base ());
NamesMap::Iterator j (names_map_.find (e.name ()));
@@ -1143,7 +1143,7 @@
Void
add_edge_right (Arguments& a, ArgumentedIterator const& pos)
{
- argumented_.insert (pos.base (), &a);
+ argumented_.insert (pos.base ().base (), &a);
}
private:

View file

@ -1,13 +0,0 @@
Fix clang error due to an ambiguity in the name lookup (Node is also defined by
libcult).
--- libxsd-frontend/xsd-frontend/semantic-graph/schema.hxx~ 2012-08-06 23:55:53.000000000 -0300
+++ libxsd-frontend/xsd-frontend/semantic-graph/schema.hxx 2012-08-06 23:56:33.000000000 -0300
@@ -241,7 +241,7 @@
friend class Bits::Graph<SemanticGraph::Node, Edge>;
using Scope::add_edge_left;
- using Node::add_edge_right;
+ using SemanticGraph::Node::add_edge_right;
Void
add_edge_left (Uses& e)

View file

@ -1,12 +0,0 @@
Do not install the man page with make install, as it might not be called if
NOPORTDOCS is set. We install the man page manually.
--- xsd/documentation/makefile~ 2012-08-10 19:07:34.000000000 -0300
+++ xsd/documentation/makefile 2012-08-10 19:07:48.000000000 -0300
@@ -21,7 +21,6 @@
$(call install-data,$(src_base)/schema-authoring-guide.xhtml,$(install_doc_dir)/xsd/schema-authoring-guide.xhtml)
$(call install-data,$(src_base)/xsd.xhtml,$(install_doc_dir)/xsd/xsd.xhtml)
$(call install-data,$(src_base)/custom-literals.xsd,$(install_doc_dir)/xsd/custom-literals.xsd)
- $(call install-data,$(src_base)/xsd.1,$(install_man_dir)/man1/xsd.1)
# Dist.
#

View file

@ -1,74 +0,0 @@
Rename the xsd binary to xsdcxx, as lang/mono already installs an executable
called `xsd'.
--- xsd/documentation/xsd.1~ 2012-08-10 14:28:12.000000000 -0300
+++ xsd/documentation/xsd.1 2012-08-10 14:30:50.000000000 -0300
@@ -1,16 +1,16 @@
.\" Process this file with
-.\" groff -man -Tascii xsd.1
+.\" groff -man -Tascii xsdcxx.1
.\"
.TH XSD 1 "April 2010" "XSD 3.3.0"
.SH NAME
-xsd \- W3C XML Schema to C++ Compiler
+xsdcxx \- W3C XML Schema to C++ Compiler
.\"
.\"
.\"
.\"--------------------------------------------------------------------
.SH SYNOPSIS
.\"--------------------------------------------------------------------
-.B xsd
+.B xsdcxx
.I command
.B [
.I options
@@ -20,19 +20,19 @@
.I file
.B ...]
.in
-.B xsd help
+.B xsdcxx help
.B [
.I command
.B ]
.in
-.B xsd version
+.B xsdcxx version
.\"
.\"
.\"
.\"--------------------------------------------------------------------
.SH DESCRIPTION
.\"--------------------------------------------------------------------
-.B xsd
+.B xsdcxx
generates vocabulary-specific, statically-typed C++ mapping from W3C XML
Schema definitions. Particular mapping to produce is selected by a
.IR command .
@@ -96,7 +96,7 @@
.PP
.RS
.RS 3
-.B xsd help
+.B xsdcxx help
.I command
.RE
.PP
@@ -203,7 +203,7 @@
with namespace
.B http://example.com/hello
and you run
-.B xsd
+.B xsdcxx
on this file, then the string in question will be:
.B hello.xsd. http://example.com/hello
@@ -1877,7 +1877,7 @@
.\"
.SH DIAGNOSTICS
If the input file is not a valid W3C XML Schema definition,
-.B xsd
+.B xsdcxx
will issue diagnostic messages to
.B STDERR
and exit with non-zero exit code.

View file

@ -1,56 +0,0 @@
Rename the xsd binary to xsdcxx, as lang/mono already installs an executable
called `xsd'.
--- xsd/documentation/xsd.xhtml~ 2012-08-10 14:31:35.000000000 -0300
+++ xsd/documentation/xsd.xhtml 2012-08-10 14:32:33.000000000 -0300
@@ -50,19 +50,19 @@
<h1>NAME</h1>
- <p>xsd - W3C XML Schema to C++ Compiler</p>
+ <p>xsdcxx - W3C XML Schema to C++ Compiler</p>
<h1>SYNOPSIS</h1>
<dl id="synopsis">
- <dt><code><b>xsd</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt>
- <dt><code><b>xsd help</b> [<i>command</i>]</code></dt>
- <dt><code><b>xsd version</b></code></dt>
+ <dt><code><b>xsdcxx</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt>
+ <dt><code><b>xsdcxx help</b> [<i>command</i>]</code></dt>
+ <dt><code><b>xsdcxx version</b></code></dt>
</dl>
<h1>DESCRIPTION</h1>
- <p><code><b>xsd</b></code> generates vocabulary-specific, statically-typed
+ <p><code><b>xsdcxx</b></code> generates vocabulary-specific, statically-typed
C++ mapping from W3C XML Schema definitions. Particular mapping to
produce is selected by a <code><i>command</i></code>. Each mapping has
a number of mapping-specific <code><i>options</i></code> that should
@@ -104,7 +104,7 @@
<dt><code><b>help</b></code></dt>
<dd>Print usage information and exit. Use
- <p><code><b>xsd help</b> <i>command</i></code></p>
+ <p><code><b>xsdcxx help</b> <i>command</i></code></p>
for command-specific help.
</dd>
@@ -174,7 +174,7 @@
<p>For example, if you have file <code><b>hello.xsd</b></code>
with namespace <code><b>http://example.com/hello</b></code> and you run
- <code><b>xsd</b></code> on this file, then the string in question
+ <code><b>xsdcxx</b></code> on this file, then the string in question
will be:</p>
<p><code><b>hello.xsd. http://example.com/hello</b></code></p>
@@ -1575,7 +1575,7 @@
<h1>DIAGNOSTICS</h1>
<p>If the input file is not a valid W3C XML Schema definition,
- <code><b>xsd</b></code> will issue diagnostic messages to STDERR
+ <code><b>xsdcxx</b></code> will issue diagnostic messages to STDERR
and exit with non-zero exit code.</p>
<h1>BUGS</h1>

View file

@ -1,15 +0,0 @@
Do not install some files by default, they should be installed only if
NOPORTDOCS is not defined, and into another directory.
--- xsd/libxsd/makefile~ 2012-08-10 18:24:36.000000000 -0300
+++ xsd/libxsd/makefile 2012-08-10 18:24:43.000000000 -0300
@@ -14,10 +14,6 @@
#
$(install):
$(call install-dir,$(src_base)/xsd,$(install_inc_dir)/xsd)
- $(call install-data,$(src_base)/FLOSSE,$(install_doc_dir)/libxsd/FLOSSE)
- $(call install-data,$(src_base)/GPLv2,$(install_doc_dir)/libxsd/GPLv2)
- $(call install-data,$(src_base)/LICENSE,$(install_doc_dir)/libxsd/LICENSE)
- $(call install-data,$(src_base)/README,$(install_doc_dir)/libxsd/README)
# Dist.
#

View file

@ -1,53 +0,0 @@
Do not build or install tests and examples: we only need to install examples,
and only if NOPORTEXAMPLES is not set.
Also do not install the documentation by default, as that should only be done if
NOPORTDOCS is not set.
--- xsd/makefile~ 2012-08-10 14:16:54.000000000 -0300
+++ xsd/makefile 2012-08-10 18:46:45.000000000 -0300
@@ -14,8 +14,6 @@
cleandoc := $(out_base)/.cleandoc
$(default): $(out_base)/xsd/ \
- $(out_base)/tests/ \
- $(out_base)/examples/ \
$(out_base)/documentation/
# Test.
@@ -26,17 +24,7 @@
# Install.
#
$(install): $(out_base)/xsd/.install \
- $(out_base)/libxsd/.install \
- $(out_base)/examples/.install \
- $(out_base)/documentation/.install
- $(call install-dir,$(src_base)/dist/examples/build,$(install_doc_dir)/xsd/examples/build)
- $(call install-dir,$(src_base)/dist/examples/cxx,$(install_doc_dir)/xsd/examples/cxx,-name makefile)
- $(call install-data,$(src_base)/dist/examples/makefile,$(install_doc_dir)/xsd/examples/makefile)
- $(call install-data,$(src_base)/FLOSSE,$(install_doc_dir)/xsd/FLOSSE)
- $(call install-data,$(src_base)/GPLv2,$(install_doc_dir)/xsd/GPLv2)
- $(call install-data,$(src_base)/LICENSE,$(install_doc_dir)/xsd/LICENSE)
- $(call install-data,$(src_base)/NEWS,$(install_doc_dir)/xsd/NEWS)
- $(call install-data,$(src_base)/dist/README-UNIX,$(install_doc_dir)/xsd/README)
+ $(out_base)/libxsd/.install
# Dist.
@@ -81,9 +69,7 @@
# Clean.
#
-$(clean): $(out_base)/xsd/.clean \
- $(out_base)/tests/.clean \
- $(out_base)/examples/.clean
+$(clean): $(out_base)/xsd/.clean
$(cleandoc): $(out_base)/documentation/.cleandoc
@@ -91,6 +77,4 @@
$(call import,$(src_base)/xsd/makefile)
$(call import,$(src_base)/libxsd/makefile)
-$(call import,$(src_base)/tests/makefile)
-$(call import,$(src_base)/examples/makefile)
$(call import,$(src_base)/documentation/makefile)

View file

@ -1,12 +0,0 @@
C++11 build fix: literals are supposed to be separated with a space.
--- xsd/xsd/cxx/elements.cxx~ 2012-08-10 22:50:51.000000000 -0300
+++ xsd/xsd/cxx/elements.cxx 2012-08-10 22:51:52.000000000 -0300
@@ -209,7 +209,7 @@
// Default mapping.
//
nsr_mapping_.push_back (
- Regex (L"#^.* (.*?/)??"L"(([a-zA-Z_]\\w*)(/[a-zA-Z_]\\w*)*)/?$#$2#"));
+ Regex (L"#^.* (.*?/)??" L"(([a-zA-Z_]\\w*)(/[a-zA-Z_]\\w*)*)/?$#$2#"));
nsr_mapping_.push_back (
Regex (L"#^.* http://www\\.w3\\.org/2001/XMLSchema$#xml_schema#"));

View file

@ -1,50 +0,0 @@
clang build fixes: WideString is needed due to the use of wchar_t in lots of
places.
--- xsd/xsd/cxx/parser/generator.cxx~ 2012-08-10 15:00:10.000000000 -0300
+++ xsd/xsd/cxx/parser/generator.cxx 2012-08-10 15:00:14.000000000 -0300
@@ -712,8 +712,8 @@
// String-based types.
//
- String char_type (ops.value<CLI::char_type> ());
- String string_type;
+ WideString char_type (ops.value<CLI::char_type> ());
+ WideString string_type;
if (char_type == L"char")
string_type = L"::std::string";
@@ -722,13 +722,13 @@
else
string_type = L"::std::basic_string< " + char_type + L" >";
- String xns;
+ WideString xns;
{
Context ctx (std::wcerr, schema, file_path, ops, 0, 0, 0, 0);
xns = ctx.xs_ns_name ();
}
- String buffer (L"::std::auto_ptr< " + xns + L"::buffer >");
+ WideString buffer (L"::std::auto_ptr< " + xns + L"::buffer >");
TypeMap::Namespace xsd ("http://www\\.w3\\.org/2001/XMLSchema");
xsd.types_push_back ("string", string_type);
@@ -1243,7 +1243,7 @@
Indentation::Clip<Indentation::SLOC, WideChar> hxx_sloc (hxx);
- String guard (guard_expr.merge (guard_prefix + hxx_name));
+ WideString guard (guard_expr.merge (guard_prefix + hxx_name));
guard = ctx.escape (guard); // Make it a C++ id.
std::transform (guard.begin (), guard.end(), guard.begin (), upcase);
@@ -1469,7 +1469,7 @@
&ixx_expr,
&hxx_impl_expr);
- String guard (guard_expr.merge (guard_prefix + hxx_impl_name));
+ WideString guard (guard_expr.merge (guard_prefix + hxx_impl_name));
guard = ctx.escape (guard); // Make it a C++ id.
std::transform (guard.begin (), guard.end(), guard.begin (), upcase);

View file

@ -1,27 +0,0 @@
C++11 build fix.
Operations such as insert() and erase() in sequential vectors such as
std::vector now take a const_iterator instead of an iterator in C++11, and
implicitly converting a Container::Vector::Iterator into a const_iterator
fails. We thus resort to just passing the wrapped std::$CONTAINER::iterator
which can then be converted as expected.
--- xsd/xsd/cxx/parser/state-processor.cxx~ 2010-04-28 03:58:09.000000000 -0300
+++ xsd/xsd/cxx/parser/state-processor.cxx 2012-08-10 23:25:49.000000000 -0300
@@ -154,7 +154,7 @@
if (++depth > depth_) // One for this compositor.
depth_ = depth;
- prefixes_.insert (prefixes_.end (),
+ prefixes_.insert (prefixes_.end ().base (),
t.prefixes_.begin ().base (),
t.prefixes_.end ().base ());
@@ -229,7 +229,7 @@
if (prefix)
{
- prefixes_.insert (prefixes_.end (),
+ prefixes_.insert (prefixes_.end ().base (),
t.prefixes_.begin ().base (),
t.prefixes_.end ().base ());

View file

@ -1,32 +0,0 @@
clang build fixes: WideString is needed due to the use of wchar_t in lots of
places.
--- xsd/xsd/cxx/tree/generator.cxx~ 2012-08-10 15:37:22.000000000 -0300
+++ xsd/xsd/cxx/tree/generator.cxx 2012-08-10 15:37:46.000000000 -0300
@@ -1304,7 +1304,7 @@
// Guard
//
- String guard (guard_expr.merge (guard_prefix + fwd_name));
+ WideString guard (guard_expr.merge (guard_prefix + fwd_name));
guard = ctx.escape (guard); // make a c++ id
std::transform (guard.begin (), guard.end(), guard.begin (), upcase);
@@ -1420,7 +1420,7 @@
// Guard
//
- String guard (guard_expr.merge (guard_prefix + hxx_name));
+ WideString guard (guard_expr.merge (guard_prefix + hxx_name));
guard = ctx.escape (guard); // make a c++ id
std::transform (guard.begin (), guard.end(), guard.begin (), upcase);
@@ -1575,7 +1575,7 @@
// Guard
//
- String guard (guard_expr.merge (guard_prefix + ixx_name));
+ WideString guard (guard_expr.merge (guard_prefix + ixx_name));
guard = ctx.escape (guard); // make a c++ id
std::transform (guard.begin (), guard.end(), guard.begin (), upcase);

View file

@ -1,32 +0,0 @@
Rename the xsd binary to xsdcxx, as lang/mono already installs an executable
called `xsd'.
--- xsd/xsd/makefile~ 2012-08-10 14:22:45.000000000 -0300
+++ xsd/xsd/makefile 2012-08-10 14:23:27.000000000 -0300
@@ -117,15 +117,15 @@
# Install
#
$(install): $(xsd)
- $(call install-exec,$<,$(install_bin_dir)/xsd)
+ $(call install-exec,$<,$(install_bin_dir)/xsdcxx)
# Dist.
#
$(dist): $(xsd)
- $(call install-exec,$<,$(dist_prefix)/bin/xsd)
+ $(call install-exec,$<,$(dist_prefix)/bin/xsdcxx)
$(dist-win): $(xsd)
- $(call install-exec,$<,$(dist_prefix)/bin/xsd.exe)
+ $(call install-exec,$<,$(dist_prefix)/bin/xsdcxx.exe)
# Clean.
#
@@ -139,7 +139,7 @@
ifeq ($(out_base),$(src_base))
$(xsd): | $(out_base)/.gitignore
-$(out_base)/.gitignore: files := xsd
+$(out_base)/.gitignore: files := xsdcxx
$(clean): $(out_base)/.gitignore.clean
$(call include,$(bld_root)/git/gitignore.make)

View file

@ -0,0 +1,13 @@
Rename the xsd binary to xsdcxx, as lang/mono already installs an executable
called `xsd'.
--- xsd/doc/makefile.orig 2014-07-21 06:36:38 UTC
+++ xsd/doc/makefile
@@ -104,7 +104,7 @@ $(install): $(out_base)/cxx/.install \
$(call install-data,$(src_base)/default.css,$(install_doc_dir)/xsd/default.css)
$(call install-data,$(out_base)/xsd.xhtml,$(install_doc_dir)/xsd/xsd.xhtml)
$(call install-data,$(src_base)/custom-literals.xsd,$(install_doc_dir)/xsd/custom-literals.xsd)
- $(call install-data,$(out_base)/xsd.1,$(install_man_dir)/man1/xsd.1)
+ $(call install-data,$(out_base)/xsd.1,$(install_man_dir)/man1/xsdcxx.1)
# Dist.
#

View file

@ -0,0 +1,78 @@
Rename the xsd binary to xsdcxx, as lang/mono already installs an executable
called `xsd'.
--- xsd/doc/xsd.1.orig 2014-07-21 06:38:41 UTC
+++ xsd/doc/xsd.1
@@ -1,16 +1,16 @@
.\" Process this file with
.\" groff -man -Tascii xsd.1
.\"
-.TH XSD 1 "July 2014" "XSD 4.0.0"
+.TH XSDCXX 1 "July 2014" "XSDCXX 4.0.0"
.SH NAME
-xsd \- W3C XML Schema to C++ Compiler
+xsdcxx \- W3C XML Schema to C++ Compiler
.\"
.\"
.\"
.\"--------------------------------------------------------------------
.SH SYNOPSIS
.\"--------------------------------------------------------------------
-.B xsd
+.B xsdcxx
.I command
.B [
.I options
@@ -20,19 +20,19 @@ xsd \- W3C XML Schema to C++ Compiler
.I file
.B ...]
.in
-.B xsd help
+.B xsdcxx help
.B [
.I command
.B ]
.in
-.B xsd version
+.B xsdcxx version
.\"
.\"
.\"
.\"--------------------------------------------------------------------
.SH DESCRIPTION
.\"--------------------------------------------------------------------
-.B xsd
+.B xsdcxx
generates vocabulary-specific, statically-typed C++ mapping from W3C XML
Schema definitions. Particular mapping to produce is selected by a
.IR command .
@@ -96,7 +96,7 @@ Print usage information and exit. Use
.PP
.RS
.RS 3
-.B xsd help
+.B xsdcxx help
.I command
.RE
.PP
@@ -133,9 +133,9 @@ semantics and uses \fBstd::unique_ptr\fP
When the C++11 mode is selected, you normally don't need to perform any
extra steps other than enable C++11 in your C++ compiler, if required\. The
-XSD compiler will automatically add the necessary macro defines to the
-generated header files that will switch the header-only XSD runtime library
-(\fBlibxsd\fP) to the C++11 mode\. However, if you include any of the XSD
+XSDCXX compiler will automatically add the necessary macro defines to the
+generated header files that will switch the header-only XSDCXX runtime library
+(\fBlibxsd\fP) to the C++11 mode\. However, if you include any of the XSDCXX
runtime headers directly in your application (normally you just include the
generated headers), then you will need to define the \fBXSD_CXX11\fP macro
for your entire project\.
@@ -1632,7 +1632,7 @@ option. With this approach you don't nee
.\"
.SH DIAGNOSTICS
If the input file is not a valid W3C XML Schema definition,
-.B xsd
+.B xsdcxx
will issue diagnostic messages to
.B STDERR
and exit with non-zero exit code.

View file

@ -0,0 +1,75 @@
Rename the xsd binary to xsdcxx, as lang/mono already installs an executable
called `xsd'.
--- xsd/doc/xsd.xhtml.orig 2014-07-21 06:38:41 UTC
+++ xsd/doc/xsd.xhtml
@@ -3,11 +3,11 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
- <title>XSD 4.0.0 Compiler Command Line Manual</title>
+ <title>XSDCXX 4.0.0 Compiler Command Line Manual</title>
<meta name="copyright" content="&copy; 2005-2014 Code Synthesis Tools CC"/>
<meta name="keywords" content="xsd,xml,schema,c++,mapping,data,binding,code,generator,manual,man,page"/>
- <meta name="description" content="XSD Compiler Command Line Manual"/>
+ <meta name="description" content="XSDCXX Compiler Command Line Manual"/>
<link rel="stylesheet" type="text/css" href="default.css" />
@@ -50,19 +50,19 @@
<h1>NAME</h1>
- <p>xsd - W3C XML Schema to C++ Compiler</p>
+ <p>xsdcxx - W3C XML Schema to C++ Compiler</p>
<h1>SYNOPSIS</h1>
<dl id="synopsis">
- <dt><code><b>xsd</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt>
- <dt><code><b>xsd help</b> [<i>command</i>]</code></dt>
- <dt><code><b>xsd version</b></code></dt>
+ <dt><code><b>xsdcxx</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt>
+ <dt><code><b>xsdcxx help</b> [<i>command</i>]</code></dt>
+ <dt><code><b>xsdcxx version</b></code></dt>
</dl>
<h1>DESCRIPTION</h1>
- <p><code><b>xsd</b></code> generates vocabulary-specific, statically-typed
+ <p><code><b>xsdcxx</b></code> generates vocabulary-specific, statically-typed
C++ mapping from W3C XML Schema definitions. Particular mapping to
produce is selected by a <code><i>command</i></code>. Each mapping has
a number of mapping-specific <code><i>options</i></code> that should
@@ -138,10 +138,10 @@
<p>When the C++11 mode is selected, you normally don't need to perform any
extra steps other than enable C++11 in your C++ compiler, if required. The
- XSD compiler will automatically add the necessary macro defines to the
- generated header files that will switch the header-only XSD runtime library
+ XSDCXX compiler will automatically add the necessary macro defines to the
+ generated header files that will switch the header-only XSDCXX runtime library
(<code><b>libxsd</b></code>) to the C++11 mode. However, if you include any
- of the XSD runtime headers directly in your application (normally you just
+ of the XSDCXX runtime headers directly in your application (normally you just
include the generated headers), then you will need to define the
<code><b>XSD_CXX11</b></code> macro for your entire project.</p></dd>
@@ -219,7 +219,7 @@
<p>For example, if you have file <code><b>hello.xsd</b></code> with
namespace <code><b>http://example.com/hello</b></code> and you run
- <code><b>xsd</b></code> on this file, then the string in question will
+ <code><b>xsdcxx</b></code> on this file, then the string in question will
be:</p>
<p><code><b>hello.xsd. http://example.com/hello</b></code></p>
@@ -1530,7 +1530,7 @@ namespace .*
<h1>DIAGNOSTICS</h1>
<p>If the input file is not a valid W3C XML Schema definition,
- <code><b>xsd</b></code> will issue diagnostic messages to STDERR
+ <code><b>xsdcxx</b></code> will issue diagnostic messages to STDERR
and exit with non-zero exit code.</p>
<h1>BUGS</h1>

View file

@ -0,0 +1,18 @@
Use the right directory name when installing documentation.
--- xsd/libxsd/makefile.orig 2015-09-06 21:07:55 UTC
+++ xsd/libxsd/makefile
@@ -13,10 +13,10 @@ dist-win := $(out_base)/.dist-win
#
$(install):
$(call install-dir,$(src_base)/xsd,$(install_inc_dir)/xsd)
- $(call install-data,$(src_base)/FLOSSE,$(install_doc_dir)/libxsd/FLOSSE)
- $(call install-data,$(src_base)/GPLv2,$(install_doc_dir)/libxsd/GPLv2)
- $(call install-data,$(src_base)/LICENSE,$(install_doc_dir)/libxsd/LICENSE)
- $(call install-data,$(src_base)/README,$(install_doc_dir)/libxsd/README)
+ $(call install-data,$(src_base)/FLOSSE,$(install_doc_dir)/xsd/FLOSSE)
+ $(call install-data,$(src_base)/GPLv2,$(install_doc_dir)/xsd/GPLv2)
+ $(call install-data,$(src_base)/LICENSE,$(install_doc_dir)/xsd/LICENSE)
+ $(call install-data,$(src_base)/README,$(install_doc_dir)/xsd/README)
# Dist.
#

View file

@ -0,0 +1,13 @@
Rename the xsd binary to xsdcxx, as lang/mono already installs an executable
called `xsd'.
--- xsd/xsd/makefile.orig 2014-07-21 06:36:38 UTC
+++ xsd/xsd/makefile
@@ -150,7 +150,7 @@ $(out_base)/: $(xsd)
# Install
#
$(install): $(xsd)
- $(call install-exec,$<,$(install_bin_dir)/xsd)
+ $(call install-exec,$<,$(install_bin_dir)/xsdcxx)
# Dist.
#

View file

@ -1,7 +1,5 @@
bin/xsdcxx
include/xsd/cxx/auto-array.hxx
include/xsd/cxx/compilers/vc-7/post.hxx
include/xsd/cxx/compilers/vc-7/pre.hxx
include/xsd/cxx/compilers/vc-8/post.hxx
include/xsd/cxx/compilers/vc-8/pre.hxx
include/xsd/cxx/config.hxx
@ -85,6 +83,7 @@ include/xsd/cxx/tree/exceptions.txx
include/xsd/cxx/tree/facet.hxx
include/xsd/cxx/tree/istream-fwd.hxx
include/xsd/cxx/tree/istream.hxx
include/xsd/cxx/tree/iterator-adapter.hxx
include/xsd/cxx/tree/list.hxx
include/xsd/cxx/tree/ostream.hxx
include/xsd/cxx/tree/parsing.hxx
@ -177,14 +176,22 @@ include/xsd/cxx/xml/string.txx
include/xsd/cxx/zc-istream.hxx
include/xsd/cxx/zc-istream.txx
man/man1/xsdcxx.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/build/cxx/compilers.make
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/build/cxx/rules.make
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/build/xsd/common.make
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/build/xsd/parser-rules.make
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/build/xsd/tree-rules.make
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/generated/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/generated/library.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/generated/library.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/generated/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/hello/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/hello/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/hello/hello.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/hello/hello.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/hello/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/library/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/library/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/library/library-pimpl.cxx
@ -193,15 +200,19 @@ man/man1/xsdcxx.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/library/library.map
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/library/library.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/library/library.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/library/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/mixed/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/mixed/anchor.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/mixed/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/mixed/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/mixed/text.map
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/mixed/text.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/mixed/text.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/mixin/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/mixin/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/mixin/instance.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/mixin/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/mixin/schema.map
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/mixin/schema.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/mixin/types.hxx
@ -209,6 +220,7 @@ man/man1/xsdcxx.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/multiroot/balance.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/multiroot/deposit.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/multiroot/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/multiroot/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/multiroot/protocol-pimpl.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/multiroot/protocol-pimpl.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/multiroot/protocol.hxx
@ -218,14 +230,14 @@ man/man1/xsdcxx.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/performance/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/performance/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/performance/gen.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/performance/test-500k.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/performance/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/performance/test-50k.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/performance/test-5k.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/performance/test.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/performance/time.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/performance/time.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polymorphism/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polymorphism/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polymorphism/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polymorphism/supermen-pimpl.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polymorphism/supermen-pimpl.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polymorphism/supermen.xml
@ -233,6 +245,7 @@ man/man1/xsdcxx.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polyroot/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polyroot/batman.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polyroot/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polyroot/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polyroot/person.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polyroot/superman.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polyroot/supermen-pimpl.cxx
@ -242,6 +255,7 @@ man/man1/xsdcxx.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/wildcard/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/wildcard/email.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/wildcard/email.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/wildcard/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/boost/README
@ -251,18 +265,23 @@ man/man1/xsdcxx.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/boost/library-prologue.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/boost/library.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/boost/library.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/boost/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/cdr/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/cdr/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/cdr/library.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/cdr/library.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/cdr/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/xdr/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/xdr/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/xdr/library.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/xdr/library.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/xdr/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/caching/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/caching/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/caching/library.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/caching/library.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/caching/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/compression/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/compression/compressed-format-target.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/compression/compressed-format-target.hxx
@ -271,17 +290,20 @@ man/man1/xsdcxx.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/compression/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/compression/library.xml.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/compression/library.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/compression/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/calendar/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/calendar/calendar.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/calendar/calendar.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/calendar/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/calendar/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/calendar/xml-schema-custom.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/calendar/xml-schema-custom.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/comments/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/comments/dom-parse.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/comments/dom-parse.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/comments/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/comments/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/comments/people.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/comments/people.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/comments/xml-schema-custom.cxx
@ -292,19 +314,24 @@ man/man1/xsdcxx.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/contacts/contacts.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/contacts/contacts.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/contacts/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/contacts/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/double/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/double/double-custom.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/double/double-custom.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/double/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/double/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/double/order.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/mixed/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/mixed/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/mixed/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/mixed/people-custom.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/mixed/people-custom.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/mixed/people.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/mixed/people.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/taxonomy/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/taxonomy/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/taxonomy/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/taxonomy/people-custom-fwd.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/taxonomy/people-custom.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/taxonomy/people-custom.hxx
@ -312,28 +339,30 @@ man/man1/xsdcxx.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/taxonomy/people.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/wildcard/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/wildcard/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/wildcard/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/wildcard/wildcard-custom.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/wildcard/wildcard-custom.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/wildcard/wildcard.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/wildcard/wildcard.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/dbxml/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/dbxml/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/dbxml/library.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/embedded/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/embedded/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/embedded/grammar-input-stream.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/embedded/grammar-input-stream.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/embedded/library.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/embedded/library.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/embedded/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/embedded/xsdbin.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/hello/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/hello/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/hello/hello.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/hello/hello.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/hello/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/library/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/library/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/library/library.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/library/library.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/library/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/messaging/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/messaging/balance.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/messaging/deposit.xml
@ -342,10 +371,12 @@ man/man1/xsdcxx.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/messaging/dom-serialize.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/messaging/dom-serialize.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/messaging/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/messaging/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/messaging/protocol.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/messaging/withdraw.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/mixed/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/mixed/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/mixed/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/mixed/text.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/mixed/text.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/multiroot/README
@ -354,25 +385,41 @@ man/man1/xsdcxx.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/multiroot/dom-parse.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/multiroot/dom-parse.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/multiroot/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/multiroot/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/multiroot/protocol.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/multiroot/withdraw.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/order/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/order/element/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/order/element/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/order/element/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/order/element/transactions.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/order/element/transactions.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/order/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/order/mixed/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/order/mixed/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/order/mixed/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/order/mixed/text.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/order/mixed/text.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/performance/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/performance/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/performance/gen.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/performance/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/performance/parsing.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/performance/serialization.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/performance/test-500k.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/performance/test-50k.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/performance/test-5k.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/performance/test.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/performance/time.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/performance/time.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/polymorphism/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/polymorphism/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/polymorphism/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/polymorphism/supermen.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/polymorphism/supermen.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/streaming/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/streaming/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/streaming/grammar-input-stream.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/streaming/grammar-input-stream.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/streaming/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/streaming/parser.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/streaming/parser.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/streaming/position.xml
@ -383,25 +430,25 @@ man/man1/xsdcxx.1.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/wildcard/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/wildcard/email.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/wildcard/email.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/wildcard/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/xpath/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/xpath/dom-parse.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/xpath/dom-parse.hxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/xpath/driver-2.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/xpath/driver.cxx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/xpath/makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/xpath/people.xml
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/xpath/people.xsd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/makefile
%%PORTDOCS%%%%DOCSDIR%%/FLOSSE
%%PORTDOCS%%%%DOCSDIR%%/GPLv2
%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/README-UNIX
%%PORTDOCS%%%%DOCSDIR%%/custom-literals.xsd
%%PORTDOCS%%%%DOCSDIR%%/cxx/parser/guide/cxx-parser-guide.pdf
%%PORTDOCS%%%%DOCSDIR%%/cxx/parser/guide/cxx-parser-guide.ps
%%PORTDOCS%%%%DOCSDIR%%/cxx/parser/guide/figure-1.png
%%PORTDOCS%%%%DOCSDIR%%/cxx/parser/guide/index.xhtml
%%PORTDOCS%%%%DOCSDIR%%/cxx/tree/dbxml/driver.cxx
%%PORTDOCS%%%%DOCSDIR%%/cxx/tree/dbxml/index.xhtml
%%PORTDOCS%%%%DOCSDIR%%/cxx/tree/dbxml/library.xsd
%%PORTDOCS%%%%DOCSDIR%%/cxx/tree/guide/cxx-tree-guide.pdf
%%PORTDOCS%%%%DOCSDIR%%/cxx/tree/guide/cxx-tree-guide.ps
%%PORTDOCS%%%%DOCSDIR%%/cxx/tree/guide/index.xhtml
@ -412,6 +459,4 @@ man/man1/xsdcxx.1.gz
%%PORTDOCS%%%%DOCSDIR%%/cxx/tree/reference/libxsd.doxygen
%%PORTDOCS%%%%DOCSDIR%%/cxx/tree/reference/makefile
%%PORTDOCS%%%%DOCSDIR%%/default.css
%%PORTDOCS%%%%DOCSDIR%%/future.xhtml
%%PORTDOCS%%%%DOCSDIR%%/schema-authoring-guide.xhtml
%%PORTDOCS%%%%DOCSDIR%%/xsd.xhtml