Date: Sat, 25 Jan 2014 08:46:11 +0000 (UTC) From: Marcus von Appen <mva@FreeBSD.org> 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 Message-ID: <201401250846.s0P8kBI1007669@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk> .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 <bsd.port.pre.mk> 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 <bsd.port.pre.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401250846.s0P8kBI1007669>