Ada Framework: Switch to gcc5-aux, upgrade 6 packages at once

The transition from gcc-aux to gcc5-aux in the Ada framework has been
blocked by the inability to build gtkada3 and, once resolved, GPS (due
to tight locking with compiler).

A few days ago, Adacore made their annual release of their main libre
products, include GPS.  However, some products were tightly coupled with
the recent compilers, so in order to upgrade, the compiler had to be
switched and dependencies require many ports to be upgraded at once:

  * lang/asis
  * devel/gnatcoll
  * devel/gps
  * x11-toolkits/gtkada3
  * www/aws
  * www/aws-demos

While the version upgrades were modest in most cases (gps, gtkada3), the
amount of work put into each port was significant.  There are too many
improvements to mention here.  A few include the removal of dynamic
package lists and incorporating gnatcoll into gps to avoid building it
twice.  A private "exp-run" was done all on all 50+ Ada ports to ensure
they still build.

Also, a new argument was added to Uses/ada.mk, "run", that pulls in the
GNAT compiler as a run depends.  This was necessary for GPS that will
not launch correctly without the compiler in place.

7 files changed, 257 insertions, 92 deletions

diff --git a/lang/asis/Makefile b/lang/asis/Makefile
index 31546987e9c1..79800dd44084 100644
--- a/lang/asis/Makefile
+++ b/lang/asis/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	asis
-PORTVERSION=	2014
-PORTREVISION=	2
+PORTVERSION=	2015
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTNAME=	${PORTNAME}-gpl-${PORTVERSION}-src
@@ -22,6 +21,7 @@ USES=		ada gmake
 NO_MTREE=	yes
 MAKE_ENV=	PROCESSORS=${MAKE_JOBS_NUMBER}
 GUSTATIC=	${LOCALBASE}/lib/gnat_util/libgnat_util.a
+PORTDOCS=	html pdf *.txt
 
 post-extract:
 	@${REINPLACE_CMD} -e 's|OPSYS|ASISOPSYS|g' \
@@ -29,24 +29,36 @@ post-extract:
 		${WRKSRC}/Makefile \
 		${WRKSRC}/Makefile.stub \
 		${WRKSRC}/common.gpr
-	@${REINPLACE_CMD} -e 's|Hostparm.OpenVMS|False|' \
-		${WRKSRC}/asis/a4g-a_types.adb \
-		${WRKSRC}/tools/gnatmetric/asis_ul-env* \
-		${WRKSRC}/tools/tool_utils/asis_ul-environment.adb \
-		${WRKSRC}/tools/tool_utils/asis_ul-projects.adb \
-		${WRKSRC}/tools/tool_utils/asis_ul-common.adb \
-		${WRKSRC}/tools/gnatpp/gnatpp-processing.adb \
-		${WRKSRC}/tools/gnatpp/gnatpp-output.ad[sb]
-
 	@${RM} -rf ${WRKSRC}/gnat
 
 do-build:
 	# This target is recreated because -j cannot be set, but
-	# MAKE_JOBS_SAFE=yes is needed for PROCESSORS value
+	# MAKE_JOBS_UNSAFE=yes would break PROCESSORS value
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} all)
 
-post-install:
-	@(cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
-		${SORT} >> ${TMPPLIST})
+do-install:
+	# gprinstall seems to be malfunctioning, just install manually
+	${MKDIR} ${STAGEDIR}${PREFIX}/bin \
+		${STAGEDIR}${PREFIX}/include/asis \
+		${STAGEDIR}${PREFIX}/lib/asis \
+		${STAGEDIR}${PREFIX}/lib/gnat \
+		${STAGEDIR}${PREFIX}/share/gps/plug-ins \
+		${STAGEDIR}${DOCSDIR}/html \
+		${STAGEDIR}${DOCSDIR}/pdf
+	${INSTALL_PROGRAM} ${WRKSRC}/tools/asistant/asistant \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/asis/*.ad[bs] \
+		${STAGEDIR}${PREFIX}/include/asis
+	${INSTALL_DATA} ${WRKSRC}/lib/*.ali ${STAGEDIR}${PREFIX}/lib/asis
+	${INSTALL_DATA} ${WRKSRC}/lib/*.a ${STAGEDIR}${PREFIX}/lib/asis
+	${INSTALL_DATA} ${WRKSRC}/documentation/*.html \
+		${STAGEDIR}${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/documentation/*.pdf \
+		${STAGEDIR}${DOCSDIR}/pdf
+	${INSTALL_DATA} ${WRKSRC}/documentation/*.txt \
+		${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/documentation/asis.xml \
+		${STAGEDIR}${PREFIX}/share/gps/plug-ins
+	${INSTALL_DATA} ${FILESDIR}/asis.gpr ${STAGEDIR}${PREFIX}/lib/gnat
 
 .include <bsd.port.mk>
diff --git a/lang/asis/distinfo b/lang/asis/distinfo
index 8bde0b533143..f1973304c197 100644
--- a/lang/asis/distinfo
+++ b/lang/asis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asis-gpl-2014-src.tar.gz) = 429d3ff2c8c72397c1cf3c39bb49cbe2268bd1b0353ff81b56734fed273a2324
-SIZE (asis-gpl-2014-src.tar.gz) = 4830531
+SHA256 (asis-gpl-2015-src.tar.gz) = 5c011786ed4173d14bda2194c5f0255dfcde4c102ee7b428567014f6c5c87bbb
+SIZE (asis-gpl-2015-src.tar.gz) = 4792357
diff --git a/lang/asis/files/asis.gpr b/lang/asis/files/asis.gpr
new file mode 100644
index 000000000000..33b259049bb9
--- /dev/null
+++ b/lang/asis/files/asis.gpr
@@ -0,0 +1,12 @@
+with "gnat_util";
+Library project Asis is
+
+   for Languages use ("Ada");
+
+   for Source_Dirs use ("../../include/asis");
+   for Library_Dir use "../../lib/asis";
+   for Library_Name use "asis";
+   for Library_Kind use "static";
+   for Externally_Built use "True";
+
+end Asis;
diff --git a/lang/asis/files/patch-Makefile.stub b/lang/asis/files/patch-Makefile.stub
index 5dba238cedfc..af0a5f244b7b 100644
--- a/lang/asis/files/patch-Makefile.stub
+++ b/lang/asis/files/patch-Makefile.stub
@@ -1,4 +1,4 @@
---- Makefile.stub.orig	2014-05-15 18:18:09.000000000 +0000
+--- Makefile.stub.orig	2015-06-22 09:23:18 UTC
 +++ Makefile.stub
 @@ -3,8 +3,7 @@ host := $(shell gcc -dumpmachine)
  
@@ -8,5 +8,5 @@
 -prefix=$(INSTALL_DIR)
 +prefix=$(PREFIX)
  
- # Asis specific directories
- GNAT_DIR=../gnat
+ # System commands
+ LN = ln -s
diff --git a/lang/asis/files/patch-asis_a4g-gnat__int.adb b/lang/asis/files/patch-asis_a4g-gnat__int.adb
index 78cc9c1a985f..84ad94c17e8b 100644
--- a/lang/asis/files/patch-asis_a4g-gnat__int.adb
+++ b/lang/asis/files/patch-asis_a4g-gnat__int.adb
@@ -1,6 +1,6 @@
---- asis/a4g-gnat_int.adb.orig	2014-04-10 13:38:35.000000000 +0000
+--- asis/a4g-gnat_int.adb.orig	2015-05-06 10:56:06 UTC
 +++ asis/a4g-gnat_int.adb
-@@ -229,40 +229,10 @@ package body A4G.GNAT_Int is
+@@ -231,40 +231,10 @@ package body A4G.GNAT_Int is
        Opt.Tree_Read;
  
        if Strong_Version_Check then
diff --git a/lang/asis/files/patch-no-OpenVMS.diff b/lang/asis/files/patch-no-OpenVMS.diff
deleted file mode 100644
index 847aed3e3fed..000000000000
--- a/lang/asis/files/patch-no-OpenVMS.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-OpenVMS Support was removed from gcc5-aux, so remove Name_AST_Entry
-This patch can be applied to gcc-aux version too.
-
---- asis/a4g-a_sem.adb.orig	2014-04-10 13:38:35 UTC
-+++ asis/a4g-a_sem.adb
-@@ -1317,14 +1317,12 @@ package body A4G.A_Sem is
-               Name_Complex_Representation       |
-               Name_CPP_Class                    |
-               Name_CPP_Constructor              |
--              Name_Export_Exception             |
-               Name_Export_Function              |
-               Name_Export_Object                |
-               Name_Export_Procedure             |
-               Name_Export_Valued_Procedure      |
-               Name_Favor_Top_Level              |
-               Name_Finalize_Storage_Only        |
--              Name_Import_Exception             |
-               Name_Import_Function              |
-               Name_Import_Object                |
-               Name_Import_Procedure             |
-@@ -1371,22 +1369,6 @@ package body A4G.A_Sem is
-             end if;
- 
-          --  Cases when a specific processing is needed
--         when Name_Float_Representation =>
--            Pragma_Arg := First (Pragma_Argument_Associations (Pragma_Node));
--
--            if Present (Next (Pragma_Arg)) then
--               Pragma_Arg := Next (Pragma_Arg);
--            end if;
--
--            Pragma_Arg := Sinfo.Expression (Pragma_Arg);
--
--            if Entity (Pragma_Arg) = Entity_Node
--             or else
--               Chars (Pragma_Arg) = Chars (Entity_Node)
--            then
--               Result := True;
--            end if;
--
-          when Name_Obsolescent =>
- 
-             if Is_Obsolescent (Entity_Node) then
-@@ -1633,8 +1615,6 @@ package body A4G.A_Sem is
-                if not (
-                      N in First_Pragma_Name .. Last_Pragma_Name
-                     or else
--                     N = Name_AST_Entry
--                    or else
-                      N = Name_CPU
-                     or else
-                      N = Name_Interface
---- asis/a4g-mapping.adb.orig	2014-04-10 13:38:35 UTC
-+++ asis/a4g-mapping.adb
-@@ -1884,7 +1884,6 @@ package body A4G.Mapping is
-             Attribute_Chars = Name_Address_Size             or else
-             Attribute_Chars = Name_Asm_Input                or else
-             Attribute_Chars = Name_Asm_Output               or else
--            Attribute_Chars = Name_AST_Entry                or else  -- VMS
-             Attribute_Chars = Name_Bit                      or else
-             Attribute_Chars = Name_Bit_Position             or else
-             Attribute_Chars = Name_Code_Address             or else
-@@ -3169,7 +3168,6 @@ package body A4G.Mapping is
- 
-       elsif Pragma_Chars in
-               First_Pragma_Name .. Last_Pragma_Name |
--              Name_AST_Entry                        |
-               Name_Interface
-       then
-          --  We have already checked for all the standard pragma names, so
diff --git a/lang/asis/pkg-plist b/lang/asis/pkg-plist
new file mode 100644
index 000000000000..d02b7d1458bd
--- /dev/null
+++ b/lang/asis/pkg-plist
@@ -0,0 +1,211 @@
+bin/asistant
+include/asis/a4g-a_alloc.ads
+include/asis/a4g-a_debug.adb
+include/asis/a4g-a_debug.ads
+include/asis/a4g-a_elists.adb
+include/asis/a4g-a_elists.ads
+include/asis/a4g-a_opt.adb
+include/asis/a4g-a_opt.ads
+include/asis/a4g-a_osint.adb
+include/asis/a4g-a_osint.ads
+include/asis/a4g-a_output.adb
+include/asis/a4g-a_output.ads
+include/asis/a4g-a_sem.adb
+include/asis/a4g-a_sem.ads
+include/asis/a4g-a_sinput.adb
+include/asis/a4g-a_sinput.ads
+include/asis/a4g-a_stand.ads
+include/asis/a4g-a_types.adb
+include/asis/a4g-a_types.ads
+include/asis/a4g-asis_tables.adb
+include/asis/a4g-asis_tables.ads
+include/asis/a4g-contt-dp.adb
+include/asis/a4g-contt-dp.ads
+include/asis/a4g-contt-sd.adb
+include/asis/a4g-contt-sd.ads
+include/asis/a4g-contt-tt.adb
+include/asis/a4g-contt-tt.ads
+include/asis/a4g-contt-ut.adb
+include/asis/a4g-contt-ut.ads
+include/asis/a4g-contt.adb
+include/asis/a4g-contt.ads
+include/asis/a4g-cu_info2.adb
+include/asis/a4g-cu_info2.ads
+include/asis/a4g-dda_aux.adb
+include/asis/a4g-dda_aux.ads
+include/asis/a4g-decl_sem.adb
+include/asis/a4g-decl_sem.ads
+include/asis/a4g-defaults.adb
+include/asis/a4g-defaults.ads
+include/asis/a4g-ee_cache.adb
+include/asis/a4g-ee_cache.ads
+include/asis/a4g-encl_el.adb
+include/asis/a4g-encl_el.ads
+include/asis/a4g-expr_sem.adb
+include/asis/a4g-expr_sem.ads
+include/asis/a4g-get_unit.adb
+include/asis/a4g-get_unit.ads
+include/asis/a4g-gnat_int.adb
+include/asis/a4g-gnat_int.ads
+include/asis/a4g-int_knds.ads
+include/asis/a4g-itests.adb
+include/asis/a4g-itests.ads
+include/asis/a4g-knd_conv.adb
+include/asis/a4g-knd_conv.ads
+include/asis/a4g-mapping.adb
+include/asis/a4g-mapping.ads
+include/asis/a4g-norm.adb
+include/asis/a4g-norm.ads
+include/asis/a4g-queries.adb
+include/asis/a4g-queries.ads
+include/asis/a4g-skip_tb.adb
+include/asis/a4g-skip_tb.ads
+include/asis/a4g-span_beginning.adb
+include/asis/a4g-span_beginning.ads
+include/asis/a4g-span_end.adb
+include/asis/a4g-span_end.ads
+include/asis/a4g-stand.adb
+include/asis/a4g-stand.ads
+include/asis/a4g-tree_rec.ads
+include/asis/a4g-u_conv.adb
+include/asis/a4g-u_conv.ads
+include/asis/a4g-unit_rec.ads
+include/asis/a4g-vcheck.adb
+include/asis/a4g-vcheck.ads
+include/asis/a4g.ads
+include/asis/asis-ada_environments-containers.adb
+include/asis/asis-ada_environments-containers.ads
+include/asis/asis-ada_environments.adb
+include/asis/asis-ada_environments.ads
+include/asis/asis-clauses.adb
+include/asis/asis-clauses.ads
+include/asis/asis-compilation_units-relations.adb
+include/asis/asis-compilation_units-relations.ads
+include/asis/asis-compilation_units-times.adb
+include/asis/asis-compilation_units-times.ads
+include/asis/asis-compilation_units.adb
+include/asis/asis-compilation_units.ads
+include/asis/asis-data_decomposition-aux.adb
+include/asis/asis-data_decomposition-aux.ads
+include/asis/asis-data_decomposition-debug.adb
+include/asis/asis-data_decomposition-debug.ads
+include/asis/asis-data_decomposition-extensions.adb
+include/asis/asis-data_decomposition-extensions.ads
+include/asis/asis-data_decomposition-set_get.adb
+include/asis/asis-data_decomposition-set_get.ads
+include/asis/asis-data_decomposition-vcheck.adb
+include/asis/asis-data_decomposition-vcheck.ads
+include/asis/asis-data_decomposition.adb
+include/asis/asis-data_decomposition.ads
+include/asis/asis-declarations.adb
+include/asis/asis-declarations.ads
+include/asis/asis-definitions.adb
+include/asis/asis-definitions.ads
+include/asis/asis-elements.adb
+include/asis/asis-elements.ads
+include/asis/asis-errors.ads
+include/asis/asis-exceptions.ads
+include/asis/asis-expressions.adb
+include/asis/asis-expressions.ads
+include/asis/asis-extensions-flat_kinds.adb
+include/asis/asis-extensions-flat_kinds.ads
+include/asis/asis-extensions-iterator.adb
+include/asis/asis-extensions-iterator.ads
+include/asis/asis-extensions-strings.adb
+include/asis/asis-extensions-strings.ads
+include/asis/asis-extensions.adb
+include/asis/asis-extensions.ads
+include/asis/asis-ids.adb
+include/asis/asis-ids.ads
+include/asis/asis-implementation-permissions.adb
+include/asis/asis-implementation-permissions.ads
+include/asis/asis-implementation.adb
+include/asis/asis-implementation.ads
+include/asis/asis-iterator.adb
+include/asis/asis-iterator.ads
+include/asis/asis-limited_views.adb
+include/asis/asis-limited_views.ads
+include/asis/asis-set_get.adb
+include/asis/asis-set_get.ads
+include/asis/asis-statements.adb
+include/asis/asis-statements.ads
+include/asis/asis-text-set_get.adb
+include/asis/asis-text-set_get.ads
+include/asis/asis-text.adb
+include/asis/asis-text.ads
+include/asis/asis.ads
+lib/asis/a4g-a_alloc.ali
+lib/asis/a4g-a_debug.ali
+lib/asis/a4g-a_elists.ali
+lib/asis/a4g-a_opt.ali
+lib/asis/a4g-a_osint.ali
+lib/asis/a4g-a_output.ali
+lib/asis/a4g-a_sem.ali
+lib/asis/a4g-a_sinput.ali
+lib/asis/a4g-a_stand.ali
+lib/asis/a4g-a_types.ali
+lib/asis/a4g-asis_tables.ali
+lib/asis/a4g-contt-dp.ali
+lib/asis/a4g-contt-sd.ali
+lib/asis/a4g-contt-tt.ali
+lib/asis/a4g-contt-ut.ali
+lib/asis/a4g-contt.ali
+lib/asis/a4g-cu_info2.ali
+lib/asis/a4g-dda_aux.ali
+lib/asis/a4g-decl_sem.ali
+lib/asis/a4g-defaults.ali
+lib/asis/a4g-ee_cache.ali
+lib/asis/a4g-encl_el.ali
+lib/asis/a4g-expr_sem.ali
+lib/asis/a4g-get_unit.ali
+lib/asis/a4g-gnat_int.ali
+lib/asis/a4g-int_knds.ali
+lib/asis/a4g-itests.ali
+lib/asis/a4g-knd_conv.ali
+lib/asis/a4g-mapping.ali
+lib/asis/a4g-norm.ali
+lib/asis/a4g-queries.ali
+lib/asis/a4g-skip_tb.ali
+lib/asis/a4g-span_beginning.ali
+lib/asis/a4g-span_end.ali
+lib/asis/a4g-stand.ali
+lib/asis/a4g-tree_rec.ali
+lib/asis/a4g-u_conv.ali
+lib/asis/a4g-unit_rec.ali
+lib/asis/a4g-vcheck.ali
+lib/asis/a4g.ali
+lib/asis/asis-ada_environments-containers.ali
+lib/asis/asis-ada_environments.ali
+lib/asis/asis-clauses.ali
+lib/asis/asis-compilation_units-relations.ali
+lib/asis/asis-compilation_units-times.ali
+lib/asis/asis-compilation_units.ali
+lib/asis/asis-data_decomposition-aux.ali
+lib/asis/asis-data_decomposition-debug.ali
+lib/asis/asis-data_decomposition-extensions.ali
+lib/asis/asis-data_decomposition-set_get.ali
+lib/asis/asis-data_decomposition-vcheck.ali
+lib/asis/asis-data_decomposition.ali
+lib/asis/asis-declarations.ali
+lib/asis/asis-definitions.ali
+lib/asis/asis-elements.ali
+lib/asis/asis-errors.ali
+lib/asis/asis-exceptions.ali
+lib/asis/asis-expressions.ali
+lib/asis/asis-extensions-flat_kinds.ali
+lib/asis/asis-extensions-iterator.ali
+lib/asis/asis-extensions-strings.ali
+lib/asis/asis-extensions.ali
+lib/asis/asis-ids.ali
+lib/asis/asis-implementation-permissions.ali
+lib/asis/asis-implementation.ali
+lib/asis/asis-iterator.ali
+lib/asis/asis-limited_views.ali
+lib/asis/asis-set_get.ali
+lib/asis/asis-statements.ali
+lib/asis/asis-text-set_get.ali
+lib/asis/asis-text.ali
+lib/asis/asis.ali
+lib/asis/libasis.a
+lib/gnat/asis.gpr
+share/gps/plug-ins/asis.xml