devel/matreskha: Upgrade version 0.6.0 => 0.7.0

Noticable improvements:
  * Ada to Javascript translator and run-time library
  * Servlet API support
  * collation tailoring by CLDR collation data
  * Enhanced XML SAX reader
  * extended Universal_Character and Universal_String
  * extended Universal_String_Vector and IRI
  * Updated unicode to 7.0.0 and CLDR to 27.0.1
  * Added uaflex - unicode aware flexible lex analyzer generator
  * Streaming support: Ada <==> JSON

7 files changed, 3 insertions, 297 deletions

diff --git a/devel/matreshka/Makefile b/devel/matreshka/Makefile
index 1b750623509b..2609c5ce03c9 100644
--- a/devel/matreshka/Makefile
+++ b/devel/matreshka/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	matreshka
-PORTVERSION=	0.6.0
-PORTREVISION=	5
+PORTVERSION=	0.7.0
 CATEGORIES=	devel
 MASTER_SITES=	http://forge.ada-ru.org/matreshka/downloads/
 
diff --git a/devel/matreshka/distinfo b/devel/matreshka/distinfo
index ce5b981f0126..e5f1bafc1c4c 100644
--- a/devel/matreshka/distinfo
+++ b/devel/matreshka/distinfo
@@ -1,2 +1,2 @@
-SHA256 (matreshka-0.6.0.tar.gz) = 0a84b7292c08f824c516fa4f7810dad5b0c585849c8993708a7cd3a44889e351
-SIZE (matreshka-0.6.0.tar.gz) = 32573172
+SHA256 (matreshka-0.7.0.tar.gz) = 25c66895d07f40582380d68794e55a3a735ba22b097f2f3ad5bad73797395f03
+SIZE (matreshka-0.7.0.tar.gz) = 34674038
diff --git a/devel/matreshka/files/patch-Makefile.build b/devel/matreshka/files/patch-Makefile.build
deleted file mode 100644
index 3db824c27443..000000000000
--- a/devel/matreshka/files/patch-Makefile.build
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.build.orig	2013-09-18 07:12:40.852703000 +0000
-+++ Makefile.build
-@@ -1,5 +1,6 @@
- include Makefile.config
- 
-+GNATMAKE = gnatmake
- GPRBUILD_FLAGS = -p $(SMP_MFLAGS)
- 
- ALL_TARGETS = league xml fastcgi soap wsse wsdl2ada sql
-@@ -31,6 +32,19 @@ endif
- all: $(ALL_TARGETS)
- 
- league:
-+ifneq (, $(findstring x86,$(ARCHITECTURE)))
-+	$(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86_utilities.adb
-+ifeq ($(ARCHITECTURE), x86)
-+	$(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-simd-intel-sse.adb
-+	$(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-simd-intel-sse2.ads
-+	$(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-generic_x86_sse2.adb
-+	$(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86-sse2.ads
-+	$(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86-sse2_popcnt.ads
-+endif
-+ifeq ($(ARCHITECTURE), x86_64)
-+	$(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86_64_popcnt.ads
-+endif
-+endif
- 	$(GPRBUILD) $(GPRBUILD_FLAGS) -Pgnat/matreshka_league.gpr
- 
- xml: league
diff --git a/devel/matreshka/files/patch-Makefile.config.in b/devel/matreshka/files/patch-Makefile.config.in
deleted file mode 100644
index da1b41d51d33..000000000000
--- a/devel/matreshka/files/patch-Makefile.config.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.config.in.orig	2013-12-22 22:34:01.201864000 +0000
-+++ Makefile.config.in
-@@ -1,6 +1,7 @@
- 
- VERSION = @VERSION@
- RTL_VERSION = @RTL_VERSION_SUFFIX@
-+ARCHITECTURE = @ARCHITECTURE@
- OPERATING_SYSTEM = @OPERATING_SYSTEM@
- 
- PREFIX = @PREFIX@
diff --git a/devel/matreshka/files/patch-Makefile.install b/devel/matreshka/files/patch-Makefile.install
deleted file mode 100644
index 1a6f0f605056..000000000000
--- a/devel/matreshka/files/patch-Makefile.install
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.install.orig	2013-12-20 08:40:13.447414000 -0500
-+++ Makefile.install
-@@ -24,7 +24,11 @@ LIBEXT = dll
- EXEEXT = .exe
- endif
- 
--INSTALL_TARGETS = league xml fastcgi soap wsse wsdl2ada sql amf dd uml mofext ocl utp
-+INSTALL_TARGETS = league xml fastcgi soap wsse wsdl2ada sql
-+
-+ifdef ENABLE_AMF
-+INSTALL_TARGETS += amf dd uml mofext ocl utp
-+endif
- 
- ifdef HAS_FIREBIRD
- INSTALL_TARGETS += firebird
diff --git a/devel/matreshka/files/patch-changeset_4465.diff b/devel/matreshka/files/patch-changeset_4465.diff
deleted file mode 100644
index e25ffdafa7bd..000000000000
--- a/devel/matreshka/files/patch-changeset_4465.diff
+++ /dev/null
@@ -1,203 +0,0 @@
-Restore FireBird SQL Support 
-http://forge.ada-ru.org/matreshka/changeset/4465
-
-===================================================================
---- source/sql/firebird/matreshka-internals-sql_drivers-firebird-databases.adb.orig
-+++ source/sql/firebird/matreshka-internals-sql_drivers-firebird-databases.adb
-@@ -213,20 +213,25 @@
- 
-    overriding function Open
-     (Self    : not null access Firebird_Database;
--     Options : League.Strings.Universal_String) return Boolean
-+     Options : SQL.Options.SQL_Options) return Boolean 
-    is
-       use type Isc_Result_Code;
-       use League.Strings;
- 
-       Result : Isc_Result_Code := 0;
-+
-+      Database_Name : constant League.Strings.Universal_String
-+        := League.Strings.To_Universal_String ("database");
-+      Password_Name : constant League.Strings.Universal_String
-+        := League.Strings.To_Universal_String ("password");
-+      User_Name     : constant League.Strings.Universal_String
-+        := League.Strings.To_Universal_String ("user");
- 
-       function Get_User     return League.Strings.Universal_String;
-       function Get_Password return League.Strings.Universal_String;
-       function Get_Database return Isc_String;
-       procedure Create_Codec;
- 
--      Pwd_Separator : constant Natural := Options.Index ('/');
--      DB_Separator  : constant Natural := Options.Index ('@');
-       Charset       : constant League.Strings.Universal_String :=
-         League.Strings.To_Universal_String ("UTF8");        
- 
-@@ -304,22 +309,9 @@
-          Empty : constant Isc_String (1 .. 0) := (others => Interfaces.C.nul);
- 
-       begin
--         if DB_Separator /= 0 then
--            declare
--               V_Item : constant Ada.Streams.Stream_Element_Array :=
--                 ASCII_Codec.Encode
--                   (Options.Slice (DB_Separator + 1, Options.Length)).
--                 To_Stream_Element_Array;
--
--               S_Item : String (1 .. V_Item'Length);
--
--               for S_Item'Address use V_Item'Address;
--               pragma Import (Ada, S_Item);
--
--            begin
--               return Interfaces.C.To_C (S_Item);
--            end;
--
-+         if Options.Is_Set (Database_Name) then
-+            return Interfaces.C.To_C
-+              (Options.Get (Database_Name).To_UTF_8_String);
-          else
-             return Empty;
-          end if;
-@@ -331,14 +323,8 @@
- 
-       function Get_Password return League.Strings.Universal_String is
-       begin
--         if Pwd_Separator /= 0 then
--            if DB_Separator /= 0 then
--               return Options.Slice (Pwd_Separator + 1, DB_Separator - 1);
--
--            else
--               return Options.Slice (Pwd_Separator + 1, Options.Length);
--            end if;
--
-+         if Options.Is_Set (Password_Name) then
-+            return Options.Get (Password_Name);
-          else
-             return League.Strings.Empty_Universal_String;
-          end if;
-@@ -350,14 +336,10 @@
- 
-       function Get_User return League.Strings.Universal_String is
-       begin
--         if Pwd_Separator /= 0 then
--            return Options.Slice (1, Pwd_Separator - 1);
--
--         elsif DB_Separator /= 0 then
--            return Options.Slice (1, DB_Separator - 1);
--
-+         if Options.Is_Set (User_Name) then
-+            return Options.Get (User_Name);
-          else
--            return Options;
-+            return League.Strings.Empty_Universal_String;
-          end if;
-       end Get_User;
- 
---- source/sql/firebird/matreshka-internals-sql_drivers-firebird-databases.ads.orig
-+++ source/sql/firebird/matreshka-internals-sql_drivers-firebird-databases.ads
-@@ -106,7 +106,7 @@
- 
-    overriding function Open
-     (Self    : not null access Firebird_Database;
--     Options : League.Strings.Universal_String) return Boolean;
-+     Options : SQL.Options.SQL_Options) return Boolean;
- 
-    procedure Check_Result
-     (Self   : not null access Firebird_Database;
---- source/sql/firebird/matreshka-internals-sql_drivers-firebird-queries.adb.orig
-+++ source/sql/firebird/matreshka-internals-sql_drivers-firebird-queries.adb
-@@ -169,6 +169,7 @@
-             end if;
-       end case;
- 
-+      Self.Is_Valid := False;
-       return True;
- 
-    exception
-@@ -294,6 +295,7 @@
-       Self.Sql_Params.Codec := Codec;
-       Self.Sql_Record.Utf   := Utf;
-       Self.Sql_Params.Utf   := Utf;
-+      Self.Is_Valid := False;
- 
-       SQL_Drivers.Initialize (Self, Database_Access (Database));
-    end Initialize;
-@@ -327,6 +329,16 @@
-    begin
-       return Self.State = Active;
-    end Is_Active;
-+
-+   --------------
-+   -- Is_Valid --
-+   --------------
-+
-+   overriding function Is_Valid
-+    (Self : not null access Firebird_Query) return Boolean is
-+   begin
-+      return Self.Is_Valid;
-+   end Is_Valid;
- 
-    ----------
-    -- Next --
-@@ -349,6 +361,7 @@
- 
-       if Result > 0 then
-          if Result = 100 then
-+            Self.Is_Valid := False;
-             return False;
- 
-          else
-@@ -358,11 +371,13 @@
- 
-             begin
-                if Check_For_Error (Self.Status'Access, EC) then
-+                  Self.Is_Valid := False;
-                   return False;
- 
-                else
-                   Self.Error := Get_Error (Self.Status'Access);
-                   Self.Finish;
-+                  Self.Is_Valid := False;
- 
-                   return False;
-                end if;
-@@ -370,6 +385,7 @@
-          end if;
- 
-       else
-+         Self.Is_Valid := True;
-          return True;
-       end if;
-    end Next;
---- source/sql/firebird/matreshka-internals-sql_drivers-firebird-queries.ads.orig
-+++ source/sql/firebird/matreshka-internals-sql_drivers-firebird-queries.ads
-@@ -81,6 +81,7 @@
-       Cursor_Name : Isc_String (1 .. 10);
-       Status      : aliased Isc_Results := (others => 0);
-       Error       : League.Strings.Universal_String;
-+      Is_Valid    : Boolean := False;
-    end record;
- 
-    overriding procedure Bind_Value
-@@ -110,6 +111,9 @@
-    overriding function Next
-     (Self : not null access Firebird_Query) return Boolean;
- 
-+   overriding function Is_Valid
-+    (Self : not null access Firebird_Query) return Boolean;
-+
-    overriding function Prepare
-     (Self  : not null access Firebird_Query;
-      Query : League.Strings.Universal_String) return Boolean;
---- source/sql/matreshka-internals-sql_drivers.ads.orig
-+++ source/sql/matreshka-internals-sql_drivers.ads
-@@ -154,7 +154,7 @@
-     (Self : not null access Abstract_Query'Class) return Boolean;
-    --  Returns True when query object is valid.
- 
--   function Is_Valid
-+   not overriding function Is_Valid
-     (Self : not null access Abstract_Query) return Boolean is abstract;
-    --  Returns True if the query is currently positioned on a valid record;
-    --  otherwise returns false.
diff --git a/devel/matreshka/files/patch-limited-fix.diff b/devel/matreshka/files/patch-limited-fix.diff
deleted file mode 100644
index 53a8252af421..000000000000
--- a/devel/matreshka/files/patch-limited-fix.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Changes required to build on gcc5-aux
-
---- source/xml/sax/xml-sax-input_sources-streams-sockets.ads.orig	2011-07-22 20:16:17 UTC
-+++ source/xml/sax/xml-sax-input_sources-streams-sockets.ads
-@@ -63,7 +63,7 @@ package XML.SAX.Input_Sources.Streams.So
- 
- private
- 
--   type Socket_Input_Source is new Stream_Input_Source with record
-+   type Socket_Input_Source is limited new Stream_Input_Source with record
-       Socket : GNAT.Sockets.Socket_Type;
-    end record;
- 
---- source/xml/sax/xml/xml-sax-simple_readers.ads.orig	2012-10-08 15:25:42 UTC
-+++ source/xml/sax/xml/xml-sax-simple_readers.ads
-@@ -303,7 +303,7 @@ private
-    type Simple_Shared_Locator is tagged;
-    type Simple_Shared_Locator_Access is access all Simple_Shared_Locator'Class;
- 
--   type SAX_Simple_Reader is new Ada.Finalization.Limited_Controlled
-+   type SAX_Simple_Reader is limited new Ada.Finalization.Limited_Controlled
-      and XML.SAX.Readers.SAX_Reader with
-    record
-       --  Handlers
---- source/league/league-environment_variables.ads.orig	2012-08-13 07:41:05 UTC
-+++ source/league/league-environment_variables.ads
-@@ -50,8 +50,7 @@ with League.Strings;
- package League.Environment_Variables is
- 
-    type Environment_Variable_Set is tagged private
--     with Iterator_Element  => League.Strings.Universal_String,
--          Constant_Indexing => Value;
-+     with Iterator_Element  => League.Strings.Universal_String;
- 
-    procedure Clear (Self : in out Environment_Variable_Set'Class);
-