Date: Sun, 28 Jun 2020 14:06:58 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r540720 - in head/math/sage: . files Message-ID: <202006281406.05SE6wpQ063421@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Sun Jun 28 14:06:58 2020 New Revision: 540720 URL: https://svnweb.freebsd.org/changeset/ports/540720 Log: - always --enable-build-as-root (DP) - remove CONFLICTS with lang/python3 (DP) - remove future CONFLICTS with blas/lapack (PR 247542) - add a pkg-message for SAGE_ROOT / SAGE_LOCAL (DP) - remove the check of R´s Makevars.site (DP) see <https://trac.sagemath.org/ticket/29943>; - use math/e-antic from the ports tree - make BROKEN on -CURRENT untill a solution is found / Python Reported by: Dima Pasechnik <dimpase (at) gmail.com> (DP) Added: head/math/sage/files/e_antic_spkg-configure.m4 (contents, props changed) head/math/sage/files/patch-src_bin_sage-env (contents, props changed) head/math/sage/files/pkg-message.in (contents, props changed) Modified: head/math/sage/Makefile head/math/sage/pkg-plist Modified: head/math/sage/Makefile ============================================================================== --- head/math/sage/Makefile Sun Jun 28 13:59:48 2020 (r540719) +++ head/math/sage/Makefile Sun Jun 28 14:06:58 2020 (r540720) @@ -3,7 +3,7 @@ PORTNAME= sage PORTVERSION= 9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= https://mirrors.xmission.com/sage/src/ \ http://mirrors.xmission.com/sage/src/ \ @@ -19,6 +19,9 @@ COMMENT= Open source Mathematics software LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING.txt +# See https://lists.freebsd.org/pipermail/freebsd-python/2020-June/020710.html +BROKEN_FreeBSD_13= Bad plist caused by changes in Python + BUILD_DEPENDS= bash:shells/bash \ dash:shells/dash \ cmake:devel/cmake \ @@ -140,6 +143,7 @@ LIB_DEPENDS= libarb.so:math/arb \ libcdd.so:math/cddlib \ libcliquer.so:math/cliquer \ libcurl.so:ftp/curl \ + libeantic.so:math/e-antic \ libec.so:math/eclib \ libecl.so:lang/ecl \ libecm.so:math/gmp-ecm \ @@ -304,8 +308,7 @@ USE_GNOME= cairo glib20 pango USE_PYTHON= cython USE_JAVA= yes # for science/jmol -CONFLICTS= python-3.* \ - ${PYTHON_PKGNAMEPREFIX}ipykernel5-5.* \ +CONFLICTS= ${PYTHON_PKGNAMEPREFIX}ipykernel5-5.* \ ${PYTHON_PKGNAMEPREFIX}ipython-7.* \ ${PYTHON_PKGNAMEPREFIX}ipywidgets-7.* \ ${PYTHON_PKGNAMEPREFIX}notebook-6.* \ @@ -330,19 +333,17 @@ CONFIGURE_ENV= SAGE_PORT=yes CC=${CC} GCC=${CC} CXX=${ DESTDIR=${BLDDIR}/${PREFIX} PATCH=${LOCALBASE}/bin/gpatch CONFIGURE_ARGS= --with-system-gcc=force \ --with-system-python3=yes \ + --enable-build-as-root \ --localstatedir=/var MAKE_ENV= MAKE=${GMAKE} DESTDIR=${BLDDIR} REINPLACE_ARGS= -i '' BINARY_ALIAS= patch=${LOCALBASE}/bin/gpatch PLIST_SUB= VER=${PORTVERSION} +SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS PORTDOCS= * -.if defined(PACKAGE_BUILDING) -CONFIGURE_ARGS+=--enable-build-as-root -.endif - .include <bsd.port.pre.mk> WSDIR= ${BLDDIR}${PREFIX} @@ -370,8 +371,8 @@ PY_LIBS= alabaster babel bleach certifi configparser c twisted vcversioner wcwidth webencodings werkzeug zope_interface PY_FILES= sage_brial JS_LIBS= jmol mathjax threejs -SPKGCM4= brial ecl gap gc giac libhomfly linbox maxima palp pynac rubiks \ - singular suitesparse sympow zn_poly +SPKGCM4= brial e_antic ecl gap gc giac libhomfly linbox maxima palp pynac \ + rubiks singular suitesparse sympow zn_poly post-patch: ${CP} ${FILESDIR}/psutil__arch__bsd__freebsd_socks.c.patch \ @@ -474,10 +475,10 @@ post-build: .endfor ${RM} ${BLDDIR}${PYTHON_CMD} ${BADLN:C|^|${BLDDIR}${PREFIX}/share/jupyter/|} ${RM} -r ${BLDDIR}${PREFIX}/var - ${RM} ${BLDDIR}${PREFIX}/lib64 ${BLDDIR}${PREFIX}/libdata/pkgconfig/blas.pc \ - ${BLDDIR}${PREFIX}/libdata/pkgconfig/cblas.pc \ - ${BLDDIR}${PREFIX}/libdata/pkgconfig/gsl.pc \ - ${BLDDIR}${PREFIX}/libdata/pkgconfig/lapack.pc + ${RM} ${BLDDIR}${PREFIX}/lib64 ${BLDDIR}${PREFIX}/lib/pkgconfig/blas.pc \ + ${BLDDIR}${PREFIX}/lib/pkgconfig/cblas.pc \ + ${BLDDIR}${PREFIX}/lib/pkgconfig/gsl.pc \ + ${BLDDIR}${PREFIX}/lib/pkgconfig/lapack.pc # Cannot use a package system for pip and setuptools ${RM} ${BLDDIR}${PREFIX}/bin/easy_install* ${BLDDIR}${PREFIX}/bin/pip* ${RM} -r ${BLDDIR}${PYTHON_SITELIBDIR}/pip-* ${BLDDIR}${PYTHON_SITELIBDIR}/pip/ @@ -498,6 +499,9 @@ post-build: ${RM} -r ${BLDDIR}${PREFIX}/bin/pygmentize \ ${BLDDIR}${PYTHON_SITELIBDIR}/Pygments-* \ ${BLDDIR}${PYTHON_SITELIBDIR}/pygments + # Remove CONFLICTS with lang/python3 + ${RM} ${BLDDIR}${PREFIX}/bin/python ${BLDDIR}${PREFIX}/bin/python3 + ${REINPLACE_CMD} -e '/exec/s|python3|${PYTHON_VERSION}|' ${BLDDIR}${PREFIX}/bin/sage # ${TRUE} because compilation of some .py fails: compileall.py -q to see errors (cd ${WSDIR} && (${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} || \ @@ -515,6 +519,8 @@ do-install: ${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/mathjax ${LN} -sf ${LOCALBASE}/www/threejs \ ${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/threejs + +post-install: ${RM} ${STAGEDIR}${PREFIX}/lib64 ${STAGEDIR}${PREFIX}/libdata/pkgconfig/blas.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/cblas.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/gsl.pc \ Added: head/math/sage/files/e_antic_spkg-configure.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/sage/files/e_antic_spkg-configure.m4 Sun Jun 28 14:06:58 2020 (r540720) @@ -0,0 +1,8 @@ +SAGE_SPKG_CONFIGURE([e_antic], [ + SAGE_SPKG_DEPCHECK([arb gmp flint], [ + AC_CHECK_HEADER([e-antic/e-antic.h], [ + AC_SEARCH_LIBS([nf_init], [eantic], [ + ], [sage_spkg_install_e_antic=yes]) + ], [sage_spkg_install_e_antic=yes]) + ]) +]) Added: head/math/sage/files/patch-src_bin_sage-env ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/sage/files/patch-src_bin_sage-env Sun Jun 28 14:06:58 2020 (r540720) @@ -0,0 +1,29 @@ +--- src/bin/sage-env.orig 2020-06-27 14:17:22 UTC ++++ src/bin/sage-env +@@ -460,16 +460,16 @@ unset R_HOME + unset R_PROFILE + # Do not use the global Makevars.site and ~/.R/Makevars when installing R packages + # Provide empty files to appease some R packages' installation scripts. +-if [ -d "$SAGE_LOCAL/lib/R/share" ] ; then +- R_MAKEVARS_SITE="$SAGE_LOCAL/lib/R/share/Makevars.site" && export R_MAKEVARS_SITE +- if ! [ -f "$R_MAKEVARS_SITE" ] ; then +- if ! [ -a "$R_MAKEVARS_SITE" ] ; then +- echo "## Empty site-wide Makevars file for Sage's R" > "$R_MAKEVARS_SITE" +- else +- >&2 echo "Warning: $R_MAKEVARS_SITE exists and is not a file : trouble ahead..." +- fi +- fi +-fi ++#if [ -d "$SAGE_LOCAL/lib/R/share" ] ; then ++# R_MAKEVARS_SITE="$SAGE_LOCAL/lib/R/share/Makevars.site" && export R_MAKEVARS_SITE ++# if ! [ -f "$R_MAKEVARS_SITE" ] ; then ++# if ! [ -a "$R_MAKEVARS_SITE" ] ; then ++# echo "## Empty site-wide Makevars file for Sage's R" > "$R_MAKEVARS_SITE" ++# else ++# >&2 echo "Warning: $R_MAKEVARS_SITE exists and is not a file : trouble ahead..." ++# fi ++# fi ++#fi + if [ -d "$DOT_SAGE" ] ; then + if ! [ -d "$DOT_SAGE/R" ] ; then + if ! [ -a "$DOT_SAGE/R" ] ; then Added: head/math/sage/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/sage/files/pkg-message.in Sun Jun 28 14:06:58 2020 (r540720) @@ -0,0 +1,5 @@ +Before running sage, please define and export the following variables: + +export SAGE_ROOT=%%PREFIX%% +export SAGE_LOCAL=%%PREFIX%% + Modified: head/math/sage/pkg-plist ============================================================================== --- head/math/sage/pkg-plist Sun Jun 28 13:59:48 2020 (r540719) +++ head/math/sage/pkg-plist Sun Jun 28 14:06:58 2020 (r540720) @@ -3,8 +3,6 @@ bin/jupyter-nbextension bin/jupyter-notebook bin/jupyter-serverextension bin/math-readline -bin/python -bin/python3 bin/sage bin/sage-cachegrind bin/sage-callgrind @@ -8490,9 +8488,6 @@ lib/libratpoints.a %%PYTHON_SITELIBDIR%%/widgetsnbextension/static/extension.js %%PYTHON_SITELIBDIR%%/widgetsnbextension/static/extension.js.map lib/sage-current-location.txt -libdata/pkgconfig/blas.pc -libdata/pkgconfig/cblas.pc -libdata/pkgconfig/lapack.pc 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?202006281406.05SE6wpQ063421>