diff options
| author | mat <mat@FreeBSD.org> | 2017-11-30 23:50:30 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2017-11-30 23:50:30 +0800 |
| commit | 32512cab3e8dd90b7cd0525bb5dc98007db431e2 (patch) | |
| tree | d296c82a71504382f4faefa0bf8d7be384ea1105 /math | |
| parent | b4ddc365e88ebdb48627086b02365b74119cf189 (diff) | |
| download | freebsd-ports-gnome-32512cab3e8dd90b7cd0525bb5dc98007db431e2.tar.gz freebsd-ports-gnome-32512cab3e8dd90b7cd0525bb5dc98007db431e2.tar.zst freebsd-ports-gnome-32512cab3e8dd90b7cd0525bb5dc98007db431e2.zip | |
Convert Python ports to FLAVORS.
Ports using USE_PYTHON=distutils are now flavored. They will
automatically get flavors (py27, py34, py35, py36) depending on what
versions they support.
There is also a USE_PYTHON=flavors for ports that do not use distutils
but need FLAVORS to be set. A USE_PYTHON=noflavors can be set if
using distutils but flavors are not wanted.
A new USE_PYTHON=optsuffix that will add PYTHON_PKGNAMESUFFIX has been
added to cope with Python ports that did not have the Python
PKGNAMEPREFIX but are flavored.
USES=python now also exports a PY_FLAVOR variable that contains the
current python flavor. It can be used in dependency lines when the
port itself is not python flavored. For example, deskutils/calibre.
By default, all the flavors are generated. To only generate flavors
for the versions in PYTHON2_DEFAULT and PYTHON3_DEFAULT, define
BUILD_DEFAULT_PYTHON_FLAVORS in your make.conf.
In all the ports with Python dependencies, the *_DEPENDS entries MUST
end with the flavor so that the framework knows which to build/use.
This is done by appending '@${PY_FLAVOR}' after the origin (or
@${FLAVOR} if in a Python module with Python flavors, as the content
will be the same). For example:
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
PR: 223071
Reviewed by: portmgr, python
Sponsored by: Absolight
Differential Revision: https://reviews.freebsd.org/D12464
Diffstat (limited to 'math')
50 files changed, 141 insertions, 165 deletions
diff --git a/math/cadabra2/Makefile b/math/cadabra2/Makefile index 8b68818e859c..46b7d4796cc3 100644 --- a/math/cadabra2/Makefile +++ b/math/cadabra2/Makefile @@ -19,8 +19,8 @@ LIB_DEPENDS= libboost_python.so:devel/boost-python-libs \ libjsoncpp.so:devel/jsoncpp \ libgmp.so:math/gmp \ libuuid.so:misc/e2fsprogs-libuuid -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sympy/__init__.py:math/py-sympy \ - ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sympy/__init__.py:math/py-sympy@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} OPTIONS_DEFINE= GUI OPTIONS_DEFAULT=GUI diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile index 4e8582574d7f..5c1500585a41 100644 --- a/math/ceres-solver/Makefile +++ b/math/ceres-solver/Makefile @@ -42,7 +42,7 @@ CUSTOM_BLAS_DESC= Handcoded BLAS routines instead of Eigen CUSTOM_BLAS_CMAKE_BOOL= CUSTOM_BLAS DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx -DOCS_USES= python:build +DOCS_USES= python:2.7,build DOCS_CMAKE_BOOL= BUILD_DOCUMENTATION EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES diff --git a/math/convertall/Makefile b/math/convertall/Makefile index 5ab4221d4618..e828e6c89ba4 100644 --- a/math/convertall/Makefile +++ b/math/convertall/Makefile @@ -39,11 +39,4 @@ do-install: -d ${DATADIR} -f ${DATADIR_REL}) (cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE) -.include <bsd.port.pre.mk> - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/fityk/Makefile b/math/fityk/Makefile index 61897048b9f8..5c7e64843ffb 100644 --- a/math/fityk/Makefile +++ b/math/fityk/Makefile @@ -46,7 +46,7 @@ OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CONFIGURE_ENABLE= python post-patch: diff --git a/math/gracetmpl/Makefile b/math/gracetmpl/Makefile index a41704b694e5..4496d7aee81d 100644 --- a/math/gracetmpl/Makefile +++ b/math/gracetmpl/Makefile @@ -10,13 +10,14 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Provide an easy way to use existing grace-files as a template -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray@${FLAVOR} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray@${FLAVOR} LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake python tar:bzip2 +USES= gmake python:2.7 tar:bzip2 +USE_PYTHON= flavors MAKE_ARGS= PREFIX="${PREFIX}" \ BIN_PREFIX="${PREFIX}/bin" \ LIB_PREFIX="${PREFIX}/lib" \ diff --git a/math/lybniz/Makefile b/math/lybniz/Makefile index b78d19aaa0c6..acca054f92dd 100644 --- a/math/lybniz/Makefile +++ b/math/lybniz/Makefile @@ -12,7 +12,7 @@ COMMENT= Mathematical function graph plotter LICENSE= BSD3CLAUSE -USES= python +USES= python:2.7 USE_PYTHON= distutils USE_GNOME= pygtk2 diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile index 6727e7966b85..4f15bb64682b 100644 --- a/math/nlopt/Makefile +++ b/math/nlopt/Makefile @@ -17,8 +17,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgmp.so:math/gmp \ libguile-2.0.so:lang/guile2 BUILD_DEPENDS= swig3.0:devel/swig30 \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1,1:math/py-numpy -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1,1:math/py-numpy + ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1,1:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1,1:math/py-numpy@${PY_FLAVOR} GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared diff --git a/math/plplot/Makefile b/math/plplot/Makefile index 8758018260f1..b8e860fa1404 100644 --- a/math/plplot/Makefile +++ b/math/plplot/Makefile @@ -58,7 +58,7 @@ LUA_USES= lua:51 LUA_CMAKE_BOOL= ENABLE_lua LUA_CMAKE_ON= -DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}" -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_BUILD_DEPENDS= swig:devel/swig13 \ ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} diff --git a/math/py-PyWavelets/Makefile b/math/py-PyWavelets/Makefile index bd36eae7c9d1..87b9a2e37f16 100644 --- a/math/py-PyWavelets/Makefile +++ b/math/py-PyWavelets/Makefile @@ -13,17 +13,15 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYNUMPY} \ - cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow + ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow + ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${FLAVOR} USE_GITHUB= yes GH_PROJECT= pywt -USES= cpe python -USE_PYTHON= autoplist distutils +USES= cpe python:2.7 +USE_PYTHON= autoplist distutils cython cython_run PYDISTUTILS_BUILD_TARGET= build build_ext PYDISTUTILS_BUILDARGS+= saveopts diff --git a/math/py-apgl/Makefile b/math/py-apgl/Makefile index bb6b0fc17955..1c287370f2d5 100644 --- a/math/py-apgl/Makefile +++ b/math/py-apgl/Makefile @@ -13,7 +13,7 @@ COMMENT= Fast python graph library with some machine learning features LICENSE= GPLv3 BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scipy>0.7.0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}scipy>0.7.0:science/py-scipy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python diff --git a/math/py-basemap/Makefile b/math/py-basemap/Makefile index 172ee9ff272c..e8f4e5638905 100644 --- a/math/py-basemap/Makefile +++ b/math/py-basemap/Makefile @@ -14,10 +14,10 @@ LICENSE= GPLv2 LGPL21 MIT LICENSE_COMB= multi BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} LIB_DEPENDS= libgeos.so:graphics/geos -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist DATADIR= ${PREFIX}/share/py-${PORTNAME}-data diff --git a/math/py-bitmath/Makefile b/math/py-bitmath/Makefile index 77b8507a6cca..6189312e2857 100644 --- a/math/py-bitmath/Makefile +++ b/math/py-bitmath/Makefile @@ -18,6 +18,6 @@ USE_PYTHON= autoplist distutils WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-4 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}progressbar231>0:misc/py-progressbar231 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}progressbar231>0:misc/py-progressbar231@${FLAVOR} .include <bsd.port.mk> diff --git a/math/py-bottleneck/Makefile b/math/py-bottleneck/Makefile index 1d712f9f3c78..90246581a891 100644 --- a/math/py-bottleneck/Makefile +++ b/math/py-bottleneck/Makefile @@ -13,13 +13,12 @@ COMMENT= Collection of fast NumPy array functions written in Cython LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYNUMPY} \ - cython:lang/cython +BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist cython OPTIONS_DEFINE= DOCS DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} diff --git a/math/py-colormath/Makefile b/math/py-colormath/Makefile index 6532b964c53a..26378e5b8860 100644 --- a/math/py-colormath/Makefile +++ b/math/py-colormath/Makefile @@ -12,10 +12,10 @@ COMMENT= Module that spares the user from directly dealing with color math LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.1:math/py-networkx +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.1:math/py-networkx@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include <bsd.port.mk> diff --git a/math/py-fastcluster/Makefile b/math/py-fastcluster/Makefile index ba9d8fca8cfb..38a8251e3c01 100644 --- a/math/py-fastcluster/Makefile +++ b/math/py-fastcluster/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} PORTDOCS= CITATION.txt \ INSTALL.txt \ diff --git a/math/py-fiat/Makefile b/math/py-fiat/Makefile index 37fd5d2e70f7..e24c84594d1a 100644 --- a/math/py-fiat/Makefile +++ b/math/py-fiat/Makefile @@ -14,7 +14,7 @@ COMMENT= FInite element Automatic Tabulator LICENSE= LGPL3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scientific>=0:math/py-scientific +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scientific>=0:math/py-scientific@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python:2 diff --git a/math/py-gato/Makefile b/math/py-gato/Makefile index 7cf67094fd2f..65546ec16d74 100644 --- a/math/py-gato/Makefile +++ b/math/py-gato/Makefile @@ -14,7 +14,7 @@ COMMENT= Python-based toolbox to visualise algorithms on graphs LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LGPL.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} NO_ARCH= yes PORTEXAMPLES= * diff --git a/math/py-gnuplot/Makefile b/math/py-gnuplot/Makefile index 1e4cb121aeb8..cb0212692e73 100644 --- a/math/py-gnuplot/Makefile +++ b/math/py-gnuplot/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= gnuplot:math/gnuplot \ ${PYNUMPY} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes diff --git a/math/py-graphillion/Makefile b/math/py-graphillion/Makefile index a9118df96039..276396a648aa 100644 --- a/math/py-graphillion/Makefile +++ b/math/py-graphillion/Makefile @@ -14,7 +14,7 @@ COMMENT= Fast, lightweight graphset operation library in Python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-install: diff --git a/math/py-keras/Makefile b/math/py-keras/Makefile index 0a372e7068d2..fd050dfa6ecd 100644 --- a/math/py-keras/Makefile +++ b/math/py-keras/Makefile @@ -11,9 +11,9 @@ COMMENT= Deep Learning library for Python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}theano>=0.8.0:math/py-theano \ - ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}theano>=0.8.0:math/py-theano@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} USES= python:-3.5 USE_PYTHON= autoplist distutils diff --git a/math/py-luminol/Makefile b/math/py-luminol/Makefile index ef17e9c41e25..cbf3da0e827e 100644 --- a/math/py-luminol/Makefile +++ b/math/py-luminol/Makefile @@ -12,8 +12,8 @@ COMMENT= Light weight python library for time series data analysis LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.2,1:math/py-numpy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.2,1:math/py-numpy@${FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/math/py-mathdom/Makefile b/math/py-mathdom/Makefile index da6665b66193..70d04a1ec2a1 100644 --- a/math/py-mathdom/Makefile +++ b/math/py-mathdom/Makefile @@ -14,9 +14,9 @@ COMMENT= Content MathML in Python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile index c8d0ce1466cf..83b113e31c3c 100644 --- a/math/py-matplotlib/Makefile +++ b/math/py-matplotlib/Makefile @@ -19,11 +19,11 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libtcl86.so:lang/tcl86 RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \ - ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado + ${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR} USE_GITHUB= yes @@ -54,8 +54,8 @@ QT5AGGBACKEND_USE= PYQT=sip,widgets QT5AGGBACKEND_VARS= QT5AGG_BACKEND=True QT5AGGBACKEND_VARS_OFF= QT5AGG_BACKEND=False TKAGGBACKEND_DESC= TKAgg backend support -TKAGGBACKEND_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter -TKAGGBACKEND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +TKAGGBACKEND_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} +TKAGGBACKEND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} TKAGGBACKEND_USES= tk:run TKAGGBACKEND_VARS= TKAGG_BACKEND=True TKAGGBACKEND_VARS_OFF= TKAGG_BACKEND=False diff --git a/math/py-mpmath/Makefile b/math/py-mpmath/Makefile index 4980be452c5e..a3bbfec49524 100644 --- a/math/py-mpmath/Makefile +++ b/math/py-mpmath/Makefile @@ -12,7 +12,7 @@ COMMENT= Python Library for Arbitrary-precision Floating-point Arithmetic LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gmpy.so:math/py-gmpy +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gmpy.so:math/py-gmpy@${FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/math/py-munkres/Makefile b/math/py-munkres/Makefile index abc4e9ee830f..0c93a4d23bd7 100644 --- a/math/py-munkres/Makefile +++ b/math/py-munkres/Makefile @@ -14,10 +14,6 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= python -USE_PYTHON= distutils - -PLIST_FILES= %%PYTHON_SITELIBDIR%%/munkres.py \ - %%PYTHON_SITELIBDIR%%/munkres.pyc \ - %%PYTHON_SITELIBDIR%%/munkres.pyo +USE_PYTHON= distutils autoplist .include <bsd.port.mk> diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile index 427eaf8b447b..ead14654e467 100644 --- a/math/py-networkx/Makefile +++ b/math/py-networkx/Makefile @@ -14,13 +14,13 @@ COMMENT= Tools for complex networks LICENSE= BSD3CLAUSE -RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator +RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR} -# ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx \ -# ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils +# ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${FLAVOR} \ +# ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${FLAVOR} NO_ARCH= yes -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= autoplist concurrent distutils SHEBANG_FILES= examples/graph/atlas.py \ examples/multigraph/chess_masters.py \ @@ -35,20 +35,20 @@ OPTIONS_GROUP_RENDER= MPL GRAPHVIZ OPTIONS_DEFAULT= NUMPY SCIPY MPL GRAPHVIZ YAML NUMPY_DESC= Matrix representation of graphs -NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy@${FLAVOR} SCIPY_DESC= Sparse matrix representation of graphs -SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse +SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse@${FLAVOR} MPL_DESC= Flexible graph rendering -MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:math/py-matplotlib +MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:math/py-matplotlib@${FLAVOR} GRAPHVIZ_DESC= Additional graph layout and rendering algorithms -GRAPHVIZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz +GRAPHVIZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz@${FLAVOR} YAML_DESC= Reading and writing YAML files -YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml +YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} .include <bsd.port.pre.mk> diff --git a/math/py-numarray/Makefile b/math/py-numarray/Makefile index 8b7ccf597e95..60897ad6ff26 100644 --- a/math/py-numarray/Makefile +++ b/math/py-numarray/Makefile @@ -13,7 +13,7 @@ COMMENT= Numeric array manipulation extension module for Python LICENSE= BSD3CLAUSE -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= Examples/convolve/benchmark.py USE_PYTHON= distutils autoplist diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile index fa0b0e2e1db3..8a72d2e0b1bd 100644 --- a/math/py-numeric/Makefile +++ b/math/py-numeric/Makefile @@ -15,7 +15,7 @@ EXTRACT_ONLY= Numeric-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Numeric Extension to Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/Numeric-${PORTVERSION} diff --git a/math/py-numexpr/Makefile b/math/py-numexpr/Makefile index e2618cba021f..66a6e5b37681 100644 --- a/math/py-numexpr/Makefile +++ b/math/py-numexpr/Makefile @@ -13,7 +13,7 @@ COMMENT= Fast numerical array expression evaluator for Python and NumPy LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.7,1:math/py-numpy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.7,1:math/py-numpy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USE_PYTHON= autoplist concurrent distutils diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index 7ecf64969b7e..374ed0fedfdd 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -22,7 +22,7 @@ PYDISTUTILS_BUILDARGS= --fcompiler=gnu95 PYDISTUTILS_CONFIGUREARGS= --fcompiler=gnu95 USES= fortran python USE_GITHUB= yes -USE_PYTHON= concurrent distutils py3kplist +USE_PYTHON= concurrent distutils py3kplist cython allflavors LDFLAGS+= -shared OPTIONS_DEFINE= DOCS SUITESPARSE TESTS @@ -42,9 +42,7 @@ NETLIB_USES= blaslapack:netlib NETLIB_LIB_DEPENDS= libcblas.so:math/cblas OPENBLAS_USES= blaslapack:openblas SUITESPARSE_LIB_DEPENDS=libumfpack.so:math/suitesparse -TESTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose - -BUILD_DEPENDS+= cython:lang/cython +TESTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} .include <bsd.port.pre.mk> diff --git a/math/py-nzmath/Makefile b/math/py-nzmath/Makefile index 59e319eb1419..eb20b8e9343e 100644 --- a/math/py-nzmath/Makefile +++ b/math/py-nzmath/Makefile @@ -11,7 +11,7 @@ DISTNAME= NZMATH-${PORTVERSION} MAINTAINER= wen@FreeBSD.org COMMENT= Number theory oriented calculation system -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= NZMATH diff --git a/math/py-pandas/Makefile b/math/py-pandas/Makefile index 5236367eb387..7a992cf991b1 100644 --- a/math/py-pandas/Makefile +++ b/math/py-pandas/Makefile @@ -13,27 +13,26 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS:= ${BUILD_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 + ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} TEST_DEPENDS:= ${RUN_DEPENDS} \ nosetests-${PYTHON_VER}:devel/py-nose \ - cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables \ - ${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}numexpr>=2.4.6:math/py-numexpr \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.2.0:textproc/py-openpyxl \ - ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd \ - ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt \ - ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numexpr>=2.4.6:math/py-numexpr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.2.0:textproc/py-openpyxl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} # Note: we cannot include math/py-statsmodels in TEST_DEPENDS because it # depends upon us for BUILD and RUN. @@ -68,35 +67,35 @@ SQL_DESC= SQLAlchemy ORM Add-ons HTML_DESC= HTML Parsing/Generation Add-ons EXCEL_DESC= MS Excel I/O Add-ons -MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib -SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy -BTLNCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck -NUMEXPR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numexpr>=2.4.6:math/py-numexpr -BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto -TABLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables +MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} +SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} +BTLNCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck@${FLAVOR} +NUMEXPR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numexpr>=2.4.6:math/py-numexpr@${FLAVOR} +BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} +TABLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables@${FLAVOR} -LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml -HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib -JINJA2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 -OPENPYXL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.2.0:textproc/py-openpyxl -XLRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd -XLWT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt -XLSX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter +LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} +HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${FLAVOR} +JINJA2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} +OPENPYXL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.2.0:textproc/py-openpyxl@${FLAVOR} +XLRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd@${FLAVOR} +XLWT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${FLAVOR} +XLSX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${FLAVOR} -ALCHEMY10_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 -ALCHEMY11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11 +ALCHEMY10_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} +ALCHEMY11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11@${FLAVOR} .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MLXML} || ${PORT_OPTIONS:MHTML5LIB} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${FLAVOR} .endif SUB_FILES= pkg-message # Official support for 2.7, 3.5, and 3.6 USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython # Uncomment the following line to enable regression-test # on a headless (X11-less) host (eg: RedPorts) diff --git a/math/py-patsy/Makefile b/math/py-patsy/Makefile index 0c0f3578b371..da2c62819b3d 100644 --- a/math/py-patsy/Makefile +++ b/math/py-patsy/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE PSFL LICENSE_COMB= multi RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist diff --git a/math/py-plastex/Makefile b/math/py-plastex/Makefile index bca443410abb..3ccfd5ef8306 100644 --- a/math/py-plastex/Makefile +++ b/math/py-plastex/Makefile @@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@FreeBSD.org COMMENT= LaTeX Document Processing Framework -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= tiarno diff --git a/math/py-probstat/Makefile b/math/py-probstat/Makefile index 79c084ca926f..0eb948d1f56c 100644 --- a/math/py-probstat/Makefile +++ b/math/py-probstat/Makefile @@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Probability And Statistics Utils for Python -USES= python tar:tgz +USES= python:2.7 tar:tgz USE_PYTHON= distutils autoplist post-install: diff --git a/math/py-pybloom/Makefile b/math/py-pybloom/Makefile index 70102edd01a2..9d403d843f29 100644 --- a/math/py-pybloom/Makefile +++ b/math/py-pybloom/Makefile @@ -10,9 +10,9 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= lwhsu@FreeBSD.org COMMENT= Probabilistic data structure -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bitarray>0:devel/py-bitarray +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bitarray>0:devel/py-bitarray@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_GITHUB= yes diff --git a/math/py-pymc/Makefile b/math/py-pymc/Makefile index 81b7695e2ff2..dc6c288d6677 100644 --- a/math/py-pymc/Makefile +++ b/math/py-pymc/Makefile @@ -17,15 +17,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} LIB_DEPENDS= liblapack.so:math/lapack \ libblas.so:math/blas RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils LDFLAGS+= -shared diff --git a/math/py-pysparse/Makefile b/math/py-pysparse/Makefile index d756f98c2700..d8904ceae11d 100644 --- a/math/py-pysparse/Makefile +++ b/math/py-pysparse/Makefile @@ -13,8 +13,8 @@ COMMENT= Fast sparse matrix library for Python LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy@${FLAVOR} LIB_DEPENDS= liblapack.so:math/lapack \ libblas.so:math/blas \ libopenblas.so:math/openblas \ @@ -26,7 +26,7 @@ GH_TAGNAME= f8430bd LDFLAGS+= -shared # Workaround for an obscure bug in py-numpy, see https://github.com/numpy/numpy/issues/7779 -USES= fortran python # fortran is needed for the correct build flags passed to py-numpy extension build process +USES= fortran python:2.7 # fortran is needed for the correct build flags passed to py-numpy extension build process USE_PYTHON= distutils autoplist .include <bsd.port.mk> diff --git a/math/py-scientific/Makefile b/math/py-scientific/Makefile index 7368a17ae8c2..992cc5b75f71 100644 --- a/math/py-scientific/Makefile +++ b/math/py-scientific/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libnetcdf.so:science/netcdf RUN_DEPENDS= ${PYNUMPY} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} diff --git a/math/py-statsmodels/Makefile b/math/py-statsmodels/Makefile index c52b8e474413..9e2d18cc9e36 100644 --- a/math/py-statsmodels/Makefile +++ b/math/py-statsmodels/Makefile @@ -12,19 +12,18 @@ COMMENT= Complement to SciPy for statistical computations LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYNUMPY} \ - cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas \ - ${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy@${FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas \ - ${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy@${FLAVOR} OPTIONS_DEFINE= DOCS EXAMPLES USES= python shebangfix -USE_PYTHON= autoplist distutils concurrent +USE_PYTHON= autoplist distutils concurrent cython USE_GITHUB= yes GH_TAGNAME= 8e812cd SHEBANG_FILES= tools/*.py statsmodels/datasets/*/data.py statsmodels/tools/print_version.py \ diff --git a/math/py-sympy/Makefile b/math/py-sympy/Makefile index 057e860579cb..06435ea3f5c5 100644 --- a/math/py-sympy/Makefile +++ b/math/py-sympy/Makefile @@ -12,7 +12,7 @@ COMMENT= Python Library For Symbolic Mathematics LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpmath>=0.19:math/py-mpmath +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpmath>=0.19:math/py-mpmath@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -20,7 +20,7 @@ USE_PYTHON= autoplist distutils OPTIONS_DEFINE= PYGLET PYGLET_DESC= Enable plotting support -PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet +PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet@${FLAVOR} post-patch: @${REINPLACE_CMD} -e "s#share/man/man1#man/man1#" ${WRKSRC}/setup.py diff --git a/math/py-theano/Makefile b/math/py-theano/Makefile index 611e8615e28f..8dabc6a1cd6e 100644 --- a/math/py-theano/Makefile +++ b/math/py-theano/Makefile @@ -13,7 +13,7 @@ MAINTAINER= demon@FreeBSD.org COMMENT= Optimizing compiler for evaluating math expressions on CPUs and GPUs RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:science/py-scipy@${FLAVOR} USES= compiler:openmp python USE_PYTHON= concurrent distutils autoplist diff --git a/math/py-yt/Makefile b/math/py-yt/Makefile index 2d35bd68a127..fe20e8d14296 100644 --- a/math/py-yt/Makefile +++ b/math/py-yt/Makefile @@ -13,19 +13,18 @@ COMMENT= Analysis and visualization toolkit for volumetric data LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.txt -BUILD_DEPENDS= cython:lang/cython \ +BUILD_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${FLAVOR} +RUN_DEPENDS= isympy:math/py-sympy@${FLAVOR} \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree -RUN_DEPENDS= isympy:math/py-sympy \ - ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib \ + ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipython>=1.0:devel/ipython LIB_DEPENDS= libembree.so:graphics/embree \ libomp.so:devel/openmp -USES= dos2unix localbase python:-3.5 -USE_PYTHON= autoplist distutils +USES= dos2unix localbase python:2.7 +USE_PYTHON= autoplist distutils cython post-patch: @${REINPLACE_CMD} -e "s|check_for_pyembree() is not None|True|; s|check_for_openmp() is True|True|" \ diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile index b98565d8e052..56eba779644c 100644 --- a/math/qtiplot/Makefile +++ b/math/qtiplot/Makefile @@ -37,9 +37,9 @@ DOCS_RUN_DEPENDS= qtiplot-doc>=0:math/qtiplot-doc DOCS_USE= QT4=assistant-adp_run PYTHON_DESC= Python scripting support -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui -PYTHON_RUN_DEPENDS:= ${PYTHON_BUILD_DEPENDS} +PYTHON_RUN_DEPENDS= ${PYTHON_BUILD_DEPENDS} PYTHON_CONFIGURE_ENV= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \ PYTHON_VERSION=${PYTHON_VERSION} diff --git a/math/rpcalc/Makefile b/math/rpcalc/Makefile index b8af31587762..791e824fb608 100644 --- a/math/rpcalc/Makefile +++ b/math/rpcalc/Makefile @@ -34,11 +34,4 @@ do-install: -d ${DATADIR} -f ${DATADIR_REL}) (cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE) -.include <bsd.port.pre.mk> - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/rpy/Makefile b/math/rpy/Makefile index a4ff8df01d94..b428bbb8530b 100644 --- a/math/rpy/Makefile +++ b/math/rpy/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libR.so:math/R RUN_DEPENDS= ${PYNUMPY} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist LDFLAGS+= -L${LOCALBASE}/lib/R/modules -L${LOCALBASE}/lib/R/lib diff --git a/math/rpy2/Makefile b/math/rpy2/Makefile index bbe4ccfcb265..aca3da0c117e 100644 --- a/math/rpy2/Makefile +++ b/math/rpy2/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libR.so:math/R RUN_DEPENDS= ${PYNUMPY} USES= fortran python readline -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix LDFLAGS+= -Wl,--as-needed pre-configure: diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile index 4e6ae8b82556..008caf3536dc 100644 --- a/math/vtk5/Makefile +++ b/math/vtk5/Makefile @@ -138,7 +138,7 @@ IGNORE= python wrapping requires shared libraries.\ Run make config again and enable the SHARED option .endif USES+= python -USE_PYTHON= distutils +USE_PYTHON= distutils noflavors PYDISTUTILS_PKGNAME= VTK # INSTALLS_EGGINFO support has been removed # INSTALLS_EGGINFO= yes diff --git a/math/vtk6/Makefile b/math/vtk6/Makefile index 35ac8655268d..69c6e5a8a475 100644 --- a/math/vtk6/Makefile +++ b/math/vtk6/Makefile @@ -178,13 +178,14 @@ PLIST_SUB+= JAVA="@comment " .endif .if ${PORT_OPTIONS:MPYTHON} -USES+= python +USES+= python:2.7 +USE_PYTHON= flavors CMAKE_ARGS+= -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_INSTALL_PYTHON_MODULE_DIR:STRING=${PYTHONPREFIX_SITELIBDIR} \ -DModule_vtkRenderingMatplotlib:BOOL=ON \ -DModule_vtkPythonInterpreter:BOOL=ON PLIST_SUB+= PYTHON="" -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${FLAVOR} .else CMAKE_ARGS+= -DVTK_WRAP_PYTHON:BOOL=OFF PLIST_SUB+= PYTHON="@comment " diff --git a/math/z3/Makefile b/math/z3/Makefile index d83fc8318b94..e6bfcfbc907b 100644 --- a/math/z3/Makefile +++ b/math/z3/Makefile @@ -28,8 +28,8 @@ DEBUG_CONFIGURE_ON= --debug PYTHON_DESC= Enable python bindings PYTHON_CONFIGURE_ON= --python -PYTHON_USES= python -PYTHON_USES_OFF= python:build +PYTHON_USES= python:2.7 +PYTHON_USES_OFF= python:2.7,build STATIC_DESC= Build static z3 library STATIC_CONFIGURE_ON= --staticlib |