git: bdcb041c74ef - main - multimedia/py-moviepy: Remove PYNUMPY

[Po-Chuan Hsieh]

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bdcb041c74ef8f85f1d36647575e0808b0be5871

commit bdcb041c74ef8f85f1d36647575e0808b0be5871
Author:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
AuthorDate: 2021-04-18 05:04:50 +0000
Commit:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-04-18 05:43:55 +0000

    multimedia/py-moviepy: Remove PYNUMPY
---
 multimedia/py-moviepy/Makefile             | 2 +-
 multimedia/py-moviepy/files/patch-setup.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/multimedia/py-moviepy/Makefile b/multimedia/py-moviepy/Makefile
index edad54c0095b..41c74fe8d7fc 100644
--- a/multimedia/py-moviepy/Makefile
+++ b/multimedia/py-moviepy/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg \
 		${PYTHON_PKGNAMEPREFIX}decorator>=4.0.2<5.0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imageio>=2.5<3.0:graphics/py-imageio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}imageio-ffmpeg>=0.2.0:graphics/py-imageio-ffmpeg@${PY_FLAVOR} \
-		${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}proglog<=1.0.0:devel/py-proglog@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.8.1<3.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.11.2<5.0:misc/py-tqdm@${PY_FLAVOR} \
diff --git a/multimedia/py-moviepy/files/patch-setup.py b/multimedia/py-moviepy/files/patch-setup.py
index e5eaef439189..85bcb8dd7e61 100644
--- a/multimedia/py-moviepy/files/patch-setup.py
+++ b/multimedia/py-moviepy/files/patch-setup.py
@@ -1,10 +1,11 @@
 --- setup.py.orig	2020-03-24 20:20:07 UTC
 +++ setup.py
-@@ -67,7 +67,6 @@ requires = [
+@@ -67,7 +67,7 @@ requires = [
      "imageio>=2.0,<2.5; python_version<'3.4'",
      "imageio_ffmpeg>=0.2.0; python_version>='3.4'",
      'tqdm>=4.11.2,<5.0',
 -    "numpy>=1.17.3; python_version!='2.7'",
++    "numpy>=0; python_version!='2.7'",
      "numpy; python_version>='2.7'",
      'requests>=2.8.1,<3.0',
      'proglog<=1.0.0'