pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/xsd xsd: Update to 4.0.0. Builds again.
details: https://anonhg.NetBSD.org/pkgsrc/rev/901150b384a1
branches: trunk
changeset: 448469:901150b384a1
user: nia <nia%pkgsrc.org@localhost>
date: Mon Mar 08 14:33:44 2021 +0000
description:
xsd: Update to 4.0.0. Builds again.
Borrowed patches from FreeBSD to rename the executable to avoid a
conflict wiht lang/mono.
diffstat:
devel/xsd/Makefile | 39 +-
devel/xsd/PLIST | 304 +++++++++-
devel/xsd/distinfo | 41 +-
devel/xsd/patches/patch-libbackend-elements-1.6.1_backend-elements_indentation_cxx.hxx | 13 -
devel/xsd/patches/patch-libcult-1.4.2_cult_cli_file-arguments.hxx | 14 -
devel/xsd/patches/patch-libcult-1.4.2_cult_containers_deque.hxx | 17 -
devel/xsd/patches/patch-libcult-1.4.2_cult_containers_graph.txx | 13 -
devel/xsd/patches/patch-libcult-1.4.2_cult_containers_map.hxx | 16 -
devel/xsd/patches/patch-libcult-1.4.2_cult_containers_vector.hxx | 16 -
devel/xsd/patches/patch-libcult-1.4.2_cult_mm_bits_evptr.hxx | 12 -
devel/xsd/patches/patch-libcult-1.4.2_cult_mm_evptr.hxx | 22 -
devel/xsd/patches/patch-libcult-1.4.2_cult_mm_shptr.hxx | 22 -
devel/xsd/patches/patch-libcult-1.4.2_cult_mm_static-ptr.hxx | 14 -
devel/xsd/patches/patch-libcult-1.4.2_cult_types_fundamental.hxx | 12 -
devel/xsd/patches/patch-libfrontend-elements-1.1.1_frontend-elements_context.hxx | 13 -
devel/xsd/patches/patch-libxsd-frontend-1.15.0_xsd-frontend_parser.cxx | 103 ---
devel/xsd/patches/patch-libxsd-frontend-1.15.0_xsd-frontend_semantic-graph_elements.cxx | 12 -
devel/xsd/patches/patch-libxsd-frontend-1.15.0_xsd-frontend_semantic-graph_elements.hxx | 13 -
devel/xsd/patches/patch-libxsd-frontend-1.15.0_xsd-frontend_semantic-graph_schema.hxx | 13 -
devel/xsd/patches/patch-libxsd-frontend-1.15.0_xsd-frontend_transformations_anonymous.cxx | 52 -
devel/xsd/patches/patch-libxsd-frontend-1.15.0_xsd-frontend_transformations_schema-per-type.cxx | 13 -
devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_elements.cxx | 13 -
devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_parser_elements.cxx | 21 -
devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_parser_generator.cxx | 173 -----
devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_parser_state-processor.cxx | 24 -
devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_tree_elements.cxx | 13 -
devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_tree_generator.cxx | 139 ----
devel/xsd/patches/patch-xsd-3.2.0-2_xsd_xsd.cxx | 40 -
devel/xsd/patches/patch-xsd-3.2.0-2_xsd_xsd.hxx | 13 -
devel/xsd/patches/patch-xsd_doc_makefile | 16 +
devel/xsd/patches/patch-xsd_doc_xsd.1 | 81 ++
devel/xsd/patches/patch-xsd_doc_xsd.xhtml | 78 ++
devel/xsd/patches/patch-xsd_libxsd_makefile | 21 +
devel/xsd/patches/patch-xsd_xsd_makefile | 16 +
34 files changed, 520 insertions(+), 902 deletions(-)
diffs (truncated from 1646 to 300 lines):
diff -r 83c0c7a36096 -r 901150b384a1 devel/xsd/Makefile
--- a/devel/xsd/Makefile Mon Mar 08 13:25:12 2021 +0000
+++ b/devel/xsd/Makefile Mon Mar 08 14:33:44 2021 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.39 2021/01/01 08:24:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2021/03/08 14:33:44 nia Exp $
-DISTNAME= xsd-3.2.0+dep
+DISTNAME= xsd-4.0.0+dep
+PKGNAME= ${DISTNAME:S/+dep//1}
+CATEGORIES= devel textproc
+MASTER_SITES= https://www.codesynthesis.com/download/xsd/${PKGVERSION_NOREV:R}/
EXTRACT_SUFX= .tar.bz2
-PKGNAME= xsd-3.2.0
-PKGREVISION= 25
-CATEGORIES= devel textproc
-MASTER_SITES= https://www.codesynthesis.com/download/xsd/3.2/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://www.codesynthesis.com/products/xsd/
@@ -13,24 +12,22 @@
LICENSE= gnu-gpl-v2
USE_TOOLS+= bash gmake gm4
-USE_LANGUAGES+= gnu++03
+USE_LANGUAGES= c c++11
+
+GCC_REQD+= 4.7 # C++11
-SUBST_CLASSES+= rpath
-SUBST_STAGE.rpath= post-configure
-SUBST_FILES.rpath= */*/*/configuration-dynamic.make
-SUBST_SED.rpath= -e 's|cxx_rpath[ ]*:=[ ]*n|cxx_rpath := y|g'
+MAKE_FILE= makefile
+
+BUILD_TARGET= # no default target should be passed to gmake.
-post-extract:
- ${RM} -f ${WRKSRC}/libcult-1.4.2/version ${WRKSRC}/libfrontend-elements-1.1.1/version
- ${RM} -f ${WRKSRC}/libxsd-frontend-1.15.0/version
+MAKE_FLAGS+= verbose=1
+MAKE_FLAGS+= install_prefix=${DESTDIR}${PREFIX}
+MAKE_FLAGS+= install_man_dir=${DESTDIR}${PREFIX}/${PKGMANDIR}
-do-build:
- # XXX: rpath needs a better hack. TODO: add optimization
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LDFLAGS="-Wl,-rpath,${PREFIX}/lib" ./build.sh
-
-do-install:
- cd ${WRKSRC} && MAKEFLAGS="install_prefix=${DESTDIR}${PREFIX} \
- install_man_dir=${DESTDIR}${PREFIX}/${PKGMANDIR}" ./build.sh install
+post-patch:
+ # Avoid conflict with C++20 <version>
+ ${RM} -f ${WRKSRC}/version
+ ${RM} -f ${WRKSRC}/build/import/lib*/version
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../textproc/xerces-c/buildlink3.mk"
diff -r 83c0c7a36096 -r 901150b384a1 devel/xsd/PLIST
--- a/devel/xsd/PLIST Mon Mar 08 13:25:12 2021 +0000
+++ b/devel/xsd/PLIST Mon Mar 08 14:33:44 2021 +0000
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:49:17 joerg Exp $
-bin/xsd
+@comment $NetBSD: PLIST,v 1.3 2021/03/08 14:33:44 nia Exp $
+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
@@ -74,16 +72,19 @@
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.ixx
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
@@ -93,6 +94,7 @@
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
@@ -108,6 +110,7 @@
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
@@ -139,6 +142,12 @@
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
@@ -156,6 +165,7 @@
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
@@ -166,42 +176,288 @@
include/xsd/cxx/xml/string.txx
include/xsd/cxx/zc-istream.hxx
include/xsd/cxx/zc-istream.txx
-man/man1/xsd.1
-share/doc/libxsd/FLOSSE
-share/doc/libxsd/GPLv2
-share/doc/libxsd/LICENSE
-share/doc/libxsd/README
+man/man1/xsdcxx.1
share/doc/xsd/FLOSSE
share/doc/xsd/GPLv2
share/doc/xsd/LICENSE
share/doc/xsd/NEWS
share/doc/xsd/README
+share/doc/xsd/custom-literals.xsd
share/doc/xsd/cxx/parser/guide/cxx-parser-guide.pdf
share/doc/xsd/cxx/parser/guide/cxx-parser-guide.ps
share/doc/xsd/cxx/parser/guide/figure-1.png
-share/doc/xsd/cxx/parser/guide/figure-1.svg
-share/doc/xsd/cxx/parser/guide/guide.html2ps
share/doc/xsd/cxx/parser/guide/index.xhtml
-share/doc/xsd/cxx/parser/guide/makefile
-share/doc/xsd/cxx/tree/dbxml/driver.cxx
-share/doc/xsd/cxx/tree/dbxml/index.xhtml
-share/doc/xsd/cxx/tree/dbxml/library.cxx
-share/doc/xsd/cxx/tree/dbxml/library.hxx
-share/doc/xsd/cxx/tree/dbxml/library.xsd
share/doc/xsd/cxx/tree/guide/cxx-tree-guide.pdf
share/doc/xsd/cxx/tree/guide/cxx-tree-guide.ps
-share/doc/xsd/cxx/tree/guide/guide.html2ps
share/doc/xsd/cxx/tree/guide/index.xhtml
-share/doc/xsd/cxx/tree/guide/makefile
share/doc/xsd/cxx/tree/manual/cxx-tree-manual.pdf
share/doc/xsd/cxx/tree/manual/cxx-tree-manual.ps
share/doc/xsd/cxx/tree/manual/index.xhtml
-share/doc/xsd/cxx/tree/manual/makefile
-share/doc/xsd/cxx/tree/manual/manual.html2ps
share/doc/xsd/cxx/tree/reference/footer.html
share/doc/xsd/cxx/tree/reference/libxsd.doxygen
share/doc/xsd/cxx/tree/reference/makefile
share/doc/xsd/default.css
-share/doc/xsd/future.xhtml
-share/doc/xsd/schema-authoring-guide.xhtml
+share/doc/xsd/examples/build/cxx/compilers.make
+share/doc/xsd/examples/build/cxx/rules.make
+share/doc/xsd/examples/build/xsd/common.make
+share/doc/xsd/examples/build/xsd/parser-rules.make
+share/doc/xsd/examples/build/xsd/tree-rules.make
+share/doc/xsd/examples/cxx/makefile
+share/doc/xsd/examples/cxx/parser/README
+share/doc/xsd/examples/cxx/parser/generated/README
+share/doc/xsd/examples/cxx/parser/generated/library.xml
+share/doc/xsd/examples/cxx/parser/generated/library.xsd
+share/doc/xsd/examples/cxx/parser/generated/makefile
+share/doc/xsd/examples/cxx/parser/hello/README
+share/doc/xsd/examples/cxx/parser/hello/driver.cxx
+share/doc/xsd/examples/cxx/parser/hello/hello.xml
+share/doc/xsd/examples/cxx/parser/hello/hello.xsd
+share/doc/xsd/examples/cxx/parser/hello/makefile
+share/doc/xsd/examples/cxx/parser/library/README
+share/doc/xsd/examples/cxx/parser/library/driver.cxx
+share/doc/xsd/examples/cxx/parser/library/library-pimpl.cxx
+share/doc/xsd/examples/cxx/parser/library/library-pimpl.hxx
+share/doc/xsd/examples/cxx/parser/library/library.hxx
+share/doc/xsd/examples/cxx/parser/library/library.map
+share/doc/xsd/examples/cxx/parser/library/library.xml
+share/doc/xsd/examples/cxx/parser/library/library.xsd
+share/doc/xsd/examples/cxx/parser/library/makefile
+share/doc/xsd/examples/cxx/parser/makefile
+share/doc/xsd/examples/cxx/parser/mixed/README
+share/doc/xsd/examples/cxx/parser/mixed/anchor.hxx
+share/doc/xsd/examples/cxx/parser/mixed/driver.cxx
+share/doc/xsd/examples/cxx/parser/mixed/makefile
+share/doc/xsd/examples/cxx/parser/mixed/text.map
+share/doc/xsd/examples/cxx/parser/mixed/text.xml
+share/doc/xsd/examples/cxx/parser/mixed/text.xsd
+share/doc/xsd/examples/cxx/parser/mixin/README
+share/doc/xsd/examples/cxx/parser/mixin/driver.cxx
+share/doc/xsd/examples/cxx/parser/mixin/instance.xml
+share/doc/xsd/examples/cxx/parser/mixin/makefile
+share/doc/xsd/examples/cxx/parser/mixin/schema.map
+share/doc/xsd/examples/cxx/parser/mixin/schema.xsd
+share/doc/xsd/examples/cxx/parser/mixin/types.hxx
+share/doc/xsd/examples/cxx/parser/multiroot/README
+share/doc/xsd/examples/cxx/parser/multiroot/balance.xml
+share/doc/xsd/examples/cxx/parser/multiroot/deposit.xml
+share/doc/xsd/examples/cxx/parser/multiroot/driver.cxx
+share/doc/xsd/examples/cxx/parser/multiroot/makefile
+share/doc/xsd/examples/cxx/parser/multiroot/protocol-pimpl.cxx
+share/doc/xsd/examples/cxx/parser/multiroot/protocol-pimpl.hxx
+share/doc/xsd/examples/cxx/parser/multiroot/protocol.hxx
+share/doc/xsd/examples/cxx/parser/multiroot/protocol.map
+share/doc/xsd/examples/cxx/parser/multiroot/protocol.xsd
+share/doc/xsd/examples/cxx/parser/multiroot/withdraw.xml
+share/doc/xsd/examples/cxx/parser/performance/README
+share/doc/xsd/examples/cxx/parser/performance/driver.cxx
+share/doc/xsd/examples/cxx/parser/performance/gen.cxx
+share/doc/xsd/examples/cxx/parser/performance/makefile
+share/doc/xsd/examples/cxx/parser/performance/test-50k.xml
+share/doc/xsd/examples/cxx/parser/performance/test.xsd
+share/doc/xsd/examples/cxx/parser/performance/time.cxx
+share/doc/xsd/examples/cxx/parser/performance/time.hxx
+share/doc/xsd/examples/cxx/parser/polymorphism/README
+share/doc/xsd/examples/cxx/parser/polymorphism/driver.cxx
+share/doc/xsd/examples/cxx/parser/polymorphism/makefile
+share/doc/xsd/examples/cxx/parser/polymorphism/supermen-pimpl.cxx
+share/doc/xsd/examples/cxx/parser/polymorphism/supermen-pimpl.hxx
+share/doc/xsd/examples/cxx/parser/polymorphism/supermen.xml
+share/doc/xsd/examples/cxx/parser/polymorphism/supermen.xsd
+share/doc/xsd/examples/cxx/parser/polyroot/README
+share/doc/xsd/examples/cxx/parser/polyroot/batman.xml
+share/doc/xsd/examples/cxx/parser/polyroot/driver.cxx
+share/doc/xsd/examples/cxx/parser/polyroot/makefile
+share/doc/xsd/examples/cxx/parser/polyroot/person.xml
+share/doc/xsd/examples/cxx/parser/polyroot/superman.xml
+share/doc/xsd/examples/cxx/parser/polyroot/supermen-pimpl.cxx
+share/doc/xsd/examples/cxx/parser/polyroot/supermen-pimpl.hxx
+share/doc/xsd/examples/cxx/parser/polyroot/supermen.xsd
+share/doc/xsd/examples/cxx/parser/wildcard/README
+share/doc/xsd/examples/cxx/parser/wildcard/driver.cxx
+share/doc/xsd/examples/cxx/parser/wildcard/email.xml
+share/doc/xsd/examples/cxx/parser/wildcard/email.xsd
+share/doc/xsd/examples/cxx/parser/wildcard/makefile
+share/doc/xsd/examples/cxx/tree/README
+share/doc/xsd/examples/cxx/tree/binary/README
+share/doc/xsd/examples/cxx/tree/binary/boost/README
+share/doc/xsd/examples/cxx/tree/binary/boost/boost-archive-extraction.hxx
+share/doc/xsd/examples/cxx/tree/binary/boost/boost-archive-insertion.hxx
+share/doc/xsd/examples/cxx/tree/binary/boost/driver.cxx
+share/doc/xsd/examples/cxx/tree/binary/boost/library-prologue.hxx
+share/doc/xsd/examples/cxx/tree/binary/boost/library.xml
+share/doc/xsd/examples/cxx/tree/binary/boost/library.xsd
+share/doc/xsd/examples/cxx/tree/binary/boost/makefile
+share/doc/xsd/examples/cxx/tree/binary/cdr/README
+share/doc/xsd/examples/cxx/tree/binary/cdr/driver.cxx
+share/doc/xsd/examples/cxx/tree/binary/cdr/library.xml
+share/doc/xsd/examples/cxx/tree/binary/cdr/library.xsd
+share/doc/xsd/examples/cxx/tree/binary/cdr/makefile
+share/doc/xsd/examples/cxx/tree/binary/makefile
+share/doc/xsd/examples/cxx/tree/binary/xdr/README
+share/doc/xsd/examples/cxx/tree/binary/xdr/driver.cxx
+share/doc/xsd/examples/cxx/tree/binary/xdr/library.xml
+share/doc/xsd/examples/cxx/tree/binary/xdr/library.xsd
+share/doc/xsd/examples/cxx/tree/binary/xdr/makefile
+share/doc/xsd/examples/cxx/tree/caching/README
+share/doc/xsd/examples/cxx/tree/caching/driver.cxx
+share/doc/xsd/examples/cxx/tree/caching/library.xml
+share/doc/xsd/examples/cxx/tree/caching/library.xsd
+share/doc/xsd/examples/cxx/tree/caching/makefile
+share/doc/xsd/examples/cxx/tree/compression/README
+share/doc/xsd/examples/cxx/tree/compression/compressed-format-target.cxx
+share/doc/xsd/examples/cxx/tree/compression/compressed-format-target.hxx
+share/doc/xsd/examples/cxx/tree/compression/compressed-input-source.cxx
+share/doc/xsd/examples/cxx/tree/compression/compressed-input-source.hxx
+share/doc/xsd/examples/cxx/tree/compression/driver.cxx
+share/doc/xsd/examples/cxx/tree/compression/library.xml.gz
+share/doc/xsd/examples/cxx/tree/compression/library.xsd
+share/doc/xsd/examples/cxx/tree/compression/makefile
+share/doc/xsd/examples/cxx/tree/custom/README
+share/doc/xsd/examples/cxx/tree/custom/calendar/README
+share/doc/xsd/examples/cxx/tree/custom/calendar/calendar.xml
+share/doc/xsd/examples/cxx/tree/custom/calendar/calendar.xsd
+share/doc/xsd/examples/cxx/tree/custom/calendar/driver.cxx
+share/doc/xsd/examples/cxx/tree/custom/calendar/makefile
+share/doc/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.cxx
+share/doc/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.hxx
+share/doc/xsd/examples/cxx/tree/custom/comments/README
+share/doc/xsd/examples/cxx/tree/custom/comments/dom-parse.cxx
+share/doc/xsd/examples/cxx/tree/custom/comments/dom-parse.hxx
Home |
Main Index |
Thread Index |
Old Index