From owner-svn-ports-all@FreeBSD.ORG Thu May 22 21:44:53 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 532A01D6; Thu, 22 May 2014 21:44:53 +0000 (UTC) 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 3F10C2EEB; Thu, 22 May 2014 21:44:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4MLirHK008351; Thu, 22 May 2014 21:44:53 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4MLiqaE008339; Thu, 22 May 2014 21:44:52 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201405222144.s4MLiqaE008339@svn.freebsd.org> From: John Marino Date: Thu, 22 May 2014 21:44:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354892 - in head: devel/gnatcoll devel/gnatcoll/files lang/gnat_util lang/gnat_util/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-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 May 2014 21:44:53 -0000 Author: marino Date: Thu May 22 21:44:51 2014 New Revision: 354892 URL: http://svnweb.freebsd.org/changeset/ports/354892 QAT: https://qat.redports.org/buildarchive/r354892/ Log: lang/gnat_util: Add set_std_prefix and update_path symbols Rather than require each user of libgnat_util to link in set_std_prefix and update_path functions, let's assume each user needs the same version of these functions and just add them directly to the library. Adjust gnatcoll accordingly -- hack no longer necessary. Added: head/lang/gnat_util/files/set_std_prefix.c (contents, props changed) head/lang/gnat_util/files/update_path.c (contents, props changed) Deleted: head/devel/gnatcoll/files/patch-src_gnatcoll__tools.gpr Modified: head/devel/gnatcoll/Makefile head/lang/gnat_util/Makefile head/lang/gnat_util/files/Makefile Modified: head/devel/gnatcoll/Makefile ============================================================================== --- head/devel/gnatcoll/Makefile Thu May 22 21:05:22 2014 (r354891) +++ head/devel/gnatcoll/Makefile Thu May 22 21:44:51 2014 (r354892) @@ -3,6 +3,7 @@ PORTNAME= gnatcoll PORTVERSION= 2014 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://downloads.dragonlace.net/src/ DISTNAME= ${PORTNAME}-gpl-${PORTVERSION}-src Modified: head/lang/gnat_util/Makefile ============================================================================== --- head/lang/gnat_util/Makefile Thu May 22 21:05:22 2014 (r354891) +++ head/lang/gnat_util/Makefile Thu May 22 21:44:51 2014 (r354892) @@ -3,6 +3,7 @@ PORTNAME= gnat_util PORTVERSION= ${SNAPSHOT} +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= ${MS_SUBDIR} @@ -25,7 +26,8 @@ MAKE_ENV= MAKEOBJDIR=${WRKSRC}/obj post-extract: @${MKDIR} ${WRKSRC}/obj -.for F in Makefile gnat_util.gpr sdefault_adb.gnat_util +.for F in Makefile gnat_util.gpr sdefault_adb.gnat_util \ + update_path.c set_std_prefix.c @${CP} ${FILESDIR}/${F} ${WRKSRC}/ .endfor .for F in ${GNAT_SRCS} Modified: head/lang/gnat_util/files/Makefile ============================================================================== --- head/lang/gnat_util/files/Makefile Thu May 22 21:05:22 2014 (r354891) +++ head/lang/gnat_util/files/Makefile Thu May 22 21:44:51 2014 (r354892) @@ -10,7 +10,8 @@ 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 -LIB_SRCS+= link.c ${GEN_SRCS} ${ADS_SRCS} ${ADB_SRCS:Nlib-*.adb} +C_SRCS= link.c update_path.c set_std_prefix.c +LIB_SRCS+= ${C_SRCS} ${GEN_SRCS} ${ADS_SRCS} ${ADB_SRCS:Nlib-*.adb} LIB_OBJS= ${LIB_SRCS:R:S/$/.o/} .PHONY: all Added: head/lang/gnat_util/files/set_std_prefix.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/gnat_util/files/set_std_prefix.c Thu May 22 21:44:51 2014 (r354892) @@ -0,0 +1,26 @@ +/********************************************************************* + * G P S * + * * + * Copyright (C) 2002-2004 * + * ACT-Europe * + * * + * GPS is free software; you can redistribute it and/or modify it * + * under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * General Public License for more details. You should have received * + * a copy of the GNU General Public License along with this program; * + * if not, write to the Free Software Foundation, Inc., 59 Temple * + * Place - Suite 330, Boston, MA 02111-1307, USA. * + *********************************************************************/ + +/* Dummy version of set_std_prefix (needed by osint.adb) */ + +void +set_std_prefix (char *path, int len) +{ +} Added: head/lang/gnat_util/files/update_path.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/gnat_util/files/update_path.c Thu May 22 21:44:51 2014 (r354892) @@ -0,0 +1,27 @@ +/********************************************************************* + * G P S * + * * + * Copyright (C) 2002-2004 * + * ACT-Europe * + * * + * GPS is free software; you can redistribute it and/or modify it * + * under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * General Public License for more details. You should have received * + * a copy of the GNU General Public License along with this program; * + * if not, write to the Free Software Foundation, Inc., 59 Temple * + * Place - Suite 330, Boston, MA 02111-1307, USA. * + *********************************************************************/ + +/* Dummy version of update_path (needed by osint.adb) */ + +char * +update_path (char *path, char *key) +{ + return path; +}