git: bf232aca5e91 - main - cad/surelog: Remove unnecessary element from CONFLICTS_INSTALL

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Tue, 11 Apr 2023 19:52:06 UTC

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bf232aca5e911a5a005b0190a9eeb76be9d5faaf

commit bf232aca5e911a5a005b0190a9eeb76be9d5faaf
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-04-11 15:09:17 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
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}