diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2020-03-24 19:54:57 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2020-03-24 19:54:57 +0000 |
| commit | 1bf9457272318a99eb550ee7603ef85903c36cea (patch) | |
| tree | 30969701cc82a93abc61c62dd66cf03666bbe585 /math | |
| parent | Add a PY_PILLOW that can be used to choose between graphics/py-pillow (diff) | |
Convert the tree to use PY_PILLOW
With hat: portmgr
Originally submitted by: kai
Diffstat (limited to 'math')
| -rw-r--r-- | math/asymptote/Makefile | 13 | ||||
| -rw-r--r-- | math/py-PyWavelets/Makefile | 13 | ||||
| -rw-r--r-- | math/py-plastex/Makefile | 2 |
3 files changed, 7 insertions, 21 deletions
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile index 16bb663cb208..f59fba82b028 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -19,7 +19,8 @@ ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libsigsegv.so:devel/libsigsegv RUN_DEPENDS= animate:graphics/ImageMagick6 \ gv:print/gv \ - ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ + ${PY_PILLOW} USES= compiler:c++14-lang gettext-runtime ghostscript gl gmake ncurses perl5 python \ shebangfix tar:tgz @@ -72,14 +73,6 @@ OFFSCREEN_LIB_DEPENDS= libOSMesa.so:graphics/libosmesa READLINE_CONFIGURE_ENABLE= readline READLINE_USES= readline:port -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>0:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} -.endif - post-patch: @${REINPLACE_CMD} 's/-lgc/-lgc-threaded/' ${WRKSRC}/configure @${REINPLACE_CMD} 's,/usr/lib/libgs.so,${LOCALBASE}/lib/libgs.so,' \ @@ -93,4 +86,4 @@ post-patch: post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asy -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/py-PyWavelets/Makefile b/math/py-PyWavelets/Makefile index 848074072553..abeb35cbed86 100644 --- a/math/py-PyWavelets/Makefile +++ b/math/py-PyWavelets/Makefile @@ -14,7 +14,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYNUMPY} \ + ${PY_PILLOW} USE_GITHUB= yes GH_PROJECT= pywt @@ -25,12 +26,4 @@ USE_PYTHON= autoplist distutils cython cython_run PYDISTUTILS_BUILD_TARGET= build build_ext PYDISTUTILS_BUILDARGS+= saveopts -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow6>=1.7:graphics/py-pillow6@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/math/py-plastex/Makefile b/math/py-plastex/Makefile index 32d4d7b36c86..e21c9b3fe95a 100644 --- a/math/py-plastex/Makefile +++ b/math/py-plastex/Makefile @@ -13,7 +13,7 @@ COMMENT= LaTeX Document Processing Framework LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} +RUN_DEPENDS= ${PY_PILLOW} USES= python:3.5+ USE_PYTHON= autoplist distutils |