git: b52114270fb7 - main - Fix CONFLICTS_INSTALL in benchmarks and biology
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 29 Jun 2022 14:55:40 UTC
The branch main has been updated by se:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b52114270fb74b73a57ab9e58cfb84f4ac0271a3
commit b52114270fb74b73a57ab9e58cfb84f4ac0271a3
Author: Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2022-06-29 14:53:54 +0000
Commit: Stefan Eßer <se@FreeBSD.org>
CommitDate: 2022-06-29 14:53:54 +0000
Fix CONFLICTS_INSTALL in benchmarks and biology
Approved by: portmgr (implicit)
---
benchmarks/nosqlbench/Makefile | 2 +-
biology/ncbi-toolkit/Makefile | 2 +-
biology/vcflib/Makefile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/benchmarks/nosqlbench/Makefile b/benchmarks/nosqlbench/Makefile
index 025615262c9a..dcc579afdcec 100644
--- a/benchmarks/nosqlbench/Makefile
+++ b/benchmarks/nosqlbench/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libleveldb.so:databases/leveldb
DATE= 20151214
USES= cmake:insource tar:bzip2
-CONFLICTS_INSTALL= nanoblogger tarantool-c # bin/nb include/tarantool/tarantool.h
+CONFLICTS_INSTALL= tarantool-c # bin/nb include/tarantool/tarantool.h
post-patch:
@${REINPLACE_CMD} -e 's|-O3 -march=native||' ${WRKSRC}/CMakeLists.txt \
diff --git a/biology/ncbi-toolkit/Makefile b/biology/ncbi-toolkit/Makefile
index 90c3219ff061..ecf33e9af5ff 100644
--- a/biology/ncbi-toolkit/Makefile
+++ b/biology/ncbi-toolkit/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
USES= gettext-runtime iconv jpeg motif xorg
USE_XORG= x11 xau xext xft xmu xrender xt
-CONFLICTS_INSTALL= fhist ncbi-cxx-toolkit # bin/test_regexp man/man1/fmerge.1.gz
+CONFLICTS_INSTALL= fhist # bin/test_regexp man/man1/fmerge.1.gz
SUB_FILES= pkg-message
diff --git a/biology/vcflib/Makefile b/biology/vcflib/Makefile
index 5656d5baf827..1ab10160d404 100644
--- a/biology/vcflib/Makefile
+++ b/biology/vcflib/Makefile
@@ -29,6 +29,6 @@ SHEBANG_FILES= scripts/*
# Clang and GCC disable sse2 by default on i386, but it's required for vcflib
CFLAGS_i386= -msse2
-CONFLICTS_INSTALL= dakota filevercmp libdisorder # include/disorder.h include/filevercmp.h include/pdflib.hpp
+CONFLICTS_INSTALL= filevercmp libdisorder # include/disorder.h include/filevercmp.h include/pdflib.hpp
.include <bsd.port.mk>