From nobody Tue Apr 11 19:52:06 2023 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 4PwxLt5lCbz44SfL; Tue, 11 Apr 2023 19:52:06 +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 4PwxLt57jfz4442; Tue, 11 Apr 2023 19:52:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681242726; 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=i+R8jYGRcllp4IYkEX5bAtxPKWFDuiNAnhGXWUTAGew=; b=ynm+I62lMenV4KXouGxLqf5WHeXZPEbLYjAaDMpB5zAZMGmoGyoA8cD5rx4lEYCjUqVwtT dJtG+Rc5hdXBmbaogkzfy1wLGKmcPlDM/i9QNFA9osCpNS2lcJtfFvTeTL8a44RBnLKUdj URND55/uMGPVAaFor4HhJi3+nvzqxP2qsU7KVPkU3aF1/FlxjXBcvI0Y3+Mrdg4iTYbGRW og1w1vuXMMX+e28j6OvKA2zsin8sk+mYtKv7QsR5AX7gv45TDGCHSfg0aJe1mR3KxwlywO I9gYP3fE03MDG2WaFc07Sxbzh1n+Nd8GyTtaPx+AAZ2mMBFAcGYgXvkFzN9QpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681242726; 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=i+R8jYGRcllp4IYkEX5bAtxPKWFDuiNAnhGXWUTAGew=; b=oMdop9hhXUMNMwOugN3yM/CO0oZLEy1B8zmLNvADeKUvv+LBOtJlIrscR2GP9mJEI465tM ZTdITpQsxQchjN0oo1Z4KWqRheO7cMXS1aIs1oI+hK2jBX5dmVFj+064p9Jbnz0tLoFW3v a120yRkktLL1Xv7DzRLjWpOJPoUsYws6aXV6CHxBEj7ttNkF4AUM+5Jz8AgwrRP8HyoM8Z gPNZJiWkb/r/GGTjzZOPDqIFA648yQKcl9+Vg53LkvIA7vbv65EpAsW4VHsZFzoelXQ7tV 2KJYuwaNHPHbHFnUNKZPPzojoCeuZbSGpkg4Z7ka+RAQqE11KxnRkSSwuVRkfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681242726; a=rsa-sha256; cv=none; b=mdfFwdoaIS3PAssqhVcPQQ66NHbjGv4Ss75BExCd/jlpwsAXe7OCt6VESqjzcgbMVME2Hi o22Yimo/A7OMYawoiQE4BqkXY98mdn+vnPK3rb138zb8uIM1KkKSZ7Q09MuKNaN+5W1uta l/OKHH5hXFpvMLVU6vKp58eC6zYglYupD6Vo1wQFtNkhhbc0DUiYxJMuaUS06LGjppMHXA NOrQNP2jYih1wlrODiJdLuzTKIzQdrZOXe1sTmUWhb4p4p+ke0sSB2Yz6fqdoanBSGmp9D qGllH/xO+bGx6uTydphJFIAVjHqIRskctCvKNDO7CxS3jWFOFhhqRpn3VWgeZQ== 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 4PwxLt3wlxzW4B; Tue, 11 Apr 2023 19:52:06 +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 33BJq6Cf053971; Tue, 11 Apr 2023 19:52:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33BJq6u2053970; Tue, 11 Apr 2023 19:52:06 GMT (envelope-from git) Date: Tue, 11 Apr 2023 19:52:06 GMT Message-Id: <202304111952.33BJq6u2053970@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: bf232aca5e91 - main - cad/surelog: Remove unnecessary element from CONFLICTS_INSTALL 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf232aca5e911a5a005b0190a9eeb76be9d5faaf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf232aca5e911a5a005b0190a9eeb76be9d5faaf commit bf232aca5e911a5a005b0190a9eeb76be9d5faaf Author: Yuri Victorovich AuthorDate: 2023-04-11 15:09:17 +0000 Commit: Yuri Victorovich CommitDate: 2023-04-11 15:09:17 +0000 cad/surelog: Remove unnecessary element from CONFLICTS_INSTALL --- cad/surelog/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile index d1c01745346e..956a91143937 100644 --- a/cad/surelog/Makefile +++ b/cad/surelog/Makefile @@ -39,7 +39,7 @@ CMAKE_ARGS= -DFREEBSD_JAVA_VERSION=${USE_JAVA} \ CMAKE_TESTING_ON= SURELOG_BUILD_TESTS # unclear how to run tests, see https://github.com/chipsalliance/Surelog/issues/3545 CMAKE_TESTING_TARGET= UnitTests -CONFLICTS_INSTALL= capnproto capnproto080 uhdm # bin/uhdm-dump lib/libcapnp.so +CONFLICTS_INSTALL= capnproto capnproto080 BINARY_ALIAS= python3=${PYTHON_CMD} tclsh=${TCLSH}