From 795fc4961d8a015346072b047cbd9594ab083fb7 Mon Sep 17 00:00:00 2001 From: John Marino Date: Thu, 15 May 2014 18:40:10 +0000 Subject: [PATCH] lang/asis: Upgrade version 2013 => 2014 The annual Adacore release happened! --- lang/asis/Makefile | 5 +---- lang/asis/distinfo | 4 ++-- lang/asis/files/patch-Makefile.stub | 2 +- lang/asis/files/patch-asis_a4g-gnat__int.adb | 19 +++++++------------ 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/lang/asis/Makefile b/lang/asis/Makefile index a24a821e8873..833c40476900 100644 --- a/lang/asis/Makefile +++ b/lang/asis/Makefile @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= asis -PORTVERSION= 2013 +PORTVERSION= 2014 CATEGORIES= lang MASTER_SITES= http://downloads.dragonlace.net/src/ DISTNAME= ${PORTNAME}-gpl-${PORTVERSION}-src -EXTRACT_SUFX= .tgz MAINTAINER= marino@FreeBSD.org COMMENT= GNAT implementation of Ada Semantic Interface Specification @@ -43,8 +42,6 @@ post-install: ${SORT} -r | ${SED} -e '/lib\/gnat$$/d' -e '/share\/doc$$/d' \ -e '/share\/gps$$/d' -e '/share\/gps\/plug-ins$$/d' \ -e 's/^/@dirrm /g' >> ${TMPPLIST} - @echo "@unexec rmdir %D/lib/gnat 2>/dev/null || true" >> ${TMPPLIST} - @echo "@unexec rmdir %D/share/doc 2>/dev/null || true" >> ${TMPPLIST} @echo "@unexec rmdir %D/share/gps/plug-ins 2>/dev/null || true" >> ${TMPPLIST} @echo "@unexec rmdir %D/share/gps 2>/dev/null || true" >> ${TMPPLIST} diff --git a/lang/asis/distinfo b/lang/asis/distinfo index 42f8ad90af6d..8bde0b533143 100644 --- a/lang/asis/distinfo +++ b/lang/asis/distinfo @@ -1,2 +1,2 @@ -SHA256 (asis-gpl-2013-src.tgz) = 5f900654ffe0a8a86bcea0c32f1777b039e261bc7ba0e262706cff9de003a23a -SIZE (asis-gpl-2013-src.tgz) = 4728571 +SHA256 (asis-gpl-2014-src.tar.gz) = 429d3ff2c8c72397c1cf3c39bb49cbe2268bd1b0353ff81b56734fed273a2324 +SIZE (asis-gpl-2014-src.tar.gz) = 4830531 diff --git a/lang/asis/files/patch-Makefile.stub b/lang/asis/files/patch-Makefile.stub index a03898a816f5..5dba238cedfc 100644 --- a/lang/asis/files/patch-Makefile.stub +++ b/lang/asis/files/patch-Makefile.stub @@ -1,4 +1,4 @@ ---- Makefile.stub.orig 2014-03-09 22:02:56.822564000 +0000 +--- Makefile.stub.orig 2014-05-15 18:18:09.000000000 +0000 +++ Makefile.stub @@ -3,8 +3,7 @@ host := $(shell gcc -dumpmachine) diff --git a/lang/asis/files/patch-asis_a4g-gnat__int.adb b/lang/asis/files/patch-asis_a4g-gnat__int.adb index 191f28bca66a..78cc9c1a985f 100644 --- a/lang/asis/files/patch-asis_a4g-gnat__int.adb +++ b/lang/asis/files/patch-asis_a4g-gnat__int.adb @@ -1,7 +1,7 @@ ---- asis/a4g-gnat_int.adb.orig 2013-04-16 14:49:49.000000000 +0000 +--- asis/a4g-gnat_int.adb.orig 2014-04-10 13:38:35.000000000 +0000 +++ asis/a4g-gnat_int.adb -@@ -231,44 +231,11 @@ package body A4G.GNAT_Int is - end if; +@@ -229,40 +229,10 @@ package body A4G.GNAT_Int is + Opt.Tree_Read; if Strong_Version_Check then - -- We check only the dates here! @@ -35,18 +35,13 @@ - 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 & ']'); +- Note_Version_Mismatch; - end if; +- + -- No need for any version check at all + -- FreeBSD Ports system ensures gnat_util is from same sources -+ -- as comiler building ASIS -+ ++ -- as compiler building ASIS + null; - end if; + -- GNAT/ASIS version check