devel/gps: Fix build on upcoming FSF GNAT 4.9

This package has a couple of issues that the new gcc (GNAT) uncovered
on FreeBSD, and the fixes have been brought over:

1) GPS should have been built in production mode across the board.
   There are some style check failures that appear in "debug" mode
   due to gcc49 checks being stricter than gcc47 checks.  Those issues
   aren't actually fixed, but rather hidden by switching to production
   which was desired anyway.
2) GCC had a couple of "ambiguous" complaints as well as an overlapping
   variable used for both in and out parameters.  Fixed with patches.

4 files changed, 45 insertions, 4 deletions

diff --git a/devel/gps/Makefile b/devel/gps/Makefile
index cad7d64cbda..f031ade125e 100644
--- a/devel/gps/Makefile
+++ b/devel/gps/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2013/10/10 14:42:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2014/04/28 22:14:51 marino Exp $
 #
 
 DISTNAME=	gps-${GPS_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTFILES=	gps-5.2.1-1-src.tgz
@@ -20,6 +20,7 @@ USE_LANGUAGES=		c ada c++
 MY_CONFIGURE_ENV+=	ADA_PROJECT_PATH=${APP}
 MY_MAKE_ENV+=		PROCESSORS=${MAKE_JOBS} \
 			ADA_PROJECT_PATH=${APP}
+MAKE_ARGS=		Build=Production
 APP=			${PREFIX}/lib/gnat
 WRKSRC=			${WRKDIR}/gps-release-ide-${GPS_VERSION}-src
 MAKE_JOBS_SAFE=		yes
@@ -44,7 +45,7 @@ do-configure:
 		./configure ${CONFIGURE_ARGS}
 
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MY_MAKE_ENV} gmake default 
+	cd ${WRKSRC} && ${SETENV} ${MY_MAKE_ENV} gmake ${MAKE_ARGS} default 
 
 pre-install:
 .if !empty(PKG_OPTIONS:Mpython)
diff --git a/devel/gps/distinfo b/devel/gps/distinfo
index d46084e59b3..ea279bfab6f 100644
--- a/devel/gps/distinfo
+++ b/devel/gps/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2013/07/09 10:16:02 marino Exp $
+$NetBSD: distinfo,v 1.9 2014/04/28 22:14:51 marino Exp $
 
 SHA1 (gps-5.2.1-1-src.tgz) = 5e69d59e2e64a3ec5a35c7fb0cb29d0950e156e7
 RMD160 (gps-5.2.1-1-src.tgz) = 2ca95998ecc5eb7930e0b645cc550e99fe144177
@@ -12,3 +12,5 @@ SHA1 (patch-gnatlib_configure) = b1daedfcd766bf4713464988bb1d7977364e84d2
 SHA1 (patch-gnatlib_gnatcoll__shared.gpr.in) = 4c0d7544ea6adeafce9d2460bf347dfeb09ef286
 SHA1 (patch-gnatlib_src_gnatcoll__readline.gpr.in) = c56494c1d5ab68d22ae967b4f686a73b7dbaccf0
 SHA1 (patch-gps_gps.gpr) = 708943c00a8e35a22ab57d1fc0bf7978e7ed6311
+SHA1 (patch-src__editor_src_src__editor__buffer.adb) = 1bb19152910bc9e779c61503ad00049243930d24
+SHA1 (patch-src__editor_src_src__editor__view.adb) = 3ffb3a1ad3189991716ea807c7106ecac9b02293
diff --git a/devel/gps/patches/patch-src__editor_src_src__editor__buffer.adb b/devel/gps/patches/patch-src__editor_src_src__editor__buffer.adb
new file mode 100644
index 00000000000..28477054d06
--- /dev/null
+++ b/devel/gps/patches/patch-src__editor_src_src__editor__buffer.adb
@@ -0,0 +1,15 @@
+$NetBSD: patch-src__editor_src_src__editor__buffer.adb,v 1.1 2014/04/28 22:14:51 marino Exp $
+
+Disambiguation required to compile with FSF GNAT 4.9.0
+
+--- src_editor/src/src_editor_buffer.adb.orig	2012-09-28 15:42:43.000000000 +0000
++++ src_editor/src/src_editor_buffer.adb
+@@ -5820,7 +5820,7 @@ package body Src_Editor_Buffer is
+ 
+          while Result
+            and then not Ends_Line (Iter)
+-           and then Is_Space (Get_Char (Iter))
++           and then Glib.Unicode.Is_Space (Gtk.Text_Iter.Get_Char (Iter))
+          loop
+             Forward_Char (Iter, Result);
+             Offset := Offset + 1;
diff --git a/devel/gps/patches/patch-src__editor_src_src__editor__view.adb b/devel/gps/patches/patch-src__editor_src_src__editor__view.adb
new file mode 100644
index 00000000000..cab8f5cafbe
--- /dev/null
+++ b/devel/gps/patches/patch-src__editor_src_src__editor__view.adb
@@ -0,0 +1,23 @@
+$NetBSD: patch-src__editor_src_src__editor__view.adb,v 1.1 2014/04/28 22:14:51 marino Exp $
+
+Disambiguation required to compile with FSF GNAT 4.9.0
+
+--- src_editor/src/src_editor_view.adb.orig	2012-07-02 09:23:20.000000000 +0000
++++ src_editor/src/src_editor_view.adb
+@@ -1789,6 +1789,7 @@ package body Src_Editor_View is
+    is
+       View         : constant Source_View := Source_View (Widget);
+       Dummy_Gint   : Gint;
++      Dummy2_Gint  : Gint;
+       W, H, D      : Gint;
+       Button_Y     : Gint;
+       Lower, Upper : Gdouble;
+@@ -1807,7 +1808,7 @@ package body Src_Editor_View is
+          Button_Y := Gint (Get_Y (Event));
+ 
+          Get_Geometry
+-           (Get_Window (View.Area), Dummy_Gint, Dummy_Gint, W, H, D);
++           (Get_Window (View.Area), Dummy_Gint, Dummy2_Gint, W, H, D);
+ 
+          Adj := Get_Vadjustment (View.Scroll);
+          Lower := Get_Lower (Adj);