From nobody Sat Sep 10 13:04:08 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MPtNT0GvLz4c0SC; Sat, 10 Sep 2022 13:04: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 4MPtNS6bF1z3qC4; Sat, 10 Sep 2022 13:04:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662815048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3l5hHjNkF4MirN6KRNXEJkbMyF1neDdPus14s4eMeiw=; b=JK6Fh7bbdmcSWOUGmXEBpkxOqn8oorLA1UO//UtyLs18+9sF0VsRE4I2pPeIbA4J7AhCO2 65Cf/wRJVS0LJ6jRhC1yzMqMulnmxtmKniUZB3pZVY8crr6snT5Tz3Bq1oL2D8qneZ2UFR EBF5gix5Lec9Fb3fK+sEjOc2Jbgit3gUEbX0eRlqTUXlqVhWUVxjO0STHWNTS7BMG6M76v s8bP0GK14KDObgRSHMSJRyhyHsFKJFR3GcP8I5U+unOkS9dpD0g+y5diEyPkS331WyMeik I5nIruU3CsyRicNSw1ULX4ImgE1/Y/F6ZsilavKsyypMkeViJu6v93vUjFMwAw== 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 4MPtNS5XJCzJhF; Sat, 10 Sep 2022 13:04:08 +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 28AD48g3027939; Sat, 10 Sep 2022 13:04:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28AD487R027938; Sat, 10 Sep 2022 13:04:08 GMT (envelope-from git) Date: Sat, 10 Sep 2022 13:04:08 GMT Message-Id: <202209101304.28AD487R027938@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: df7041a2ce93 - main - graphics/py-wand: Convert to USES=magick List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: df7041a2ce93a83385a2db6d69fa421a72ecdcd6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662815048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3l5hHjNkF4MirN6KRNXEJkbMyF1neDdPus14s4eMeiw=; b=Gn0oXf2dgZCvEPIzLTjKwQUT5u5xV17lk3LGkIaTKIj1wlGZeHtfO161Mj0mfqlOoMTwyF O2xQGGTmLdLBSbGBduwNKU7afY6bPXkr4yNMVDDgc4AQQxXIh7+MCFLy+4snL+ITFkwCHv SpHJZH7wL/nA0cINAys+lR9K0V6N2We0HqSWj5fAY0yA6YmFgBDuzukG0ip0T6X6Lh85oX 8dymGuQ7qeD/jZrLheKJ9k9rY/oJLi2G2yNOvBvDpDXwycXlfnSN9jVu2wJ/ZqrCzRE6up ztCiaTrOmRWeyXqVvXjPQGug6dqALa9Ak3XccrCOg1IlxZQt0S8MXbhofhwjyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662815048; a=rsa-sha256; cv=none; b=cPNmo4HyejFhI4+ab1bP9+2uo0IBBL45pwyC00SQU3rQz9iGPinvjYtX1EfVyUPQ84pmL8 qhymfG1K42f3DLE/9RgXXttH3Ndf3WUeXGQ2sXvTikBT7y9N8xrPS/UYoWtt2O0fAGT+ua ObOR/bt+mGQ+U+DVBe8E0eHmnX9ssGWPgmjM4H4RdqkP6C8Hr8C37kTxIpPu8OHLLY+VYz 6zQJSUfVT1L7MDL0+gYj8JPpvzfyzQ6Ae0s8aqdOuPOQKplkwjCE7uAXKn+lhqIfZ6Gjxr p/mE8taKL0wZhauhSOF8dv3lDukHXRxRwtVpzIeau75z2XZHXlHRgErGqVxf8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=df7041a2ce93a83385a2db6d69fa421a72ecdcd6 commit df7041a2ce93a83385a2db6d69fa421a72ecdcd6 Author: Po-Chuan Hsieh AuthorDate: 2022-09-10 12:53:33 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-09-10 13:02:46 +0000 graphics/py-wand: Convert to USES=magick Use the default ImageMagick since all of them (ImageMagick{6,7}{,-nox11}) are mutually exclusive. --- graphics/py-wand/Makefile | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/graphics/py-wand/Makefile b/graphics/py-wand/Makefile index 552aabeaff68..8466489ecd36 100644 --- a/graphics/py-wand/Makefile +++ b/graphics/py-wand/Makefile @@ -11,32 +11,9 @@ WWW= https://github.com/emcconville/wand LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python:3.6+ +USES= magick python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -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*) - -.include - -.if ${PORT_OPTIONS:MX11} -.if ${PORT_OPTIONS:MIMAGEMAGICK7} -USES+= magick:7 -.else -USES+= magick:6 -.endif -.else -.if ${PORT_OPTIONS:MIMAGEMAGICK7} -USES+= magick:7,nox11 -.else -USES+= magick:6,nox11 -.endif -.endif - .include