From owner-svn-ports-head@freebsd.org  Sun Jun 28 17:13:42 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 375FC98FCF2;
 Sun, 28 Jun 2015 17:13:42 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0E6B51069;
 Sun, 28 Jun 2015 17:13:42 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5SHDf8a024831;
 Sun, 28 Jun 2015 17:13:41 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5SHDfw1024825;
 Sun, 28 Jun 2015 17:13:41 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201506281713.t5SHDfw1024825@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Sun, 28 Jun 2015 17:13:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r390799 - in head/devel/gprbuild: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Jun 2015 17:13:42 -0000

Author: marino
Date: Sun Jun 28 17:13:40 2015
New Revision: 390799
URL: https://svnweb.freebsd.org/changeset/ports/390799

Log:
  devel/gprbuild: Fix regression
  
  One of the prior "extra patches" handled the breakage caused by the
  version number change in GCC.  When I purged all the extra patches, this
  one got thrown out accidently.  Add it back to fix at least the
  textproc/templates_parser port (and probably others)

Modified:
  head/devel/gprbuild/Makefile
  head/devel/gprbuild/files/patch-src_gprlib.adb

Modified: head/devel/gprbuild/Makefile
==============================================================================
--- head/devel/gprbuild/Makefile	Sun Jun 28 17:07:06 2015	(r390798)
+++ head/devel/gprbuild/Makefile	Sun Jun 28 17:13:40 2015	(r390799)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gprbuild
 PORTVERSION=	${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTNAME=	gprbuild-gpl-${YEAR}-src

Modified: head/devel/gprbuild/files/patch-src_gprlib.adb
==============================================================================
--- head/devel/gprbuild/files/patch-src_gprlib.adb	Sun Jun 28 17:07:06 2015	(r390798)
+++ head/devel/gprbuild/files/patch-src_gprlib.adb	Sun Jun 28 17:13:40 2015	(r390799)
@@ -26,6 +26,19 @@
  
              when Gprexch.Library_Rpath_Options =>
                 Library_Rpath_Options_Table.Append
+@@ -1143,10 +1153,10 @@ begin
+ 
+                      Libgnat :=
+                        new String'
+-                         ("-lgnat-" & Line (6 .. Last));
++                         ("-lgnat-" & Line (6));
+                      Libgnarl :=
+                        new String'
+-                         ("-lgnarl-" & Line (6 .. Last));
++                         ("-lgnarl-" & Line (6));
+                   end if;
+ 
+                else
 @@ -2113,7 +2123,7 @@ begin
           Library_Switches_Table.Append
             (new String'("-L" & Imported_Library_Directories.Table (J).all));