From 8e2a89b541867f9b43bfefc59a9af5245cdb4c2c Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Mon, 28 Feb 2022 22:16:01 +0100 Subject: cleanup: Remove ports depending on expired lang/gcc6-aux Keep ports-mgmt/synth and dependencies (including lang/gcc6-aux itself) for now as synth is the only Ada port still maintained and might be somewhat high-profile. Removed ports: archivers/zip-ada cad/ghdl databases/adabase databases/apq databases/apq-mysql databases/apq-odbc databases/apq-pgsql devel/ada-util devel/adabooch devel/adaid devel/ahven devel/alog devel/aunit devel/florist-gpl devel/gprbuild devel/libspark2012 devel/matreshka devel/pcsc-ada devel/pragmarcs devel/sdl_gnat dns/ironsides graphics/generic_image_decoder lang/adacontrol lang/asis lang/gnat_util lang/lua-ada math/plplot-ada misc/excel-writer net/adasockets net/anet security/libadacrypt textproc/adabrowse textproc/templates_parser textproc/words textproc/xmlada x11-toolkits/gtkada x11-toolkits/gtkada3 --- devel/ahven/files/extra-src_ahven-framework.adb | 59 ------------------------- 1 file changed, 59 deletions(-) delete mode 100644 devel/ahven/files/extra-src_ahven-framework.adb (limited to 'devel/ahven/files/extra-src_ahven-framework.adb') diff --git a/devel/ahven/files/extra-src_ahven-framework.adb b/devel/ahven/files/extra-src_ahven-framework.adb deleted file mode 100644 index a25d65d0620f..000000000000 --- a/devel/ahven/files/extra-src_ahven-framework.adb +++ /dev/null @@ -1,59 +0,0 @@ ---- src/ahven-framework.adb.orig 2014-02-08 21:21:51.000000000 +0000 -+++ src/ahven-framework.adb -@@ -14,6 +14,8 @@ - -- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -- - -+with GNAT.Traceback.Symbolic; -+with GNAT.Regpat; - with Ada.Strings; - with Ada.Unchecked_Deallocation; - with Ada.Exceptions; -@@ -22,6 +24,24 @@ with Ahven.Long_AStrings; - package body Ahven.Framework is - use Ahven.AStrings; - -+ -- Convert an exception into a traceback, but truncate it at the first -+ -- line matching "0x.* in ahven.framework" as this is unwanted trace. -+ function Filtered_Traceback (E : in Ada.Exceptions.Exception_Occurrence) -+ return String is -+ ftb : constant String := GNAT.Traceback.Symbolic.Symbolic_Traceback (E); -+ pat : constant String := "(0x[0-9a-f]* in ahven\.framework)"; -+ reg : constant GNAT.Regpat.Pattern_Matcher := GNAT.Regpat.Compile (pat); -+ result : GNAT.Regpat.Match_Array (0 .. 1); -+ use type GNAT.Regpat.Match_Location; -+ begin -+ GNAT.Regpat.Match (reg, ftb, result); -+ if result (0) = GNAT.Regpat.No_Match then -+ return ftb; -+ else -+ return ftb (1 .. result (1).First - 2); -+ end if; -+ end Filtered_Traceback; -+ - -- A few local procedures, so we do not need to duplicate code. - procedure Free_Test is - new Ada.Unchecked_Deallocation (Object => Test'Class, -@@ -346,19 +366,19 @@ package body Ahven.Framework is - Set_Status - (S => TEST_FAIL, - Message => Ada.Exceptions.Exception_Message (E), -- Long_Message => Ada.Exceptions.Exception_Information (E), -+ Long_Message => Filtered_Traceback (E), - R => Result); - when E : Test_Skipped_Error => - Set_Status - (S => TEST_SKIP, - Message => Ada.Exceptions.Exception_Message (E), -- Long_Message => Ada.Exceptions.Exception_Information (E), -+ Long_Message => Filtered_Traceback (E), - R => Result); - when E : others => - Set_Status - (S => TEST_ERROR, - Message => Ada.Exceptions.Exception_Message (E), -- Long_Message => Ada.Exceptions.Exception_Information (E), -+ Long_Message => Filtered_Traceback (E), - R => Result); - end; - end Run_A_Command; -- cgit v1.2.3