git: f12567a3b704 - main - graphics/py-wand: Update to 0.6.7

[Po-Chuan Hsieh]

The branch main has been updated by sunpoet:

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

commit f12567a3b704a7a60a601bdb970a829ba819e434
Author:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
AuthorDate: 2021-09-19 05:31:39 +0000
Commit:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-09-19 06:00:53 +0000

    graphics/py-wand: Update to 0.6.7
    
    - Allow graphics/ImageMagick{6,7}*
    - Change the default ImageMagick from 6 to 7
    
    Changes:        https://github.com/emcconville/wand/releases
---
 graphics/py-wand/Makefile             | 29 +++++++++++++++++++++++------
 graphics/py-wand/distinfo             |  6 +++---
 graphics/py-wand/files/patch-setup.py | 10 ----------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/graphics/py-wand/Makefile b/graphics/py-wand/Makefile
index 49bf9440d3a2..55640299e938 100644
--- a/graphics/py-wand/Makefile
+++ b/graphics/py-wand/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	Wand
-PORTVERSION=	0.4.5
+PORTVERSION=	0.6.7
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,15 +10,32 @@ COMMENT=	MagickWand Python binding
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
-
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	X11
+OPTIONS_SINGLE=	IMAGEMAGICK
+OPTIONS_SINGLE_IMAGEMAGICK=	IMAGEMAGICK6 IMAGEMAGICK7
+OPTIONS_DEFAULT=IMAGEMAGICK7 X11
+IMAGEMAGICK6_DESC=	Use ImageMagick 6.x (graphics/ImageMagick6*)
+IMAGEMAGICK7_DESC=	Use ImageMagick 7.x (graphics/ImageMagick7*)
 
-PYDISTUTILS_INSTALLARGS+=	--install-data ${DATADIR}
+.include <bsd.port.options.mk>
 
-.include <bsd.port.post.mk>
+.if ${PORT_OPTIONS:MX11}
+.if ${PORT_OPTIONS:MIMAGEMAGICK7}
+LIB_DEPENDS=	libMagickWand-7.so:graphics/ImageMagick7
+.else
+LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
+.endif
+.else
+.if ${PORT_OPTIONS:MIMAGEMAGICK7}
+LIB_DEPENDS=	libMagickWand-7.so:graphics/ImageMagick7-nox11
+.else
+LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6-nox11
+.endif
+.endif
+
+.include <bsd.port.mk>
diff --git a/graphics/py-wand/distinfo b/graphics/py-wand/distinfo
index 35e4f3361719..3845fa11327b 100644
--- a/graphics/py-wand/distinfo
+++ b/graphics/py-wand/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542296080
-SHA256 (Wand-0.4.5.tar.gz) = b40a2215545e8c7193b3fccd6e7251dc556ec9b878a4f67d992b056ff396bc65
-SIZE (Wand-0.4.5.tar.gz) = 65854
+TIMESTAMP = 1629364766
+SHA256 (Wand-0.6.7.tar.gz) = ebc01bccc25dba68414ab55b482341f9ad2b197d7f49d5e724f339bbf63fb6db
+SIZE (Wand-0.6.7.tar.gz) = 11686093
diff --git a/graphics/py-wand/files/patch-setup.py b/graphics/py-wand/files/patch-setup.py
deleted file mode 100644
index 1e1c24f5f7c4..000000000000
--- a/graphics/py-wand/files/patch-setup.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- setup.py.orig	2016-10-22 05:27:48 UTC
-+++ setup.py
-@@ -35,7 +35,6 @@ else:
- setup(
-     name='Wand',
-     packages=['wand'],
--    data_files=[('', ['README.rst'])],
-     version=VERSION,
-     description='Ctypes-based simple MagickWand API binding for Python',
-     long_description=readme(),