diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2017-11-30 15:50:30 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2017-11-30 15:50:30 +0000 |
| commit | 551be3c7231225ed9c26479af2b8914fb2ef0ea8 (patch) | |
| tree | d296c82a71504382f4faefa0bf8d7be384ea1105 /graphics | |
| parent | 02f9c9be1699251467efc027f210049dfe14f9c5 (diff) | |
| download | freebsd-ports-551be3c7231225ed9c26479af2b8914fb2ef0ea8.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 'graphics')
85 files changed, 210 insertions, 272 deletions
diff --git a/graphics/Makefile b/graphics/Makefile index 3d6b4fe26eaa..7f556e6ded60 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -913,10 +913,6 @@ SUBDIR += py-traitsui SUBDIR += py-wand SUBDIR += py-webcolors - SUBDIR += py3-cairo - SUBDIR += py3-imagesize - SUBDIR += py3-pillow - SUBDIR += py3-pygraphviz SUBDIR += pygts SUBDIR += pymorph SUBDIR += pysvg diff --git a/graphics/boxer/Makefile b/graphics/boxer/Makefile index 78210244ccec..10d53c301283 100644 --- a/graphics/boxer/Makefile +++ b/graphics/boxer/Makefile @@ -20,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= box:graphics/box -USES= python +USES= python:2.7 USE_GNOME= pygtk2 USE_PYTHON= distutils autoplist USE_LDCONFIG= yes diff --git a/graphics/caffe/Makefile b/graphics/caffe/Makefile index 6c398dbeff69..dbfb7298cb99 100644 --- a/graphics/caffe/Makefile +++ b/graphics/caffe/Makefile @@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS_INSTALL= caffe2-* BUILD_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/cython:lang/cython \ ${LOCALBASE}/include/cblas.h:math/cblas \ bash:shells/bash LIB_DEPENDS= libsnappy.so:archivers/snappy \ @@ -30,15 +29,16 @@ LIB_DEPENDS= libsnappy.so:archivers/snappy \ libopenblas.so:math/openblas \ libhdf5.so:science/hdf5 RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf \ - ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.12:graphics/py-scikit-image \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets + ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.12:graphics/py-scikit-image@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${FLAVOR} USE_LDCONFIG= yes -USES= gmake python fortran compiler:c++11-lib pkgconfig +USES= gmake python:2.7 fortran compiler:c++11-lib pkgconfig +USE_PYTHON= flavors cython CXXFLAGS+= -DGTEST_USE_OWN_TR1_TUPLE=1 LDFLAGS+= -DGTEST_USE_OWN_TR1_TUPLE=1 diff --git a/graphics/cegui/Makefile b/graphics/cegui/Makefile index 0bada2c1c7c8..122e40ea9ecb 100644 --- a/graphics/cegui/Makefile +++ b/graphics/cegui/Makefile @@ -45,7 +45,7 @@ LUA_LIB_DEPENDS= libtolua++-${LUA_VER}.so:lang/tolua++ LUA_CMAKE_ON= -DCEGUI_BUILD_LUA_MODULE=ON -DCEGUI_BUILD_LUA_GENERATOR=ON LUA_CMAKE_OFF= -DCEGUI_BUILD_LUA_MODULE=OFF -DCEGUI_BUILD_LUA_GENERATOR=OFF # this option is not currently used as it doesn't compile (see also CMAKE_ARGS below) -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_LIB_DEPENDS= libboost_python.so:devel/boost-python-libs PYTHON_CMAKE_ON= -DCEGUI_BUILD_PYTHON_MODULES=ON PYTHON_CMAKE_OFF= -DCEGUI_BUILD_PYTHON_MODULES=OFF diff --git a/graphics/curator/Makefile b/graphics/curator/Makefile index 93008a241be0..4ece00e60ee7 100644 --- a/graphics/curator/Makefile +++ b/graphics/curator/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Static Image Gallery Generator for web or CD-ROM galleries USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix PLIST_FILES= man/man1/curator.1.gz diff --git a/graphics/driconf/Makefile b/graphics/driconf/Makefile index 38d499adc654..793b47f4e56c 100644 --- a/graphics/driconf/Makefile +++ b/graphics/driconf/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2 USE_GL= glut USE_PYTHON= distutils NO_BUILD= yes -USES= gettext python +USES= gettext python:2.7 PYDISTUTILS_EGGINFODIR= ${STAGEDIR}${PREFIX}/lib/driconf pre-patch: diff --git a/graphics/entangle/Makefile b/graphics/entangle/Makefile index 4446d7176ae8..a346f5dea815 100644 --- a/graphics/entangle/Makefile +++ b/graphics/entangle/Makefile @@ -20,9 +20,9 @@ LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 \ libraw_r.so:graphics/libraw \ libpeas-1.0.so:devel/libpeas RUN_DEPENDS:= ${BUILD_DEPENDS:Nitstool*} \ - ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas + ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} -USES= gettext-tools gmake libtool pkgconfig python:3 +USES= gettext-tools gmake libtool pkgconfig python:3.4+ GNU_CONFIGURE= yes USE_GNOME= cairo gtk30 intltool introspection USE_GSTREAMER1= core diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile index 75e5115948c7..b38fe0fb9fc1 100644 --- a/graphics/eog-plugins/Makefile +++ b/graphics/eog-plugins/Makefile @@ -42,8 +42,8 @@ CHAMPLAIN_LIB_DEPENDS= libcogl.so:graphics/cogl \ CHAMPLAIN_USE= GL=egl XORG=x11,xcomposite,xdamage,xext,xfixes,xi,xrandr PYTHON_CONFIGURE_ENABLE=python -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas -PYTHON_USES= python:3 +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} +PYTHON_USES= python:3.4+ PYTHON_VARS= GLIB_SCHEMAS+="org.gnome.eog.plugins.export-to-folder.gschema.xml \ org.gnome.eog.plugins.fullscreenbg.gschema.xml \ org.gnome.eog.plugins.pythonconsole.gschema.xml" diff --git a/graphics/facedetect/Makefile b/graphics/facedetect/Makefile index 372d6b07ebf0..b2916672f019 100644 --- a/graphics/facedetect/Makefile +++ b/graphics/facedetect/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv -USES= python:run shebangfix +USES= python:2.7,run shebangfix USE_GITHUB= yes NO_BUILD= yes NO_ARCH= yes diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile index d884ea8ccc39..9d3818961308 100644 --- a/graphics/geos/Makefile +++ b/graphics/geos/Makefile @@ -27,7 +27,7 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 PYTHON_CONFIGURE_ENABLE=python -PYTHON_USES= python +PYTHON_USES= python:2.7 RUBY_BUILD_DEPENDS= swig3.0:devel/swig30 RUBY_CONFIGURE_ENABLE= ruby RUBY_CONFIGURE_ENV= RUBY="${RUBY}" diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile index 77479e2c3023..c5967c5e3211 100644 --- a/graphics/gnofract4d/Makefile +++ b/graphics/gnofract4d/Makefile @@ -21,7 +21,7 @@ USE_GITHUB= yes GH_ACCOUNT= edyoung USES= desktop-file-utils display:build jpeg localbase pathfix \ - pkgconfig python shared-mime-info shebangfix + pkgconfig python:2.7 shared-mime-info shebangfix SHEBANG_FILES= fractutils/get.py USE_GNOME= intlhack libxslt:build pygtk2 USE_PYTHON= distutils autoplist diff --git a/graphics/graphene/Makefile b/graphics/graphene/Makefile index e05e8682aa6f..58a516ce44d9 100644 --- a/graphics/graphene/Makefile +++ b/graphics/graphene/Makefile @@ -11,7 +11,7 @@ COMMENT= Optimizations for speeding up vector operations LICENSE= MIT -USES= gnome meson pkgconfig python:3 shebangfix tar:xz +USES= gnome meson pkgconfig python:3.4+ shebangfix tar:xz USE_GNOME= glib20 py3gobject3 OPTIONS_SUB= yes diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile index 8a2fe4cbc992..28569894c2e9 100644 --- a/graphics/gsculpt/Makefile +++ b/graphics/gsculpt/Makefile @@ -15,8 +15,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_python.so:devel/boost-python-libs -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL \ - ${PYTHON_PKGNAMEPREFIX}gtkglext>0:x11-toolkits/py-gtkglext +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gtkglext>0:x11-toolkits/py-gtkglext@${PY_FLAVOR} BROKEN_powerpc= fails to compile BROKEN_sparc64= fails to compile diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index 264ae1fd9160..9a46715cabfd 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -48,7 +48,7 @@ AUTOPANOSIFTC_DESC= Install graphics/autopano-sift-c AUTOPANOSIFTC_RUN_DEPENDS= autopano:graphics/autopano-sift-c PYTHON_DESC= Python Scripting Interface -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_BUILD_DEPENDS= swig2.0:devel/swig20 PYTHON_CMAKE_ON= -DBUILD_HSI=ON PYTHON_CMAKE_OFF= -DBUILD_HSI=OFF diff --git a/graphics/imgtops/Makefile b/graphics/imgtops/Makefile index 0f1e84b11bee..93bc552b5435 100644 --- a/graphics/imgtops/Makefile +++ b/graphics/imgtops/Makefile @@ -13,9 +13,9 @@ COMMENT= Create efficient Encapsulated Postscript files from images LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} -USES= ghostscript:run python +USES= ghostscript:run python:2.7 USE_PYTHON= distutils post-install: diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile index 977ee6949718..0a00f32df16b 100644 --- a/graphics/lensfun/Makefile +++ b/graphics/lensfun/Makefile @@ -28,8 +28,8 @@ PYHELPERS_DESC= Install database helper scripts (need Python 3) SIMD_CMAKE_OFF= -DBUILD_FOR_SSE:BOOL=OFF -DBUILD_FOR_SSE2:BOOL=OFF -PYHELPERS_CMAKE_ON= -DSTAGEDIR:STRING=${STAGEDIR} +PYHELPERS_CMAKE_ON= -DSTAGEDIR:STRING=${STAGEDIR} -DPYTHON:STRING=${PYTHON_CMD} PYHELPERS_CMAKE_OFF= -DINSTALL_HELPER_SCRIPTS:BOOL=OFF -DPYTHON:STRING=IGNORE -PYHELPERS_USES= python:3 +PYHELPERS_USES= python:3.4+ .include <bsd.port.mk> diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile index 53da6d2fa288..b2432b5413f3 100644 --- a/graphics/mapnik/Makefile +++ b/graphics/mapnik/Makefile @@ -73,7 +73,7 @@ PROJ_LIB_DEPENDS= libproj.so:graphics/proj PROJ_MAKE_ARGS_OFF= PROJ=False CAIRO_LIB_DEPENDS= libcairo.so:graphics/cairo -CAIRO_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:graphics/py-cairo +CAIRO_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:graphics/py-cairo@${PY_FLAVOR} CAIRO_MAKE_ARGS_OFF= CAIRO=False .include <bsd.port.pre.mk> diff --git a/graphics/mirage/Makefile b/graphics/mirage/Makefile index 040fd2abf19b..d9d2c98ed918 100644 --- a/graphics/mirage/Makefile +++ b/graphics/mirage/Makefile @@ -12,7 +12,7 @@ COMMENT= Fast and simple image viewer LICENSE= GPLv3 -USES= desktop-file-utils gettext python tar:bzip2 +USES= desktop-file-utils gettext python:2.7 tar:bzip2 USE_GNOME= gtk20 pygtk2 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= Mirage diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile index 41840c7859e6..8427c3cfa0b3 100644 --- a/graphics/opencolorio/Makefile +++ b/graphics/opencolorio/Makefile @@ -63,7 +63,7 @@ CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=OFF \ -DPYTHON:STRING=${PYTHON_CMD} PLIST= ${PKGDIR}/pkg-plist-pyglue .else # master port -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \ libyaml-cpp03.so:devel/yaml-cpp03 USES+= python:2,build diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index eec552524509..32c572e28ed0 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -142,6 +142,7 @@ LIB_DEPENDS+= libopencv_legacy.so:graphics/opencv BUILD_DEPENDS+= ${PYNUMPY} RUN_DEPENDS+= ${PYNUMPY} USES+= fortran python:2.7 +USE_PYTHON= flavors CMAKE_ARGS+= -DBUILD_opencv_python:BOOL=On . for module in apps java stitching superres videostab CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off diff --git a/graphics/piglit/Makefile b/graphics/piglit/Makefile index 39a70536efff..02a73554d7ed 100644 --- a/graphics/piglit/Makefile +++ b/graphics/piglit/Makefile @@ -13,16 +13,16 @@ LICENSE_COMB= multi BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six + ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} LIB_DEPENDS= libcaca.so:graphics/libcaca \ libdrm.so:graphics/libdrm \ libOpenCL.so:devel/ocl-icd \ libpng.so:graphics/png \ libwaffle-1.so:graphics/waffle RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six + ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= dumbbell diff --git a/graphics/py-PyOpenGL-accelerate/Makefile b/graphics/py-PyOpenGL-accelerate/Makefile index 2a801dbfb383..a72c2964a3c4 100644 --- a/graphics/py-PyOpenGL-accelerate/Makefile +++ b/graphics/py-PyOpenGL-accelerate/Makefile @@ -13,11 +13,10 @@ COMMENT= OpenGL acceleration code for PyOpenGL LICENSE= BSD3CLAUSE -BUILD_DEPENDS= cython:lang/cython \ - ${PYNUMPY} +BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython USES= python .include <bsd.port.mk> diff --git a/graphics/py-PyOpenGL/Makefile b/graphics/py-PyOpenGL/Makefile index 02bce0f2a713..e17484b0f6f4 100644 --- a/graphics/py-PyOpenGL/Makefile +++ b/graphics/py-PyOpenGL/Makefile @@ -13,7 +13,7 @@ MAINTAINER= python@FreeBSD.org COMMENT= OpenGL (and related library) interface for Python BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= TKINTER @@ -24,8 +24,8 @@ USES= dos2unix python USE_GL= glut USE_PYTHON= distutils autoplist -TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter -TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} +TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} post-patch: @${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \ diff --git a/graphics/py-PyX/Makefile b/graphics/py-PyX/Makefile index 948dd906ddb5..bf8e084d9d27 100644 --- a/graphics/py-PyX/Makefile +++ b/graphics/py-PyX/Makefile @@ -12,7 +12,7 @@ COMMENT= Python package for creating encapsulated PostScript figures LICENSE= GPLv2 -USES= python:3 +USES= python:3.4+ USE_TEX= latex:build USE_PYTHON= autoplist distutils diff --git a/graphics/py-actdiag/Makefile b/graphics/py-actdiag/Makefile index 0ea7671e3129..651c20ae0d3b 100644 --- a/graphics/py-actdiag/Makefile +++ b/graphics/py-actdiag/Makefile @@ -13,9 +13,9 @@ COMMENT= Simple activity-diagram image generator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \ - ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag \ - ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib +RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \ + ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${FLAVOR} \ + ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} USES= python:-3.4 USE_PYTHON= autoplist distutils diff --git a/graphics/py-blockdiag/Makefile b/graphics/py-blockdiag/Makefile index b4163e5d9279..bf9d1d88d1dc 100644 --- a/graphics/py-blockdiag/Makefile +++ b/graphics/py-blockdiag/Makefile @@ -13,9 +13,9 @@ COMMENT= Simple block-diagram image generator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \ - ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib \ - ${PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors +RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \ + ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} \ + ${PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors@${FLAVOR} USES= python:-3.4 USE_PYTHON= autoplist distutils @@ -33,7 +33,7 @@ PDF_DESC= Enable PDF output OPTIONS_DEFAULT= PDF IPAFONT_RUN_DEPENDS= ${LOCALBASE}/share/font-ipa/ipag.otf:japanese/font-ipa -PDF_RUN_DEPENDS= ${PKGNAMEPREFIX}reportlab>0:print/py-reportlab +PDF_RUN_DEPENDS= ${PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${FLAVOR} post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/blockdiag/utils/bootstrap.py diff --git a/graphics/py-blockdiagcontrib-cisco/Makefile b/graphics/py-blockdiagcontrib-cisco/Makefile index c8025776b613..2254f8e81db8 100644 --- a/graphics/py-blockdiagcontrib-cisco/Makefile +++ b/graphics/py-blockdiagcontrib-cisco/Makefile @@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= kuriyama@FreeBSD.org COMMENT= Networking shapes for blockdiag designed by Cisco -RUN_DEPENDS= ${PKGNAMEPREFIX}blockdiag>=0.8.0:graphics/py-blockdiag +RUN_DEPENDS= ${PKGNAMEPREFIX}blockdiag>=0.8.0:graphics/py-blockdiag@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index bb6d2a834494..0151a061f1af 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -18,9 +18,12 @@ LICENSE_FILE_MPL11= ${WRKSRC}/COPYING-MPL-1.1 PORTSCOUT= limitw:1,even -USES= gnome pkgconfig python:2 +USES= gnome pkgconfig python USE_PYTHON= distutils USE_GNOME= cairo +py34_PLIST= ${.CURDIR}/pkg-plist-py3 +py35_PLIST= ${.CURDIR}/pkg-plist-py3 +py36_PLIST= ${.CURDIR}/pkg-plist-py3 PLIST_SUB= PORTVER=${PORTVERSION} diff --git a/graphics/py3-cairo/pkg-plist b/graphics/py-cairo/pkg-plist-py3 index 6ec2d15cc0b8..6ec2d15cc0b8 100644 --- a/graphics/py3-cairo/pkg-plist +++ b/graphics/py-cairo/pkg-plist-py3 diff --git a/graphics/py-cairocffi/Makefile b/graphics/py-cairocffi/Makefile index dcd07d81df17..03967743a3a6 100644 --- a/graphics/py-cairocffi/Makefile +++ b/graphics/py-cairocffi/Makefile @@ -13,10 +13,14 @@ COMMENT= Cairo cffi-based cairo bindings for Python LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi +py34_BROKEN= does not package +py35_BROKEN= does not package +py36_BROKEN= does not package + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR} BUILD_DEPENDS= ${RUN_DEPENDS} -USES= python:2+ +USES= python USE_PYTHON= autoplist distutils cffi USE_GNOME= cairo diff --git a/graphics/py-django-easy-thumbnails/Makefile b/graphics/py-django-easy-thumbnails/Makefile index 4ce75eb72f5c..deea5a184827 100644 --- a/graphics/py-django-easy-thumbnails/Makefile +++ b/graphics/py-django-easy-thumbnails/Makefile @@ -12,7 +12,7 @@ COMMENT= Easy thumbnails for Django LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/graphics/py-djvulibre/Makefile b/graphics/py-djvulibre/Makefile index ff89275a9499..7e08147170ec 100644 --- a/graphics/py-djvulibre/Makefile +++ b/graphics/py-djvulibre/Makefile @@ -12,11 +12,10 @@ COMMENT= Python support for the DjVu image format LICENSE= GPLv2 -BUILD_DEPENDS= cython:lang/cython LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre USES= python:2 pkgconfig -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython post-patch: @${REINPLACE_CMD} -e "s|'python'|'${PYTHON_CMD}'|g" ${WRKSRC}/setup.py diff --git a/graphics/py-editobj/Makefile b/graphics/py-editobj/Makefile index b10418ee5def..f38f5bd9e442 100644 --- a/graphics/py-editobj/Makefile +++ b/graphics/py-editobj/Makefile @@ -13,7 +13,7 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Create and display a Tkinter dialog box for editing any Python object DIST_SUBDIR= python -USES+= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= EditObj WRKSRC= ${WRKDIR}/EditObj-${PORTVERSION} diff --git a/graphics/py-exiv2/Makefile b/graphics/py-exiv2/Makefile index a8c9485ed41a..68f1c15652fc 100644 --- a/graphics/py-exiv2/Makefile +++ b/graphics/py-exiv2/Makefile @@ -16,6 +16,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2\ libboost_python.so:devel/boost-python-libs USES= python:2 scons tar:bzip2 +USE_PYTHON= flavors USE_LDCONFIG= yes CXXFLAGS+= -I${LOCALBASE}/include MAKE_ARGS+= prefix=${PREFIX} use_env=1 diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile index e3dba8c5667c..0a83f62583a1 100644 --- a/graphics/py-gd/Makefile +++ b/graphics/py-gd/Makefile @@ -14,7 +14,7 @@ COMMENT= Python interface to the GD library LIB_DEPENDS= libgd.so:graphics/gd -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist pythonprefix PYSETUP= setup.py diff --git a/graphics/py-gdal/Makefile b/graphics/py-gdal/Makefile index f8001877e04f..c28912ec27d6 100644 --- a/graphics/py-gdal/Makefile +++ b/graphics/py-gdal/Makefile @@ -27,8 +27,8 @@ WRKSRC_SUBDIR= swig/python SHEBANG_FILES= scripts/*.py -NUMPY_BUILD_DEPENDS= ${PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy -NUMPY_RUN_DEPENDS= ${PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy +NUMPY_BUILD_DEPENDS= ${PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy@${FLAVOR} +NUMPY_RUN_DEPENDS= ${PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy@${FLAVOR} NUMPY_USES= fortran post-install: diff --git a/graphics/py-gizeh/Makefile b/graphics/py-gizeh/Makefile index 18eda196cec6..4707d7c3eb78 100644 --- a/graphics/py-gizeh/Makefile +++ b/graphics/py-gizeh/Makefile @@ -12,7 +12,7 @@ COMMENT= Simple vector graphics in Python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairocffi>0:graphics/py-cairocffi \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairocffi>0:graphics/py-cairocffi@${FLAVOR} \ ${PYNUMPY} USES= python diff --git a/graphics/py-glewpy/Makefile b/graphics/py-glewpy/Makefile index e85bbd0cfb66..9f217bc7146a 100644 --- a/graphics/py-glewpy/Makefile +++ b/graphics/py-glewpy/Makefile @@ -16,9 +16,9 @@ PATCHFILES= glewpy-${PORTVERSION}-generatedsources.diff.bz2 MAINTAINER= acm@FreeBSD.org COMMENT= Advanced OpenGL extensions to Python -BUILD_DEPENDS= pyrex>=0.9.6.2:devel/pyrex +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>=0.9.6.2:devel/pyrex@${FLAVOR} -USES= python +USES= python:2.7 USE_GL= glew USE_PYTHON= distutils diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile index dfb86f7ce969..9f16125f04d4 100644 --- a/graphics/py-goocanvas/Makefile +++ b/graphics/py-goocanvas/Makefile @@ -18,9 +18,10 @@ LIB_DEPENDS= libgoocanvas.so:graphics/goocanvas PLIST_FILES= %%PYTHON_SITELIBDIR%%/goocanvasmodule.so \ libdata/pkgconfig/pygoocanvas.pc USE_GNOME= pygtk2 +USE_PYTHON= flavors GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-docs -USES= gmake libtool pathfix pkgconfig python tar:bzip2 +USES= gmake libtool pathfix pkgconfig python:2.7 tar:bzip2 INSTALL_TARGET= install-strip post-patch: diff --git a/graphics/py-graphviz/Makefile b/graphics/py-graphviz/Makefile index 8a738ca730c7..f3cde0b181fa 100644 --- a/graphics/py-graphviz/Makefile +++ b/graphics/py-graphviz/Makefile @@ -14,8 +14,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= dot:graphics/graphviz -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov \ - ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${FLAVOR} NO_ARCH= yes USES= python zip diff --git a/graphics/py-graphy/Makefile b/graphics/py-graphy/Makefile index b299558b1a0f..9f41a1467734 100644 --- a/graphics/py-graphy/Makefile +++ b/graphics/py-graphy/Makefile @@ -15,6 +15,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE USES= python:run tar:bzip2 +USE_PYTHON= flavors PORTDOCS= README PORTEXAMPLES= * diff --git a/graphics/py-imagesize/Makefile b/graphics/py-imagesize/Makefile index 77ccba373e44..8bbe08eec321 100644 --- a/graphics/py-imagesize/Makefile +++ b/graphics/py-imagesize/Makefile @@ -13,7 +13,7 @@ COMMENT= Python image size library LICENSE= MIT NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist distutils .include <bsd.port.mk> diff --git a/graphics/py-imgurpython/Makefile b/graphics/py-imgurpython/Makefile index 07ff59ec43c4..c11e1b950534 100644 --- a/graphics/py-imgurpython/Makefile +++ b/graphics/py-imgurpython/Makefile @@ -11,7 +11,7 @@ COMMENT= Python client for the Imgur API LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests@${FLAVOR} NO_ARCH= yes USES= python diff --git a/graphics/py-leather/Makefile b/graphics/py-leather/Makefile index 89527cf728c3..5c35a25cb630 100644 --- a/graphics/py-leather/Makefile +++ b/graphics/py-leather/Makefile @@ -11,7 +11,7 @@ COMMENT= Charting library for those who need charts now LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile index 5c295997fb4d..3fb535ccc804 100644 --- a/graphics/py-mayavi/Makefile +++ b/graphics/py-mayavi/Makefile @@ -26,10 +26,10 @@ BUILD_DEPENDS= vtk6>=6.1.0_8:math/vtk6 \ py27-sphinx>=1.3.1_2:textproc/py-sphinx RUN_DEPENDS= vtk6>=6.1.0_8:math/vtk6 \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}envisage>=4.4.0:devel/py-envisage \ - ${PYTHON_PKGNAMEPREFIX}pyface>=4.5.2:devel/py-pyface \ - ${PYTHON_PKGNAMEPREFIX}scimath>=4.1.2:science/py-scimath \ - ${PYTHON_PKGNAMEPREFIX}traitsui>=4.5.1:graphics/py-traitsui + ${PYTHON_PKGNAMEPREFIX}envisage>=4.4.0:devel/py-envisage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyface>=4.5.2:devel/py-pyface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scimath>=4.1.2:science/py-scimath@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitsui>=4.5.1:graphics/py-traitsui@${FLAVOR} USES= python:-2.7 shebangfix tar:bzip2 USE_PYTHON= autoplist distutils diff --git a/graphics/py-mcomix/Makefile b/graphics/py-mcomix/Makefile index 219b183820e1..13ab6146c510 100644 --- a/graphics/py-mcomix/Makefile +++ b/graphics/py-mcomix/Makefile @@ -13,7 +13,7 @@ COMMENT= GTK2 comic book viewer LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python tar:bzip2 diff --git a/graphics/py-nwdiag/Makefile b/graphics/py-nwdiag/Makefile index 9cea67acd398..7e93bb569da3 100644 --- a/graphics/py-nwdiag/Makefile +++ b/graphics/py-nwdiag/Makefile @@ -13,9 +13,9 @@ COMMENT= Simple network-diagram image generator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \ - ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib \ - ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag +RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \ + ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} \ + ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${FLAVOR} USES= python:-3.4 USE_PYTHON= autoplist distutils diff --git a/graphics/py-openexr/Makefile b/graphics/py-openexr/Makefile index e60ad467993c..b415d09e1270 100644 --- a/graphics/py-openexr/Makefile +++ b/graphics/py-openexr/Makefile @@ -15,7 +15,7 @@ COMMENT= Python module for ILM's OpenEXR image format and library LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-extract: diff --git a/graphics/py-paint/Makefile b/graphics/py-paint/Makefile index e21c201a6746..c7b1f4c427a6 100644 --- a/graphics/py-paint/Makefile +++ b/graphics/py-paint/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= libpng.so:graphics/png \ OPTIONS_DEFINE= EXAMPLES -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_GNOME= libartlgpl2 NO_WRKSUBDIR= yes diff --git a/graphics/py-pillow/Makefile b/graphics/py-pillow/Makefile index 17f1a7682cb2..9f52ecbf2990 100644 --- a/graphics/py-pillow/Makefile +++ b/graphics/py-pillow/Makefile @@ -45,15 +45,15 @@ TIFF_VARS= PYDISTUTILS_BUILDARGS+=--enable-tiff TIFF_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-tiff TKINTER_USES= tk -TKINTER_BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter -TKINTER_RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} +TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} TKINTER_VARS= PYDISTUTILS_BUILDARGS+="--include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}" WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_VARS= PYDISTUTILS_BUILDARGS+=--enable-webp --enable-webpmux WEBP_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-webp --disable-webpmux -USES?= cpe python +USES= cpe python USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils diff --git a/graphics/py-plotly/Makefile b/graphics/py-plotly/Makefile index c9b0959293b8..3b72a312b72b 100644 --- a/graphics/py-plotly/Makefile +++ b/graphics/py-plotly/Makefile @@ -12,9 +12,9 @@ COMMENT= Plotting library for collaborative, interactive, publication-quality gr LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} NO_ARCH= yes USES= python diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile index 32d504ceea14..7ef131dd4bcf 100644 --- a/graphics/py-poppler/Makefile +++ b/graphics/py-poppler/Makefile @@ -17,7 +17,8 @@ COMMENT= Python bindings for the Poppler PDF rendering library LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib GNU_CONFIGURE= yes -USES= gmake libtool pkgconfig python +USES= gmake libtool pkgconfig python:2.7 USE_GNOME= atk pygtk2 +USE_PYTHON= flavors .include <bsd.port.mk> diff --git a/graphics/py-pycha/Makefile b/graphics/py-pycha/Makefile index ddbf7ccad59a..51abba345772 100644 --- a/graphics/py-pycha/Makefile +++ b/graphics/py-pycha/Makefile @@ -18,6 +18,6 @@ USE_PYTHON= distutils autoplist OPTIONS_DEFINE= CAIRO OPTIONS_DEFAULT= CAIRO -CAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo +CAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${FLAVOR} .include <bsd.port.mk> diff --git a/graphics/py-pycollada/Makefile b/graphics/py-pycollada/Makefile index d75c82af7413..37fe3b965f48 100644 --- a/graphics/py-pycollada/Makefile +++ b/graphics/py-pycollada/Makefile @@ -11,8 +11,8 @@ COMMENT= Python library for reading and writing collada documents LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil@${FLAVOR} NO_ARCH= yes USES= python @@ -21,6 +21,6 @@ USE_PYTHON= autoplist distutils OPTIONS_DEFINE= LXML LXML_DESC= Uses lxml for XML loading, construction, and saving. -LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml +LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} .include <bsd.port.mk> diff --git a/graphics/py-pydot/Makefile b/graphics/py-pydot/Makefile index 3b0fb3864b47..4110570ba4e6 100644 --- a/graphics/py-pydot/Makefile +++ b/graphics/py-pydot/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= dot:graphics/graphviz \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.4:devel/py-pyparsing + ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.4:devel/py-pyparsing@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils diff --git a/graphics/py-pyembree/Makefile b/graphics/py-pyembree/Makefile index c71756f26ad2..5818a523f08c 100644 --- a/graphics/py-pyembree/Makefile +++ b/graphics/py-pyembree/Makefile @@ -14,13 +14,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN= fails to configure -BUILD_DEPENDS= cython:lang/cython \ - ${PYNUMPY} +BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libembree.so:graphics/embree RUN_DEPENDS= ${PYNUMPY} USES= localbase python:2 -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython USE_GITHUB= yes GH_ACCOUNT= scopatz diff --git a/graphics/py-pygal/Makefile b/graphics/py-pygal/Makefile index 0d5f317adb5a..b872bbafa570 100644 --- a/graphics/py-pygal/Makefile +++ b/graphics/py-pygal/Makefile @@ -12,7 +12,7 @@ COMMENT= Python svg graph plotting library LICENSE= LGPL3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml@${FLAVOR} NO_ARCH= yes USES= python diff --git a/graphics/py-pyganim/Makefile b/graphics/py-pyganim/Makefile index 1fadc329d947..0069d610fcb6 100644 --- a/graphics/py-pyganim/Makefile +++ b/graphics/py-pyganim/Makefile @@ -13,7 +13,7 @@ COMMENT= Sprite animation module for Pygame LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python zip diff --git a/graphics/py-pygooglechart/Makefile b/graphics/py-pygooglechart/Makefile index 2bd74730ef37..26ca5ca4ef37 100644 --- a/graphics/py-pygooglechart/Makefile +++ b/graphics/py-pygooglechart/Makefile @@ -12,7 +12,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= nivit@FreeBSD.org COMMENT= Complete Python wrapper for the Google Chart API -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist PORTEXAMPLES= * diff --git a/graphics/py-pygraphviz/Makefile b/graphics/py-pygraphviz/Makefile index 823572b54418..c8a068cf40c7 100644 --- a/graphics/py-pygraphviz/Makefile +++ b/graphics/py-pygraphviz/Makefile @@ -14,9 +14,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcgraph.so:graphics/graphviz -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}nose>=0.10.1:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.10.1:devel/py-nose@${FLAVOR} -USES?= pkgconfig python +USES= pkgconfig python USE_PYTHON= autoplist concurrent distutils PYDISTUTILS_BUILD_TARGET= build build_ext diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile index f19864a8ab81..72891b027ff9 100644 --- a/graphics/py-qt4-svg/Makefile +++ b/graphics/py-qt4-svg/Makefile @@ -13,6 +13,7 @@ PYQT_DIST= yes USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT4= corelib gui svg moc_build qmake_build OPTIONS_DEFINE= API DEBUG diff --git a/graphics/py-qt5-svg/Makefile b/graphics/py-qt5-svg/Makefile index 82ad199c2ea6..863e8de197c1 100644 --- a/graphics/py-qt5-svg/Makefile +++ b/graphics/py-qt5-svg/Makefile @@ -13,6 +13,7 @@ PYQT_DIST= yes USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run gui_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui svg widgets qmake_build OPTIONS_DEFINE= API DEBUG diff --git a/graphics/py-rabbyt/Makefile b/graphics/py-rabbyt/Makefile index 2a57b990a6ec..d366c3369729 100644 --- a/graphics/py-rabbyt/Makefile +++ b/graphics/py-rabbyt/Makefile @@ -13,7 +13,7 @@ DISTNAME= Rabbyt-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Fast sprite library for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_GL= gl glu diff --git a/graphics/py-sane/Makefile b/graphics/py-sane/Makefile index f8513ee4af65..e1b3a4cc3676 100644 --- a/graphics/py-sane/Makefile +++ b/graphics/py-sane/Makefile @@ -14,10 +14,10 @@ MAINTAINER= buganini@gmail.com COMMENT= Python bindings for Sane LIB_DEPENDS= libsane.so:graphics/sane-backends -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} DIST_SUBDIR= python -USES= python +USES= python:2.7 USE_PYTHON= distutils WRKSRC= ${WRKDIR}/${DISTNAME}/Sane diff --git a/graphics/py-scikit-image/Makefile b/graphics/py-scikit-image/Makefile index e0980ef22552..deb3b314c3ce 100644 --- a/graphics/py-scikit-image/Makefile +++ b/graphics/py-scikit-image/Makefile @@ -13,23 +13,21 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets - -USES= cpe python + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${FLAVOR} + +USES= cpe python:2.7 USE_GITHUB= yes -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython cython_run PYDISTUTILS_BUILD_TARGET= build build_ext PYDISTUTILS_BUILDARGS+= saveopts diff --git a/graphics/py-seqdiag/Makefile b/graphics/py-seqdiag/Makefile index aab6a9acdd79..065edeaa385c 100644 --- a/graphics/py-seqdiag/Makefile +++ b/graphics/py-seqdiag/Makefile @@ -13,9 +13,9 @@ COMMENT= Simple sequence-diagram image generator LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \ - ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib \ - ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag +RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \ + ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} \ + ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${FLAVOR} USES= python:-3.4 USE_PYTHON= autoplist distutils diff --git a/graphics/py-sk1/Makefile b/graphics/py-sk1/Makefile index 9ce225682797..f826d212abe7 100644 --- a/graphics/py-sk1/Makefile +++ b/graphics/py-sk1/Makefile @@ -13,11 +13,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libMagickCore-6.so:graphics/ImageMagick -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups \ - ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${FLAVOR} USES= desktop-file-utils python:2 USE_GITHUB= yes diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile index 31d06e52e5af..705103840e64 100644 --- a/graphics/py-sorl-thumbnail/Makefile +++ b/graphics/py-sorl-thumbnail/Makefile @@ -13,12 +13,12 @@ COMMENT= Sorl-thumbnail provides an easy way to generate image thumbnails LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} USES= python USE_PYTHON= autoplist distutils -DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}@${FLAVOR} OPTIONS_DEFINE= DJANGO PDF WORD DJANGO_DESC= Enable Django @@ -30,7 +30,7 @@ OPTIONS_DEFAULT= DJANGO .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDJANGO} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} .endif .if ${PORT_OPTIONS:MPDF} diff --git a/graphics/py-soya3d/Makefile b/graphics/py-soya3d/Makefile index 1b0705ce7e50..59ac59a3db2b 100644 --- a/graphics/py-soya3d/Makefile +++ b/graphics/py-soya3d/Makefile @@ -14,15 +14,15 @@ DIST_SUBDIR= python MAINTAINER= ports@FreeBSD.org COMMENT= Very high level 3D engine for Python -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} LIB_DEPENDS= libode.so:devel/ode \ libcal3d.so:graphics/cal3d \ libfreetype.so:print/freetype2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:graphics/py-editobj \ - ${PYTHON_SITELIBDIR}/tofu/client.py:net/py-tofu \ - ${PYTHON_SITELIBDIR}/cerealizer/__init__.py:security/py-cerealizer +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:graphics/py-editobj@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/tofu/client.py:net/py-tofu@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/cerealizer/__init__.py:security/py-cerealizer@${FLAVOR} -USES= gmake openal:al,alut python tar:bzip2 +USES= gmake openal:al,alut python:2.7 tar:bzip2 USE_GL= glew glu USE_PYTHON= autoplist distutils USE_SDL= sdl diff --git a/graphics/py-stltools/Makefile b/graphics/py-stltools/Makefile index d1f9c5a45eba..11aad1b536c6 100644 --- a/graphics/py-stltools/Makefile +++ b/graphics/py-stltools/Makefile @@ -24,7 +24,7 @@ EXAMPLES= test/cube.stl test/cube_bin.stl OPTIONS_DEFINE= PYCAIRO DOCS EXAMPLES PYCAIRO_DESC= Use (py)Cairo to enable stl2pdf to function. -PYCAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>1.8:graphics/py-cairo +PYCAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>1.8:graphics/py-cairo@${FLAVOR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/graphics/py-toyplot/Makefile b/graphics/py-toyplot/Makefile index fb79b4a20be6..8357f2075839 100644 --- a/graphics/py-toyplot/Makefile +++ b/graphics/py-toyplot/Makefile @@ -12,13 +12,13 @@ COMMENT= Modern plotting toolkit supporting electronic publishing LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.8:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}colormath>=2.1.1:math/py-colormath \ - ${PYTHON_PKGNAMEPREFIX}multipledispatch>=0.4.7:devel/py-multipledispatch \ - ${PYTHON_PKGNAMEPREFIX}png>=0.0.17:graphics/py-png \ - ${PYTHON_PKGNAMEPREFIX}reportlab>=3.2.0:print/py-reportlab +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.8:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colormath>=2.1.1:math/py-colormath@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}multipledispatch>=0.4.7:devel/py-multipledispatch@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}png>=0.0.17:graphics/py-png@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}reportlab>=3.2.0:print/py-reportlab@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include <bsd.port.mk> diff --git a/graphics/py-traitsui/Makefile b/graphics/py-traitsui/Makefile index 11b866f0e5be..9d46042bd85e 100644 --- a/graphics/py-traitsui/Makefile +++ b/graphics/py-traitsui/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE_LGPL21= ${WRKSRC}/image_LICENSE_Nuvola.txt LICENSE_FILE_EPL= ${WRKSRC}/image_LICENSE_Eclipse.txt # See ${WRKSRC}/image_LICENSE.txt for per file license information -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apptools>=4.3.0:devel/py-apptools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apptools>=4.3.0:devel/py-apptools@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils diff --git a/graphics/py3-cairo/Makefile b/graphics/py3-cairo/Makefile deleted file mode 100644 index 442843e6fee9..000000000000 --- a/graphics/py3-cairo/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Created by: Michael Johnson <ahze@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= cairo -PORTVERSION= 1.14.1 -CATEGORIES= graphics python -MASTER_SITES= https://github.com/pygobject/pycairo/releases/download/v${PORTVERSION}/ -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= py${PORTNAME}-${PORTVERSION} - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Python 3 bindings for Cairo - -LICENSE= LGPL21 MPL11 -LICENSE_COMB= multi -LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING-LGPL-2.1 -LICENSE_FILE_MPL11= ${WRKSRC}/COPYING-MPL-1.1 - -PORTSCOUT= limitw:1,even - -USES= gnome pkgconfig python:3 -USE_PYTHON= distutils -USE_GNOME= cairo - -PLIST_SUB= PORTVER=${PORTVERSION} - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cairo/_cairo.so - -.include <bsd.port.mk> diff --git a/graphics/py3-cairo/distinfo b/graphics/py3-cairo/distinfo deleted file mode 100644 index 206460c5c8f7..000000000000 --- a/graphics/py3-cairo/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1506344417 -SHA256 (pycairo-1.14.1.tar.gz) = 0d13a0a6eeaf0c357db04392943eb9b25767445608d31dde1307f003f68c5754 -SIZE (pycairo-1.14.1.tar.gz) = 154394 diff --git a/graphics/py3-cairo/pkg-descr b/graphics/py3-cairo/pkg-descr deleted file mode 100644 index 95ccd8a92e07..000000000000 --- a/graphics/py3-cairo/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Python 3 bindings for Cairo. - -WWW: https://github.com/pygobject/pycairo diff --git a/graphics/py3-imagesize/Makefile b/graphics/py3-imagesize/Makefile deleted file mode 100644 index 8b51d361bf88..000000000000 --- a/graphics/py3-imagesize/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Danilo G. Baio <dbaio@bsd.com.br> -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-imagesize - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/py3-pillow/Makefile b/graphics/py3-pillow/Makefile deleted file mode 100644 index d95a17090886..000000000000 --- a/graphics/py3-pillow/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Ben Woods <woodsb02@FreeBSD.org> -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pillow - -TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/${PYTHON_PKGNAMEPREFIX}tkinter -TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/${PYTHON_PKGNAMEPREFIX}tkinter - -USES= cpe python:3.2+ - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/py3-pygraphviz/Makefile b/graphics/py3-pygraphviz/Makefile deleted file mode 100644 index 088ffcc9d4ee..000000000000 --- a/graphics/py3-pygraphviz/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Ben Woods <woodsb02@FreeBSD.org> -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pygraphviz - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.10.1:devel/py3-nose - -PORTSCOUT= ignore:1 - -USES= pkgconfig python:3.4+ - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 09ab2581c492..4baf855c98c9 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -89,48 +89,48 @@ GRASS_CMAKE_OFF= -DWITH_GRASS7:BOOL=FALSE POSTGIS_CMAKE_ON= -DWITH_POSTGRESQL:BOOL=TRUE POSTGIS_CMAKE_OFF= -DWITH_POSTGRESQL:BOOL=FALSE -PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32 \ - ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr \ - ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj \ +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32 \ - ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}gdal>=2.0.1:graphics/py-gdal \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2,1:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr \ - ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gdal>=2.0.1:graphics/py-gdal@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2,1:math/py-numpy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:databases/py-psycopg2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml + ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} PYTHON_CMAKE_ON= -DWITH_BINDINGS:BOOL=TRUE PYTHON_CMAKE_OFF= -DWITH_BINDINGS:BOOL=FALSE diff --git a/graphics/sk1libs/Makefile b/graphics/sk1libs/Makefile index 80a4356b9287..50a2e54ccec5 100644 --- a/graphics/sk1libs/Makefile +++ b/graphics/sk1libs/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/GNU_LGPL_v2 LIB_DEPENDS= liblcms.so:graphics/lcms \ libfreetype.so:print/freetype2 -USES= jpeg python +USES= jpeg python:2.7 USE_PYTHON= distutils PYDISTUTILS_BUILD_TARGET=build_ext PYDISTUTILS_BUILDARGS= -L${LOCALBASE}/lib \ diff --git a/graphics/tilecache/Makefile b/graphics/tilecache/Makefile index 254398e6671d..9a08a92317b3 100644 --- a/graphics/tilecache/Makefile +++ b/graphics/tilecache/Makefile @@ -10,13 +10,13 @@ MASTER_SITES= http://tilecache.org/ MAINTAINER= joris.dedieu@gmail.com COMMENT= Python-based WMS-C/TMS server -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup \ - ${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste@${FLAVOR} LICENSE= BSD3CLAUSE MIT LICENSE_COMB= multi -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= distutils autoplist SHEBANG_FILES= tilecache.cgi tilecache.fcgi diff --git a/graphics/uniconvertor/Makefile b/graphics/uniconvertor/Makefile index 38d443034922..5b65270889d5 100644 --- a/graphics/uniconvertor/Makefile +++ b/graphics/uniconvertor/Makefile @@ -15,9 +15,9 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/src/GNU_GPL_v2 LICENSE_FILE_LGPL20+ = ${WRKSRC}/src/GNU_LGPL_v2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sk1libs/__init__.py:graphics/sk1libs +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sk1libs/__init__.py:graphics/sk1libs@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils post-install: diff --git a/graphics/uniconvw/Makefile b/graphics/uniconvw/Makefile index a46fe96668da..d3d32d7fe059 100644 --- a/graphics/uniconvw/Makefile +++ b/graphics/uniconvw/Makefile @@ -18,9 +18,9 @@ LICENSE_FILE_LGPL20+ = ${WRKSRC}/src/GNU_LGPL_v2 RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sk1libs/__init__.py:graphics/sk1libs \ ${PYTHON_SITELIBDIR}/uniconvertor/__init__.py:graphics/uniconvertor \ - ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2 + ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2@${FLAVOR} -USES= desktop-file-utils python +USES= desktop-file-utils python:2.7 USE_PYTHON= distutils NO_ARCH= yes diff --git a/graphics/variety/Makefile b/graphics/variety/Makefile index 05e811ae91f2..c960c72f4ccb 100644 --- a/graphics/variety/Makefile +++ b/graphics/variety/Makefile @@ -14,19 +14,19 @@ COMMENT= Wallpaper changer LICENSE= GPLv3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:devel/py-python-distutils-extra \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:devel/py-python-distutils-extra@${FLAVOR} \ intltool-update:textproc/intltool -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}cairo>=1.10.0:graphics/py-cairo \ - ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.5.1:ftp/py-pycurl \ - ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}exiv2>=0.3.2_3:graphics/py-exiv2 \ - ${PYTHON_PKGNAMEPREFIX}gobject3>=3.14.0:devel/py-gobject3 \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cairo>=1.10.0:graphics/py-cairo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.5.1:ftp/py-pycurl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:devel/py-dbus@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}exiv2>=0.3.2_3:graphics/py-exiv2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gobject3>=3.14.0:devel/py-gobject3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:www/py-httplib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR} \ ImageMagick>=6.9.0.4,1:graphics/ImageMagick \ bash>=4.3.33:shells/bash \ ca_root_nss>=3.17.4:security/ca_root_nss \ diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index 5121fe260387..0907625d8776 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -53,7 +53,7 @@ OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes DOCS_CONFIGURE_ENABLE= docs -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CONFIGURE_WITH= python PYTHON_CONFIGURE_ENABLE= pyvips8 PYTHON_USE= GNOME=pygobject3 |