From owner-dev-commits-ports-all@freebsd.org Sun Sep 19 06:09:09 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2DF056AC384; Sun, 19 Sep 2021 06:09:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HBy1w3G6Wz3NhB; Sun, 19 Sep 2021 06:09:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F2D418604; Sun, 19 Sep 2021 06:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18J695HH055400; Sun, 19 Sep 2021 06:09:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18J6954I055399; Sun, 19 Sep 2021 06:09:05 GMT (envelope-from git) Date: Sun, 19 Sep 2021 06:09:05 GMT Message-Id: <202109190609.18J6954I055399@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: f12567a3b704 - main - graphics/py-wand: Update to 0.6.7 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f12567a3b704a7a60a601bdb970a829ba819e434 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Sep 2021 06:09:09 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=f12567a3b704a7a60a601bdb970a829ba819e434 commit f12567a3b704a7a60a601bdb970a829ba819e434 Author: Po-Chuan Hsieh AuthorDate: 2021-09-19 05:31:39 +0000 Commit: Po-Chuan Hsieh 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 +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 -.include +.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 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(),