From nobody Wed Nov 17 12:35:09 2021 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 C56F11892E1F; Wed, 17 Nov 2021 12:35: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 4HvMp53wwvz3QBD; Wed, 17 Nov 2021 12:35:09 +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 68D4A20ECF; Wed, 17 Nov 2021 12:35:09 +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 1AHCZ9ON033575; Wed, 17 Nov 2021 12:35:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AHCZ9i3033574; Wed, 17 Nov 2021 12:35:09 GMT (envelope-from git) Date: Wed, 17 Nov 2021 12:35:09 GMT Message-Id: <202111171235.1AHCZ9i3033574@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 10672193d0da - main - graphics/autotrace: fix package build by disabling one of conflicting options 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10672193d0daad0be9520df775f4c4d8d7e49ba6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=10672193d0daad0be9520df775f4c4d8d7e49ba6 commit 10672193d0daad0be9520df775f4c4d8d7e49ba6 Author: Dmitry Marakasov AuthorDate: 2021-11-17 10:44:06 +0000 Commit: Dmitry Marakasov CommitDate: 2021-11-17 12:34:17 +0000 graphics/autotrace: fix package build by disabling one of conflicting options autotrace (optionally) pulls both imagemagick6 and pstoedit, while the latter also pulls imagemagick7. Since imagemagick6 conflicts with imagemagick7 and autotrace does not support imagemagick7, one of the options need to be disabled by default to avoid the conflict. Disabling PSTOEDIT in assumption that raster image support would be more useful than postscript support. Approved by: portmgr blanket --- graphics/autotrace/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile index 3017e51ea673..b2d03ed1272f 100644 --- a/graphics/autotrace/Makefile +++ b/graphics/autotrace/Makefile @@ -23,7 +23,7 @@ LDFLAGS+= $$(libpng-config --L_opts) INSTALL_TARGET= install-strip OPTIONS_DEFINE= IMAGEMAGICK MING PSTOEDIT -OPTIONS_DEFAULT=IMAGEMAGICK PSTOEDIT +OPTIONS_DEFAULT=IMAGEMAGICK MING_DESC= Enable swf interface PSTOEDIT_DESC= Convert postscript to other formats @@ -46,4 +46,5 @@ post-patch: post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libautotrace.so + .include