From owner-svn-ports-all@FreeBSD.ORG Sat Nov 16 13:36:51 2013 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 A7A31C50; Sat, 16 Nov 2013 13:36:51 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7EA5F217C; Sat, 16 Nov 2013 13:36:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAGDapVU017893; Sat, 16 Nov 2013 13:36:51 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAGDapvW017892; Sat, 16 Nov 2013 13:36:51 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201311161336.rAGDapvW017892@svn.freebsd.org> From: Marcus von Appen Date: Sat, 16 Nov 2013 13:36:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333995 - head/lang/ironpython 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.16 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: Sat, 16 Nov 2013 13:36:51 -0000 Author: mva Date: Sat Nov 16 13:36:51 2013 New Revision: 333995 URL: http://svnweb.freebsd.org/changeset/ports/333995 Log: - Enable staging support - Fix installation on 10.x and CURRENT Reported by: pkg-fallout@ Modified: head/lang/ironpython/Makefile Modified: head/lang/ironpython/Makefile ============================================================================== --- head/lang/ironpython/Makefile Sat Nov 16 13:33:45 2013 (r333994) +++ head/lang/ironpython/Makefile Sat Nov 16 13:36:51 2013 (r333995) @@ -21,30 +21,28 @@ GH_COMMIT= 568c234 SUB_FILES= ipy ipy64 -NO_STAGE= yes do-build: cd ${WRKSRC} && ${LOCALBASE}/bin/xbuild /t:Stage \ /p:Configuration=Release /p:ReferencedPlatform=V4 \ /p:Mono=true /p:BaseConfiguration=Release do-install: - @${MKDIR} ${PREFIX}/lib/ironpython + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/ironpython cd ${WRKSRC}/Stage/Release/IronPython-${PORTVERSION} && \ - ${COPYTREE_SHARE} . ${PREFIX}/lib/ironpython; - ${CHMOD} a+x ${PREFIX}/lib/ironpython/ipy.exe - ${CHMOD} a+x ${PREFIX}/lib/ironpython/ipy64.exe + ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/ironpython; + ${CHMOD} a+x ${STAGEDIR}${PREFIX}/lib/ironpython/ipy.exe + ${CHMOD} a+x ${STAGEDIR}${PREFIX}/lib/ironpython/ipy64.exe for f in ${SUB_FILES}; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$$f ${PREFIX}/bin; \ + ${INSTALL_SCRIPT} ${WRKDIR}/$$f ${STAGEDIR}${PREFIX}/bin; \ done post-install: @for f in ${SUB_FILES}; do \ ${ECHO_CMD} "bin/$$f" >> ${TMPPLIST}; \ done - @${ECHO_CMD} "bin/ - @${FIND} -P ${PREFIX}/lib/ironpython ! -type d 2>/dev/null | \ - ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST} - @${FIND} -P -d ${PREFIX}/lib/ironpython -type d 2>/dev/null | \ - ${SED} -ne 's,^${PREFIX}/,@dirrm ,p' >> ${TMPPLIST} + @${FIND} -P ${STAGEDIR}${PREFIX}/lib/ironpython ! -type d 2>/dev/null | \ + ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,,p' >> ${TMPPLIST} + @${FIND} -P -d ${STAGEDIR}${PREFIX}/lib/ironpython -type d 2>/dev/null | \ + ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,@dirrm ,p' >> ${TMPPLIST} .include