From nobody Wed Feb 23 21:34:45 2022 X-Original-To: dev-commits-ports-all@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 51C1F19EB21A; Wed, 23 Feb 2022 21:34:46 +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 4K3q7V1rkgz4VZf; Wed, 23 Feb 2022 21:34:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645652086; 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=sw1H8pcKOppaRpGwi2/BwnDX6ns9jL/h9EiZKcJIyIg=; b=hVdrGdcLgiZq0fn7Yu5tAxqazP7zv1lJbyH6ch0cCmsAr63i7eB44bcW00ig356wc7QeLA I1Y1t7bWW5mQkWvUWqeEACfT2Gaj4VyFjr3Y4lFN5z5uedbeO8NTJ/FJmrYfSx2kEZmOFE mI+oH2AIeVrDk5B3DhLa4MdP+j65UcyGUuBAPF/WVb4W3G+lZ51wssByNYLGwDAu7kow5a atolJQHwo4Mz2tRJ+wlWWk6NtLVLR99eGLrheBUR/kdjHyfmlR/LraerO1kkHwMZBWVNZ7 e5w/d3HDz+NpevjVgWYtFR05bYcyqIPS9IxVKGM2Cr2259YAzG+22rsuj/Ty6w== 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 1BCA21F7EB; Wed, 23 Feb 2022 21:34:46 +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 21NLYjlr098706; Wed, 23 Feb 2022 21:34:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NLYjWW098705; Wed, 23 Feb 2022 21:34:45 GMT (envelope-from git) Date: Wed, 23 Feb 2022 21:34:45 GMT Message-Id: <202202232134.21NLYjWW098705@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: b8bdbd8f07ac - main - graphics/seexpr: mark conflict with graphics/kseexpr List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8bdbd8f07aca8af9e9081ff2ae5e5a453b08475 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645652086; 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=sw1H8pcKOppaRpGwi2/BwnDX6ns9jL/h9EiZKcJIyIg=; b=iJmbsIYHlSsjY4j3EkvznImUP5OqhP8tUlMxbCM9wh5K69xA71ssue0xHxiRoOiV4NTz5g lvqHBgV/MiIo/iCpAKbmO1P1NdEE8qVvaezqWu2nWJDfZNyqmZrGta2NAOOswif8mgKb4h IZqzXTelMfYSTEeLjKRl6IoK424OLLCPPkDFEt8iIywTCJ4qBvCZ7A2FirIg8KxV53RDQp IyQNBmv1IuV6P7+Zd/K4/PnJkxn607K11qy7mleIJwLzX6yU461J55f04EAi14e5kdoFQC h8YkZZT1TRSkMP4/hlIBMknoZW3rmV2xd/FVzi2GyYoJbmUXzEyPPTnWXZ3tng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645652086; a=rsa-sha256; cv=none; b=RcLxmCoz9Rx0F/aPtsdx9HiVXJhZWDwc22I1gVHAaoJDL8X2vWVEn867Lt2V9uTnSjQehD Gz7iXZ/zvDIyoR4l+lUior69kIxNlUIB7eLXDltkydsBYoD+OKBDijWH95o7syW/+6D+6v eWN1YKTLNOYYFhsZJSFGlzUDpDIC6SRps0zp3YDHyRsLuISTDM3Us+UmeVZVWF2ccYgE8s 6tRMD5CDEg52RLwOuxNNYeOtIsxcf0Bvdb24aI1NtTP5mqhzEE6RGZRokRHWv79+w8bZFz m/7VEiudqMHrURmJ5I+bq2k06tIvTMaqzOv61Q9kNTViwBFBmdsPMo6vEvg58g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8bdbd8f07aca8af9e9081ff2ae5e5a453b08475 commit b8bdbd8f07aca8af9e9081ff2ae5e5a453b08475 Author: Max Brazhnikov AuthorDate: 2022-02-23 21:33:57 +0000 Commit: Max Brazhnikov CommitDate: 2022-02-23 21:33:57 +0000 graphics/seexpr: mark conflict with graphics/kseexpr --- graphics/seexpr/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/graphics/seexpr/Makefile b/graphics/seexpr/Makefile index bba03ab09b34..5d4ccc5d06f5 100644 --- a/graphics/seexpr/Makefile +++ b/graphics/seexpr/Makefile @@ -21,6 +21,8 @@ USE_QT= buildtools_build qmake_build core gui opengl widgets MAKE_JOBS_UNSAFE= yes # https://github.com/wdas/seexpr/issues/40 +CONFLICTS_INSTALL= kseexpr + OPTIONS_DEFINE= ANIMCURVE DEEPWATER LLVM NLS PYTHON OPTIONS_DEFAULT= DEEPWATER OPTIONS_SUB= yes