Index: head/science/py-openpiv/Makefile
===================================================================
--- head/science/py-openpiv/Makefile	(revision 539746)
+++ head/science/py-openpiv/Makefile	(revision 539747)
@@ -1,43 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	openpiv
-PORTVERSION=	0.21.0
-PORTREVISION=	1
+PORTVERSION=	0.21.8b
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Python module for Particle Image Velocimetry
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY} \
-		${PY_FUTURE} \
-		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>=0.12.0:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}progressbar2>=3.8.1:misc/py-progressbar2@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.7+
 USE_PYTHON=	autoplist distutils cython cython_run
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenPIV
 GH_PROJECT=	openpiv-python
 
-post-patch:
-# Do not install supplementing data to allow concurrent installion
-	${REINPLACE_CMD} -e '/data_files = data_files,/d' ${WRKSRC}/setup.py
-	${REINPLACE_CMD} -e '/version/s,0.20.9,0.21.0,' ${WRKSRC}/setup.py
+OPTIONS_DEFINE=	EXTRA
+EXTRA_DESC=	Install additional Python packages (for tutorial/examples)
 
-.include <bsd.port.pre.mk>
+EXTRA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}imageio>=0:graphics/py-imageio@${PY_FLAVOR}
 
-.if ${PYTHON_REL} < 3000
-PY_FUTURE=	${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR}
-.else
-PY_FUTURE=
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/science/py-openpiv/distinfo
===================================================================
--- head/science/py-openpiv/distinfo	(revision 539746)
+++ head/science/py-openpiv/distinfo	(revision 539747)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546449802
-SHA256 (OpenPIV-openpiv-python-0.21.0_GH0.tar.gz) = 09747e5a49bede8547c0b8a2b6db8ac96afdaad9f9528f358349f47aeca6b7fd
-SIZE (OpenPIV-openpiv-python-0.21.0_GH0.tar.gz) = 20623127
+TIMESTAMP = 1580209067
+SHA256 (OpenPIV-openpiv-python-0.21.8b_GH0.tar.gz) = 4c7354e0a0faa6f03ab0d3e8e432c4de9e1652c4fef3198c6ec2c555c4b5fc10
+SIZE (OpenPIV-openpiv-python-0.21.8b_GH0.tar.gz) = 17385092