svn commit: r348174 - in head/lang/asis: . files

[John Marino]

Author: marino
Date: Fri Mar 14 08:37:27 2014
New Revision: 348174
URL: http://svnweb.freebsd.org/changeset/ports/348174
QAT: https://qat.redports.org/buildarchive/r348174/

Log:
  lang/asis: New version as result of gcc-aux upgrade to gcc49
  
  The ASIS source has to be matched with the compiler source of the compiler
  that builds it.  ASIS is always tricky because it's matched to annual
  releases of GNAT GPL, and never to GNAT FSF.  However, after disabling the
  useless (and faulty) strong version check, ASIS 2013 seems to work okay
  with gcc49.  At least the two ports that use it seem to work ok.

Added:
  head/lang/asis/files/patch-asis_a4g-gnat__int.adb   (contents, props changed)
Deleted:
  head/lang/asis/files/patch-Makefile
  head/lang/asis/files/patch-asis__bld.gpr
  head/lang/asis/files/patch-asis_asis.gpr
Modified:
  head/lang/asis/Makefile
  head/lang/asis/distinfo
  head/lang/asis/files/patch-Makefile.stub

Modified: head/lang/asis/Makefile
==============================================================================
--- head/lang/asis/Makefile	Fri Mar 14 08:37:16 2014	(r348173)
+++ head/lang/asis/Makefile	Fri Mar 14 08:37:27 2014	(r348174)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	asis
-PORTVERSION=	2011
-PORTREVISION=	3
+PORTVERSION=	2013
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 DISTNAME=	${PORTNAME}-gpl-${PORTVERSION}-src
@@ -14,7 +13,7 @@ COMMENT=	GNAT implementation of Ada Sema
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	gnat_util>=2013:${PORTSDIR}/lang/gnat_util \
+BUILD_DEPENDS=	gprbuild>=20130416:${PORTSDIR}/devel/gprbuild \
 		xmlada>=3.2:${PORTSDIR}/textproc/xmlada \
 		${GUSTATIC}:${PORTSDIR}/lang/gnat_util
 RUN_DEPENDS=	${GUSTATIC}:${PORTSDIR}/lang/gnat_util
@@ -26,6 +25,7 @@ GUSTATIC=	${LOCALBASE}/lib/gnat_util/lib
 
 post-extract:
 	@${REINPLACE_CMD} -e 's|OPSYS|ASISOPSYS|g' \
+		-e 's|(prefix)|(DESTDIR)$$(prefix)|g' \
 		${WRKSRC}/Makefile \
 		${WRKSRC}/Makefile.stub \
 		${WRKSRC}/common.gpr

Modified: head/lang/asis/distinfo
==============================================================================
--- head/lang/asis/distinfo	Fri Mar 14 08:37:16 2014	(r348173)
+++ head/lang/asis/distinfo	Fri Mar 14 08:37:27 2014	(r348174)
@@ -1,2 +1,2 @@
-SHA256 (asis-gpl-2011-src.tgz) = abce6aecf13a94bafcbaab363241878805898cb731d30dc0686a7079c96029a8
-SIZE (asis-gpl-2011-src.tgz) = 3132742
+SHA256 (asis-gpl-2013-src.tgz) = 5f900654ffe0a8a86bcea0c32f1777b039e261bc7ba0e262706cff9de003a23a
+SIZE (asis-gpl-2013-src.tgz) = 4728571

Modified: head/lang/asis/files/patch-Makefile.stub
==============================================================================
--- head/lang/asis/files/patch-Makefile.stub	Fri Mar 14 08:37:16 2014	(r348173)
+++ head/lang/asis/files/patch-Makefile.stub	Fri Mar 14 08:37:27 2014	(r348174)
@@ -1,4 +1,4 @@
---- Makefile.stub.orig	2013-07-16 23:01:45.000000000 +0000
+--- Makefile.stub.orig	2014-03-09 22:02:56.822564000 +0000
 +++ Makefile.stub
 @@ -3,8 +3,7 @@ host := $(shell gcc -dumpmachine)
  

Added: head/lang/asis/files/patch-asis_a4g-gnat__int.adb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/asis/files/patch-asis_a4g-gnat__int.adb	Fri Mar 14 08:37:27 2014	(r348174)
@@ -0,0 +1,52 @@
+--- asis/a4g-gnat_int.adb.orig	2013-04-16 14:49:49.000000000 +0000
++++ asis/a4g-gnat_int.adb
+@@ -231,44 +231,11 @@ package body A4G.GNAT_Int is
+       end if;
+ 
+       if Strong_Version_Check then
+-         --  We check only the dates here!
+-         First_A_Idx :=
+-           Index (Source  => ASIS_GNAT_V,
+-                  Pattern => "(") + 1;
+-
+-         First_T_Idx :=
+-           Index (Source  => Tree_Version_String.all,
+-                  Pattern => "(") + 1;
+-
+-         Last_A_Idx := Index (Source  => ASIS_GNAT_V,
+-                     Pattern => ")") - 1;
+-
+-         if Index (Source  => ASIS_GNAT_V, Pattern => "-") /= 0 then
+-            Last_A_Idx := Index (Source  => ASIS_GNAT_V,
+-                                 Pattern => "-") - 1;
+-         end if;
+-
+-         Last_T_Idx := Index (Source  => Tree_Version_String.all,
+-                              Pattern => ")") - 1;
+-
+-         if Index (Source  => Tree_Version_String.all, Pattern => "-") /=
+-            0
+-         then
+-            Last_T_Idx :=
+-              Index (Source  => Tree_Version_String.all,
+-                     Pattern => "-") - 1;
+-         end if;
+-
+-         if ASIS_GNAT_V (First_A_Idx .. Last_A_Idx) /=
+-            Tree_Version_String (First_T_Idx .. Last_T_Idx)
+-         then
+-            Close (Desc, File_Closed);
+-            Ada.Exceptions.Raise_Exception
+-              (Program_Error'Identity,
+-               A_Name_Buffer (1 .. A_Name_Len) &
+-               ": Inconsistent versions of GNAT [" & Tree_Version_String.all &
+-               "] and ASIS [" & ASIS_GNAT_V & ']');
+-         end if;
++         --  No need for any version check at all
++         --  FreeBSD Ports system ensures gnat_util is from same sources
++         --  as comiler building ASIS
++         
++         null;
+ 
+       end if;
+