svn commit: r542957 - head/math/sage
Thierry Thomas
thierry at FreeBSD.org
Thu Jul 23 19:52:35 UTC 2020
Author: thierry
Date: Thu Jul 23 19:52:34 2020
New Revision: 542957
URL: https://svnweb.freebsd.org/changeset/ports/542957
Log:
Yet another attempt to fix plist on -CURRENT: the swing between egg and wheel
does not only depend on $OSREL.
Modified:
head/math/sage/Makefile
Modified: head/math/sage/Makefile
==============================================================================
--- head/math/sage/Makefile Thu Jul 23 19:25:07 2020 (r542956)
+++ head/math/sage/Makefile Thu Jul 23 19:52:34 2020 (r542957)
@@ -343,13 +343,6 @@ PORTDOCS= *
.include <bsd.port.pre.mk>
-# See https://lists.freebsd.org/pipermail/freebsd-python/2020-June/020710.html
-.if ${OSREL:R} < 13
-PLIST_SUB+= EGG="" WHEEL="@comment "
-.else
-PLIST_SUB+= EGG="@comment " WHEEL=""
-.endif
-
WSDIR= ${BLDDIR}${PREFIX}
SPKG_INST= configure.ac configure build/sage_bootstrap/uninstall.py \
build/make/install src/bin/sage-env
@@ -511,6 +504,12 @@ post-build:
-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} || \
${TRUE}))
${FIND} ${BLDDIR}${PREFIX} -name "*.bak" -delete
+# See https://lists.freebsd.org/pipermail/freebsd-python/2020-June/020710.html
+.if exists(${PYTHON_SITELIBDIR}/path.py-7.1.dist-info/WHEEL)
+PLIST_SUB+= EGG="@comment " WHEEL=""
+.else
+PLIST_SUB+= EGG="" WHEEL="@comment "
+.endif
do-install:
cd "${BLDDIR}" && ${FIND} . | ${CPIO} -pdum ${STAGEDIR}
More information about the svn-ports-all
mailing list