Date: Sat, 25 Jan 2014 22:20:01 GMT From: Nathan Whitehorn <nwhitehorn@freebsd.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/185884: [patch] Miscellaneous ports fixes for python 3 Message-ID: <201401252220.s0PMK1GR050386@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/185884; it has been noted by GNATS.
From: Nathan Whitehorn <nwhitehorn@freebsd.org>
To: bug-followup@FreeBSD.org, nwhitehorn@FreeBSD.org
Cc:
Subject: Re: ports/185884: [patch] Miscellaneous ports fixes for python 3
Date: Sat, 25 Jan 2014 16:16:28 -0600
This is a multi-part message in MIME format.
--Boundary_(ID_tBmBruLoENg/I66fQNBM6w)
Content-type: text/plain; CHARSET=US-ASCII; format=flowed
Content-transfer-encoding: 7BIT
Here's another patch (an addition to the last rather than a replacement)
that fixes sphinx. Doing the grammar pickle generation post-build
happens before 2to3 is run, with the result that the command will fail
to execute. Running it in the stage directory solves the problem.
-Nathan
--Boundary_(ID_tBmBruLoENg/I66fQNBM6w)
Content-type: text/plain; CHARSET=US-ASCII; name=py3-sphinx.diff
Content-transfer-encoding: 7BIT
Content-disposition: attachment; filename=py3-sphinx.diff
Index: Makefile
===================================================================
--- Makefile (revision 341085)
+++ Makefile (working copy)
@@ -25,15 +25,11 @@
PYDISTUTILS_AUTOPLIST= yes
PYDISTUTILS_PKGNAME= Sphinx
-post-build:
- cd ${WRKSRC} && \
+post-install:
+ cd ${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}/${PYEASYINSTALL_EGG} && \
${SETENV} PYTHONPATH=${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}:${PYTHONPREFIX_SITELIBDIR} \
- ${PYTHON_CMD} -m sphinx.pycode.pgen2.driver -c 'import load_grammar'
+ ${PYTHON_CMD} -m sphinx.pycode.pgen2.driver -c 'load_grammar(force=True)'
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/sphinx/pycode/Grammar${PYTHON_VER}.pickle \
- ${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}/${PYEASYINSTALL_EGG}/sphinx/pycode/
-
${ECHO_CMD} ${PYTHON_SITELIBDIR:S;${PYTHONBASE}/;;}/${PYEASYINSTALL_EGG}/sphinx/pycode/Grammar${PYTHON_VER}.pickle >> ${TMPPLIST}
.include <bsd.port.mk>
--Boundary_(ID_tBmBruLoENg/I66fQNBM6w)--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401252220.s0PMK1GR050386>