diff --git a/math/py-scikit-umfpack/Makefile b/math/py-scikit-umfpack/Makefile index ee9e48d76bc5..d89e731dbdb7 100644 --- a/math/py-scikit-umfpack/Makefile +++ b/math/py-scikit-umfpack/Makefile @@ -1,34 +1,33 @@ PORTNAME= scikit-umfpack DISTVERSION= 0.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Python interface to UMFPACK sparse direct solver WWW= https://scikit-umfpack.github.io/scikit-umfpack/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= does not build with SuiteSparse 6 # https://github.com/scikit-umfpack/scikit-umfpack/issues/78 - BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ swig:devel/swig LIB_DEPENDS= libamd.so:math/suitesparse-amd \ + libcblas.so:math/cblas \ libopenblas.so:math/openblas \ libumfpack.so:math/suitesparse-umfpack RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} -USES= python +USES= fortran python USE_PYTHON= distutils cython autoplist pytest # tests fail, see https://github.com/scikit-umfpack/scikit-umfpack/issues/77 TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/scikits/umfpack/__umfpack${PYTHON_EXT_SUFFIX}.so .include diff --git a/math/py-scikit-umfpack/files/patch-scikits_umfpack_umfpack.i b/math/py-scikit-umfpack/files/patch-scikits_umfpack_umfpack.i new file mode 100644 index 000000000000..40fc3b86b101 --- /dev/null +++ b/math/py-scikit-umfpack/files/patch-scikits_umfpack_umfpack.i @@ -0,0 +1,97 @@ +--- scikits/umfpack/umfpack.i.orig 2017-10-25 11:44:24 UTC ++++ scikits/umfpack/umfpack.i +@@ -6,6 +6,8 @@ + /* + See umfpack.py for more information. + ++ Patched from ++ + Created by: Robert Cimrman + */ + +@@ -218,18 +220,21 @@ CONF_IN( UMFPACK_INFO ) + }; + + %include +-%include +-%include +-%include +-%include +-%include +-%include + +-%include +-%include +-%include +-%include ++#if UMFPACK_MAIN_VERSION < 6 ++ %include ++ %include ++ %include ++ %include ++ %include ++ %include + ++ %include ++ %include ++ %include ++ %include ++#endif ++ + /* + The order is important below! + */ +@@ -240,21 +245,22 @@ OPAQUE_ARGOUT( void * ) + void **Numeric + } + +-%include +-%include ++#if UMFPACK_MAIN_VERSION < 6 ++ %include ++ %include ++#endif + +- + OPAQUE_ARGINOUT( void * ) + %apply void ** opaque_arginout { + void **Symbolic, + void **Numeric + } + +-%include +-%include ++#if UMFPACK_MAIN_VERSION < 6 ++ %include ++ %include ++#endif + +- +- + /* + * wnbell - attempt to get L,U,P,Q out + */ +@@ -280,8 +286,11 @@ OPAQUE_ARGINOUT( void * ) + SuiteSparse_long *n_col, + SuiteSparse_long *nz_udiag + }; +-%include + ++#if UMFPACK_MAIN_VERSION < 6 ++ %include ++#endif ++ + ARRAY_IN( double, double, DOUBLE ) + %apply double *array { + double Lx [ ], +@@ -326,6 +335,8 @@ ARRAY_IN( SuiteSparse_long, SuiteSparse_long, INT64 ) + }; + %apply long *OUTPUT { SuiteSparse_long *do_recip}; + +-%include +- ++#if UMFPACK_MAIN_VERSION < 6 ++ %include + #endif ++ ++#endif // SWIGPYTHON