Fix a bit more fallout from the Boost filesystem API changes.

Fix confusion around Narrow vs Wide strings.

4 files changed, 193 insertions, 63 deletions

diff --git a/devel/xsd/distinfo b/devel/xsd/distinfo
index ccac671670a..b3bce0056b8 100644
--- a/devel/xsd/distinfo
+++ b/devel/xsd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2013/03/24 16:58:28 joerg Exp $
+$NetBSD: distinfo,v 1.3 2013/03/28 21:20:15 joerg Exp $
 
 SHA1 (xsd-3.2.0+dep.tar.bz2) = d57fd3b326dcfab3af8fdc40fc3cf27fb9d7c7c5
 RMD160 (xsd-3.2.0+dep.tar.bz2) = da02eb15e607ee9b434f2a729c6f8a3da0981348
@@ -14,6 +14,8 @@ SHA1 (patch-libxsd-frontend-1.15.0_xsd-frontend_transformations_anonymous.cxx) =
 SHA1 (patch-libxsd-frontend-1.15.0_xsd-frontend_transformations_schema-per-type.cxx) = 0ed23703a8f11984dc51e2bbdcc744b32a5be369
 SHA1 (patch-xsd-3.2.0-2_xsd_cxx_elements.cxx) = 8006dc3a16d945a9c256e0fd2a4c412ad63e8919
 SHA1 (patch-xsd-3.2.0-2_xsd_cxx_parser_elements.cxx) = 06702b980f04c5718b7c0aefb8d629466501f0d2
-SHA1 (patch-xsd-3.2.0-2_xsd_cxx_parser_generator.cxx) = b6263becce71dd133a6db5c0c23467c441c8da1e
+SHA1 (patch-xsd-3.2.0-2_xsd_cxx_parser_generator.cxx) = e56dce412f315f1b88f426480dc794a7f69e569a
+SHA1 (patch-xsd-3.2.0-2_xsd_cxx_tree_elements.cxx) = df8759581d58e9b230dc4569d0bce3d23d5ab8ec
+SHA1 (patch-xsd-3.2.0-2_xsd_cxx_tree_generator.cxx) = 79c5927337f1a35e1d6ac53fbba429f1fc0350de
 SHA1 (patch-xsd-3.2.0-2_xsd_xsd.cxx) = e89a36f5616416ad31fa47b1bba2018cb3fbaec9
 SHA1 (patch-xsd-3.2.0-2_xsd_xsd.hxx) = 9e64ecb2e5560bb21b7dcf324c1831a59b26f07d
diff --git a/devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_parser_generator.cxx b/devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_parser_generator.cxx
index 833341093d5..15e5c10f928 100644
--- a/devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_parser_generator.cxx
+++ b/devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_parser_generator.cxx
@@ -1,6 +1,6 @@
-$NetBSD: patch-xsd-3.2.0-2_xsd_cxx_parser_generator.cxx,v 1.1 2013/03/24 16:58:29 joerg Exp $
+$NetBSD: patch-xsd-3.2.0-2_xsd_cxx_parser_generator.cxx,v 1.2 2013/03/28 21:20:15 joerg Exp $
 
---- xsd-3.2.0-2/xsd/cxx/parser/generator.cxx.orig	2013-03-23 20:02:16.000000000 +0000
+--- xsd-3.2.0-2/xsd/cxx/parser/generator.cxx.orig	2008-07-28 12:00:51.000000000 +0000
 +++ xsd-3.2.0-2/xsd/cxx/parser/generator.cxx
 @@ -539,7 +539,7 @@ namespace CXX
      {
@@ -20,75 +20,33 @@ $NetBSD: patch-xsd-3.2.0-2_xsd_cxx_parser_generator.cxx,v 1.1 2013/03/24 16:58:2
              generate_xml_schema = false;
          }
        }
-@@ -692,12 +692,12 @@ namespace CXX
-         String char_type (ops.value<CLI::char_type> ());
-         String string_type;
- 
--        if (char_type == L"char")
--          string_type = L"::std::string";
--        else if (char_type == L"wchar_t")
--          string_type = L"::std::wstring";
-+        if (char_type == "char")
-+          string_type = "::std::string";
-+        else if (char_type == "wchar_t")
-+          string_type = "::std::wstring";
+@@ -689,8 +689,8 @@ namespace CXX
+ 
+         // String-based types.
+         //
+-        String char_type (ops.value<CLI::char_type> ());
+-        String string_type;
++        WideString char_type (ops.value<CLI::char_type> ());
++        WideString string_type;
+ 
+         if (char_type == L"char")
+           string_type = L"::std::string";
+@@ -699,13 +699,13 @@ namespace CXX
          else
--          string_type = L"::std::basic_string< " + char_type + L" >";
-+          string_type = "::std::basic_string< " + char_type + " >";
+           string_type = L"::std::basic_string< " + char_type + L" >";
  
-         String xns;
+-        String xns;
++        WideString xns;
          {
-@@ -705,7 +705,7 @@ namespace CXX
+           Context ctx (std::wcerr, schema, ops, 0, 0, 0);
            xns = ctx.xs_ns_name ();
          }
  
 -        String buffer (L"::std::auto_ptr< " + xns + L"::buffer >");
-+        String buffer ("::std::auto_ptr< " + xns + "::buffer >");
++        WideString buffer (L"::std::auto_ptr< " + xns + L"::buffer >");
          TypeMap::Namespace xsd ("http://www\\.w3\\.org/2001/XMLSchema");
  
          xsd.types_push_back ("string", string_type);
-@@ -713,29 +713,29 @@ namespace CXX
-         xsd.types_push_back ("token", string_type);
-         xsd.types_push_back ("Name", string_type);
-         xsd.types_push_back ("NMTOKEN", string_type);
--        xsd.types_push_back ("NMTOKENS", xns + L"::string_sequence");
-+        xsd.types_push_back ("NMTOKENS", xns + "::string_sequence");
-         xsd.types_push_back ("NCName", string_type);
- 
-         xsd.types_push_back ("ID", string_type);
-         xsd.types_push_back ("IDREF", string_type);
--        xsd.types_push_back ("IDREFS", xns + L"::string_sequence");
-+        xsd.types_push_back ("IDREFS", xns + "::string_sequence");
- 
-         xsd.types_push_back ("language", string_type);
-         xsd.types_push_back ("anyURI", string_type);
--        xsd.types_push_back ("QName", xns + L"::qname");
-+        xsd.types_push_back ("QName", xns + "::qname");
- 
-         xsd.types_push_back ("base64Binary", buffer, buffer);
-         xsd.types_push_back ("hexBinary", buffer, buffer);
- 
--        xsd.types_push_back ("gDay", xns + L"::gday");
--        xsd.types_push_back ("gMonth", xns + L"::gmonth");
--        xsd.types_push_back ("gYear", xns + L"::gyear");
--        xsd.types_push_back ("gMonthDay", xns + L"::gmonth_day");
--        xsd.types_push_back ("gYearMonth", xns + L"::gyear_month");
--        xsd.types_push_back ("date", xns + L"::date");
--        xsd.types_push_back ("time", xns + L"::time");
--        xsd.types_push_back ("dateTime", xns + L"::date_time");
--        xsd.types_push_back ("duration", xns + L"::duration");
-+        xsd.types_push_back ("gDay", xns + "::gday");
-+        xsd.types_push_back ("gMonth", xns + "::gmonth");
-+        xsd.types_push_back ("gYear", xns + "::gyear");
-+        xsd.types_push_back ("gMonthDay", xns + "::gmonth_day");
-+        xsd.types_push_back ("gYearMonth", xns + "::gyear_month");
-+        xsd.types_push_back ("date", xns + "::date");
-+        xsd.types_push_back ("time", xns + "::time");
-+        xsd.types_push_back ("dateTime", xns + "::date_time");
-+        xsd.types_push_back ("duration", xns + "::duration");
- 
-         // Fundamental C++ types.
-         //
 @@ -800,7 +800,7 @@ namespace CXX
  
        // Generate code.
@@ -195,3 +153,21 @@ $NetBSD: patch-xsd-3.2.0-2_xsd_cxx_parser_generator.cxx,v 1.1 2013/03/24 16:58:2
  
        if (guard_prefix)
          guard_prefix += '_';
+@@ -1148,7 +1148,7 @@ namespace CXX
+ 
+         Indentation::Clip<Indentation::SLOC, WideChar> hxx_sloc (hxx);
+ 
+-        String guard (guard_expr.merge (guard_prefix + hxx_name));
++        WideString guard (guard_expr.merge (guard_prefix + hxx_name));
+         guard = ctx.escape (guard); // Make it a C++ id.
+         std::transform (guard.begin (), guard.end(), guard.begin (), upcase);
+ 
+@@ -1354,7 +1354,7 @@ namespace CXX
+         Context ctx (hxx_impl, schema, ops,
+                      &hxx_expr, &ixx_expr, &hxx_impl_expr);
+ 
+-        String guard (guard_expr.merge (guard_prefix + hxx_impl_name));
++        WideString guard (guard_expr.merge (guard_prefix + hxx_impl_name));
+         guard = ctx.escape (guard); // Make it a C++ id.
+         std::transform (guard.begin (), guard.end(), guard.begin (), upcase);
+ 
diff --git a/devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_tree_elements.cxx b/devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_tree_elements.cxx
new file mode 100644
index 00000000000..d745dc96149
--- /dev/null
+++ b/devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_tree_elements.cxx
@@ -0,0 +1,13 @@
+$NetBSD: patch-xsd-3.2.0-2_xsd_cxx_tree_elements.cxx,v 1.1 2013/03/28 21:20:15 joerg Exp $
+
+--- xsd-3.2.0-2/xsd/cxx/tree/elements.cxx.orig	2013-03-28 16:25:23.000000000 +0000
++++ xsd-3.2.0-2/xsd/cxx/tree/elements.cxx
+@@ -1282,7 +1282,7 @@ namespace CXX
+       }
+       catch (SemanticGraph::InvalidPath const&)
+       {
+-        path_str = path.native_file_string ();
++        path_str = path.string ();
+       }
+ 
+       String inc_path;
diff --git a/devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_tree_generator.cxx b/devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_tree_generator.cxx
new file mode 100644
index 00000000000..cd2fc9b10b5
--- /dev/null
+++ b/devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_tree_generator.cxx
@@ -0,0 +1,139 @@
+$NetBSD: patch-xsd-3.2.0-2_xsd_cxx_tree_generator.cxx,v 1.1 2013/03/28 21:20:15 joerg Exp $
+
+--- xsd-3.2.0-2/xsd/cxx/tree/generator.cxx.orig	2013-03-28 16:28:31.000000000 +0000
++++ xsd-3.2.0-2/xsd/cxx/tree/generator.cxx
+@@ -717,7 +717,7 @@ namespace CXX
+     {
+       try
+       {
+-        Path fs_path (path, boost::filesystem::native);
++        Path fs_path (path);
+         ifs.open (fs_path, std::ios_base::in | std::ios_base::binary);
+ 
+         if (!ifs.is_open ())
+@@ -871,7 +871,7 @@ namespace CXX
+       {
+         if (NarrowString name = ops.value<CLI::extern_xml_schema> ())
+         {
+-          if (file_path.native_file_string () != name)
++          if (file_path.string () != name)
+             generate_xml_schema = false;
+         }
+       }
+@@ -886,7 +886,7 @@ namespace CXX
+ 
+       // Generate code.
+       //
+-      NarrowString name (file_path.leaf ());
++      NarrowString name (file_path.leaf ().string());
+ 
+       NarrowString hxx_suffix (ops.value <CLI::hxx_suffix> ());
+       NarrowString ixx_suffix (ops.value <CLI::ixx_suffix> ());
+@@ -945,9 +945,9 @@ namespace CXX
+       NarrowString ixx_name (inline_ ? ixx_expr.merge (name) : NarrowString ());
+       NarrowString fwd_name (forward ? fwd_expr.merge (name) : NarrowString ());
+ 
+-      Path hxx_path (hxx_name, boost::filesystem::native);
+-      Path ixx_path (ixx_name, boost::filesystem::native);
+-      Path fwd_path (fwd_name, boost::filesystem::native);
++      Path hxx_path (hxx_name);
++      Path ixx_path (ixx_name);
++      Path fwd_path (fwd_name);
+       Paths cxx_paths;
+ 
+       if (source)
+@@ -973,19 +973,19 @@ namespace CXX
+             }
+ 
+             cxx_paths.push_back (
+-              Path (cxx_expr.merge (part_name), boost::filesystem::native));
++              Path (cxx_expr.merge (part_name)));
+           }
+         }
+         else
+           cxx_paths.push_back (
+-            Path (cxx_expr.merge (name), boost::filesystem::native));
++            Path (cxx_expr.merge (name)));
+       }
+ 
+       if (NarrowString dir  = ops.value<CLI::output_dir> ())
+       {
+         try
+         {
+-          Path path (dir, boost::filesystem::native);
++          Path path (dir);
+ 
+           hxx_path = path / hxx_path;
+           ixx_path = path / ixx_path;
+@@ -1023,7 +1023,7 @@ namespace CXX
+         }
+ 
+         unlinks.add (fwd_path);
+-        file_list.push_back (fwd_path.native_file_string ());
++        file_list.push_back (fwd_path.string ());
+       }
+ 
+ 
+@@ -1036,7 +1036,7 @@ namespace CXX
+       }
+ 
+       unlinks.add (hxx_path);
+-      file_list.push_back (hxx_path.native_file_string ());
++      file_list.push_back (hxx_path.string ());
+ 
+ 
+       // IXX
+@@ -1052,7 +1052,7 @@ namespace CXX
+         }
+ 
+         unlinks.add (ixx_path);
+-        file_list.push_back (ixx_path.native_file_string ());
++        file_list.push_back (ixx_path.string ());
+       }
+ 
+ 
+@@ -1073,7 +1073,7 @@ namespace CXX
+           }
+ 
+           unlinks.add (*i);
+-          file_list.push_back (i->native_file_string ());
++          file_list.push_back (i->string ());
+           cxx.push_back (s);
+         }
+       }
+@@ -1145,7 +1145,7 @@ namespace CXX
+       NarrowString guard_prefix (ops.value<CLI::guard_prefix> ());
+ 
+       if (!guard_prefix)
+-        guard_prefix = file_path.branch_path ().native_directory_string ();
++        guard_prefix = file_path.branch_path ().string ();
+ 
+       if (guard_prefix)
+         guard_prefix += '_';
+@@ -1161,7 +1161,7 @@ namespace CXX
+ 
+         // Guard
+         //
+-        String guard (guard_expr.merge (guard_prefix + fwd_name));
++        WideString guard (guard_expr.merge (guard_prefix + fwd_name));
+         guard = ctx.escape (guard); // make a c++ id
+         std::transform (guard.begin (), guard.end(), guard.begin (), upcase);
+ 
+@@ -1269,7 +1269,7 @@ namespace CXX
+ 
+         // Guard
+         //
+-        String guard (guard_expr.merge (guard_prefix + hxx_name));
++        WideString guard (guard_expr.merge (guard_prefix + hxx_name));
+         guard = ctx.escape (guard); // make a c++ id
+         std::transform (guard.begin (), guard.end(), guard.begin (), upcase);
+ 
+@@ -1415,7 +1415,7 @@ namespace CXX
+ 
+         // Guard
+         //
+-        String guard (guard_expr.merge (guard_prefix + ixx_name));
++        WideString guard (guard_expr.merge (guard_prefix + ixx_name));
+         guard = ctx.escape (guard); // make a c++ id
+         std::transform (guard.begin (), guard.end(), guard.begin (), upcase);
+