svn commit: r539413 - in head/math/sage: . files
Thierry Thomas
thierry at FreeBSD.org
Wed Jun 17 10:05:15 UTC 2020
Author: thierry
Date: Wed Jun 17 10:05:10 2020
New Revision: 539413
URL: https://svnweb.freebsd.org/changeset/ports/539413
Log:
- Unbreak and upgrade to 9.1
- Take maintainership.
PR: 247298
Submitted by: /me
Approved by: stephen (previous maintainer)
Differential Revision: D24195
Added:
head/math/sage/files/brial_spkg-configure.m4 (contents, props changed)
head/math/sage/files/ecl_spkg-configure.m4 (contents, props changed)
head/math/sage/files/gap_spkg-configure.m4 (contents, props changed)
head/math/sage/files/gc_spkg-configure.m4 (contents, props changed)
head/math/sage/files/giac_spkg-configure.m4 (contents, props changed)
head/math/sage/files/jmol_spkg-configure.m4.in (contents, props changed)
head/math/sage/files/libhomfly_spkg-configure.m4 (contents, props changed)
head/math/sage/files/linbox_spkg-configure.m4 (contents, props changed)
head/math/sage/files/mathjax_spkg-configure.m4.in (contents, props changed)
head/math/sage/files/maxima_spkg-configure.m4 (contents, props changed)
head/math/sage/files/palp_spkg-configure.m4 (contents, props changed)
head/math/sage/files/patch-bootstrap (contents, props changed)
head/math/sage/files/patch-build_bin_sage-apply-patches (contents, props changed)
head/math/sage/files/patch-build_bin_sage-build-env-config.in (contents, props changed)
head/math/sage/files/patch-build_make_install (contents, props changed)
head/math/sage/files/patch-build_pkgs_cddlib_spkg-configure.m4 (contents, props changed)
head/math/sage/files/patch-build_pkgs_gsl_spkg-configure.m4 (contents, props changed)
head/math/sage/files/patch-build_pkgs_tachyon_patches_Make-arch.patch (contents, props changed)
head/math/sage/files/patch-configure.ac (contents, props changed)
head/math/sage/files/patch-src_sage_libs_ecl.pyx (contents, props changed)
head/math/sage/files/patch-src_sage_libs_eclsig.h (contents, props changed)
head/math/sage/files/psutil__arch__bsd__freebsd_socks.c.patch (contents, props changed)
head/math/sage/files/py_libs_spkg-configure.m4 (contents, props changed)
head/math/sage/files/pynac_spkg-configure.m4 (contents, props changed)
head/math/sage/files/rubiks_spkg-configure.m4 (contents, props changed)
head/math/sage/files/sage_brial_spkg-configure.m4.in (contents, props changed)
head/math/sage/files/singular_spkg-configure.m4 (contents, props changed)
head/math/sage/files/suitesparse_spkg-configure.m4 (contents, props changed)
head/math/sage/files/sympow_spkg-configure.m4 (contents, props changed)
head/math/sage/files/threejs_spkg-configure.m4.in (contents, props changed)
head/math/sage/files/zn_poly_spkg-configure.m4 (contents, props changed)
head/math/sage/pkg-plist (contents, props changed)
Deleted:
head/math/sage/files/gcc.in
head/math/sage/files/ld.in
head/math/sage/files/optional-packages.txt
head/math/sage/files/patch-build_pkgs_eclib_spkg-install
head/math/sage/files/patch-build_pkgs_git_spkg-install
head/math/sage/files/patch-build_pkgs_iml_spkg-install
head/math/sage/files/patch-build_pkgs_libgap_spkg-install
head/math/sage/files/patch-build_pkgs_m4rie_spkg-install
head/math/sage/files/patch-build_pkgs_maxima_fbsd-patch-src_interfaces_xmaxima_Makefile.in
head/math/sage/files/patch-build_pkgs_maxima_spkg-install
head/math/sage/files/patch-build_pkgs_ncurses_fbsd-patch-src_configure
head/math/sage/files/patch-build_pkgs_numpy_fbsd-patch-src_numpy_distutils_system_info.py
head/math/sage/files/patch-build_pkgs_ppl_fbsd-patch-src_demos_ppl_lpsol_ppl_lpsol.c
head/math/sage/files/patch-build_pkgs_ppl_spkg-install
head/math/sage/files/patch-build_pkgs_pynac_spkg-install
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Doc-library-fcntl.rst
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Lib__distutils__unixccompiler.py
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Lib_distutils_command_build_scripts.py
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Makefile.pre.in
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules-_ctypes-libffi-configure
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules-fcntlmodule.c
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_Modules___ctypes__libffi__src__arm__ffi.c
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_issue21166
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_pr192365
head/math/sage/files/patch-build_pkgs_python_fbsd-patch-src_setup.py
head/math/sage/files/patch-build_pkgs_scons_fbsd-patch-src_engine_SCons_compat__scons_subprocess.py
head/math/sage/files/patch-build_pkgs_sympow_fbsd-patch-src_disk.c
head/math/sage/files/patch-build_pkgs_zlib_spkg-install
head/math/sage/files/patch-src_bin_sage-spkg
head/math/sage/files/patch-src_doc_common_builder.py
head/math/sage/files/patch-src_doc_common_custom-sphinx-build.py
Modified:
head/math/sage/Makefile
head/math/sage/distinfo
Modified: head/math/sage/Makefile
==============================================================================
--- head/math/sage/Makefile Wed Jun 17 09:35:01 2020 (r539412)
+++ head/math/sage/Makefile Wed Jun 17 10:05:10 2020 (r539413)
@@ -2,135 +2,521 @@
# $FreeBSD$
PORTNAME= sage
-PORTVERSION= 6.7
-PORTREVISION= 8
+PORTVERSION= 9.1
CATEGORIES= math
-MASTER_SITES= http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/ \
- http://mirrors.xmission.com/sage/src/ \
- http://www-ftp.lip6.fr/pub/math/sagemath/src/ \
- http://mirrors.mit.edu/sage/src/ \
- http://www.sagemath.org/src-old/
+MASTER_SITES= https://mirrors.xmission.com/sage/src/ \
+ http://mirrors.xmission.com/sage/src/ \
+ https://www-ftp.lip6.fr/pub/math/sagemath/src/ \
+ https://mirrors.mit.edu/sage/src/ \
+ https://files.sagemath.org/src/ \
+ ftp://www-ftp.lip6.fr/pub/math/sagemath/src/
PKGNAMESUFFIX= -math
-MAINTAINER= stephen at FreeBSD.org
+MAINTAINER= thierry at FreeBSD.org
COMMENT= Open source Mathematics software
-BROKEN= unfetchable
-DEPRECATED= Broken for more than 6 months
-EXPIRATION_DATE= 2020-06-05
-
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING.txt
-BUILD_DEPENDS= bash:shells/bash \
- convert:graphics/ImageMagick6 \
- ffmpeg:multimedia/ffmpeg \
- automake:devel/automake \
- autoconf:devel/autoconf
-LIB_DEPENDS= libatlas.so:math/atlas \
- liblapack.so:math/lapack
-RUN_DEPENDS= bash:shells/bash
+BUILD_DEPENDS= bash:shells/bash \
+ dash:shells/dash \
+ cmake:devel/cmake \
+ dreadnaut:math/nauty \
+ ${PYTHON_PKGNAMEPREFIX}alabaster>0:textproc/py-alabaster@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}bleach>0:www/py-bleach@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}brial>0:math/py-brial@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}cvxopt>0:math/py-cvxopt@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}cypari2>0:math/py-cypari2@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}entrypoints>0:devel/py-entrypoints@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}fpylll>0:math/py-fpylll@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}gmpy2-devel>0:math/py-gmpy2-devel@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}imagesize>0:graphics/py-imagesize@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}ipython5>0:devel/ipython5@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}ipython_genutils>0:devel/py-ipython_genutils@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}itsdangerous>0:security/py-itsdangerous@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0i:devel/py-Jinja2@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}jupyter_core>0:devel/py-jupyter_core@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}jupyter_client>0:devel/py-jupyter_client@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}kiwisolver>0:math/py-kiwisolver@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}nbconvert>0:devel/py-nbconvert@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}nbformat>0:devel/py-nbformat@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}\
+ ${PYNUMPY} \
+ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pandocfilters>0:textproc/py-pandocfilters@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pathlib2>0:devel/py-pathlib2@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pickleshare>0:databases/py-pickleshare@${PY_FLAVOR}\
+ ${PY_PILLOW} \
+ ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pplpy>0:math/py-pplpy@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}prompt_toolkit1>0:devel/py-prompt_toolkit1@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}rpy2>0:math/py-rpy2@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}scandir>0:sysutils/py-scandir@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}simplegeneric>0:devel/py-simplegeneric@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}terminado>0:net/py-terminado@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}testpath>0:devel/py-testpath@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}traitlets>0:devel/py-traitlets@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}traitlets>0:devel/py-traitlets@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}webencodings>0:converters/py-webencodings@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR}\
+ fflas-ffpack-config:math/fflas-ffpack \
+ gfan:math/gfan \
+ git:devel/git \
+ gp2c:math/gp2c \
+ jmol:science/jmol \
+ libatomic_ops>0:devel/libatomic_ops \
+ MathJax>0:www/mathjax \
+ maxima>0:math/maxima \
+ p5-XML-Writer>0:textproc/p5-XML-Writer \
+ p5-XML-LibXML>0:textproc/p5-XML-LibXML \
+ p5-XML-LibXSLT>0:textproc/p5-XML-LibXSLT\
+ p5-File-Slurp>0:devel/p5-File-Slurp \
+ p5-JSON>0:converters/p5-JSON \
+ p5-SVG>0:textproc/p5-SVG \
+ p5-MongoDB>0:databases/p5-MongoDB \
+ p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu\
+ palp>0:math/palp \
+ pandoc:textproc/hs-pandoc \
+ pari-elldata>0:math/pari_elldata\
+ pari-galdata>0:math/pari_galdata\
+ pari-galpol>0:math/pari_galpol \
+ pari-nftables>0:math/pari_nftables \
+ pari-seadata>0:math/pari_seadata\
+ QuadraticSieve:math/flintqs \
+ ninja:devel/ninja \
+ gpatch:devel/patch \
+ rubiks>0:math/rubiks \
+ sympow:math/sympow \
+ tachyon:graphics/tachyon \
+ three.js>0:www/threejs \
+ yasm:devel/yasm \
+ gtar:archivers/gtar \
+ convert:graphics/ImageMagick6 \
+ ffmpeg:multimedia/ffmpeg \
+ ${LOCALBASE}/lib/libBLT.a:x11-toolkits/blt
+LIB_DEPENDS= libarb.so:math/arb \
+ libboost_thread.so:devel/boost-libs \
+ libbraiding.so:math/libbraiding \
+ libbrial.so:math/brial \
+ libCbc.so:math/cbc \
+ libcdd.so:math/cddlib \
+ libcliquer.so:math/cliquer \
+ libcurl.so:ftp/curl \
+ libec.so:math/eclib \
+ libecl.so:lang/ecl \
+ libecm.so:math/gmp-ecm \
+ libflint.so:math/flint2 \
+ libfplll.so:math/fplll \
+ libfreetype.so:print/freetype2 \
+ libgc.so:devel/boehm-gc \
+ libgc-threaded.so:devel/boehm-gc-threaded\
+ libgf2x.so:math/gf2x \
+ libgivaro.so:math/givaro \
+ libglpk.so:math/glpk \
+ libgap.so:math/gap \
+ libgmp.so:math/gmp \
+ libgsl.so:math/gsl \
+ libhomfly.so:math/libhomfly \
+ libiml.so:math/iml \
+ libisl.so:devel/isl \
+ libLfunction.so:math/lcalc \
+ libffi.so:devel/libffi \
+ libgd.so:graphics/gd \
+ libgiac.so:math/giacxcas \
+ liblinbox.so:math/linbox \
+ liblrcalc.so:math/lrcalc \
+ liblrsgmp.so:math/lrslib \
+ libm4ri.so:math/m4ri \
+ libm4rie.so:math/m4rie \
+ libmpc.so:math/mpc \
+ libmpfi.so:math/mpfi \
+ libmpfr.so:math/mpfr \
+ libmpir.so:math/mpir \
+ libntl.so:math/ntl \
+ libpari.so:math/pari \
+ libpcre.so:devel/pcre \
+ libplanarity.so:math/planarity \
+ libpng.so:graphics/png \
+ libppl.so:devel/ppl \
+ libpynac.so:math/pynac \
+ libR.so:math/R \
+ librw.so:math/rankwidth \
+ libSingular.so:math/singular \
+ libamd.so:math/suitesparse \
+ libsemigroups.so:math/libsemigroups \
+ libsymmetrica.so:math/symmetrica\
+ libzmq.so:net/libzmq4 \
+ libzn_poly-0.9.so:math/zn_poly \
+ libqd.so:math/qd \
+ libisl.so:devel/isl \
+ libblas.so:math/blas \
+ libicuuc.so:devel/icu \
+ libtiff.so:graphics/tiff \
+ liblapack.so:math/lapack \
+ libedit.so:devel/libedit \
+ libwebp.so:graphics/webp \
+ libpcre2-8.so:devel/pcre2 \
+ libgdbm.so:databases/gdbm \
+ liblcms2.so:graphics/lcms2 \
+ libopenjp2.so:graphics/openjpeg
+RUN_DEPENDS= bash:shells/bash \
+ dreadnaut:math/nauty \
+ ${PYTHON_PKGNAMEPREFIX}alabaster>0:textproc/py-alabaster@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}bleach>0:www/py-bleach@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}brial>0:math/py-brial@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}cvxopt>0:math/py-cvxopt@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}cypari2>0:math/py-cypari2@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}cysignals>0:devel/py-cysignals@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}entrypoints>0:devel/py-entrypoints@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}fpylll>0:math/py-fpylll@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}gmpy2-devel>0:math/py-gmpy2-devel@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}imagesize>0:graphics/py-imagesize@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}ipython5>0:devel/ipython5@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}ipython_genutils>0:devel/py-ipython_genutils@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}itsdangerous>0:security/py-itsdangerous@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}jupyter_core>0:devel/py-jupyter_core@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}jupyter_client>0:devel/py-jupyter_client@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}kiwisolver>0:math/py-kiwisolver@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}mpmath>0:math/py-mpmath@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}nbconvert>0:devel/py-nbconvert@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}nbformat>0:devel/py-nbformat@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}\
+ ${PYNUMPY} \
+ ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pandocfilters>0:textproc/py-pandocfilters@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pathlib2>0:devel/py-pathlib2@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pickleshare>0:databases/py-pickleshare@${PY_FLAVOR}\
+ ${PY_PILLOW} \
+ ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pplpy>0:math/py-pplpy@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}prompt_toolkit1>0:devel/py-prompt_toolkit1@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}rpy2>0:math/py-rpy2@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}scandir>0:sysutils/py-scandir@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}simplegeneric>0:devel/py-simplegeneric@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}terminado>0:net/py-terminado@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}testpath>0:devel/py-testpath@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}traitlets>0:devel/py-traitlets@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}webencodings>0:converters/py-webencodings@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR}\
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR}\
+ fflas-ffpack-config:math/fflas-ffpack \
+ gfan:math/gfan \
+ git:devel/git \
+ gp2c:math/gp2c \
+ jmol:science/jmol \
+ MathJax>0:www/mathjax \
+ maxima>0:math/maxima \
+ p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu\
+ palp>0:math/palp \
+ pandoc:textproc/hs-pandoc \
+ pari-elldata>0:math/pari_elldata\
+ pari-galdata>0:math/pari_galdata\
+ pari-galpol>0:math/pari_galpol \
+ pari-nftables>0:math/pari_nftables \
+ pari-seadata>0:math/pari_seadata\
+ QuadraticSieve:math/flintqs \
+ rubiks>0:math/rubiks \
+ sympow:math/sympow \
+ tachyon:graphics/tachyon \
+ three.js>0:www/threejs \
+ yasm:devel/yasm \
+ pixz:archivers/pixz
-pre-extract:
- @${ECHO_MSG}
- @${ECHO_MSG} Instead of installing the port, which will take a considerable amount of
- @${ECHO_MSG} extra time and space, you can instead type \"make build\". Then you can move
- @${ECHO_MSG} work/${PORTNAME}-${PORTVERSION} to wherever you like, and run sage from there.
- @${ECHO_MSG} However, there is no guarantee that this alternative will always work.
-. if !(defined(PACKAGE_BUILDING) || defined(BATCH))
- @sleep 10
-. endif
+USES= autoreconf blaslapack:openblas compiler:c++11-lib fortran \
+ gettext gmake gnome iconv jpeg libtool localbase ncurses perl5 \
+ pkgconfig python:3.6+ readline shebangfix sqlite tk xorg
+USE_TEX= latex:build pdftex:build tex:build
+USE_XORG= x11 xext xscrnsaver
+USE_GNOME= cairo glib20 pango
+USE_PYTHON= cython
+USE_JAVA= yes # for science/jmol
-PLIST_FILES= bin/sage
-USE_TEX= latex:build
-USES= gmake iconv jpeg tk perl5
+CONFLICTS= python-3.* \
+ ${PYTHON_PKGNAMEPREFIX}ipykernel5-5.* \
+ ${PYTHON_PKGNAMEPREFIX}ipython-7.* \
+ ${PYTHON_PKGNAMEPREFIX}ipywidgets-7.* \
+ ${PYTHON_PKGNAMEPREFIX}notebook-6.* \
+ ${PYTHON_PKGNAMEPREFIX}prompt_toolkit-2.* \
+ ${PYTHON_PKGNAMEPREFIX}widgetsnbextension-3.5.*
-# Optimization flags will be defined by the source
-CFLAGS:= ${CFLAGS:C/^-O.*$//}
-FFLAGS:= ${CFLAGS:C/^-O.*$//}
+SHEBANG_FILES= .
+SHEBANG_LANG+= dash
+dash_OLD_CMD= /bin/dash
+dash_CMD= ${LOCALBASE}/bin/dash
-MAKE_ENV+= SAGE_PORT=yes \
- SAGE_ATLAS_LIB=${LOCALBASE}/lib \
- DOT_SAGE=${WRKSRC}/tmp/.sage \
- SAGE_FAT_BINARY=yes \
- PERL=${PERL}
+DISABLE_BINUTILS= yes
-# The following is needed for the lapack subpackage.
-MAKE_ARGS+= ARCH="${AR}"
+LIBS= -lomp -pthread
+.if !defined{WITH_DEBUG}
+LDFLAGS+= -s
+.endif
+BLDDIR= ${WRKDIR}/build
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= SAGE_PORT=yes CC=${CC} GCC=${CC} CXX=${CXX} AS=${AS} LD=${LD} \
+ SAGE_LOCAL=${PREFIX} SAGE_DESTDIR=${BLDDIR}/ \
+ DESTDIR=${BLDDIR}/${PREFIX} PATCH=${LOCALBASE}/bin/gpatch
+CONFIGURE_ARGS= --with-system-gcc=force \
+ --with-system-python3=yes \
+ --localstatedir=/var
+MAKE_ENV= MAKE=${GMAKE} DESTDIR=${BLDDIR}
+REINPLACE_ARGS= -i ''
+BINARY_ALIAS= patch=${LOCALBASE}/bin/gpatch
+PLIST_SUB= VER=${PORTVERSION}
-post-patch:
-# Create wrapper for invocation of make.
- @${MKDIR} ${WRKSRC}/local/bin
- @${LN} -s -f ${LOCALBASE}/bin/gmake ${WRKSRC}/local/bin/make
+OPTIONS_DEFINE= DOCS
+PORTDOCS= *
-# Create wrapper for invocation of ld.
- @${SED} -e 's#%%LD%%#${LOCALBASE}/bin/ld#' \
- ${FILESDIR}/ld.in > ${WRKSRC}/local/bin/ld
- @${CHMOD} +x ${WRKSRC}/local/bin/ld
+.if defined(PACKAGE_BUILDING)
+CONFIGURE_ARGS+=--enable-build-as-root
+.endif
-post-build:
- ${RM} -r ${WRKSRC}/tmp/.sage
- ${CHMOD} -R a+rX ${WRKSRC}
+.include <bsd.port.pre.mk>
-check regression-test test: build
- @${ECHO_MSG} This test can also be performed after installation by typing \"sage -testall\".
- @${ECHO_MSG}
- cd ${WRKSRC} && ${SETENV} DOT_SAGE=${WRKSRC}/tmp/.sage ./sage -testall
- ${RM} ${WRKSRC}/python*.core
+WSDIR= ${BLDDIR}${PREFIX}
+SPKG_INST= configure.ac configure build/sage_bootstrap/uninstall.py \
+ build/make/install src/bin/sage-env
+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 \
+ share/jupyter/kernels/sagemath/kernel.json
+BADLN= kernels/sagemath/doc nbextensions/jsmol \
+ nbextensions/mathjax nbextensions/threejs
+# External dependencies not yet handled by SageMath
+PY_LIBS= alabaster babel bleach certifi configparser cvxopt cycler \
+ cypari cysignals cython dateutil decorator defusedxml docutils \
+ entrypoints fpylll future gmpy2 html5lib imagesize ipython \
+ ipython_genutils itsdangerous jinja2 jsonschema jupyter_client \
+ jupyter_core kiwisolver markupsafe matplotlib mistune mpmath \
+ nbconvert nbformat networkx nose numpy packaging pandocfilters \
+ pathlib2 pexpect pickleshare pillow pkgconfig pplpy \
+ prometheus_client prompt_toolkit psutil ptyprocess pyparsing \
+ pytz pyzmq requests rpy2 scandir scipy send2trash simplegeneric \
+ six snowballstemmer sympy terminado testpath tornado traitlets \
+ 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
-# Don't build docs (because of mysterious race conditions).
-ALL_TARGET= build
+post-patch:
+ ${CP} ${FILESDIR}/psutil__arch__bsd__freebsd_socks.c.patch \
+ ${WRKSRC}/build/pkgs/psutil/patches/
+.for sp in ${SPKGCM4}
+ ${CP} ${FILESDIR}/${sp}_spkg-configure.m4 \
+ ${WRKSRC}/build/pkgs/${sp}/spkg-configure.m4
+.endfor
+.for sp in ${PY_LIBS}
+ ${CP} ${FILESDIR}/py_libs_spkg-configure.m4 \
+ ${WRKSRC}/build/pkgs/${sp:C/pari2/pari/}/spkg-configure.m4
+.endfor
+.for sp in ${PY_FILES}
+ ${SED} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|' ${FILESDIR}/${sp}_spkg-configure.m4.in \
+ > ${WRKSRC}/build/pkgs/${sp}/spkg-configure.m4
+.endfor
+.for sp in ${JS_LIBS}
+ ${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${FILESDIR}/${sp}_spkg-configure.m4.in \
+ > ${WRKSRC}/build/pkgs/${sp}/spkg-configure.m4
+.endfor
-INSTALL_SAGE_DIR= ${PREFIX}/${PORTNAME}-${PORTVERSION}
-STAGED_SAGE_DIR= ${STAGEDIR}${INSTALL_SAGE_DIR}
-do-install:
- cd ${WRKDIR} && ${FIND} -s ${WRKSRC} | \
- ${GREP} -v '^${WRKSRC}/upstream/' | \
- ${GREP} -v '^${WRKSRC}/tmp' | \
- ${SED} -e 's#${WRKDIR}/##' | \
- ${CPIO} -pmud -R ${BINOWN}:${BINGRP} ${STAGEDIR}${PREFIX}
- ${ECHO_CMD} | ${SETENV} DOT_SAGE=${STAGED_SAGE_DIR}/tmp/.sage ${STAGED_SAGE_DIR}/sage
- ${RM} -r ${STAGED_SAGE_DIR}/tmp/.sage
- ${SED} -e "s+#SAGE_ROOT.*+SAGE_ROOT=${INSTALL_SAGE_DIR}+" ${WRKSRC}/sage > ${STAGEDIR}${PREFIX}/bin/sage
- ${CHMOD} ${BINMODE} ${STAGEDIR}${PREFIX}/bin/sage
+pre-configure:
+ ${REINPLACE_CMD} -e 's|SAGE_LOCAL="$$prefix"|SAGE_LOCAL="${WSDIR}"|' \
+ -e 's|lib/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/configure.ac
+ ${REINPLACE_CMD} -e 's|SAGE_LOCAL="@prefix@"|SAGE_LOCAL="${WSDIR}"|' \
+ ${WRKSRC}/src/bin/sage-env-config.in
+ ${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|;s|%%LDFLAGS%%|${LDFLAGS}|' \
+ ${WRKSRC}/build/pkgs/tachyon/patches/Make-arch.patch
+ ${REINPLACE_CMD} -e '/SUITESPARSE_INC_DIR/s|$${SAGE_LOCAL}/include|${LOCALBASE}/include/suitesparse|'\
+ ${WRKSRC}/build/pkgs/cvxopt/spkg-install.in
+.for f in ${PY_LIBS}
+ ${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|;s|py_libs|${f}|' \
+ ${WRKSRC}/build/pkgs/${f}/spkg-configure.m4
+.endfor
+ ${REINPLACE_CMD} -e 's|import cypari|import cypari2|' \
+ ${WRKSRC}/build/pkgs/cypari/spkg-configure.m4
+ ${REINPLACE_CMD} -e 's|import ipython|import IPython|' \
+ ${WRKSRC}/build/pkgs/ipython/spkg-configure.m4
+ ${REINPLACE_CMD} -e 's|import pillow|import PIL|' \
+ ${WRKSRC}/build/pkgs/pillow/spkg-configure.m4
+ ${REINPLACE_CMD} -e 's|import pplpy|import ppl|' \
+ ${WRKSRC}/build/pkgs/pplpy/spkg-configure.m4
+ ${REINPLACE_CMD} -e 's|import pyzmq|import zmq|' \
+ ${WRKSRC}/build/pkgs/pyzmq/spkg-configure.m4
+ ${REINPLACE_CMD} -e 's|import zope_interface|import zope.interface|' \
+ ${WRKSRC}/build/pkgs/zope_interface/spkg-configure.m4
+ ${REINPLACE_CMD} -e '/GAP_ROOT=/s|$$SAGE_LOCAL|${LOCALBASE}|' \
+ ${WRKSRC}/build/pkgs/gap_packages/spkg-install.in
+ ${REINPLACE_CMD} -e "/os.path.join/s|SAGE_LOCAL|'${LOCALBASE}'|"\
+ ${WRKSRC}/src/sage/libs/gap/util.pyx
+ ${REINPLACE_CMD} -e "/os.path.join(SAGE_LOCAL/s|SAGE_LOCAL|'${LOCALBASE}'|" \
+ ${WRKSRC}/src/sage/env.py
+ ${REINPLACE_CMD} -e "/^library_dirs/s|SAGE_LOCAL|'${LOCALBASE}'|" \
+ ${WRKSRC}/src/setup.py
+.for f in ${SHR2FIX}
+ ${REINPLACE_CMD} -e "/${f}/s|SAGE_SHARE|'${LOCALBASE}/share/'|" \
+ ${WRKSRC}/src/sage/env.py
+.endfor
+ ${REINPLACE_CMD} -e "/JMOL_DIR/s|SAGE_SHARE|'${JAVASHAREDIR}'|" \
+ -e "/JMOL_DIR/s|jmol|classes|" \
+ ${WRKSRC}/src/sage/env.py
+ ${REINPLACE_CMD} -e "/JSMOL_DIR/s|SAGE_SHARE|'${LOCALBASE}/www'|" \
+ -e "/JSMOL_DIR/s|jsmol|JSmol|" \
+ ${WRKSRC}/src/sage/env.py
+ ${REINPLACE_CMD} -e "/MATHJAX_DIR/s|SAGE_SHARE|'${LOCALBASE}/www'|" \
+ -e "/MATHJAX_DIR/s|mathjax|MathJax|" \
+ ${WRKSRC}/src/sage/env.py
+ ${REINPLACE_CMD} -e "/THREEJS_DIR/s|SAGE_SHARE|'${LOCALBASE}/www'|" \
+ ${WRKSRC}/src/sage/env.py
+.for f in ${SE2FIX}
+ ${REINPLACE_CMD} -e '/${f}/s|$$SAGE_LOCAL|${LOCALBASE}|' \
+ ${WRKSRC}/src/bin/sage-env
+.endfor
+ ${REINPLACE_CMD} -e '/LDFLAGS=/s|-rpath,$$SAGE_LOCAL|-rpath,${LOCALBASE}|' \
+ ${WRKSRC}/src/bin/sage-env
+.for f in ${SPKG_INST}
+ ${REINPLACE_CMD} -e 's|/var/lib/sage|/share/libdata/${PORTNAME}|' \
+ ${WRKSRC}/${f}
+.endfor
+ (cd ${WRKSRC} && ./bootstrap)
+ ${MKDIR} ${BLDDIR}${PREFIX}/lib/pkgconfig # Removed thereafter
-post-install:
- @${FIND} -s ${STAGED_SAGE_DIR} -not -type d | \
- ${SED} -e 's#${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
- @${FIND} -s ${STAGED_SAGE_DIR} -type d -empty | \
- ${SED} -e 's#${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
+post-build:
+.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}|'
+.endfor
+.for d in ${PY2FIX}
+ ${FIND} ${WSDIR}/${d} -type f -exec ${GREP} -I -l "/usr/bin/env python" {} \; |\
+ ${XARGS} ${SED} -i "" -e 's|/usr/bin/env pytho.*|${PYTHON_CMD}|'
+.endfor
+ ${FIND} ${BLDDIR}/${PYTHON_LIBDIR} -type d -name __pycache__ | \
+ ${XARGS} ${RM} -r
+.for f in ${DOC2FIX}
+ ${FIND} ${BLDDIR}${DOCSDIR} -type f -name "*${f}" | ${XARGS} \
+ ${SED} -i "" -e 's|${BLDDIR}||g'
+.endfor
+.for f in ${STG2FIX}
+ ${SED} -i "" -e 's|${BLDDIR}||g' ${BLDDIR}${PREFIX}/${f}
+.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
+ # 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/
+ ${RM} -r ${BLDDIR}${PYTHON_SITELIBDIR}/setuptools* \
+ ${BLDDIR}${PYTHON_SITELIBDIR}/easy_install.py \
+ ${BLDDIR}${PYTHON_SITELIBDIR}/pkg_resources \
+ ${BLDDIR}${PYTHON_SITELIBDIR}/__pycache__/easy_install*
+ # Remoce CONFLICTS with py3x-backports-1
+ ${RM} ${BLDDIR}${PYTHON_SITELIBDIR}/backports/__init__.py \
+ ${BLDDIR}${PYTHON_SITELIBDIR}/backports/__init__.cpython-${PYTHON_SUFFIX}.pyc
+ # Wont use a system package for sphinx because it would need py-sphinx18 + its dependencies
+ # Check https://trac.sagemath.org/ticket/28856
+ ${RM} ${BLDDIR}${PREFIX}/bin/sphinx-*
+ ${RM} -r ${BLDDIR}${PYTHON_SITELIBDIR}/sphinx
+ ${RM} -r ${BLDDIR}${PYTHON_SITELIBDIR}/sphinxcontrib \
+ ${BLDDIR}${PYTHON_SITELIBDIR}/Sphinx-* \
+ ${BLDDIR}${PYTHON_SITELIBDIR}/sphinxcontrib_websupport-*
+ ${RM} -r ${BLDDIR}${PREFIX}/bin/pygmentize \
+ ${BLDDIR}${PYTHON_SITELIBDIR}/Pygments-* \
+ ${BLDDIR}${PYTHON_SITELIBDIR}/pygments
+ # ${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}/;;} || \
+ ${TRUE}))
+ ${FIND} ${BLDDIR}${PREFIX} -name "*.bak" -delete
-.include <bsd.port.pre.mk>
-
-MAKE_ENV+= MAKE="${MAKE} -j${MAKE_JOBS_NUMBER}"
-
-.ifdef MAINTAINER_MODE
-test-fbsd-patches: patch
- ${RM} -r ${WRKSRC}/build/pkgs/*/src; \
- for d in ${WRKSRC}/build/pkgs/*; do \
- if ls $$d/fbsd-patch-* > /dev/null 2>&1; then \
- ${ECHO_MSG} Testing patches in $${d##*/}; \
- b=$${d##*/}-`${CAT} $$d/package-version.txt | ${SED} 's/\.p.*//'`; \
- c=${WRKSRC}/upstream/$$b.tar.bz2 ; \
- if [ ! -e $$c ]; then \
- c=${WRKSRC}/upstream/$$b.tar.gz ; \
- if [ ! -e $$c ]; then \
- ${ECHO_MSG} Couldn\'t find $$c; \
- exit 1; \
- fi; \
- fi; \
- b=`echo $$b | sed 's/python/Python/'` ; \
- if ! (cd $$d && tar xf $$c && ${MV} $$b src); then \
- ${ECHO_MSG} Unable to unarchive $$c; \
- exit 1; \
- fi; \
- if ! (cd $$d && ${CAT} fbsd-patch-* | patch); then \
- ${ECHO_MSG} Patches in $${d##*/} failed; \
- exit 1; \
- fi; \
- fi; \
- done; \
- ${RM} -r ${WRKSRC}/build/pkgs/*/src
-.endif
+do-install:
+ cd "${BLDDIR}" && ${FIND} . | ${CPIO} -pdum ${STAGEDIR}
+ # Remove bad links
+ ${LN} -sf ${DOCSDIR} \
+ ${STAGEDIR}${PREFIX}/share/jupyter/kernels/sagemath/doc
+ ${LN} -sf ${LOCALBASE}/www/JSmol \
+ ${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/jsmol
+ ${LN} -sf ${LOCALBASE}/www/MathJax \
+ ${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/mathjax
+ ${LN} -sf ${LOCALBASE}/www/threejs \
+ ${STAGEDIR}${PREFIX}/share/jupyter/nbextensions/threejs
+ ${RM} ${STAGEDIR}${PREFIX}/lib64 ${STAGEDIR}${PREFIX}/libdata/pkgconfig/blas.pc \
+ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/cblas.pc \
+ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/gsl.pc \
+ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/lapack.pc
.include <bsd.port.post.mk>
Modified: head/math/sage/distinfo
==============================================================================
--- head/math/sage/distinfo Wed Jun 17 09:35:01 2020 (r539412)
+++ head/math/sage/distinfo Wed Jun 17 10:05:10 2020 (r539413)
@@ -1,2 +1,3 @@
-SHA256 (sage-6.7.tar.gz) = da4688cb48c221356005935c666fa3eac96c50de60f3e5b274072f0520745677
-SIZE (sage-6.7.tar.gz) = 487207063
+TIMESTAMP = 1590251415
+SHA256 (sage-9.1.tar.gz) = 1ca30cc554e99910752170214e1d30576800ec897d66c77481b4eb505afefbb3
+SIZE (sage-9.1.tar.gz) = 1125768506
Added: head/math/sage/files/brial_spkg-configure.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/brial_spkg-configure.m4 Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,47 @@
+SAGE_SPKG_CONFIGURE([brial], [
+ SAGE_SPKG_DEPCHECK([boost m4ri], [
+ # If we're using the system m4ri and boost, ensure that we can
+ # compile and run an executable linked against both libbrial and
+ # libbrial_groebner (both are used by SageMath).
+ AC_LANG_PUSH(C++)
+ SAVED_LIBS=$LIBS
+ LIBS="$LIBS -lbrial -lbrial_groebner"
+ AC_MSG_CHECKING([if we can link against brial libraries])
+ AC_RUN_IFELSE([
+ AC_LANG_PROGRAM([
+ #include <polybori.h>
+ #include <polybori/groebner/groebner_alg.h>
+ USING_NAMESPACE_PBORI
+ USING_NAMESPACE_PBORIGB
+
+ class MyConstant : public BooleConstant{
+ public: void negate() { this->m_value = !this->m_value; }
+ };
+ ],[
+ BoolePolyRing r = BoolePolyRing(2, COrderEnums::dlex);
+ ReductionStrategy rs = ReductionStrategy(r);
+ rs.llReduceAll(); // uses groebner lib
+ if (2 != r.nVariables()) { return 1; }
+ if (r.constant(true) == r.constant(false)) { return 2; }
+ MyConstant f = MyConstant();
+ f.negate(); // ensures v1.1.0+ if m_value isn't const
+ if (!f.isOne()) { return 3; }
+ return 0;
+ ])
+ ],
+ [
+ AC_MSG_RESULT([yes])
+ sage_spkg_install_brial=no
+ ],
+ [
+ AC_MSG_RESULT([no])
+ sage_spkg_install_brial=yes
+ ])
+ LIBS=$SAVED_LIBS
+ AC_LANG_POP
+ ],
+ [ # If we're installing sage's boost or m4ri, then we have to
+ # install its BRiAl, too.
+ sage_spkg_install_brial=yes
+ ])
+])
Added: head/math/sage/files/ecl_spkg-configure.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/ecl_spkg-configure.m4 Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,6 @@
+SAGE_SPKG_CONFIGURE([ecl], [
+ AC_PATH_PROG([ECL], [ecl])
+ AS_IF([test x$ECL = x], [
+ AC_MSG_NOTICE([ecl not found. Installing ecl])
+ sage_spkg_install_ecl=yes])
+])
Added: head/math/sage/files/gap_spkg-configure.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/gap_spkg-configure.m4 Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,8 @@
+SAGE_SPKG_CONFIGURE([gap], [
+ SAGE_SPKG_DEPCHECK([gmp], [
+ AC_CHECK_HEADER([gap/system.h], [
+ AC_SEARCH_LIBS([GAP_COMM], [gap], [
+ ], [sage_spkg_install_gap=yes])
+ ], [sage_spkg_install_gap=yes])
+ ])
+])
Added: head/math/sage/files/gc_spkg-configure.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/gc_spkg-configure.m4 Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,6 @@
+SAGE_SPKG_CONFIGURE([gc], [
+ SAGE_SPKG_DEPCHECK([libatomic_ops], [
+ dnl checking with pkg-config
+ PKG_CHECK_MODULES([GC], [bdw-gc-threaded >= 7.6.4], [], [sage_spkg_install_gc=yes])
+ ])
+])
Added: head/math/sage/files/giac_spkg-configure.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/giac_spkg-configure.m4 Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,8 @@
+SAGE_SPKG_CONFIGURE([giac], [
+ SAGE_SPKG_DEPCHECK([pari], [
+ AC_CHECK_HEADER([giac/giac.h], [
+ AC_SEARCH_LIBS([ConvertUTF16toUTF8], [giac], [
+ ], [sage_spkg_install_giac=yes])
+ ], [sage_spkg_install_giac=yes])
+ ])
+])
Added: head/math/sage/files/jmol_spkg-configure.m4.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/jmol_spkg-configure.m4.in Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,10 @@
+SAGE_SPKG_CONFIGURE(
+ [jmol], [dnl direct testing of file existence
+ AC_MSG_CHECKING(JSmol installation...)
+ if [[ -f %%LOCALBASE%%/www/JSmol/JSmol.lite.js ]] ; then
+ AC_MSG_RESULT(OK)
+ else
+ AC_MSG_RESULT(KO)
+ sage_spkg_install_jmol=yes
+ fi
+])
Added: head/math/sage/files/libhomfly_spkg-configure.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/libhomfly_spkg-configure.m4 Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,8 @@
+SAGE_SPKG_CONFIGURE([libhomfly], [
+ SAGE_SPKG_DEPCHECK([gc], [
+ AC_CHECK_HEADER([homfly.h], [
+ AC_SEARCH_LIBS([homfly], [homfly], [
+ ], [sage_spkg_install_libhomfly=yes])
+ ], [sage_spkg_install_libhomfly=yes])
+ ])
+])
Added: head/math/sage/files/linbox_spkg-configure.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/linbox_spkg-configure.m4 Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,6 @@
+SAGE_SPKG_CONFIGURE([linbox], [
+ SAGE_SPKG_DEPCHECK([gmp givaro fflas-ffpack], [
+ dnl checking with pkg-config
+ PKG_CHECK_MODULES([LINBOX], [linbox >= 1.6.3], [], [sage_spkg_install_linbox=yes])
+ ])
+])
Added: head/math/sage/files/mathjax_spkg-configure.m4.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/mathjax_spkg-configure.m4.in Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,10 @@
+SAGE_SPKG_CONFIGURE(
+ [mathjax], [dnl direct testing of file existence
+ AC_MSG_CHECKING(MathJax installation...)
+ if [[ -f %%LOCALBASE%%/www/MathJax/MathJax.js ]] ; then
+ AC_MSG_RESULT(OK)
+ else
+ AC_MSG_RESULT(KO)
+ sage_spkg_install_mathjax=yes
+ fi
+])
Added: head/math/sage/files/maxima_spkg-configure.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/maxima_spkg-configure.m4 Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,6 @@
+SAGE_SPKG_CONFIGURE([maxima], [
+ AC_PATH_PROG([MAXIMA], [maxima])
+ AS_IF([test x$MAXIMA = x], [
+ AC_MSG_NOTICE([maxima not found. Installing maxima])
+ sage_spkg_install_maxima=yes])
+])
Added: head/math/sage/files/palp_spkg-configure.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/palp_spkg-configure.m4 Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,4 @@
+SAGE_SPKG_CONFIGURE([palp], [
+ AC_PATH_PROG([PALP], [poly.x])
+ AS_IF([test -z "$ac_cv_path_PALP"], [sage_spkg_install_palp=yes])
+])
Added: head/math/sage/files/patch-bootstrap
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/patch-bootstrap Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,13 @@
+--- bootstrap.orig 2020-05-08 20:11:43 UTC
++++ bootstrap
+@@ -98,7 +98,9 @@ SAGE_SPKG_CONFIGURE_$(echo ${pkgname} | tr '[a-z]' '[A
+ echo "$spkg_configures" >> m4/sage_spkg_configures.m4
+
+ SAGE_ROOT="$SAGE_ROOT" src/doc/bootstrap && \
+- install_config_rpath && \
++ install_config_rpath
++ exit
++ # Continue with FreeBSD autoreconf
+ aclocal -I m4 && \
+ automake --add-missing --copy build/make/Makefile-auto && \
+ autoconf
Added: head/math/sage/files/patch-build_bin_sage-apply-patches
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/patch-build_bin_sage-apply-patches Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,11 @@
+--- build/bin/sage-apply-patches.orig 2020-01-01 11:03:10 UTC
++++ build/bin/sage-apply-patches
+@@ -67,7 +67,7 @@ if [[ -r "${patches[0]}" ]]; then
+ # Skip non-existing or non-readable patches
+ [ -r "$patch" ] || continue
+ echo "Applying $patch"
+- patch $patch_strip $patch_args < "$patch"
++ gpatch $patch_strip $patch_args < "$patch"
+ if [ $? -ne 0 ]; then
+ echo >&2 "Error applying '$patch'"
+ exit 1
Added: head/math/sage/files/patch-build_bin_sage-build-env-config.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/patch-build_bin_sage-build-env-config.in Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,9 @@
+--- build/bin/sage-build-env-config.in.orig 2020-04-14 07:43:36 UTC
++++ build/bin/sage-build-env-config.in
+@@ -87,5 +87,6 @@ export SAGE_PARI_CFG="@SAGE_PARI_CFG@"
+
+ export SAGE_GLPK_PREFIX="@SAGE_GLPK_PREFIX@"
+ export SAGE_FREETYPE_PREFIX="@SAGE_FREETYPE_PREFIX@"
++export SAGE_SUITESPARSE_PREFIX="@SAGE_SUITESPARSE_PREFIX@"
+
+ export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@"
Added: head/math/sage/files/patch-build_make_install
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/patch-build_make_install Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,13 @@
+--- build/make/install.orig 2020-05-08 20:50:01 UTC
++++ build/make/install
+@@ -28,7 +28,9 @@ if [ -z "${SAGE_ORIG_PATH_SET}" ]; then
+ fi
+ export PATH="$SAGE_ROOT/build/bin:$SAGE_SRC/bin:$SAGE_LOCAL/bin:$PATH"
+
+-export PYTHONPATH="$SAGE_LOCAL"
++PYTHON_SITELIBDIR=`$PYTHON_FOR_VENV -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])'`
++REL_PYTHON_SITELIBDIR=`echo $PYTHON_SITELIBDIR | sed -e "s|$PYTHONBASE||"`
++export PYTHONPATH="$SAGE_LOCAL:$SAGE_LOCAL$REL_PYTHON_SITELIBDIR:$PYTHON_SITELIBDIR"
+
+ ###############################################################################
+ # Skip the rest if nothing to do (i.e., to [re]build).
Added: head/math/sage/files/patch-build_pkgs_cddlib_spkg-configure.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/patch-build_pkgs_cddlib_spkg-configure.m4 Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,23 @@
+--- build/pkgs/cddlib/spkg-configure.m4.orig 2020-04-27 18:08:24 UTC
++++ build/pkgs/cddlib/spkg-configure.m4
+@@ -24,13 +24,13 @@ SAGE_SPKG_CONFIGURE([cddlib], [
+ dnl check, passing up a chance to detect cddlib on Fedora and Debian
+ dnl for now. Once all of cddlib's consumers know about the new (or
+ dnl both) locations, we can update this check to support them.
+- AC_CHECK_HEADER([cdd.h],[],[sage_spkg_install_cddlib=yes],[
+- #include <setoper.h>
+- #include <cddmp.h>
++ AC_CHECK_HEADER([cdd/cdd.h],[
++ dnl Both lattE and gfan try to link against libcddgmp (as
++ dnl opposed to libcdd).
++ AC_SEARCH_LIBS([dd_abs],[cddgmp],[],[sage_spkg_install_cddlib=yes])
++ ],[sage_spkg_install_cddlib=yes],[
++ #include <cdd/setoper.h>
++ #include <cdd/cddmp.h>
+ ])
+-
+- dnl Both lattE and gfan try to link against libcddgmp (as
+- dnl opposed to libcdd).
+- AC_SEARCH_LIBS([dd_abs],[cddgmp],[],[sage_spkg_install_cddlib=yes])
+ ])
+ ])
Added: head/math/sage/files/patch-build_pkgs_gsl_spkg-configure.m4
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/patch-build_pkgs_gsl_spkg-configure.m4 Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,18 @@
+--- build/pkgs/gsl/spkg-configure.m4.orig 2020-05-27 14:11:57 UTC
++++ build/pkgs/gsl/spkg-configure.m4
+@@ -2,15 +2,6 @@ SAGE_SPKG_CONFIGURE([gsl], [
+ m4_pushdef([SAGE_GSL_MINVER],["2.4"])
+ SAGE_SPKG_DEPCHECK([atlas openblas], [
+ PKG_CHECK_MODULES([GSL], [gsl >= $SAGE_GSL_MINVER], [
+- PKG_CHECK_VAR([GSLPCDIR], [gsl], [pcfiledir], [
+- GSL_PC="$GSLPCDIR"/gsl.pc
+- AC_SUBST([SAGE_SYSTEM_FACADE_PC_FILES])
+- AS_VAR_APPEND([SAGE_SYSTEM_FACADE_PC_FILES], [" \$(SAGE_PKGCONFIG)/gsl.pc"])
+- AC_SUBST([SAGE_GSL_PC_COMMAND],["\$(SED) -e 's/\$\${GSL_CBLAS_LIB}//' -e \"s/^GSL_CBLAS_LIB=.*/Requires: cblas/\" \"$GSL_PC\" > \"\$(@)\""])
+- ], [
+- AC_MSG_WARN([Unable to locate the directory of gsl.pc. This should not happen!])
+- sage_spkg_install_gsl=yes
+- ])
+ ], [sage_spkg_install_gsl=yes])
+ ])
+ m4_popdef([SAGE_GSL_MINVER])
Added: head/math/sage/files/patch-build_pkgs_tachyon_patches_Make-arch.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sage/files/patch-build_pkgs_tachyon_patches_Make-arch.patch Wed Jun 17 10:05:10 2020 (r539413)
@@ -0,0 +1,542 @@
+--- build/pkgs/tachyon/patches/Make-arch.patch.orig 2020-01-01 11:03:10 UTC
++++ build/pkgs/tachyon/patches/Make-arch.patch
+@@ -10,7 +10,15 @@
+
+ # MPI path setup, probably shouldn't need to be changed.
+ MPIINC=$(MPIDIR)/include
+-@@ -23,7 +24,8 @@ default:
++@@ -16,14 +17,15 @@
++ MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
++ MISCINC=$(JPEGINC) $(PNGINC) $(SPACEBALLINC)
++ MISCFLAGS=$(MISCDEFS) $(MISCINC)
++-MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB)
+++MISCLIB=%%LDFLAGS%% $(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB)
++
++ default:
++ @echo " Choose one of the architectures specified below."
+ @echo "--------------------------------------------------------------"
+ @echo " Parallel Versions "
+ @echo ""
+@@ -20,7 +28,7 @@
+ @echo " aix-64-thr - IBM AIX 5.x POSIX Threads, 64-bit "
+ @echo " aix-mpi - IBM AIX 5.x (SP) MPI "
+ @echo " asci-red-mpi - Intel ASCI Red MPI "
+-@@ -32,11 +34,12 @@ default:
++@@ -32,11 +34,12 @@
+ @echo " cray-t3e-mpi - Cray T3E MPI "
+ @echo " cray-xt3-mpi - Cray XT3 MPI "
+ @echo " compaq-alphasc-mpi - Lemieux at PSC MPI "
+@@ -34,7 +42,7 @@
+ @echo " linux-alpha-ccc-qsw - Linux Alpha, Compaq C, MPI, QSWnet "
+ @echo " linux-lam - Linux MPI (OSC LAM) "
+ @echo " linux-lam-64 - Linux AMD64/EM64T, MPI, 64-bit "
+-@@ -48,13 +51,14 @@ default:
++@@ -48,13 +51,14 @@
+ @echo "linux-ia64-thr-sgicc - Linux IA-64, SGI Pro64 Compilers "
+ @echo " macosx-thr - MacOS X PowerPC, POSIX Threads "
+ @echo " macosx-x86-thr - MacOS X Intel x86, POSIX Threads "
+@@ -56,7 +64,7 @@
+ @echo "--------------------------------------------------------------"
+ @echo " Hybrid Parallel Versions "
+ @echo ""
+-@@ -63,9 +67,11 @@ default:
++@@ -63,9 +67,11 @@
+ @echo "--------------------------------------------------------------"
+ @echo " Sequential Versions "
+ @echo ""
+@@ -70,7 +78,7 @@
+ @echo " irix6 - SGI Irix 6.x "
+ @echo " linux - Linux "
+ @echo " linux-64 - Linux, AMD64/EM64T, GCC 3.x, 64-bit "
+-@@ -102,7 +108,7 @@ default:
++@@ -102,7 +108,7 @@
+ @echo "Consult the README file in this directory for further info. "
+
+ ##
+@@ -79,7 +87,7 @@
+ ## No pthreads on ASCI Red yet. I didn't bother with the cop() stuff
+ ##
+ asci-red-mpi:
+-@@ -118,7 +124,7 @@ asci-red-mpi:
++@@ -118,7 +124,7 @@
+
+ ##
+ ## IBM Blue Gene/L Parallel Supercomputer
+@@ -88,7 +96,7 @@
+ ## NOTE: strip breaks bluegene executables, they are dynamically re-linked
+ ## at runtime, so we must use /bin/true rather than strip
+ ##
+-@@ -137,7 +143,7 @@ bluegene-mpi:
++@@ -137,7 +143,7 @@
+ ## Cray Parallel Vector Processor Machines Using Threads
+ ##
+ ## Tested on J90s, but should work on almost any of the Cray PVP systems.
+@@ -97,7 +105,7 @@
+ ## off running on a fast workstation, or even better, on a T3E!!!
+ ##
+ cray-thr:
+-@@ -228,7 +234,7 @@ cray-xt3-mpi:
++@@ -228,7 +234,7 @@
+ ##
+ ## Architecture flags for the Intel Paragon XP/S Supercomputer using MPI
+ ## for message passing. NX is no longer supported by this software.
+@@ -106,7 +114,7 @@
+ ## Concurrent I/O is used by default.
+ ##
+
+-@@ -264,8 +270,8 @@ paragon-mpi:
++@@ -264,8 +270,8 @@
+
+
+ ##
+@@ -117,7 +125,7 @@
+ ## Tested with the mpich distribution from Argonne National Labs
+ ##
+
+-@@ -277,7 +283,7 @@ ipsc860-mpi:
++@@ -277,7 +283,7 @@
+ "AR = ar860" \
+ "ARFLAGS = r" \
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list