From owner-svn-ports-head@freebsd.org Sun Mar 13 21:04:45 2016 Return-Path: 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 1C2D1ACD8E8; Sun, 13 Mar 2016 21:04:45 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 EC664E13; Sun, 13 Mar 2016 21:04:44 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2DL4iMV060682; Sun, 13 Mar 2016 21:04:44 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2DL4hIF060678; Sun, 13 Mar 2016 21:04:43 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201603132104.u2DL4hIF060678@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Sun, 13 Mar 2016 21:04:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411030 - in head/lang/gcc6-aux: . 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.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Mar 2016 21:04:45 -0000 Author: marino Date: Sun Mar 13 21:04:43 2016 New Revision: 411030 URL: https://svnweb.freebsd.org/changeset/ports/411030 Log: lang/gcc6-aux: install gnatdroid/dejagnu support Change names of gnatdroid-support dejagnu exp files so that gcc6-aux can co-exist with gcc-aux. The gnatdroid compilers will be rebased on gcc6-aux in the future. Technically the resulting package changes and thus requires a bump, but nothing uses these two new files yet, so I'm not bumping it. Added: head/lang/gcc6-aux/files/android6.exp - copied, changed from r411028, head/lang/gcc6-aux/files/android.exp head/lang/gcc6-aux/files/gnatdroid6.exp - copied, changed from r411028, head/lang/gcc6-aux/files/gnatdroid.exp Deleted: head/lang/gcc6-aux/files/android.exp head/lang/gcc6-aux/files/gnatdroid.exp Modified: head/lang/gcc6-aux/Makefile Modified: head/lang/gcc6-aux/Makefile ============================================================================== --- head/lang/gcc6-aux/Makefile Sun Mar 13 20:44:00 2016 (r411029) +++ head/lang/gcc6-aux/Makefile Sun Mar 13 21:04:43 2016 (r411030) @@ -254,20 +254,17 @@ do-install: cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \ ${MAKE_CMD} install-strip ${MAKE_ARGS} ${MV} ${STAGEDIR}${PKG_PREFIX}/share ${WRKDIR}/moved_share -# Don't activate until this port builds gnatdroid -# Otherwise it will conflict with lang/gcc-aux -# Add "share" after {PORTNAME} on 3rd line of post-stage target -# ${MKDIR} ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards \ -# ${STAGEDIR}${PREFIX}/share/dejagnu/config -# ${INSTALL_DATA} ${FILESDIR}/android.exp \ -# ${STAGEDIR}${PREFIX}/share/dejagnu/config -# ${INSTALL_DATA} ${FILESDIR}/gnatdroid.exp \ -# ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards + ${MKDIR} ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards \ + ${STAGEDIR}${PREFIX}/share/dejagnu/config + ${INSTALL_DATA} ${FILESDIR}/android6.exp \ + ${STAGEDIR}${PREFIX}/share/dejagnu/config + ${INSTALL_DATA} ${FILESDIR}/gnatdroid6.exp \ + ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards post-stage: (cd ${STAGEDIR}${PKG_PREFIX}; ${FIND} * -type d -empty | \ ${SORT} -dr | ${XARGS} ${RMDIR}) - (cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} \ + (cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} share \ \( -type f -or -type l \) | ${SORT} | ${SED} \ -e 's/\/man\/man[1578]\/.*[1578]$$/&.gz/' >> ${TMPPLIST}) .if ${PORT_OPTIONS:MBOOTSTRAP} Copied and modified: head/lang/gcc6-aux/files/android6.exp (from r411028, head/lang/gcc6-aux/files/android.exp) ============================================================================== --- head/lang/gcc6-aux/files/android.exp Sun Mar 13 20:08:47 2016 (r411028, copy source) +++ head/lang/gcc6-aux/files/android6.exp Sun Mar 13 21:04:43 2016 (r411030) @@ -1,7 +1,7 @@ # This file is part of DejaGnu. if {![info exists board]} { - error "must set $board before loading android.exp" + error "must set $board before loading android6.exp" } # For rcp_download, rsh_exec. Copied and modified: head/lang/gcc6-aux/files/gnatdroid6.exp (from r411028, head/lang/gcc6-aux/files/gnatdroid.exp) ============================================================================== --- head/lang/gcc6-aux/files/gnatdroid.exp Sun Mar 13 20:08:47 2016 (r411028, copy source) +++ head/lang/gcc6-aux/files/gnatdroid6.exp Sun Mar 13 21:04:43 2016 (r411030) @@ -1,6 +1,6 @@ # gnatdroid testsuite running over ssh. -load_generic_config "android" +load_generic_config "android6" process_multilib_options ""