Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 Jun 2015 12:28:02 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r390696 - in head/lang: gcc5-aux gnat_util gnat_util/files
Message-ID:  <201506271228.t5RCS2ck032046@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marino
Date: Sat Jun 27 12:28:02 2015
New Revision: 390696
URL: https://svnweb.freebsd.org/changeset/ports/390696

Log:
  lang/gnat_util: Update for 2015 tools
  
  While here, convert autogen plist to static one.

Added:
  head/lang/gnat_util/files/osint_scars.c   (contents, props changed)
  head/lang/gnat_util/pkg-plist   (contents, props changed)
Deleted:
  head/lang/gnat_util/files/set_std_prefix.c
  head/lang/gnat_util/files/update_path.c
Modified:
  head/lang/gcc5-aux/Makefile.version
  head/lang/gnat_util/Makefile
  head/lang/gnat_util/Makefile.sources
  head/lang/gnat_util/files/Makefile
  head/lang/gnat_util/files/sdefault_adb.gnat_util

Modified: head/lang/gcc5-aux/Makefile.version
==============================================================================
--- head/lang/gcc5-aux/Makefile.version	Sat Jun 27 12:01:30 2015	(r390695)
+++ head/lang/gcc5-aux/Makefile.version	Sat Jun 27 12:28:02 2015	(r390696)
@@ -6,7 +6,7 @@ GCC_VERSION=		${GCC_BRANCH}.${GCC_POINT}
 SNAPSHOT=		20150609
 BUILD_RELEASE=		no
 MAIN_PR=		1
-UTIL_PR=		0
+UTIL_PR=		1
 ARMV7_PR=		0
 
 .if ${BUILD_RELEASE:Mno}

Modified: head/lang/gnat_util/Makefile
==============================================================================
--- head/lang/gnat_util/Makefile	Sat Jun 27 12:01:30 2015	(r390695)
+++ head/lang/gnat_util/Makefile	Sat Jun 27 12:28:02 2015	(r390696)
@@ -30,8 +30,7 @@ MAKE_ENV=	MAKEOBJDIR=${WRKSRC}/obj
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/obj
-.for F in Makefile gnat_util.gpr sdefault_adb.gnat_util \
-	update_path.c set_std_prefix.c
+.for F in Makefile gnat_util.gpr sdefault_adb.gnat_util osint_scars.c
 	@${CP} ${FILESDIR}/${F} ${WRKSRC}/
 .endfor
 .for F in ${GNAT_SRCS}
@@ -46,7 +45,5 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/gcc/ada/gnat_ugn.texi \
 		${STAGEDIR}${DATADIR}
-	@(cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \
-		${SORT} >> ${TMPPLIST})
 
 .include <bsd.port.mk>

Modified: head/lang/gnat_util/Makefile.sources
==============================================================================
--- head/lang/gnat_util/Makefile.sources	Sat Jun 27 12:01:30 2015	(r390695)
+++ head/lang/gnat_util/Makefile.sources	Sat Jun 27 12:28:02 2015	(r390696)
@@ -37,6 +37,8 @@ GNAT_SRCS= \
 	fname-uf.ads \
 	fname.adb \
 	fname.ads \
+	get_scos.adb \
+	get_scos.ads \
 	gnatvsn.adb \
 	gnatvsn.ads \
 	hostparm.ads \
@@ -100,6 +102,8 @@ GNAT_SRCS= \
 	prj-util.ads \
 	prj.adb \
 	prj.ads \
+	put_scos.adb \
+	put_scos.ads \
 	repinfo.adb \
 	repinfo.ads \
 	restrict.adb \
@@ -109,6 +113,8 @@ GNAT_SRCS= \
 	scans.ads \
 	scng.adb \
 	scng.ads \
+	scos.adb \
+	scos.ads \
 	sdefault.ads \
 	sem_aux.adb \
 	sem_aux.ads \

Modified: head/lang/gnat_util/files/Makefile
==============================================================================
--- head/lang/gnat_util/files/Makefile	Sat Jun 27 12:01:30 2015	(r390695)
+++ head/lang/gnat_util/files/Makefile	Sat Jun 27 12:28:02 2015	(r390696)
@@ -2,15 +2,15 @@
 # used instead of the provided asis.gpr file.
 # $FreeBSD$
 
-CP=cp -p
-MKDIR=mkdir -p
-SRC=gen_src
+CP=		cp -p
+MKDIR=		mkdir -p
+SRC=		gen_src
 ADA_FLAGS=	-O2 -gnatn -gnatws -gnat05
 C_FLAGS=	-O2
 ADB_SRCS!=	cd ${.CURDIR} && ls *.adb | sort -r
 GEN_SRCS=	sdefault.adb snames.adb xsnamest.adb
 ADS_SRCS=	rident.ads hostparm.ads err_vars.ads alloc.ads prj-com.ads
-C_SRCS=		link.c update_path.c set_std_prefix.c
+C_SRCS=		link.c osint_scars.c
 LIB_SRCS+=	${C_SRCS} ${GEN_SRCS} ${ADS_SRCS} ${ADB_SRCS:Nlib-*.adb}
 LIB_OBJS=	${LIB_SRCS:R:S/$/.o/}
 

Added: head/lang/gnat_util/files/osint_scars.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/gnat_util/files/osint_scars.c	Sat Jun 27 12:28:02 2015	(r390696)
@@ -0,0 +1,14 @@
+/* Dummy version of set_std_prefix (needed by osint.adb) */
+
+void
+set_std_prefix (char *path, int len)
+{
+}
+
+/* Dummy version of update_path (needed by osint.adb) */
+
+char *
+update_path (char *path, char *key)
+{
+  return path;
+}

Modified: head/lang/gnat_util/files/sdefault_adb.gnat_util
==============================================================================
--- head/lang/gnat_util/files/sdefault_adb.gnat_util	Sat Jun 27 12:01:30 2015	(r390695)
+++ head/lang/gnat_util/files/sdefault_adb.gnat_util	Sat Jun 27 12:28:02 2015	(r390696)
@@ -1,41 +1,8 @@
-------------------------------------------------------------------------------
---                                                                          --
---                         GNAT COMPILER COMPONENTS                         --
---                                                                          --
---                              S D E F A U L T                             --
---                                                                          --
---                                 B o d y                                  --
---                                                                          --
---          Copyright (C) 1992-2007, Free Software Foundation, Inc.         --
---                                                                          --
--- GNAT is free software;  you can  redistribute it  and/or modify it under --
--- terms of the  GNU General Public License as published  by the Free Soft- --
--- ware  Foundation;  either version 3,  or (at your option) any later ver- --
--- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
--- OUT ANY WARRANTY;  without even the  implied warranty of MERCHANTABILITY --
--- or FITNESS FOR A PARTICULAR PURPOSE.                                     --
---                                                                          --
--- As a special exception under Section 7 of GPL version 3, you are granted --
--- additional permissions described in the GCC Runtime Library Exception,   --
--- version 3.1, as published by the Free Software Foundation.               --
---                                                                          --
--- You should have received a copy of the GNU General Public License and    --
--- a copy of the GCC Runtime Library Exception along with this program;     --
--- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
--- <http://www.gnu.org/licenses/>.                                          --
---                                                                          --
--- GNAT was originally developed  by the GNAT team at  New York University. --
--- Extensive contributions were provided by Ada Core Technologies Inc.      --
---                                                                          --
-------------------------------------------------------------------------------
-
 --  This is a dummy version of the body of Sdefault, used by gnat_util. It gets
---  copied to sdefault.adb by Makefile.gnat_util.
+--  copied to sdefault.adb by custom makefile that comes with port.
 
 package body Sdefault is
 
-   Target : constant String_Ptr := new String'("no target");
-
    function Include_Dir_Default_Name return String_Ptr is
    begin
       return null;
@@ -48,7 +15,7 @@ package body Sdefault is
 
    function Target_Name return String_Ptr is
    begin
-      return Target;
+      return null;
    end Target_Name;
 
    function Search_Dir_Prefix return String_Ptr is

Added: head/lang/gnat_util/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/gnat_util/pkg-plist	Sat Jun 27 12:28:02 2015	(r390696)
@@ -0,0 +1,250 @@
+include/gnat_util/ali-util.adb
+include/gnat_util/ali-util.ads
+include/gnat_util/ali.adb
+include/gnat_util/ali.ads
+include/gnat_util/alloc.ads
+include/gnat_util/aspects.adb
+include/gnat_util/aspects.ads
+include/gnat_util/atree.adb
+include/gnat_util/atree.ads
+include/gnat_util/binderr.adb
+include/gnat_util/binderr.ads
+include/gnat_util/butil.adb
+include/gnat_util/butil.ads
+include/gnat_util/casing.adb
+include/gnat_util/casing.ads
+include/gnat_util/csets.adb
+include/gnat_util/csets.ads
+include/gnat_util/debug.adb
+include/gnat_util/debug.ads
+include/gnat_util/einfo.adb
+include/gnat_util/einfo.ads
+include/gnat_util/elists.adb
+include/gnat_util/elists.ads
+include/gnat_util/err_vars.ads
+include/gnat_util/errout.adb
+include/gnat_util/errout.ads
+include/gnat_util/erroutc.adb
+include/gnat_util/erroutc.ads
+include/gnat_util/errutil.adb
+include/gnat_util/errutil.ads
+include/gnat_util/fmap.adb
+include/gnat_util/fmap.ads
+include/gnat_util/fname-uf.adb
+include/gnat_util/fname-uf.ads
+include/gnat_util/fname.adb
+include/gnat_util/fname.ads
+include/gnat_util/get_scos.adb
+include/gnat_util/get_scos.ads
+include/gnat_util/gnatvsn.adb
+include/gnat_util/gnatvsn.ads
+include/gnat_util/hostparm.ads
+include/gnat_util/impunit.adb
+include/gnat_util/impunit.ads
+include/gnat_util/krunch.adb
+include/gnat_util/krunch.ads
+include/gnat_util/lib-list.adb
+include/gnat_util/lib-sort.adb
+include/gnat_util/lib.adb
+include/gnat_util/lib.ads
+include/gnat_util/makeutl.adb
+include/gnat_util/makeutl.ads
+include/gnat_util/mlib-fil.adb
+include/gnat_util/mlib-fil.ads
+include/gnat_util/mlib-tgt-specific.adb
+include/gnat_util/mlib-tgt-specific.ads
+include/gnat_util/mlib-tgt.adb
+include/gnat_util/mlib-tgt.ads
+include/gnat_util/mlib-utl.adb
+include/gnat_util/mlib-utl.ads
+include/gnat_util/mlib.adb
+include/gnat_util/mlib.ads
+include/gnat_util/namet.adb
+include/gnat_util/namet.ads
+include/gnat_util/nlists.adb
+include/gnat_util/nlists.ads
+include/gnat_util/opt.adb
+include/gnat_util/opt.ads
+include/gnat_util/osint.adb
+include/gnat_util/osint.ads
+include/gnat_util/output.adb
+include/gnat_util/output.ads
+include/gnat_util/prj-attr-pm.adb
+include/gnat_util/prj-attr-pm.ads
+include/gnat_util/prj-attr.adb
+include/gnat_util/prj-attr.ads
+include/gnat_util/prj-com.ads
+include/gnat_util/prj-conf.adb
+include/gnat_util/prj-conf.ads
+include/gnat_util/prj-dect.adb
+include/gnat_util/prj-dect.ads
+include/gnat_util/prj-env.adb
+include/gnat_util/prj-env.ads
+include/gnat_util/prj-err.adb
+include/gnat_util/prj-err.ads
+include/gnat_util/prj-ext.adb
+include/gnat_util/prj-ext.ads
+include/gnat_util/prj-nmsc.adb
+include/gnat_util/prj-nmsc.ads
+include/gnat_util/prj-part.adb
+include/gnat_util/prj-part.ads
+include/gnat_util/prj-pp.adb
+include/gnat_util/prj-pp.ads
+include/gnat_util/prj-proc.adb
+include/gnat_util/prj-proc.ads
+include/gnat_util/prj-strt.adb
+include/gnat_util/prj-strt.ads
+include/gnat_util/prj-tree.adb
+include/gnat_util/prj-tree.ads
+include/gnat_util/prj-util.adb
+include/gnat_util/prj-util.ads
+include/gnat_util/prj.adb
+include/gnat_util/prj.ads
+include/gnat_util/put_scos.adb
+include/gnat_util/put_scos.ads
+include/gnat_util/repinfo.adb
+include/gnat_util/repinfo.ads
+include/gnat_util/restrict.adb
+include/gnat_util/restrict.ads
+include/gnat_util/rident.ads
+include/gnat_util/scans.adb
+include/gnat_util/scans.ads
+include/gnat_util/scng.adb
+include/gnat_util/scng.ads
+include/gnat_util/scos.adb
+include/gnat_util/scos.ads
+include/gnat_util/sdefault.adb
+include/gnat_util/sdefault.ads
+include/gnat_util/sem_aux.adb
+include/gnat_util/sem_aux.ads
+include/gnat_util/sinfo.adb
+include/gnat_util/sinfo.ads
+include/gnat_util/sinput-c.adb
+include/gnat_util/sinput-c.ads
+include/gnat_util/sinput-p.adb
+include/gnat_util/sinput-p.ads
+include/gnat_util/sinput.adb
+include/gnat_util/sinput.ads
+include/gnat_util/snames.adb
+include/gnat_util/snames.ads
+include/gnat_util/stand.adb
+include/gnat_util/stand.ads
+include/gnat_util/stringt.adb
+include/gnat_util/stringt.ads
+include/gnat_util/styleg.adb
+include/gnat_util/styleg.ads
+include/gnat_util/stylesw.adb
+include/gnat_util/stylesw.ads
+include/gnat_util/switch-m.adb
+include/gnat_util/switch-m.ads
+include/gnat_util/switch.adb
+include/gnat_util/switch.ads
+include/gnat_util/table.adb
+include/gnat_util/table.ads
+include/gnat_util/targparm.adb
+include/gnat_util/targparm.ads
+include/gnat_util/tempdir.adb
+include/gnat_util/tempdir.ads
+include/gnat_util/tree_in.adb
+include/gnat_util/tree_in.ads
+include/gnat_util/tree_io.adb
+include/gnat_util/tree_io.ads
+include/gnat_util/types.adb
+include/gnat_util/types.ads
+include/gnat_util/uintp.adb
+include/gnat_util/uintp.ads
+include/gnat_util/uname.adb
+include/gnat_util/uname.ads
+include/gnat_util/urealp.adb
+include/gnat_util/urealp.ads
+include/gnat_util/widechar.adb
+include/gnat_util/widechar.ads
+include/gnat_util/xsnamest.adb
+include/gnat_util/xutil.adb
+include/gnat_util/xutil.ads
+lib/gnat/gnat_util.gpr
+lib/gnat_util/ali-util.ali
+lib/gnat_util/ali.ali
+lib/gnat_util/alloc.ali
+lib/gnat_util/aspects.ali
+lib/gnat_util/atree.ali
+lib/gnat_util/binderr.ali
+lib/gnat_util/butil.ali
+lib/gnat_util/casing.ali
+lib/gnat_util/csets.ali
+lib/gnat_util/debug.ali
+lib/gnat_util/einfo.ali
+lib/gnat_util/elists.ali
+lib/gnat_util/err_vars.ali
+lib/gnat_util/errout.ali
+lib/gnat_util/erroutc.ali
+lib/gnat_util/errutil.ali
+lib/gnat_util/fmap.ali
+lib/gnat_util/fname-uf.ali
+lib/gnat_util/fname.ali
+lib/gnat_util/get_scos.ali
+lib/gnat_util/gnatvsn.ali
+lib/gnat_util/hostparm.ali
+lib/gnat_util/krunch.ali
+lib/gnat_util/lib.ali
+lib/gnat_util/libgnat_util.a
+lib/gnat_util/makeutl.ali
+lib/gnat_util/mlib-fil.ali
+lib/gnat_util/mlib-tgt-specific.ali
+lib/gnat_util/mlib-tgt.ali
+lib/gnat_util/mlib-utl.ali
+lib/gnat_util/mlib.ali
+lib/gnat_util/namet.ali
+lib/gnat_util/nlists.ali
+lib/gnat_util/opt.ali
+lib/gnat_util/osint.ali
+lib/gnat_util/output.ali
+lib/gnat_util/prj-attr-pm.ali
+lib/gnat_util/prj-attr.ali
+lib/gnat_util/prj-com.ali
+lib/gnat_util/prj-conf.ali
+lib/gnat_util/prj-dect.ali
+lib/gnat_util/prj-env.ali
+lib/gnat_util/prj-err.ali
+lib/gnat_util/prj-ext.ali
+lib/gnat_util/prj-nmsc.ali
+lib/gnat_util/prj-part.ali
+lib/gnat_util/prj-pp.ali
+lib/gnat_util/prj-proc.ali
+lib/gnat_util/prj-strt.ali
+lib/gnat_util/prj-tree.ali
+lib/gnat_util/prj-util.ali
+lib/gnat_util/prj.ali
+lib/gnat_util/put_scos.ali
+lib/gnat_util/repinfo.ali
+lib/gnat_util/restrict.ali
+lib/gnat_util/rident.ali
+lib/gnat_util/scans.ali
+lib/gnat_util/scng.ali
+lib/gnat_util/scos.ali
+lib/gnat_util/sdefault.ali
+lib/gnat_util/sem_aux.ali
+lib/gnat_util/sinfo.ali
+lib/gnat_util/sinput-c.ali
+lib/gnat_util/sinput-p.ali
+lib/gnat_util/sinput.ali
+lib/gnat_util/snames.ali
+lib/gnat_util/stand.ali
+lib/gnat_util/stringt.ali
+lib/gnat_util/styleg.ali
+lib/gnat_util/stylesw.ali
+lib/gnat_util/switch-m.ali
+lib/gnat_util/switch.ali
+lib/gnat_util/table.ali
+lib/gnat_util/targparm.ali
+lib/gnat_util/tempdir.ali
+lib/gnat_util/tree_in.ali
+lib/gnat_util/tree_io.ali
+lib/gnat_util/types.ali
+lib/gnat_util/uintp.ali
+lib/gnat_util/uname.ali
+lib/gnat_util/urealp.ali
+lib/gnat_util/widechar.ali
+lib/gnat_util/xsnamest.ali
+lib/gnat_util/xutil.ali
+%%DATADIR%%/gnat_ugn.texi



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506271228.t5RCS2ck032046>