devel/gps: Build with USE_LANGUAGES+= ada

1) Remove lang/gnat-aux dependency
2) USE_LANGUAGES+= ada (invokes lang/gcc-aux dependency)
3) Restore use of pkgsrc wrappers
4) Unreferenced pragma added, required to build with lang/gcc-aux
5) Ada 2012 binding interpretation fixes added, required to build with
   lang/gcc-aux
6) GPRBuild-based packages require USE_LANGUAGES+= c++ fortran in addition
   to "c" and "ada" because GPRBUILD probes for these languages.  If they
   aren't on the language list, pkgsrc comes back with a warning message
   that causes gprbuild to throw an unhandled exception due to a regex
   failure.  devel/gps doesn't contain c++ or fortran despite the value of
   USE_LANGUAGES.

6 files changed, 79 insertions, 8 deletions

diff --git a/devel/gps/Makefile b/devel/gps/Makefile
index 23078779efc..2102b083307 100644
--- a/devel/gps/Makefile
+++ b/devel/gps/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2012/06/14 07:44:06 sbd Exp $
+# $NetBSD: Makefile,v 1.13 2012/07/08 20:23:50 marino Exp $
 #
 
 DISTNAME=	gps-${GPS_VERSION}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/ \
 		http://dragonlace.mirrors.ada.cx/src/
@@ -19,7 +19,8 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake sed perl awk pkg-config
 
 GPS_VERSION=		5.0.1
-MY_CONFIGURE_ENV+=	CC=gnatgcc
+USE_LANGUAGES=		c ada c++ fortran
+MY_CONFIGURE_ENV+=	ADA_PROJECT_PATH=${APP}
 MY_CONFIGURE_ENV+=	PYTHON=${PREFIX}/bin/python${PYVERSSUFFIX}
 APP=			${PREFIX}/lib/gnat
 
@@ -27,10 +28,6 @@ APP=			${PREFIX}/lib/gnat
 
 CONFIGURE_ARGS+=	--with-gmp=${PREFIX}
 
-post-wrapper:
-	${RM} -rf ${WRKDIR}/.wrapper/bin
-	${RM} -rf ${WRKDIR}/.gcc/bin
-
 do-configure:
 	cd ${WRKSRC} && ${SETENV} ${MY_CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
 do-build:
diff --git a/devel/gps/distinfo b/devel/gps/distinfo
index 139655b8d2d..eb9ae8f7792 100644
--- a/devel/gps/distinfo
+++ b/devel/gps/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2012/05/16 17:56:48 marino Exp $
+$NetBSD: distinfo,v 1.7 2012/07/08 20:23:50 marino Exp $
 
 SHA1 (gps-5.0.1.tar.bz2) = 5fc7fba2d80b2b405c60b0a4ecc6c4d2792a3829
 RMD160 (gps-5.0.1.tar.bz2) = 17d90cd493cca50a70ebb4118b69ebba759b964a
@@ -6,6 +6,7 @@ Size (gps-5.0.1.tar.bz2) = 9303980 bytes
 SHA1 (patch-aa) = 4a590aa2a38797548a44e3974f3534aa36138ab0
 SHA1 (patch-ab) = 59c13a902436f3953a467b914e8b3c01443263c6
 SHA1 (patch-ac) = 4c350aa10b82aef2baaf29465ffec30942ed6c0d
+SHA1 (patch-ada__module_core_src_ada__semantic__tree-generics.adb) = 2992967f3aa4fce3eb85cd67033d8f4f96c768eb
 SHA1 (patch-ae) = 30d8f07a0115ddd6820f907806eaf41360297f67
 SHA1 (patch-af) = b54e4b5076bbdcb67953856d668c9e9bde72f3ea
 SHA1 (patch-ak) = 415e7a0017ce22fa28657dcafabc6ebc7c151582
@@ -14,3 +15,6 @@ SHA1 (patch-am) = bb0257d86161abd39d9d8a952a0a20d921d401dc
 SHA1 (patch-an) = 9a12bfd2950fe4fc06a72f5970ff125cdddb6f82
 SHA1 (patch-distrib_gnat__switches_awk) = d3e3ad94662fa3a8a32237e0cd630d071f153267
 SHA1 (patch-gps_gps.gpr) = 2f6dd86b6588fcade4618bf5189894b092f4a9d8
+SHA1 (patch-prj_editor_src_gpr__creation.adb) = 2b1a19e491468e4a5190d52aa8eb3d93e3dcc8c1
+SHA1 (patch-refactoring_core_src_refactoring-services.adb) = 6753f334182696e38aa31c298d5bf9a957ce83b8
+SHA1 (patch-toolchains_editor_core_src_toolchains-parsers.ads) = a8443c4204cf23757b42d3330e52b46b80d52ec3
diff --git a/devel/gps/patches/patch-ada__module_core_src_ada__semantic__tree-generics.adb b/devel/gps/patches/patch-ada__module_core_src_ada__semantic__tree-generics.adb
new file mode 100644
index 00000000000..2f784bce3db
--- /dev/null
+++ b/devel/gps/patches/patch-ada__module_core_src_ada__semantic__tree-generics.adb
@@ -0,0 +1,24 @@
+$NetBSD: patch-ada__module_core_src_ada__semantic__tree-generics.adb,v 1.1 2012/07/08 20:23:50 marino Exp $
+
+--- ada_module/core/src/ada_semantic_tree-generics.adb.orig	2010-09-17 09:28:03.000000000 +0000
++++ ada_module/core/src/ada_semantic_tree-generics.adb
+@@ -389,14 +389,12 @@ package body Ada_Semantic_Tree.Generics
+       Cached : Cache_Access := Get_Cache (Info);
+    begin
+       if Cached /= null then
+-         Result := new Declaration_View_Record'
+-           (Entity          =>
+-              To_Entity_Access
+-                (Instanciated_Package (Cached.all).Generic_Package),
+-            Generic_Context =>
++         Result := new Declaration_View_Record;
++         Declaration_View_Record (Result.all).Generic_Context :=
+               To_Active
+-                (Instanciated_Package (Cached.all).Generic_Context),
+-            others => <>);
++                (Instanciated_Package (Cached.all).Generic_Context);
++         Result.Entity := To_Entity_Access
++           (Instanciated_Package (Cached.all).Generic_Package);
+ 
+          Ref (Declaration_View_Record (Result.all).Generic_Context);
+ 
diff --git a/devel/gps/patches/patch-prj_editor_src_gpr__creation.adb b/devel/gps/patches/patch-prj_editor_src_gpr__creation.adb
new file mode 100644
index 00000000000..1938bdfae6d
--- /dev/null
+++ b/devel/gps/patches/patch-prj_editor_src_gpr__creation.adb
@@ -0,0 +1,12 @@
+$NetBSD: patch-prj_editor_src_gpr__creation.adb,v 1.1 2012/07/08 20:23:50 marino Exp $
+
+--- prj_editor/src/gpr_creation.adb.orig	2010-03-30 08:12:23.000000000 +0000
++++ prj_editor/src/gpr_creation.adb
+@@ -571,6 +571,7 @@ package body GPR_Creation is
+       Current_Project : Integer;
+       All_Source_Dirs : Boolean := False)
+    is
++      pragma Unreferenced (Root_Project);
+       Current_Dir : Natural;
+       Tmp         : Import_Project_Error;
+    begin
diff --git a/devel/gps/patches/patch-refactoring_core_src_refactoring-services.adb b/devel/gps/patches/patch-refactoring_core_src_refactoring-services.adb
new file mode 100644
index 00000000000..4454120d9ed
--- /dev/null
+++ b/devel/gps/patches/patch-refactoring_core_src_refactoring-services.adb
@@ -0,0 +1,12 @@
+$NetBSD: patch-refactoring_core_src_refactoring-services.adb,v 1.1 2012/07/08 20:23:50 marino Exp $
+
+--- refactoring/core/src/refactoring-services.adb.orig	2010-10-01 14:01:51.000000000 +0000
++++ refactoring/core/src/refactoring-services.adb
+@@ -1318,6 +1318,7 @@ package body Refactoring.Services is
+       Direction : Integer := 1) return Editor_Location'Class
+    is
+       Loc : Editor_Location'Class := From;
++      pragma Unreferenced (Direction);
+       Seen_Comment : Boolean := False;
+    begin
+       loop
diff --git a/devel/gps/patches/patch-toolchains_editor_core_src_toolchains-parsers.ads b/devel/gps/patches/patch-toolchains_editor_core_src_toolchains-parsers.ads
new file mode 100644
index 00000000000..af20ff54612
--- /dev/null
+++ b/devel/gps/patches/patch-toolchains_editor_core_src_toolchains-parsers.ads
@@ -0,0 +1,22 @@
+$NetBSD: patch-toolchains_editor_core_src_toolchains-parsers.ads,v 1.1 2012/07/08 20:23:50 marino Exp $
+
+--- toolchains_editor/core/src/toolchains-parsers.ads.orig	2010-09-21 08:15:41.000000000 +0000
++++ toolchains_editor/core/src/toolchains-parsers.ads
+@@ -73,7 +73,7 @@ package Toolchains.Parsers is
+    type Parsed_Project_Record is private;
+    type Parsed_Project is access all Parsed_Project_Record;
+ 
+-   type Project_Parser_Record is private;
++   type Project_Parser_Record is limited private;
+    type Project_Parser is access all Project_Parser_Record;
+ 
+    --------------------
+@@ -184,7 +184,7 @@ private
+    package Parsed_Projects_Maps is new Ada.Containers.Ordered_Maps
+      (Project_Node_Id, Parsed_Project);
+ 
+-   type Project_Parser_Record is record
++   type Project_Parser_Record is limited record
+       Manager                : Toolchain_Manager;
+ 
+       Tree_Data              : Project_Tree_Ref;