From owner-svn-ports-head@FreeBSD.ORG Sat Jan 25 08:46:12 2014 Return-Path: Delivered-To: svn-ports-head@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 8CCDFF33; Sat, 25 Jan 2014 08:46:12 +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 7829D1D10; Sat, 25 Jan 2014 08:46:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0P8kCrA007672; Sat, 25 Jan 2014 08:46:12 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0P8kBI1007669; Sat, 25 Jan 2014 08:46:11 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201401250846.s0P8kBI1007669@svn.freebsd.org> From: Marcus von Appen Date: Sat, 25 Jan 2014 08:46:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340996 - in head/lang: python python2 python3 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.17 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: Sat, 25 Jan 2014 08:46:12 -0000 Author: mva Date: Sat Jan 25 08:46:11 2014 New Revision: 340996 URL: http://svnweb.freebsd.org/changeset/ports/340996 QAT: https://qat.redports.org/buildarchive/r340996/ Log: - Enable stagedir support Modified: head/lang/python/Makefile head/lang/python2/Makefile head/lang/python3/Makefile Modified: head/lang/python/Makefile ============================================================================== --- head/lang/python/Makefile Sat Jan 25 08:40:30 2014 (r340995) +++ head/lang/python/Makefile Sat Jan 25 08:46:11 2014 (r340996) @@ -25,7 +25,6 @@ PLIST_FILES= bin/2to3 \ bin/python-shared \ bin/python-shared-config -NO_STAGE= yes .include .if ${PYTHON_MAJOR_VER} == 2 @@ -37,21 +36,28 @@ RUN_DEPENDS+= python3:${PORTSDIR}/lang/p do-install: .for file in python python-shared - ${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} ${PREFIX}/bin/${file} + ${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} \ + ${STAGEDIR}${PREFIX}/bin/${file} .endfor - ${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER} ${PREFIX}/bin/2to3 + ${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER} \ + ${STAGEDIR}${PREFIX}/bin/2to3 .if ${PYTHON_MAJOR_VER} == 2 - ${LN} -sf ${PREFIX}/bin/smtpd${PYTHON_MAJOR_VER}.py ${PREFIX}/bin/smtpd.py + ${LN} -sf ${PREFIX}/bin/smtpd${PYTHON_MAJOR_VER}.py \ + ${STAGEDIR}${PREFIX}/bin/smtpd.py .for file in idle pydoc - ${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} ${PREFIX}/bin/${file} + ${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} \ + ${STAGEDIR}${PREFIX}/bin/${file} .endfor .elif ${PYTHON_MAJOR_VER} == 3 .for file in idle pydoc - ${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} ${PREFIX}/bin/${file} + ${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} \ + ${STAGEDIR}${PREFIX}/bin/${file} .endfor .endif - ${LN} -sf ${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config ${PREFIX}/bin/python-config - ${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config ${PREFIX}/bin/python-shared-config + ${LN} -sf ${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config \ + ${STAGEDIR}${PREFIX}/bin/python-config + ${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config \ + ${STAGEDIR}${PREFIX}/bin/python-shared-config # Major upgrade support PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portupgrade Modified: head/lang/python2/Makefile ============================================================================== --- head/lang/python2/Makefile Sat Jan 25 08:40:30 2014 (r340995) +++ head/lang/python2/Makefile Sat Jan 25 08:46:11 2014 (r340996) @@ -26,20 +26,25 @@ PLIST_FILES= bin/2to3-${PYTHON_MAJOR_VER bin/smtpd${PYTHON_MAJOR_VER}.py \ libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc -NO_STAGE= yes .include RUN_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR} do-install: .for file in idle pydoc python python-shared - ${LN} -sf ${PREFIX}/bin/${file}${PYTHON_VER} ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} + ${LN} -sf ${PREFIX}/bin/${file}${PYTHON_VER} \ + ${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} .endfor - ${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_VER} ${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER} - ${LN} -sf ${PREFIX}/bin/smtpd${PYTHON_VER}.py ${PREFIX}/bin/smtpd${PYTHON_MAJOR_VER}.py - ${LN} -sf ${PREFIX}/bin/python${PYTHON_VER}-config ${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config - ${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_VER}-config ${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config - ${LN} -sf ${PREFIX}/libdata/pkgconfig/python-${PYTHON_VER}.pc ${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc + ${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_VER} \ + ${STAGEDIR}${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER} + ${LN} -sf ${PREFIX}/bin/smtpd${PYTHON_VER}.py \ + ${STAGEDIR}${PREFIX}/bin/smtpd${PYTHON_MAJOR_VER}.py + ${LN} -sf ${PREFIX}/bin/python${PYTHON_VER}-config \ + ${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config + ${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_VER}-config \ + ${STAGEDIR}${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config + ${LN} -sf ${PREFIX}/libdata/pkgconfig/python-${PYTHON_VER}.pc \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc # Major upgrade support PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portupgrade Modified: head/lang/python3/Makefile ============================================================================== --- head/lang/python3/Makefile Sat Jan 25 08:40:30 2014 (r340995) +++ head/lang/python3/Makefile Sat Jan 25 08:46:11 2014 (r340996) @@ -25,22 +25,27 @@ PLIST_FILES= bin/2to3-${PYTHON_MAJOR_VER bin/python-shared${PYTHON_MAJOR_VER}-config \ libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc -NO_STAGE= yes .include RUN_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR} do-install: .for file in python python-shared - ${LN} -sf ${PREFIX}/bin/${file}${PYTHON_VER} ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} + ${LN} -sf ${PREFIX}/bin/${file}${PYTHON_VER} \ + ${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} .endfor - ${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_VER} ${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER} + ${LN} -sf ${PREFIX}/bin/2to3-${PYTHON_VER} \ + ${STAGEDIR}${PREFIX}/bin/2to3-${PYTHON_MAJOR_VER} .for file in idle pydoc - ${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} + ${LN} -sf ${PREFIX}/bin/${file}${PYTHON_MAJOR_VER}-${PYTHON_VER} \ + ${STAGEDIR}${PREFIX}/bin/${file}${PYTHON_MAJOR_VER} .endfor - ${LN} -sf ${PREFIX}/bin/python${PYTHON_VER}-config ${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config - ${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_VER}-config ${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config - ${LN} -sf ${PREFIX}/libdata/pkgconfig/python-${PYTHON_VER}.pc ${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc + ${LN} -sf ${PREFIX}/bin/python${PYTHON_VER}-config \ + ${STAGEDIR}${PREFIX}/bin/python${PYTHON_MAJOR_VER}-config + ${LN} -sf ${PREFIX}/bin/python-shared${PYTHON_VER}-config \ + ${STAGEDIR}${PREFIX}/bin/python-shared${PYTHON_MAJOR_VER}-config + ${LN} -sf ${PREFIX}/libdata/pkgconfig/python-${PYTHON_VER}.pc \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/python${PYTHON_MAJOR_VER}.pc # Major upgrade support PORTUPGRADE_CMD= ${LOCALBASE}/sbin/portupgrade