Date: Sun, 20 Aug 2023 21:52:55 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7f15f71bba56 - main - cad/surelog: Remove CONFLICTS_INSTALL; Fix typo Message-ID: <202308202152.37KLqtnq073406@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f15f71bba56e1cc5fd2b4279dea4c6ce46722a2 commit 7f15f71bba56e1cc5fd2b4279dea4c6ce46722a2 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2023-08-20 21:52:21 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2023-08-20 21:52:21 +0000 cad/surelog: Remove CONFLICTS_INSTALL; Fix typo It doesn't conflict with capnproto any more. --- cad/surelog/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cad/surelog/Makefile b/cad/surelog/Makefile index 84c4cafddeb2..2d7ce93e7c70 100644 --- a/cad/surelog/Makefile +++ b/cad/surelog/Makefile @@ -39,8 +39,6 @@ CMAKE_ARGS= -DFREEBSD_JAVA_VERSION=${USE_JAVA} \ CMAKE_TESTING_ON= SURELOG_BUILD_TESTS # 2 tests fail, see https://github.com/chipsalliance/Surelog/issues/3545 CMAKE_TESTING_TARGET= UnitTests -CONFLICTS_INSTALL= capnproto capnproto080 - BINARY_ALIAS= python3=${PYTHON_CMD} tclsh=${TCLSH} CONFLICTS_BUILD= openjdk8 openjdk11 openjdk18 openjdk19 @@ -60,7 +58,7 @@ TCMALLOC_LIB_DEPENDS= libtcmalloc.so:devel/google-perftools PORTSCOUT= limit:^.*[0-9]\.[0-9] # prevent tags like 'show' -post-install: # workaound for https://github.com/chipsalliance/Surelog/issues/3596 +post-install: # workaround for https://github.com/chipsalliance/Surelog/issues/3596 @${RMDIR} \ ${STAGEDIR}${DATADIR}/pkg/work \ ${STAGEDIR}${DATADIR}/pkg \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308202152.37KLqtnq073406>