From nobody Wed Jun 29 14:55:40 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 5468E870EFE; Wed, 29 Jun 2022 14:55:40 +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 4LY4Jr1r8cz4mDs; Wed, 29 Jun 2022 14:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656514540; 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=BX/MYEdWWt/tHTSIfHy53K/3rjBihL9cKHoL9m5o2SM=; b=LcURGv9QBfBsx4pWmiP0OubuRNPfnEkAwUJvd2Je/KXpwduf4eOwcO3yLBSge0v3sNJz/R rTuDqvwc0PaHgN2PdQQNdExYozdVk6UuKY2uXzB0lr3tAjq0XhdjBTwPhjg5xKfYenY5wb Rq8hi1hc83doTbDV4/a+jtyJme+ycJWL055UtZwLsle6hzgMCE9TeaQfUqUyZ9bigSsI6C LdKW6z1O5ZbR76c4QoP1LvpJH9oSwM/qS1MuzrFHZRPMD75tRWRq5zytgMWrh0UCpJs4el 2ZlJPvldOX/SnLA8ZUqieKwZ/Rf6PVAr4e0DfgqaedZkcygS/1R0jTXaHk+BvQ== 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 1EBFB13864; Wed, 29 Jun 2022 14:55:40 +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 25TEteaE048756; Wed, 29 Jun 2022 14:55:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25TEte3Q048755; Wed, 29 Jun 2022 14:55:40 GMT (envelope-from git) Date: Wed, 29 Jun 2022 14:55:40 GMT Message-Id: <202206291455.25TEte3Q048755@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: b52114270fb7 - main - Fix CONFLICTS_INSTALL in benchmarks and biology 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b52114270fb74b73a57ab9e58cfb84f4ac0271a3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656514540; 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=BX/MYEdWWt/tHTSIfHy53K/3rjBihL9cKHoL9m5o2SM=; b=Tg2xsVjzicteP6E7hxXn04CSZPoeFYhhMXGt1jkkr6HpyyqasGILBMzB+hd9vjgDSfZF7v L14SHLb0d55XtOVpdHPXFK7aMB+z/myuXJ0tJMV9ZAkRS2XWeVoGZuCSPFhqzRBmTvNMAr xdsWyywbJxihbNR8aVjCnPaVcnJODhb3iyhDw9SCzeL85fIap8SZq7bK2iGdklXewrbTGj 1eyYTA/OlOR7UcvCDrtIaViqvrISaHFRQZTKrvEeUZSoHK4Aw9tAWAVA5yikx2qvxYqPm2 62aFDVDEwqdPpiNXzTHwZPwh1wgnIRN5+5TCHXyB3xW0gLJhaao24VxcWlfbXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656514540; a=rsa-sha256; cv=none; b=GVuhdqw3vch2FIgqwIUijqZTTsK0RULpx2emJpG4IBz2Vx/oN5FCY85sGeHT2G23zDnps9 tzEVhPFTmXjRvUlwgZMYBFWzdX8LsehzhLVFOgZX1Q9ZhLKO+FOsRMf9pkP9snG6Z7rdFu 6MI2ZDw5IcwPi2LTbS0lhlwDvc18wiPbFCw0xSSkyHMexX5Bcx/RBiYarWQ6ZPXTW3atKM SEWIgSu1vc2EuvIZwsyTzPeJB6hxOFFqZ1rFsXNeCNdesYdoQZXGnF1nJwXDpaLJFIr/pW jxfiBz2tK/o8LKWOjJrlHQumwkf1IBw+zgxRQM1vFOtqeJnorIbGNQoWmTczfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=b52114270fb74b73a57ab9e58cfb84f4ac0271a3 commit b52114270fb74b73a57ab9e58cfb84f4ac0271a3 Author: Stefan Eßer AuthorDate: 2022-06-29 14:53:54 +0000 Commit: Stefan Eßer 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