Date: Tue, 4 Aug 2020 18:27:31 +0000 (UTC) From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544180 - head/math/sage Message-ID: <202008041827.074IRVs9054379@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arrowd Date: Tue Aug 4 18:27:31 2020 New Revision: 544180 URL: https://svnweb.freebsd.org/changeset/ports/544180 Log: math/sage: Unbreak build with DOCS=OFF. Reviewed by: thierry Modified: head/math/sage/Makefile head/math/sage/pkg-plist Modified: head/math/sage/Makefile ============================================================================== --- head/math/sage/Makefile Tue Aug 4 18:23:06 2020 (r544179) +++ head/math/sage/Makefile Tue Aug 4 18:27:31 2020 (r544180) @@ -3,7 +3,7 @@ PORTNAME= sage PORTVERSION= 9.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math MASTER_SITES= https://mirrors.xmission.com/sage/src/ \ http://mirrors.xmission.com/sage/src/ \ @@ -333,14 +333,18 @@ CONFIGURE_ARGS= --with-system-gcc=force \ --enable-build-as-root \ --localstatedir=/var MAKE_ENV= MAKE=${GMAKE} DESTDIR=${BLDDIR} +ALL_TARGET= build REINPLACE_ARGS= -i '' BINARY_ALIAS= patch=${LOCALBASE}/bin/gpatch +OPTIONS_SUB= yes PLIST_SUB= VER=${PORTVERSION} SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS PORTDOCS= * +DOCS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx + .include <bsd.port.pre.mk> WSDIR= ${BLDDIR}${PREFIX} @@ -350,7 +354,7 @@ PY2FIX= bin lib/${PYTHON_VERSION} DOC2FIX= .pickle .doctree SE2FIX= ^ECLDIR= ^SINGULAR MAXIMA_PREFIX SHR2FIX= GAP_ROOT_DIR PPLPY_DOCS SINGULARPATH -STG2FIX= bin/sage-env-config default.qepcadrc \ +STG2FIX= bin/sage-env-config \ share/jupyter/kernels/sagemath/kernel.json BADLN= kernels/sagemath/doc nbextensions/jsmol \ nbextensions/mathjax nbextensions/threejs @@ -453,6 +457,9 @@ pre-configure: ${MKDIR} ${BLDDIR}${PREFIX}/lib/pkgconfig # Removed thereafter post-build: +.if ${PORT_OPTIONS:MDOCS} + (cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_CMD} doc) +.endif .for d in ${PY2FIX} ${FIND} ${WSDIR}/${d} -type f -exec ${GREP} -I -l "${WSDIR}/bin/python" {} \; |\ ${XARGS} ${SED} -i "" -e 's|${WSDIR}/bin/pytho.*|${PYTHON_CMD}|' @@ -512,7 +519,7 @@ PLIST_SUB+= EGG="" WHEEL="@comment " .endif do-install: - cd "${BLDDIR}" && ${FIND} . | ${CPIO} -pdum ${STAGEDIR} + cd "${BLDDIR}" && ${FIND} . | ${CPIO} -pduml ${STAGEDIR} # Remove bad links ${LN} -sf ${DOCSDIR} \ ${STAGEDIR}${PREFIX}/share/jupyter/kernels/sagemath/doc Modified: head/math/sage/pkg-plist ============================================================================== --- head/math/sage/pkg-plist Tue Aug 4 18:23:06 2020 (r544179) +++ head/math/sage/pkg-plist Tue Aug 4 18:27:31 2020 (r544180) @@ -58,12 +58,11 @@ bin/sage-upgrade bin/sage-valgrind bin/sage-version.sh bin/sagenb-export -default.qepcadrc etc/jupyter/jupyter_notebook_config.py etc/jupyter/nbconfig/notebook.d/widgetsnbextension.json -etc/sage-started.txt include/ratpoints.h lib/libratpoints.a +%%DOCS%%lib/sage-force-relocate.txt %%PYTHON_SITELIBDIR%%/__pycache__/backports_abc.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/__pycache__/ipykernel_launcher.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/__pycache__/path.cpython-%%PYTHON_SUFFIX%%.pyc @@ -8587,7 +8586,6 @@ lib/libratpoints.a %%PYTHON_SITELIBDIR%%/widgetsnbextension/_version.py %%PYTHON_SITELIBDIR%%/widgetsnbextension/static/extension.js %%PYTHON_SITELIBDIR%%/widgetsnbextension/static/extension.js.map -lib/sage-current-location.txt pyvenv.cfg share/combinatorial_designs/MOLS_table.txt share/conway_polynomials/conway_polynomials.p
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008041827.074IRVs9054379>