Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Jul 2021 08:12:47 GMT
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: cefbab3326f1 - main - devel/xsd: update to xsd-4.1.0.a11
Message-ID:  <202107210812.16L8ClYO035702@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cefbab3326f101150b79c8ac146cbe8edd3d1ea3

commit cefbab3326f101150b79c8ac146cbe8edd3d1ea3
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2021-07-21 08:10:28 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2021-07-21 08:12:41 +0000

    devel/xsd: update to xsd-4.1.0.a11
    
    Follow Linux distiributions and update to the lastest available (still
    old) version xsd-4.1.0.a11.
---
 devel/xsd/Makefile                      | 14 ++++-----
 devel/xsd/distinfo                      |  5 ++--
 devel/xsd/files/patch-xsd_doc_xsd.1     | 29 +++++-------------
 devel/xsd/files/patch-xsd_doc_xsd.xhtml | 53 +++++++++++++++------------------
 devel/xsd/pkg-plist                     |  7 +++++
 5 files changed, 47 insertions(+), 61 deletions(-)

diff --git a/devel/xsd/Makefile b/devel/xsd/Makefile
index 8510fe2e9359..f63e2ae61f74 100644
--- a/devel/xsd/Makefile
+++ b/devel/xsd/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	xsd
-PORTVERSION=	4.0.0
+DISTVERSION=	4.1.0.a11
 DISTVERSIONSUFFIX=	+dep
-PORTREVISION=	4
 CATEGORIES=	devel
-MASTER_SITES=	http://www.codesynthesis.com/download/${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITES=	https://codesynthesis.com/~boris/tmp/${PORTNAME}/${DISTVERSION}/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	W3C XML Schema to C++ translator
@@ -21,17 +20,16 @@ BUILD_DEPENDS=	${LOCALBASE}/include/build-0.3/abspath.make:devel/build
 LIB_DEPENDS=	libcutl.so:devel/libcutl \
 		libxerces-c.so:textproc/xerces-c3
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+USES=		compiler:c++11-lang ghostscript:build gmake localbase:ldflags tar:bzip2
 
-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=		compiler:c++11-lang gmake tar:bzip2
+ALL_TARGET=	# no default target should be passed to gmake.
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 # Use devel/build instead of the port's bundled copy.
diff --git a/devel/xsd/distinfo b/devel/xsd/distinfo
index 81e54b894fa6..917f7e1570b1 100644
--- a/devel/xsd/distinfo
+++ b/devel/xsd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xsd-4.0.0+dep.tar.bz2) = eca52a9c8f52cdbe2ae4e364e4a909503493a0d51ea388fc6c9734565a859817
-SIZE (xsd-4.0.0+dep.tar.bz2) = 1642625
+TIMESTAMP = 1626852794
+SHA256 (xsd-4.1.0.a11+dep.tar.bz2) = 4fbe2d1e17ad4451bb3a9d9101ac89f7b465205470f1c7ad5e2c1386ac2c87d2
+SIZE (xsd-4.1.0.a11+dep.tar.bz2) = 1778335
diff --git a/devel/xsd/files/patch-xsd_doc_xsd.1 b/devel/xsd/files/patch-xsd_doc_xsd.1
index 5009f8018645..ee3e585c828a 100644
--- a/devel/xsd/files/patch-xsd_doc_xsd.1
+++ b/devel/xsd/files/patch-xsd_doc_xsd.1
@@ -1,19 +1,17 @@
 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.orig	2017-09-24 00:18:08 UTC
 +++ xsd/doc/xsd.1
-@@ -1,16 +1,16 @@
+@@ -1,7 +1,7 @@
  .\" 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"
+-.TH XSD 1 "July 2014" "XSD 4.1.0"
++.TH XSDCXX 1 "July 2014" "XSDCXX 4.1.0"
  .SH NAME
--xsd \- W3C XML Schema to C++ Compiler
-+xsdcxx \- W3C XML Schema to C++ Compiler
- .\"
- .\"
+ xsd \- W3C XML Schema to C++ Compiler
  .\"
+@@ -10,7 +10,7 @@ xsd \- W3C XML Schema to C++ Compiler
  .\"--------------------------------------------------------------------
  .SH SYNOPSIS
  .\"--------------------------------------------------------------------
@@ -54,20 +52,7 @@ called `xsd'.
  .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
+@@ -1461,7 +1461,7 @@ option. With this approach you don't need to worry abo
  .\"
  .SH DIAGNOSTICS
  If the input file is not a valid W3C XML Schema definition,
diff --git a/devel/xsd/files/patch-xsd_doc_xsd.xhtml b/devel/xsd/files/patch-xsd_doc_xsd.xhtml
index 1f712969f570..321f1a928bcc 100644
--- a/devel/xsd/files/patch-xsd_doc_xsd.xhtml
+++ b/devel/xsd/files/patch-xsd_doc_xsd.xhtml
@@ -1,22 +1,22 @@
 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.orig	2017-09-24 00:18:08 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>
+-  <title>XSD 4.1.0 Compiler Command Line Manual</title>
++  <title>XSDCXX 4.1.0 Compiler Command Line Manual</title>
  
-   <meta name="copyright" content="&copy; 2005-2014 Code Synthesis Tools CC"/>
+   <meta name="copyright" content="&copy; 2005-2017 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 @@
+@@ -52,19 +52,19 @@
  
    <h1>NAME</h1>
  
@@ -41,30 +41,25 @@ 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
-@@ -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 .*
+@@ -106,7 +106,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>
+ 
+@@ -218,7 +218,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>;
+@@ -1564,7 +1564,7 @@ namespace .*
    <h1>DIAGNOSTICS</h1>
  
    <p>If the input file is not a valid W3C XML Schema definition,
diff --git a/devel/xsd/pkg-plist b/devel/xsd/pkg-plist
index 83d60d3f7b52..c3219741b91d 100644
--- a/devel/xsd/pkg-plist
+++ b/devel/xsd/pkg-plist
@@ -415,6 +415,13 @@ man/man1/xsdcxx.1.gz
 %%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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107210812.16L8ClYO035702>