head	1.2;
access;
symbols
	pkgsrc-2020Q4:1.1.0.64
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.62
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.58
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.38
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.60
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.56
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.54
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.52
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.50
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.48
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.46
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.44
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.42
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.40
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.36
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.34
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.32
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.30
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.28
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.26
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.24
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.22
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.20
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.18
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.16
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.14
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.12
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.10
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.8
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.6
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.4
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.2
	pkgsrc-2013Q1-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2021.03.08.14.33.44;	author nia;	state dead;
branches;
next	1.1;
commitid	V3BdLvSjXSVhWvKC;

1.1
date	2013.03.24.16.58.28;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@xsd: Update to 4.0.0. Builds again.

Borrowed patches from FreeBSD to rename the executable to avoid a
conflict wiht lang/mono.
@
text
@$NetBSD: patch-libxsd-frontend-1.15.0_xsd-frontend_parser.cxx,v 1.1 2013/03/24 16:58:28 joerg Exp $

--- libxsd-frontend-1.15.0/xsd-frontend/parser.cxx.orig	2013-03-23 19:50:39.000000000 +0000
+++ libxsd-frontend-1.15.0/xsd-frontend/parser.cxx
@@@@ -1126,7 +1126,7 @@@@ namespace XSDFrontend
     operator () (SemanticGraph::Path const& x,
                  SemanticGraph::Path const& y) const
     {
-        return x.native_file_string () < y.native_file_string ();
+        return x.string () < y.string ();
     }
   };
 
@@@@ -1446,8 +1446,8 @@@@ namespace XSDFrontend
       friend Boolean
       operator< (SchemaId const& x, SchemaId const& y)
       {
-        return x.path_.native_file_string () < y.path_.native_file_string ()
-          || (x.path_.native_file_string () == y.path_.native_file_string ()
+        return x.path_.string () < y.path_.string ()
+          || (x.path_.string () == y.path_.string ()
               && x.ns_ < y.ns_);
       }
 
@@@@ -2029,7 +2029,7 @@@@ namespace XSDFrontend
       {
         // Retry as a native path.
         //
-        path = Path (loc, boost::filesystem::native);
+        path = Path (loc);
       }
 
       if (path.is_complete ())
@@@@ -2129,7 +2129,7 @@@@ namespace XSDFrontend
       {
         // Retry as a native path.
         //
-        path = Path (loc, boost::filesystem::native);
+        path = Path (loc);
       }
 
       if (path.is_complete ())
@@@@ -4121,8 +4121,7 @@@@ namespace XSDFrontend
 
 
       XSDFrontend::SemanticGraph::Path abs_path (
-        XML::transcode_to_narrow (e.getLocation ()->getURI ()),
-        boost::filesystem::native);
+        XML::transcode_to_narrow (e.getLocation ()->getURI ()));
 
       XSDFrontend::SemanticGraph::Path rel_path (ctx_.file (abs_path));
 
@@@@ -4176,7 +4175,7 @@@@ namespace XSDFrontend
           ctx_ (ctx)
     {
       setSystemId (XML::XMLChString (
-                     String (abs_.native_file_string ())).c_str ());
+                     String (abs_.string())).c_str ());
     }
 
     virtual Xerces::BinInputStream*
@@@@ -4249,8 +4248,7 @@@@ namespace XSDFrontend
 
       // base_uri should be a valid path by now.
       //
-      Path base (XML::transcode_to_narrow (base_uri),
-                 boost::filesystem::native);
+      Path base (XML::transcode_to_narrow (base_uri));
 
       if (prv_id == 0)
       {
@@@@ -4274,18 +4272,7 @@@@ namespace XSDFrontend
 
       try
       {
-        Path path;
-
-        try
-        {
-          path = Path (path_str);
-        }
-        catch (InvalidPath const&)
-        {
-          // Retry as a native path.
-          //
-          path = Path (path_str, boost::filesystem::native);
-        }
+        Path path(path_str);
 
         Path base_dir (base.branch_path ());
 
@@@@ -4307,9 +4294,9 @@@@ namespace XSDFrontend
 
         using namespace Xerces;
 
-        InputSource* is (
+        InputSource* is =
           new (XMLPlatformUtils::fgMemoryManager)
-          InputSource (abs_path, rel_path, base, ctx_));
+          InputSource (abs_path, rel_path, base, ctx_);
 
         // Note that I can't use XMLPlatformUtils::fgMemoryManager here
         // since Wrapper4InputSource is-not-an XMemory.
@


1.1
log
@Fix build with newer boost.
@
text
@d1 1
a1 1
$NetBSD$
@