devel/xsd: Update to 4.2.0

Add two new support ports: devel/libxsd and devel/libxsd-frontend. The runtime library was moved out of devel/xsd to devel/libxsd which is why the headers are gone. The compiler frontend, which following a previous comment in the devel/xsd Makefile suggesting that it should be a separate port, but more out of necessity for compatibility with the build2 build system, is now devel/libxsd-frontend. The examples are now a separate distribution and I didn't really see any urgent need to reincorporate them, as they would require yet another port that the majority of our userbase would probably not be interested in as xsd is ultimately just a build dependency for textproc/libkolabxml. Update devel/libcutl to 1.11.0 due to header relocation. Update textproc/libkolabxml to HEAD for C++11 compatibility. Differential Revision: https://reviews.freebsd.org/D43080
2024-10-18 19:49:40 +00:00 · 2023-12-16 17:39:14 -05:00 · 2023-12-16 17:39:14 -05:00 · 8c77316ede
commit 8c77316ede
parent a6c0085aee
25 changed files with 487 additions and 828 deletions
--- a/devel/Makefile
+++ b/devel/Makefile
@ -1463,6 +1463,8 @@
    SUBDIR += libxalloc
    SUBDIR += libxo
    SUBDIR += libxs
+    SUBDIR += libxsd
+    SUBDIR += libxsd-frontend
    SUBDIR += libxtend
    SUBDIR += libzakalwe
    SUBDIR += libzim
--- a/devel/libcutl/Makefile
+++ b/devel/libcutl/Makefile
@ -1,8 +1,7 @@
 PORTNAME=	libcutl
-PORTVERSION=	1.10.0
-PORTREVISION=	22
+PORTVERSION=	1.11.0
 CATEGORIES=	devel
-MASTER_SITES=	https://www.codesynthesis.com/download/${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITES=	https://www.codesynthesis.com/download/xsd/4.2/

 MAINTAINER=	rakuco@FreeBSD.org
 COMMENT=	C++ utility library with generic and independent components
@ -11,36 +10,25 @@ WWW=		https://www.codesynthesis.com/projects/libcutl/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BROKEN_sparc64=	Does not build: cannot configure with boost
+BUILD_DEPENDS=	build2>=0.16.0:devel/build2

-LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-		libexpat.so:textproc/expat2
-
-USES=		compiler:c++11-lib libtool
-# libcutl 1.10.0 is not compatible with C++17, which is the default since clang
-# 16. This means ports depending on it also need to use at most C++14.
-USE_CXXSTD=	c++11
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-
-# The checks for external boost and external expat are quite limited and do not
-# add the ${LOCALBASE} paths correctly (libboost.m4 uses wrong paths and
-# libexpat.m4 does nothing at all).
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_ARGS=	--disable-static \
-		--with-boost=${LOCALBASE} \
-		--with-external-boost \
-		--with-external-expat \
-		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
+USES=		compiler:c++2b-lang

 OPTIONS_DEFINE=	DOCS

-post-patch:
-# Avoid conflict with C++20 <version> by adding .txt suffix
-	@${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
-	@${REINPLACE_CMD} -i .c++20 '/doc_DATA/s/version/&.txt/' \
-		${WRKSRC}/Makefile.in
+B_CMD=		${LOCALBASE}/bin/b
+B_ARGS=		-V -j ${MAKE_JOBS_NUMBER} -J ${MAKE_JOBS_NUMBER}
+
+do-build:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${B_CMD} configure ${B_ARGS} \
+		config.cxx=${CXX} \
+		config.cxx.coptions="${CXXFLAGS}" \
+		config.cxx.loptions="${LDFLAGS} ${STRIP}" \
+		config.bin.lib=shared \
+		config.bin.rpath=${PREFIX}/lib \
+		config.install.chroot=${STAGEDIR} \
+		config.install.root=${PREFIX}
+do-install:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${B_CMD} install ${B_ARGS}

 .include <bsd.port.mk>
--- a/devel/libcutl/distinfo
+++ b/devel/libcutl/distinfo
@ -1,2 +1,3 @@
-SHA256 (libcutl-1.10.0.tar.gz) = bdee4b10ce621f18ec91e9ba63d539a2d74542a1d443e0e3f819861ab689d2f6
-SIZE (libcutl-1.10.0.tar.gz) = 1024621
+TIMESTAMP = 1702595107
+SHA256 (libcutl-1.11.0.tar.gz) = bb78ff87d6cb1a2544543ffe7941f0aeb8f9dcaf7dd46e9acef3e032ed7881dc
+SIZE (libcutl-1.11.0.tar.gz) = 35415
--- a/devel/libcutl/files/patch-configure
+++ b/devel/libcutl/files/patch-configure
@ -1,38 +0,0 @@
-Use regex from C++11 instead of boost/tr1's version (the latter is gone as of
-boost 1.65).
--- configure.orig	2015-11-24 13:45:55 UTC
-+++ configure
-@@ -17554,13 +17554,13 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 
-#include <boost/tr1/regex.hpp>
-+#include <regex>
- 
- int
- main ()
- {
-  std::tr1::regex r ("te.t", std::tr1::regex_constants::ECMAScript);
-  return std::tr1::regex_match ("test", r) ? 0 : 1;
-+  std::regex r ("te.t", std::regex_constants::ECMAScript);
-+  return std::regex_match ("test", r) ? 0 : 1;
- }
- 
- _ACEOF
-@@ -17631,13 +17631,13 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 
-#include <boost/tr1/regex.hpp>
-+#include <regex>
- 
- int
- main ()
- {
-  std::tr1::regex r ("te.t", std::tr1::regex_constants::ECMAScript);
-  return std::tr1::regex_match ("test", r) ? 0 : 1;
-+  std::regex r ("te.t", std::regex_constants::ECMAScript);
-+  return std::regex_match ("test", r) ? 0 : 1;
- }
- 
- _ACEOF
--- a/devel/libcutl/files/patch-cutl_re_re.cxx
+++ b/devel/libcutl/files/patch-cutl_re_re.cxx
@ -1,141 +0,0 @@
-Use regex from C++11 instead of boost/tr1's version (the latter is gone as of
-boost 1.65).
--- cutl/re/re.cxx.orig	2017-07-14 14:59:43 UTC
-+++ cutl/re/re.cxx
-@@ -9,7 +9,7 @@
- #ifndef LIBCUTL_EXTERNAL_BOOST
- #  include <cutl/details/boost/tr1/regex.hpp>
- #else
-#  include <boost/tr1/regex.hpp>
-+#  include <regex>
- #endif
- 
- using namespace std;
-@@ -40,17 +40,17 @@ namespace cutl
-     struct basic_regex<C>::impl
-     {
-       typedef basic_string<C> string_type;
-      typedef tr1::basic_regex<C> regex_type;
-+      typedef std::basic_regex<C> regex_type;
-       typedef typename regex_type::flag_type flag_type;
- 
-       impl () {}
-       impl (regex_type const& r): r (r) {}
-       impl (string_type const& s, bool icase)
-       {
-        flag_type f (tr1::regex_constants::ECMAScript);
-+        flag_type f (std::regex_constants::ECMAScript);
- 
-         if (icase)
-          f |= tr1::regex_constants::icase;
-+          f |= std::regex_constants::icase;
- 
-         r.assign (s, f);
-       }
-@@ -118,15 +118,15 @@ namespace cutl
-           impl_ = s == 0 ? new impl : new impl (*s, icase);
-         else
-         {
-          impl::flag_type f (tr1::regex_constants::ECMAScript);
-+          impl::flag_type f (std::regex_constants::ECMAScript);
- 
-           if (icase)
-            f |= tr1::regex_constants::icase;
-+            f |= std::regex_constants::icase;
- 
-           impl_->r.assign (*s, f);
-         }
-       }
-      catch (tr1::regex_error const& e)
-+      catch (std::regex_error const& e)
-       {
-         throw basic_format<char> (s == 0 ? "" : *s, e.what ());
-       }
-@@ -146,15 +146,15 @@ namespace cutl
-           impl_ = s == 0 ? new impl : new impl (*s, icase);
-         else
-         {
-          impl::flag_type f (tr1::regex_constants::ECMAScript);
-+          impl::flag_type f (std::regex_constants::ECMAScript);
- 
-           if (icase)
-            f |= tr1::regex_constants::icase;
-+            f |= std::regex_constants::icase;
- 
-           impl_->r.assign (*s, f);
-         }
-       }
-      catch (tr1::regex_error const& e)
-+      catch (std::regex_error const& e)
-       {
-         throw basic_format<wchar_t> (s == 0 ? L"" : *s, e.what ());
-       }
-@@ -166,28 +166,28 @@ namespace cutl
-     bool basic_regex<char>::
-     match (string_type const& s) const
-     {
-      return tr1::regex_match (s, impl_->r);
-+      return std::regex_match (s, impl_->r);
-     }
- 
-     template <>
-     bool basic_regex<wchar_t>::
-     match (string_type const& s) const
-     {
-      return tr1::regex_match (s, impl_->r);
-+      return std::regex_match (s, impl_->r);
-     }
- 
-     template <>
-     bool basic_regex<char>::
-     search (string_type const& s) const
-     {
-      return tr1::regex_search (s, impl_->r);
-+      return std::regex_search (s, impl_->r);
-     }
- 
-     template <>
-     bool basic_regex<wchar_t>::
-     search (string_type const& s) const
-     {
-      return tr1::regex_search (s, impl_->r);
-+      return std::regex_search (s, impl_->r);
-     }
- 
-     template <>
-@@ -196,13 +196,13 @@ namespace cutl
-              string_type const& sub,
-              bool first_only) const
-     {
-      tr1::regex_constants::match_flag_type f (
-        tr1::regex_constants::format_default);
-+      std::regex_constants::match_flag_type f (
-+        std::regex_constants::format_default);
- 
-       if (first_only)
-        f |= tr1::regex_constants::format_first_only;
-+        f |= std::regex_constants::format_first_only;
- 
-      return tr1::regex_replace (s, impl_->r, sub, f);
-+      return std::regex_replace (s, impl_->r, sub, f);
-     }
- 
-     template <>
-@@ -211,13 +211,13 @@ namespace cutl
-              string_type const& sub,
-              bool first_only) const
-     {
-      tr1::regex_constants::match_flag_type f (
-        tr1::regex_constants::format_default);
-+      std::regex_constants::match_flag_type f (
-+        std::regex_constants::format_default);
- 
-       if (first_only)
-        f |= tr1::regex_constants::format_first_only;
-+        f |= std::regex_constants::format_first_only;
- 
-      return tr1::regex_replace (s, impl_->r, sub, f);
-+      return std::regex_replace (s, impl_->r, sub, f);
-     }
-   }
- }
--- a/devel/libcutl/pkg-plist
+++ b/devel/libcutl/pkg-plist
@ -1,64 +1,53 @@
-include/cutl/compiler/code-stream.hxx
-include/cutl/compiler/code-stream.txx
-include/cutl/compiler/context.hxx
-include/cutl/compiler/context.txx
-include/cutl/compiler/cxx-indenter.hxx
-include/cutl/compiler/cxx-indenter.ixx
-include/cutl/compiler/cxx-indenter.txx
-include/cutl/compiler/sloc-counter.hxx
-include/cutl/compiler/sloc-counter.txx
-include/cutl/compiler/traversal.hxx
-include/cutl/compiler/traversal.txx
-include/cutl/compiler/type-id.hxx
-include/cutl/compiler/type-id.ixx
-include/cutl/compiler/type-id.txx
-include/cutl/compiler/type-info.hxx
-include/cutl/compiler/type-info.ixx
-include/cutl/container/any.hxx
-include/cutl/container/graph.hxx
-include/cutl/container/graph.txx
-include/cutl/container/key.hxx
-include/cutl/container/map-iterator.hxx
-include/cutl/container/multi-index.hxx
-include/cutl/container/pointer-iterator.hxx
-include/cutl/details/config.h
-include/cutl/details/config.hxx
-include/cutl/details/export.hxx
-include/cutl/details/genx/genx.h
-include/cutl/exception.hxx
-include/cutl/fs/auto-remove.hxx
-include/cutl/fs/exception.hxx
-include/cutl/fs/path.hxx
-include/cutl/fs/path.ixx
-include/cutl/fs/path.txx
-include/cutl/meta/answer.hxx
-include/cutl/meta/class-p.hxx
-include/cutl/meta/polymorphic-p.hxx
-include/cutl/meta/remove-c.hxx
-include/cutl/meta/remove-cv.hxx
-include/cutl/meta/remove-p.hxx
-include/cutl/meta/remove-v.hxx
-include/cutl/re.hxx
-include/cutl/re/re.txx
-include/cutl/shared-ptr.hxx
-include/cutl/shared-ptr/base.hxx
-include/cutl/shared-ptr/base.ixx
-include/cutl/shared-ptr/base.txx
-include/cutl/static-ptr.hxx
-include/cutl/xml/exception.hxx
-include/cutl/xml/parser.hxx
-include/cutl/xml/parser.ixx
-include/cutl/xml/parser.txx
-include/cutl/xml/qname.hxx
-include/cutl/xml/serializer.hxx
-include/cutl/xml/serializer.ixx
-include/cutl/xml/value-traits.hxx
-include/cutl/xml/value-traits.txx
-lib/libcutl-1.10.so
+include/libcutl/compiler/code-stream.hxx
+include/libcutl/compiler/code-stream.txx
+include/libcutl/compiler/context.hxx
+include/libcutl/compiler/context.txx
+include/libcutl/compiler/cxx-indenter.hxx
+include/libcutl/compiler/cxx-indenter.ixx
+include/libcutl/compiler/cxx-indenter.txx
+include/libcutl/compiler/sloc-counter.hxx
+include/libcutl/compiler/sloc-counter.txx
+include/libcutl/compiler/traversal.hxx
+include/libcutl/compiler/traversal.txx
+include/libcutl/compiler/type-id.hxx
+include/libcutl/compiler/type-id.ixx
+include/libcutl/compiler/type-id.txx
+include/libcutl/compiler/type-info.hxx
+include/libcutl/compiler/type-info.ixx
+include/libcutl/container/any.hxx
+include/libcutl/container/graph.hxx
+include/libcutl/container/graph.txx
+include/libcutl/container/key.hxx
+include/libcutl/container/map-iterator.hxx
+include/libcutl/container/multi-index.hxx
+include/libcutl/container/pointer-iterator.hxx
+include/libcutl/exception.hxx
+include/libcutl/export.hxx
+include/libcutl/fs/auto-remove.hxx
+include/libcutl/fs/exception.hxx
+include/libcutl/fs/path.hxx
+include/libcutl/fs/path.ixx
+include/libcutl/fs/path.txx
+include/libcutl/meta/answer.hxx
+include/libcutl/meta/class-p.hxx
+include/libcutl/meta/polymorphic-p.hxx
+include/libcutl/meta/remove-c.hxx
+include/libcutl/meta/remove-cv.hxx
+include/libcutl/meta/remove-p.hxx
+include/libcutl/meta/remove-v.hxx
+include/libcutl/re.hxx
+include/libcutl/re/re.txx
+include/libcutl/shared-ptr.hxx
+include/libcutl/shared-ptr/base.hxx
+include/libcutl/shared-ptr/base.ixx
+include/libcutl/shared-ptr/base.txx
+include/libcutl/static-ptr.hxx
+include/libcutl/version.hxx
+lib/libcutl-1.11.so
 lib/libcutl.so
 libdata/pkgconfig/libcutl.pc
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+libdata/pkgconfig/libcutl.shared.pc
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/version.txt
+%%PORTDOCS%%%%DOCSDIR%%/manifest
--- a/devel/libxsd-frontend/Makefile
+++ b/devel/libxsd-frontend/Makefile
@ -0,0 +1,36 @@
+PORTNAME=	libxsd-frontend
+DISTVERSION=	2.1.0
+CATEGORIES=	devel
+MASTER_SITES=	https://www.codesynthesis.com/download/xsd/4.2/
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	W3C XML Schema compiler frontend
+WWW=		https://www.codesynthesis.com/projects/libxsd-frontend/
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/GPLv2
+
+BUILD_DEPENDS=	build2>=0.16.0:devel/build2
+LIB_DEPENDS=	libcutl.so:devel/libcutl \
+		libxerces-c.so:textproc/xerces-c3
+
+USES=		compiler:c++2b-lang pkgconfig
+
+OPTIONS_DEFINE=	DOCS
+
+B_CMD=		${LOCALBASE}/bin/b
+B_ARGS=		-V -j ${MAKE_JOBS_NUMBER} -J ${MAKE_JOBS_NUMBER}
+
+do-build:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${B_CMD} configure ${B_ARGS} \
+		config.cxx=${CXX} \
+		config.cxx.coptions="${CXXFLAGS}" \
+		config.cxx.loptions="${LDFLAGS} ${STRIP}" \
+		config.bin.lib=shared \
+		config.bin.rpath=${PREFIX}/lib \
+		config.install.chroot=${STAGEDIR} \
+		config.install.root=${PREFIX}
+do-install:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${B_CMD} install ${B_ARGS}
+
+.include <bsd.port.mk>
--- a/devel/libxsd-frontend/distinfo
+++ b/devel/libxsd-frontend/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1702598278
+SHA256 (libxsd-frontend-2.1.0.tar.gz) = 98321b9c2307d7c4e1eba49da6a522ffa81bdf61f7e3605e469aa85bfcab90b1
+SIZE (libxsd-frontend-2.1.0.tar.gz) = 79844
--- a/devel/libxsd-frontend/pkg-descr
+++ b/devel/libxsd-frontend/pkg-descr
@ -0,0 +1,2 @@
+libxsd-frontend is a compiler frontend for the W3C XML Schema definition
+language. It includes parser, semantic graph types and traversal mechanism.
--- a/devel/libxsd-frontend/pkg-plist
+++ b/devel/libxsd-frontend/pkg-plist
@ -0,0 +1,57 @@
+include/libxsd-frontend/export.hxx
+include/libxsd-frontend/generators/dependencies.hxx
+include/libxsd-frontend/parser.hxx
+include/libxsd-frontend/schema-dom-parser.hxx
+include/libxsd-frontend/semantic-graph.hxx
+include/libxsd-frontend/semantic-graph/annotation.hxx
+include/libxsd-frontend/semantic-graph/any-attribute.hxx
+include/libxsd-frontend/semantic-graph/any.hxx
+include/libxsd-frontend/semantic-graph/attribute-group.hxx
+include/libxsd-frontend/semantic-graph/attribute.hxx
+include/libxsd-frontend/semantic-graph/complex.hxx
+include/libxsd-frontend/semantic-graph/compositors.hxx
+include/libxsd-frontend/semantic-graph/element-group.hxx
+include/libxsd-frontend/semantic-graph/element.hxx
+include/libxsd-frontend/semantic-graph/elements.hxx
+include/libxsd-frontend/semantic-graph/enumeration.hxx
+include/libxsd-frontend/semantic-graph/fundamental.hxx
+include/libxsd-frontend/semantic-graph/list.hxx
+include/libxsd-frontend/semantic-graph/namespace.hxx
+include/libxsd-frontend/semantic-graph/particle.hxx
+include/libxsd-frontend/semantic-graph/schema.hxx
+include/libxsd-frontend/semantic-graph/union.hxx
+include/libxsd-frontend/transformations/anonymous.hxx
+include/libxsd-frontend/transformations/enum-synthesis.hxx
+include/libxsd-frontend/transformations/restriction.hxx
+include/libxsd-frontend/transformations/schema-per-type.hxx
+include/libxsd-frontend/transformations/simplifier.hxx
+include/libxsd-frontend/traversal.hxx
+include/libxsd-frontend/traversal/any-attribute.hxx
+include/libxsd-frontend/traversal/any.hxx
+include/libxsd-frontend/traversal/attribute-group.hxx
+include/libxsd-frontend/traversal/attribute.hxx
+include/libxsd-frontend/traversal/complex.hxx
+include/libxsd-frontend/traversal/compositors.hxx
+include/libxsd-frontend/traversal/element-group.hxx
+include/libxsd-frontend/traversal/element.hxx
+include/libxsd-frontend/traversal/elements.hxx
+include/libxsd-frontend/traversal/elements.txx
+include/libxsd-frontend/traversal/enumeration.hxx
+include/libxsd-frontend/traversal/fundamental.hxx
+include/libxsd-frontend/traversal/list.hxx
+include/libxsd-frontend/traversal/namespace.hxx
+include/libxsd-frontend/traversal/particle.hxx
+include/libxsd-frontend/traversal/schema.hxx
+include/libxsd-frontend/traversal/union.hxx
+include/libxsd-frontend/types.hxx
+include/libxsd-frontend/version.hxx
+include/libxsd-frontend/xml.hxx
+lib/libxsd-frontend-2.1.so
+lib/libxsd-frontend.so
+libdata/pkgconfig/libxsd-frontend.pc
+libdata/pkgconfig/libxsd-frontend.shared.pc
+%%PORTDOCS%%%%DOCSDIR%%/GPLv2
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/manifest
--- a/devel/libxsd/Makefile
+++ b/devel/libxsd/Makefile
@ -0,0 +1,43 @@
+PORTNAME=	libxsd
+DISTVERSION=	4.2.0
+CATEGORIES=	devel
+MASTER_SITES=	https://www.codesynthesis.com/download/xsd/${DISTVERSION:R}/
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	XSD runtime library
+WWW=		https://www.codesynthesis.com/projects/xsd/
+
+LICENSE=		FLOSSE GPLv2
+LICENSE_COMB=		dual
+LICENSE_NAME_FLOSSE=	FLOSS Exception
+LICENSE_FILE_FLOSSE=	${WRKSRC}/FLOSSE
+LICENSE_PERMS_FLOSSE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+BUILD_DEPENDS=	build2>=0:devel/build2
+RUN_DEPENDS=	expat>=2.4.9:textproc/expat2 \
+		xerces-c3>=3.2.4:textproc/xerces-c3
+
+USES=		pkgconfig
+
+NO_ARCH=	yes
+NO_CCACHE=	yes
+
+OPTIONS_DEFINE=	DOCS
+
+B_CMD=		${LOCALBASE}/bin/b
+B_ARGS=		-V -j ${MAKE_JOBS_NUMBER} -J ${MAKE_JOBS_NUMBER}
+
+do-build:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${B_CMD} configure ${B_ARGS} \
+		config.cxx=${CXX} \
+		config.cxx.coptions="${CXXFLAGS}" \
+		config.cxx.loptions="${LDFLAGS} ${STRIP}" \
+		config.bin.lib=shared \
+		config.bin.rpath=${PREFIX}/lib \
+		config.install.chroot=${STAGEDIR} \
+		config.install.root=${PREFIX}
+
+do-install:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${B_CMD} install ${B_ARGS}
+
+.include <bsd.port.mk>
--- a/devel/libxsd/distinfo
+++ b/devel/libxsd/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1702699632
+SHA256 (libxsd-4.2.0.tar.gz) = 55caf0038603883eb39ac4caeaacda23a09cf81cffc8eb55a854b6b06ef2c52e
+SIZE (libxsd-4.2.0.tar.gz) = 189158
--- a/devel/libxsd/pkg-descr
+++ b/devel/libxsd/pkg-descr
@ -0,0 +1,10 @@
+libxsd is the runtime library for the XSD XML Schema to C++ data binding
+compiler.
+
+XSD is an open-source, cross-platform XML Schema to C++ data binding
+compiler. Provided with an XML document specification (XML Schema), it
+generates C++ classes that represent the given vocabulary as well as XML
+parsing and serialization code. You can then access the data stored in
+XML using types and functions that semantically correspond to your
+application domain rather than dealing with generic elements/attributes
+and raw strings.
--- a/devel/libxsd/pkg-plist
+++ b/devel/libxsd/pkg-plist
@ -0,0 +1,185 @@
+include/xsd/cxx/auto-array.hxx
+include/xsd/cxx/compilers/vc-8/post.hxx
+include/xsd/cxx/compilers/vc-8/pre.hxx
+include/xsd/cxx/config.hxx
+include/xsd/cxx/exceptions.hxx
+include/xsd/cxx/parser/document.hxx
+include/xsd/cxx/parser/document.txx
+include/xsd/cxx/parser/elements.hxx
+include/xsd/cxx/parser/elements.txx
+include/xsd/cxx/parser/error-handler.hxx
+include/xsd/cxx/parser/error-handler.txx
+include/xsd/cxx/parser/exceptions.hxx
+include/xsd/cxx/parser/exceptions.ixx
+include/xsd/cxx/parser/exceptions.txx
+include/xsd/cxx/parser/expat/elements.hxx
+include/xsd/cxx/parser/expat/elements.txx
+include/xsd/cxx/parser/map.hxx
+include/xsd/cxx/parser/map.ixx
+include/xsd/cxx/parser/map.txx
+include/xsd/cxx/parser/non-validating/parser.hxx
+include/xsd/cxx/parser/non-validating/parser.txx
+include/xsd/cxx/parser/non-validating/xml-schema-pimpl.hxx
+include/xsd/cxx/parser/non-validating/xml-schema-pimpl.ixx
+include/xsd/cxx/parser/non-validating/xml-schema-pimpl.txx
+include/xsd/cxx/parser/non-validating/xml-schema-pskel.hxx
+include/xsd/cxx/parser/non-validating/xml-schema-pskel.ixx
+include/xsd/cxx/parser/non-validating/xml-schema-pskel.txx
+include/xsd/cxx/parser/schema-exceptions.hxx
+include/xsd/cxx/parser/schema-exceptions.ixx
+include/xsd/cxx/parser/schema-exceptions.txx
+include/xsd/cxx/parser/substitution-map.hxx
+include/xsd/cxx/parser/substitution-map.txx
+include/xsd/cxx/parser/validating/exceptions.hxx
+include/xsd/cxx/parser/validating/exceptions.ixx
+include/xsd/cxx/parser/validating/exceptions.txx
+include/xsd/cxx/parser/validating/inheritance-map.hxx
+include/xsd/cxx/parser/validating/inheritance-map.txx
+include/xsd/cxx/parser/validating/parser.hxx
+include/xsd/cxx/parser/validating/parser.txx
+include/xsd/cxx/parser/validating/xml-schema-pimpl.hxx
+include/xsd/cxx/parser/validating/xml-schema-pimpl.ixx
+include/xsd/cxx/parser/validating/xml-schema-pimpl.txx
+include/xsd/cxx/parser/validating/xml-schema-pskel.hxx
+include/xsd/cxx/parser/validating/xml-schema-pskel.ixx
+include/xsd/cxx/parser/validating/xml-schema-pskel.txx
+include/xsd/cxx/parser/xerces/elements.hxx
+include/xsd/cxx/parser/xerces/elements.txx
+include/xsd/cxx/parser/xml-schema.hxx
+include/xsd/cxx/parser/xml-schema.ixx
+include/xsd/cxx/parser/xml-schema.txx
+include/xsd/cxx/post.hxx
+include/xsd/cxx/pre.hxx
+include/xsd/cxx/ro-string.hxx
+include/xsd/cxx/ro-string.txx
+include/xsd/cxx/tree/ace-cdr-stream-common.hxx
+include/xsd/cxx/tree/ace-cdr-stream-extraction.hxx
+include/xsd/cxx/tree/ace-cdr-stream-insertion.hxx
+include/xsd/cxx/tree/bits/literals.hxx
+include/xsd/cxx/tree/bits/literals.ixx
+include/xsd/cxx/tree/buffer.hxx
+include/xsd/cxx/tree/buffer.txx
+include/xsd/cxx/tree/comparison-map.hxx
+include/xsd/cxx/tree/comparison-map.txx
+include/xsd/cxx/tree/containers-wildcard.hxx
+include/xsd/cxx/tree/containers.hxx
+include/xsd/cxx/tree/containers.txx
+include/xsd/cxx/tree/date-time-extraction.txx
+include/xsd/cxx/tree/date-time-insertion.txx
+include/xsd/cxx/tree/date-time-ostream.txx
+include/xsd/cxx/tree/date-time.hxx
+include/xsd/cxx/tree/date-time.ixx
+include/xsd/cxx/tree/date-time.txx
+include/xsd/cxx/tree/element-map.hxx
+include/xsd/cxx/tree/element-map.txx
+include/xsd/cxx/tree/elements.hxx
+include/xsd/cxx/tree/elements.ixx
+include/xsd/cxx/tree/elements.txx
+include/xsd/cxx/tree/error-handler.hxx
+include/xsd/cxx/tree/error-handler.txx
+include/xsd/cxx/tree/exceptions.hxx
+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
+include/xsd/cxx/tree/parsing.txx
+include/xsd/cxx/tree/parsing/boolean.hxx
+include/xsd/cxx/tree/parsing/byte.hxx
+include/xsd/cxx/tree/parsing/date-time.txx
+include/xsd/cxx/tree/parsing/decimal.hxx
+include/xsd/cxx/tree/parsing/double.hxx
+include/xsd/cxx/tree/parsing/element-map.txx
+include/xsd/cxx/tree/parsing/float.hxx
+include/xsd/cxx/tree/parsing/int.hxx
+include/xsd/cxx/tree/parsing/long.hxx
+include/xsd/cxx/tree/parsing/short.hxx
+include/xsd/cxx/tree/parsing/unsigned-byte.hxx
+include/xsd/cxx/tree/parsing/unsigned-int.hxx
+include/xsd/cxx/tree/parsing/unsigned-long.hxx
+include/xsd/cxx/tree/parsing/unsigned-short.hxx
+include/xsd/cxx/tree/serialization.hxx
+include/xsd/cxx/tree/serialization.txx
+include/xsd/cxx/tree/serialization/boolean.hxx
+include/xsd/cxx/tree/serialization/byte.hxx
+include/xsd/cxx/tree/serialization/date-time.txx
+include/xsd/cxx/tree/serialization/decimal.hxx
+include/xsd/cxx/tree/serialization/double.hxx
+include/xsd/cxx/tree/serialization/element-map.txx
+include/xsd/cxx/tree/serialization/float.hxx
+include/xsd/cxx/tree/serialization/int.hxx
+include/xsd/cxx/tree/serialization/long.hxx
+include/xsd/cxx/tree/serialization/short.hxx
+include/xsd/cxx/tree/serialization/unsigned-byte.hxx
+include/xsd/cxx/tree/serialization/unsigned-int.hxx
+include/xsd/cxx/tree/serialization/unsigned-long.hxx
+include/xsd/cxx/tree/serialization/unsigned-short.hxx
+include/xsd/cxx/tree/std-ostream-map.hxx
+include/xsd/cxx/tree/std-ostream-map.txx
+include/xsd/cxx/tree/std-ostream-operators.hxx
+include/xsd/cxx/tree/stream-extraction-map.hxx
+include/xsd/cxx/tree/stream-extraction-map.txx
+include/xsd/cxx/tree/stream-extraction.hxx
+include/xsd/cxx/tree/stream-insertion-map.hxx
+include/xsd/cxx/tree/stream-insertion-map.txx
+include/xsd/cxx/tree/stream-insertion.hxx
+include/xsd/cxx/tree/text.hxx
+include/xsd/cxx/tree/text.txx
+include/xsd/cxx/tree/type-factory-map.hxx
+include/xsd/cxx/tree/type-factory-map.txx
+include/xsd/cxx/tree/type-serializer-map.hxx
+include/xsd/cxx/tree/type-serializer-map.txx
+include/xsd/cxx/tree/types.hxx
+include/xsd/cxx/tree/types.txx
+include/xsd/cxx/tree/xdr-stream-common.hxx
+include/xsd/cxx/tree/xdr-stream-extraction.hxx
+include/xsd/cxx/tree/xdr-stream-insertion.hxx
+include/xsd/cxx/version.hxx
+include/xsd/cxx/xml/bits/literals.hxx
+include/xsd/cxx/xml/bits/literals.ixx
+include/xsd/cxx/xml/char-iso8859-1.hxx
+include/xsd/cxx/xml/char-iso8859-1.txx
+include/xsd/cxx/xml/char-lcp.hxx
+include/xsd/cxx/xml/char-lcp.txx
+include/xsd/cxx/xml/char-utf8.hxx
+include/xsd/cxx/xml/char-utf8.txx
+include/xsd/cxx/xml/dom/auto-ptr.hxx
+include/xsd/cxx/xml/dom/bits/error-handler-proxy.hxx
+include/xsd/cxx/xml/dom/bits/error-handler-proxy.txx
+include/xsd/cxx/xml/dom/elements.hxx
+include/xsd/cxx/xml/dom/elements.txx
+include/xsd/cxx/xml/dom/parsing-header.hxx
+include/xsd/cxx/xml/dom/parsing-source.hxx
+include/xsd/cxx/xml/dom/parsing-source.txx
+include/xsd/cxx/xml/dom/serialization-header.hxx
+include/xsd/cxx/xml/dom/serialization-header.txx
+include/xsd/cxx/xml/dom/serialization-source.hxx
+include/xsd/cxx/xml/dom/serialization-source.txx
+include/xsd/cxx/xml/dom/wildcard-source.hxx
+include/xsd/cxx/xml/dom/wildcard-source.txx
+include/xsd/cxx/xml/elements.hxx
+include/xsd/cxx/xml/elements.txx
+include/xsd/cxx/xml/error-handler.hxx
+include/xsd/cxx/xml/exceptions.hxx
+include/xsd/cxx/xml/qualified-name.hxx
+include/xsd/cxx/xml/sax/bits/error-handler-proxy.hxx
+include/xsd/cxx/xml/sax/bits/error-handler-proxy.txx
+include/xsd/cxx/xml/sax/std-input-source.hxx
+include/xsd/cxx/xml/std-memory-manager.hxx
+include/xsd/cxx/xml/string.hxx
+include/xsd/cxx/xml/string.ixx
+include/xsd/cxx/xml/string.txx
+include/xsd/cxx/zc-istream.hxx
+include/xsd/cxx/zc-istream.txx
+libdata/pkgconfig/libxsd.pc
+libdata/pkgconfig/libxsd.shared.pc
+%%PORTDOCS%%%%DOCSDIR%%/FLOSSE
+%%PORTDOCS%%%%DOCSDIR%%/GPLv2
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/PACKAGE-README.md
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/manifest
--- a/devel/xsd/Makefile
+++ b/devel/xsd/Makefile
@ -1,9 +1,7 @@
 PORTNAME=	xsd
-DISTVERSION=	4.1.0.a11
-PORTREVISION=	2
-DISTVERSIONSUFFIX=	+dep
+DISTVERSION=	4.2.0
 CATEGORIES=	devel
-MASTER_SITES=	https://codesynthesis.com/~boris/tmp/${PORTNAME}/${DISTVERSION}/
+MASTER_SITES=	https://www.codesynthesis.com/download/${PORTNAME}/${DISTVERSION:R}/

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	W3C XML Schema to C++ translator
@ -12,43 +10,38 @@ WWW=		https://www.codesynthesis.com/projects/xsd/
 LICENSE=		FLOSSE GPLv2
 LICENSE_COMB=		dual
 LICENSE_NAME_FLOSSE=	FLOSS Exception
-LICENSE_FILE_FLOSSE=	${WRKSRC}/xsd/FLOSSE
+LICENSE_FILE_FLOSSE=	${WRKSRC}/FLOSSE
 LICENSE_PERMS_FLOSSE=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

-BUILD_DEPENDS=	${LOCALBASE}/include/build-0.3/abspath.make: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'.
+BUILD_DEPENDS=	build2>=0:devel/build2
 LIB_DEPENDS=	libcutl.so:devel/libcutl \
-		libxerces-c.so:textproc/xerces-c3
+		libxerces-c.so:textproc/xerces-c3 \
+		libxsd-frontend.so:devel/libxsd-frontend

-USES=		compiler:c++11-lang ghostscript:build gmake localbase:ldflags tar:bzip2
-# devel/libcutl 1.10.0 does not work with C++17 which is the default since
-# clang 16. This can be removed once that port starts working with C++17 and
-# has its own USE_CXXSTD removed.
-USE_CXXSTD=	c++11
+USES=		compiler:c++2b-lang pkgconfig

-MAKEFILE=	makefile
-MAKE_ARGS=	EXTERNAL_LIBCUTL=y \
-		install_prefix=${STAGEDIR}${PREFIX} \
-		install_man_dir=${STAGEDIR}${MANPREFIX}/man \
-		verbose=1
-ALL_TARGET=	# no default target should be passed to gmake.
+OPTIONS_DEFINE=	DOCS

-OPTIONS_DEFINE=	DOCS EXAMPLES
+B_CMD=		${LOCALBASE}/bin/b
+B_ARGS=		-V -j ${MAKE_JOBS_NUMBER} -J ${MAKE_JOBS_NUMBER}

-post-patch:
-# Use devel/build instead of the port's bundled copy.
-	${RM} -r ${WRKSRC}/build-0.3
-	${LN} -s ${LOCALBASE}/include/build-0.3 ${WRKSRC}/build-0.3
-# Avoid conflict with C++20 <version> by adding .txt suffix
-	@${MV} ${WRKSRC}/libxsd-frontend/version \
-		${WRKSRC}/libxsd-frontend/version.txt
+do-build:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${B_CMD} configure ${B_ARGS} \
+		config.cxx=${CXX} \
+		config.cxx.coptions="${CXXFLAGS}" \
+		config.cxx.loptions="${LDFLAGS} ${STRIP}" \
+		config.bin.lib=shared \
+		config.bin.rpath=${PREFIX}/lib \
+		config.install.chroot=${STAGEDIR} \
+		config.install.root=${PREFIX}
+
+do-install:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${B_CMD} install ${B_ARGS}

 post-install:
-# Install examples into the right directory.
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${MV} ${STAGEDIR}${DOCSDIR}/examples/* ${STAGEDIR}${EXAMPLESDIR}
-	${RMDIR} ${STAGEDIR}${DOCSDIR}/examples
+# Rename the xsd binary to xsdcxx, as lang/mono already installs an executable
+# called `xsd'.
+	@cd ${STAGEDIR}${PREFIX}/bin && ${MV} xsd xsdcxx
+	@cd ${STAGEDIR}${PREFIX}/share/man/man1 && ${MV} xsd.1 xsdcxx.1

 .include <bsd.port.mk>
--- a/devel/xsd/distinfo
+++ b/devel/xsd/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1626852794
-SHA256 (xsd-4.1.0.a11+dep.tar.bz2) = 4fbe2d1e17ad4451bb3a9d9101ac89f7b465205470f1c7ad5e2c1386ac2c87d2
-SIZE (xsd-4.1.0.a11+dep.tar.bz2) = 1778335
+TIMESTAMP = 1702607105
+SHA256 (xsd-4.2.0.tar.gz) = 2bed17c601cfb984f9a7501fd5c672f4f18eac678f5bdef6016971966add9145
+SIZE (xsd-4.2.0.tar.gz) = 1082536
--- a/devel/xsd/files/patch-doc_pregenerated_xsd.1
+++ b/devel/xsd/files/patch-doc_pregenerated_xsd.1
@ -1,13 +1,14 @@
 Rename the xsd binary to xsdcxx, as lang/mono already installs an executable
 called `xsd'.
--- xsd/doc/xsd.1.orig	2017-09-24 00:18:08 UTC
-+++ xsd/doc/xsd.1
+
+--- doc/pregenerated/xsd.1.orig	2023-09-28 07:36:28 UTC
+++ doc/pregenerated/xsd.1
@@ -1,7 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii xsd.1
 .\"
-.TH XSD 1 "July 2014" "XSD 4.1.0"
-+.TH XSDCXX 1 "July 2014" "XSDCXX 4.1.0"
+-.TH XSD 1 "January 2023" "XSD 4.2.0"
+.TH XSDCXX 1 "January 2023" "XSDCXX 4.2.0"
 .SH NAME
 xsd \- W3C XML Schema to C++ Compiler
 .\"
@ -52,7 +53,7 @@ called `xsd'.
 .I command
 .RE
 .PP
-@@ -1461,7 +1461,7 @@ option. With this approach you don't need to worry abo
+@@ -1484,7 +1484,7 @@ If the input file is not a valid W3C XML Schema defini
 .\"
 .SH DIAGNOSTICS
 If the input file is not a valid W3C XML Schema definition,
--- a/devel/xsd/files/patch-doc_pregenerated_xsd.xhtml
+++ b/devel/xsd/files/patch-doc_pregenerated_xsd.xhtml
@ -1,22 +1,24 @@
 Rename the xsd binary to xsdcxx, as lang/mono already installs an executable
 called `xsd'.
--- xsd/doc/xsd.xhtml.orig	2017-09-24 00:18:08 UTC
-+++ xsd/doc/xsd.xhtml
-@@ -3,11 +3,11 @@
+
+--- doc/pregenerated/xsd.xhtml.orig	2023-09-28 07:36:28 UTC
+++ doc/pregenerated/xsd.xhtml
+@@ -3,12 +3,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 
 <head>
-  <title>XSD 4.1.0 Compiler Command Line Manual</title>
-+  <title>XSDCXX 4.1.0 Compiler Command Line Manual</title>
+-  <title>XSD 4.2.0 Compiler Command Line Manual</title>
+  <title>XSDCXX 4.2.0 Compiler Command Line Manual</title>
 
-   <meta name="copyright" content="&copy; 2005-2017 Code Synthesis Tools CC"/>
+   <meta name="version" content="4.2.0"/>
+   <meta name="copyright" content="&#169; 2005-2023 Code Synthesis"/>
   <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" />
 
-@@ -52,19 +52,19 @@
+@@ -53,19 +53,19 @@
 
   <h1>NAME</h1>
 
@ -41,7 +43,7 @@ called `xsd'.
   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
-@@ -106,7 +106,7 @@
+@@ -107,7 +107,7 @@
 
     <dt><code><b>help</b></code></dt>
     <dd>Print usage information and exit. Use
@ -50,7 +52,7 @@ called `xsd'.
       for command-specific help.
     </dd>
 
-@@ -218,7 +218,7 @@
+@@ -221,7 +221,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
@ -58,8 +60,8 @@ called `xsd'.
 +    <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>
-@@ -1564,7 +1564,7 @@ namespace .*
+     <p class="code"><code><b>hello.xsd.
+@@ -1596,7 +1596,7 @@ namespace .*
   <h1>DIAGNOSTICS</h1>
 
   <p>If the input file is not a valid W3C XML Schema definition,
--- a/devel/xsd/files/patch-xsd_doc_makefile
+++ b/devel/xsd/files/patch-xsd_doc_makefile
@ -1,13 +0,0 @@
-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.
- #
--- a/devel/xsd/files/patch-xsd_libxsd_makefile
+++ b/devel/xsd/files/patch-xsd_libxsd_makefile
@ -1,18 +0,0 @@
-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.
- #
--- a/devel/xsd/files/patch-xsd_xsd_makefile
+++ b/devel/xsd/files/patch-xsd_xsd_makefile
@ -1,13 +0,0 @@
-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.
- #
--- a/devel/xsd/pkg-plist
+++ b/devel/xsd/pkg-plist
@ -1,456 +1,10 @@
 bin/xsdcxx
-include/xsd/cxx/auto-array.hxx
-include/xsd/cxx/compilers/vc-8/post.hxx
-include/xsd/cxx/compilers/vc-8/pre.hxx
-include/xsd/cxx/config.hxx
-include/xsd/cxx/exceptions.hxx
-include/xsd/cxx/parser/document.hxx
-include/xsd/cxx/parser/document.txx
-include/xsd/cxx/parser/elements.hxx
-include/xsd/cxx/parser/elements.txx
-include/xsd/cxx/parser/error-handler.hxx
-include/xsd/cxx/parser/error-handler.txx
-include/xsd/cxx/parser/exceptions.hxx
-include/xsd/cxx/parser/exceptions.ixx
-include/xsd/cxx/parser/exceptions.txx
-include/xsd/cxx/parser/expat/elements.hxx
-include/xsd/cxx/parser/expat/elements.txx
-include/xsd/cxx/parser/map.hxx
-include/xsd/cxx/parser/map.ixx
-include/xsd/cxx/parser/map.txx
-include/xsd/cxx/parser/non-validating/parser.hxx
-include/xsd/cxx/parser/non-validating/parser.txx
-include/xsd/cxx/parser/non-validating/xml-schema-pimpl.hxx
-include/xsd/cxx/parser/non-validating/xml-schema-pimpl.ixx
-include/xsd/cxx/parser/non-validating/xml-schema-pimpl.txx
-include/xsd/cxx/parser/non-validating/xml-schema-pskel.hxx
-include/xsd/cxx/parser/non-validating/xml-schema-pskel.ixx
-include/xsd/cxx/parser/non-validating/xml-schema-pskel.txx
-include/xsd/cxx/parser/schema-exceptions.hxx
-include/xsd/cxx/parser/schema-exceptions.ixx
-include/xsd/cxx/parser/schema-exceptions.txx
-include/xsd/cxx/parser/substitution-map.hxx
-include/xsd/cxx/parser/substitution-map.txx
-include/xsd/cxx/parser/validating/exceptions.hxx
-include/xsd/cxx/parser/validating/exceptions.ixx
-include/xsd/cxx/parser/validating/exceptions.txx
-include/xsd/cxx/parser/validating/inheritance-map.hxx
-include/xsd/cxx/parser/validating/inheritance-map.txx
-include/xsd/cxx/parser/validating/parser.hxx
-include/xsd/cxx/parser/validating/parser.txx
-include/xsd/cxx/parser/validating/xml-schema-pimpl.hxx
-include/xsd/cxx/parser/validating/xml-schema-pimpl.ixx
-include/xsd/cxx/parser/validating/xml-schema-pimpl.txx
-include/xsd/cxx/parser/validating/xml-schema-pskel.hxx
-include/xsd/cxx/parser/validating/xml-schema-pskel.ixx
-include/xsd/cxx/parser/validating/xml-schema-pskel.txx
-include/xsd/cxx/parser/xerces/elements.hxx
-include/xsd/cxx/parser/xerces/elements.txx
-include/xsd/cxx/parser/xml-schema.hxx
-include/xsd/cxx/parser/xml-schema.ixx
-include/xsd/cxx/parser/xml-schema.txx
-include/xsd/cxx/post.hxx
-include/xsd/cxx/pre.hxx
-include/xsd/cxx/ro-string.hxx
-include/xsd/cxx/ro-string.txx
-include/xsd/cxx/tree/ace-cdr-stream-common.hxx
-include/xsd/cxx/tree/ace-cdr-stream-extraction.hxx
-include/xsd/cxx/tree/ace-cdr-stream-insertion.hxx
-include/xsd/cxx/tree/bits/literals.hxx
-include/xsd/cxx/tree/bits/literals.ixx
-include/xsd/cxx/tree/buffer.hxx
-include/xsd/cxx/tree/buffer.txx
-include/xsd/cxx/tree/comparison-map.hxx
-include/xsd/cxx/tree/comparison-map.txx
-include/xsd/cxx/tree/containers-wildcard.hxx
-include/xsd/cxx/tree/containers.hxx
-include/xsd/cxx/tree/containers.txx
-include/xsd/cxx/tree/date-time-extraction.txx
-include/xsd/cxx/tree/date-time-insertion.txx
-include/xsd/cxx/tree/date-time-ostream.txx
-include/xsd/cxx/tree/date-time.hxx
-include/xsd/cxx/tree/date-time.ixx
-include/xsd/cxx/tree/date-time.txx
-include/xsd/cxx/tree/element-map.hxx
-include/xsd/cxx/tree/element-map.txx
-include/xsd/cxx/tree/elements.hxx
-include/xsd/cxx/tree/elements.ixx
-include/xsd/cxx/tree/elements.txx
-include/xsd/cxx/tree/error-handler.hxx
-include/xsd/cxx/tree/error-handler.txx
-include/xsd/cxx/tree/exceptions.hxx
-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
-include/xsd/cxx/tree/parsing.txx
-include/xsd/cxx/tree/parsing/boolean.hxx
-include/xsd/cxx/tree/parsing/byte.hxx
-include/xsd/cxx/tree/parsing/date-time.txx
-include/xsd/cxx/tree/parsing/decimal.hxx
-include/xsd/cxx/tree/parsing/double.hxx
-include/xsd/cxx/tree/parsing/element-map.txx
-include/xsd/cxx/tree/parsing/float.hxx
-include/xsd/cxx/tree/parsing/int.hxx
-include/xsd/cxx/tree/parsing/long.hxx
-include/xsd/cxx/tree/parsing/short.hxx
-include/xsd/cxx/tree/parsing/unsigned-byte.hxx
-include/xsd/cxx/tree/parsing/unsigned-int.hxx
-include/xsd/cxx/tree/parsing/unsigned-long.hxx
-include/xsd/cxx/tree/parsing/unsigned-short.hxx
-include/xsd/cxx/tree/serialization.hxx
-include/xsd/cxx/tree/serialization.txx
-include/xsd/cxx/tree/serialization/boolean.hxx
-include/xsd/cxx/tree/serialization/byte.hxx
-include/xsd/cxx/tree/serialization/date-time.txx
-include/xsd/cxx/tree/serialization/decimal.hxx
-include/xsd/cxx/tree/serialization/double.hxx
-include/xsd/cxx/tree/serialization/element-map.txx
-include/xsd/cxx/tree/serialization/float.hxx
-include/xsd/cxx/tree/serialization/int.hxx
-include/xsd/cxx/tree/serialization/long.hxx
-include/xsd/cxx/tree/serialization/short.hxx
-include/xsd/cxx/tree/serialization/unsigned-byte.hxx
-include/xsd/cxx/tree/serialization/unsigned-int.hxx
-include/xsd/cxx/tree/serialization/unsigned-long.hxx
-include/xsd/cxx/tree/serialization/unsigned-short.hxx
-include/xsd/cxx/tree/std-ostream-map.hxx
-include/xsd/cxx/tree/std-ostream-map.txx
-include/xsd/cxx/tree/std-ostream-operators.hxx
-include/xsd/cxx/tree/stream-extraction-map.hxx
-include/xsd/cxx/tree/stream-extraction-map.txx
-include/xsd/cxx/tree/stream-extraction.hxx
-include/xsd/cxx/tree/stream-insertion-map.hxx
-include/xsd/cxx/tree/stream-insertion-map.txx
-include/xsd/cxx/tree/stream-insertion.hxx
-include/xsd/cxx/tree/text.hxx
-include/xsd/cxx/tree/text.txx
-include/xsd/cxx/tree/type-factory-map.hxx
-include/xsd/cxx/tree/type-factory-map.txx
-include/xsd/cxx/tree/type-serializer-map.hxx
-include/xsd/cxx/tree/type-serializer-map.txx
-include/xsd/cxx/tree/types.hxx
-include/xsd/cxx/tree/types.txx
-include/xsd/cxx/tree/xdr-stream-common.hxx
-include/xsd/cxx/tree/xdr-stream-extraction.hxx
-include/xsd/cxx/tree/xdr-stream-insertion.hxx
-include/xsd/cxx/version.hxx
-include/xsd/cxx/xml/bits/literals.hxx
-include/xsd/cxx/xml/bits/literals.ixx
-include/xsd/cxx/xml/char-iso8859-1.hxx
-include/xsd/cxx/xml/char-iso8859-1.txx
-include/xsd/cxx/xml/char-lcp.hxx
-include/xsd/cxx/xml/char-lcp.txx
-include/xsd/cxx/xml/char-utf8.hxx
-include/xsd/cxx/xml/char-utf8.txx
-include/xsd/cxx/xml/dom/auto-ptr.hxx
-include/xsd/cxx/xml/dom/bits/error-handler-proxy.hxx
-include/xsd/cxx/xml/dom/bits/error-handler-proxy.txx
-include/xsd/cxx/xml/dom/elements.hxx
-include/xsd/cxx/xml/dom/elements.txx
-include/xsd/cxx/xml/dom/parsing-header.hxx
-include/xsd/cxx/xml/dom/parsing-source.hxx
-include/xsd/cxx/xml/dom/parsing-source.txx
-include/xsd/cxx/xml/dom/serialization-header.hxx
-include/xsd/cxx/xml/dom/serialization-header.txx
-include/xsd/cxx/xml/dom/serialization-source.hxx
-include/xsd/cxx/xml/dom/serialization-source.txx
-include/xsd/cxx/xml/dom/wildcard-source.hxx
-include/xsd/cxx/xml/dom/wildcard-source.txx
-include/xsd/cxx/xml/elements.hxx
-include/xsd/cxx/xml/elements.txx
-include/xsd/cxx/xml/error-handler.hxx
-include/xsd/cxx/xml/exceptions.hxx
-include/xsd/cxx/xml/qualified-name.hxx
-include/xsd/cxx/xml/sax/bits/error-handler-proxy.hxx
-include/xsd/cxx/xml/sax/bits/error-handler-proxy.txx
-include/xsd/cxx/xml/sax/std-input-source.hxx
-include/xsd/cxx/xml/std-memory-manager.hxx
-include/xsd/cxx/xml/string.hxx
-include/xsd/cxx/xml/string.ixx
-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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/library/library-pimpl.hxx
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/library/library.hxx
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/multiroot/README
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/multiroot/protocol.map
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/multiroot/protocol.xsd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/multiroot/withdraw.xml
-%%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/makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/performance/test-50k.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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polymorphism/supermen.xsd
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polyroot/supermen-pimpl.hxx
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/polyroot/supermen.xsd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/parser/wildcard/README
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/boost/boost-archive-extraction.hxx
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/boost/boost-archive-insertion.hxx
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/binary/boost/driver.cxx
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/compression/compressed-input-source.cxx
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/compression/compressed-input-source.hxx
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/comments/xml-schema-custom.hxx
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/contacts/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/contacts/contacts-custom.cxx
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/contacts/contacts-custom.hxx
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/custom/taxonomy/people.xml
-%%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/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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/messaging/dom-parse.cxx
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/messaging/dom-parse.hxx
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/multiroot/balance.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/multiroot/deposit.xml
-%%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-50k.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/secure/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/secure/driver.cxx
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/secure/library.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/secure/library.xsd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/secure/makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/secure/secure-dom-parser.cxx
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/secure/secure-dom-parser.hxx
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/streaming/position.xsd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/streaming/serializer.cxx
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/streaming/serializer.hxx
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cxx/tree/wildcard/README
-%%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.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%%/PACKAGE-README.md
+%%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/custom-literals.xsd
 %%PORTDOCS%%%%DOCSDIR%%/cxx/parser/guide/cxx-parser-guide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/cxx/parser/guide/cxx-parser-guide.ps
@ -462,8 +16,7 @@ man/man1/xsdcxx.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/cxx/tree/manual/cxx-tree-manual.pdf
 %%PORTDOCS%%%%DOCSDIR%%/cxx/tree/manual/cxx-tree-manual.ps
 %%PORTDOCS%%%%DOCSDIR%%/cxx/tree/manual/index.xhtml
-%%PORTDOCS%%%%DOCSDIR%%/cxx/tree/reference/footer.html
-%%PORTDOCS%%%%DOCSDIR%%/cxx/tree/reference/libxsd.doxygen
-%%PORTDOCS%%%%DOCSDIR%%/cxx/tree/reference/makefile
 %%PORTDOCS%%%%DOCSDIR%%/default.css
+%%PORTDOCS%%%%DOCSDIR%%/manifest
 %%PORTDOCS%%%%DOCSDIR%%/xsd.xhtml
+share/man/man1/xsdcxx.1.gz
--- a/textproc/libkolabxml/Makefile
+++ b/textproc/libkolabxml/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	libkolabxml
-DISTVERSION=	1.2.1
-PORTREVISION=	1
+DISTVERSION=	1.2.1-3
+DISTVERSIONSUFFIX=	-g27d1927
 CATEGORIES=	textproc
 MASTER_SITES=	LOCAL/kde/${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}
@ -14,11 +14,15 @@ WWW=		https://kolab.org/
 # are considered LGPL3-licensed, though.
 LICENSE=	LGPL3+

-BUILD_DEPENDS=	xsdcxx:devel/xsd
+BUILD_DEPENDS=	libxsd>=4.2.0:devel/libxsd \
+		xsdcxx:devel/xsd
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libcurl.so:ftp/curl \
 		libxerces-c.so.3:textproc/xerces-c3

+USES=		cmake tar:xz
+USE_LDCONFIG=	yes
+
 # TODO: Conditionally enable the bindings based on OPTIONs.
 CMAKE_OFF=	BUILD_TESTS \
 		BUILD_UTILS \
@ -27,16 +31,13 @@ CMAKE_OFF=	BUILD_TESTS \
 		JAVA_BINDINGS \
 		PHP_BINDINGS \
 		PYTHON_BINDINGS
-USES=		cmake tar:xz
-USE_CXXSTD=	c++11
-USE_LDCONFIG=	yes

-PLIST_SUB=	SHLIB_VER=${PORTVERSION}
+PLIST_SUB=	SHLIB_VER=${PORTVERSION:R}

 create-distfile:
 	${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
 	${SH} ${FILESDIR}/create_libkolabxml_release.sh \
 		${DISTDIR}/${DIST_SUBDIR} \
-		${DISTVERSION}
+		${DISTVERSIONFULL}

 .include <bsd.port.mk>
--- a/textproc/libkolabxml/distinfo
+++ b/textproc/libkolabxml/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1695429252
-SHA256 (libkolabxml/libkolabxml-1.2.1.tar.xz) = b3f0fd0aeb4977d36b273a087c502bfa9c52f262e3b2e3e31f17ae5d43832f51
-SIZE (libkolabxml/libkolabxml-1.2.1.tar.xz) = 105900
+TIMESTAMP = 1702759937
+SHA256 (libkolabxml/libkolabxml-1.2.1-3-g27d1927.tar.xz) = e4eea5ec9b00507eb7bce8dd7d5cef88d2e2a60b1187fc890dc25157281114f0
+SIZE (libkolabxml/libkolabxml-1.2.1-3-g27d1927.tar.xz) = 105824
--- a/textproc/libkolabxml/files/patch-src_shared__conversions.h
+++ b/textproc/libkolabxml/files/patch-src_shared__conversions.h
@ -0,0 +1,13 @@
+Fix build with devel/xsd >= 4.2.0
+
+--- src/shared_conversions.h.orig	2023-12-16 04:50:40 UTC
+++ src/shared_conversions.h
+@@ -29,7 +29,7 @@ typedef ::xsd::cxx::tree::type type;
+ typedef boost::shared_ptr<cDateTime> cDateTimePtr;
+ 
+ typedef ::xsd::cxx::tree::type type;
+-#if (XSD_INT_VERSION >= 4000000L)
+#if (LIBXSD_VERSION >= 4000000L)
+ typedef ::xsd::cxx::tree::simple_type< char, type > simple_type;
+ #else
+ typedef ::xsd::cxx::tree::simple_type< type > simple_type;