From nobody Tue Jan 10 17:13:23 2023 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 4Nry7l73kGz2sFFm; Tue, 10 Jan 2023 17:13:23 +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 4Nry7l6fKzz44NZ; Tue, 10 Jan 2023 17:13:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673370803; 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=gsUpkE+pb8w/mCpdZNQ9PxasBinRNAP9NAqvNsZ4wkY=; b=ZEEltfNb2cpnbFT2HYiRuwGfFpD2y4P7Q74QoN7lnXfucyIQfdCdj4L0tiNjbUdP3Tto1H og1Lj6SD+355TOh8Z6YzZcLPUXYmeiyiRxxAWPNLX97ffUPTijLt1mmGeMGfTgLgzK0cb7 5FJxYfJOwEm81t0HIu94wE6P4Of8jhBvKKWY2wFqo/jI/qSuJlrfdEH9J+gsSYAH1EU3NY zZ5pVFZNu2LlsRI8w4rv9TPY8HeqaTXbtaxYkoJw9QjVktTBe+82VDRK7x5ZTVoFVU30jf Oq1C2ThNg0JtMeh55WbMEbB6blsuQcqMukLavumWoE95/ocoljv3UM0j19s7mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673370803; 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=gsUpkE+pb8w/mCpdZNQ9PxasBinRNAP9NAqvNsZ4wkY=; b=nqToVHkiBUdqEZSD1230lghbAnKcjFzvs2Wv0PVe0gNhv8HKQcIlYkpJiZGb7+rdKkVpPh BiW722Zc7u6qaND+4ZRB0g2mIPaNFSzsqZG7GCJWwCJ8sgbpuuG9JST21S1V8ADAgCnRvb ekdAUMVgezqYdPl4XqkN5Ld4zo6RpiJDDFnmECXRfv42XAMsPkXA42GjStnZjz2wC3+Qql ajYo/MDxHrMKsn9YZcJBENg8gvzVEgyV+Y36M7L/PnGOYK0pyjmWHMZcvXLbkHQb+quG41 COlfLh/iQpv7rkj8rF+S78izyL5/+m5/FvTwt6fKAjwDQ+Vx+NPSf3l7uIXY+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673370803; a=rsa-sha256; cv=none; b=jwRfOFDWPYtKt6V5L7UMxu6+1Hpj5IWBBKjRw82JCAP+ZLveoq5TXCfu9k1lcpiMFyuywy 5fLGQfnbHNj82489KoCDWpFVPtH+/z3psM1j/4yEJEALfbbfcdE30N+QhzQpZoNjPjgPs7 Vwa9Pn1gzfhmtjD8inAYYzIB1IsfT+xPnQaZGpLoTFKyVPIj9vkbbUmLFaM9XQzddNdtEE 0da12N+etejwuX9J4XHYE5I+jGKbut5zE/6qjRcZ7t4/sjHBOesPc8ilhkmOboXKydmdZg SnBFJ7yUuBXbd1hJmXU4j1cG8tifaK4H02VfbQBpE8J7K+tM1iCeWt2W+geG0A== 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 4Nry7l5lqqzGNd; Tue, 10 Jan 2023 17:13:23 +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 30AHDNAv081666; Tue, 10 Jan 2023 17:13:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30AHDNHl081665; Tue, 10 Jan 2023 17:13:23 GMT (envelope-from git) Date: Tue, 10 Jan 2023 17:13:23 GMT Message-Id: <202301101713.30AHDNHl081665@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adam Weinberger Subject: git: 07b61611e9a2 - main - multiple: Fix msgpack cmake package name 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: adamw X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07b61611e9a26854900a8db50235c0b7880e025e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=07b61611e9a26854900a8db50235c0b7880e025e commit 07b61611e9a26854900a8db50235c0b7880e025e Author: Adam Weinberger AuthorDate: 2023-01-10 17:09:52 +0000 Commit: Adam Weinberger CommitDate: 2023-01-10 17:13:15 +0000 multiple: Fix msgpack cmake package name msgpack-c's cmake package name changed to `msgpackc' msgpack-cxx's cmake package named to `msgpackc-cxx' because I guess that's how msgpack's developers roll. Fix the two instances I could find where a CMakeLists.txt was looking for msgpack through its cmake package name. There are probably others. --- devel/opendht/files/patch-CMakeLists.txt | 11 ++++++++++- science/mmtf-cpp/Makefile | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/devel/opendht/files/patch-CMakeLists.txt b/devel/opendht/files/patch-CMakeLists.txt index 3b7adfa72d00..f50759bf427d 100644 --- a/devel/opendht/files/patch-CMakeLists.txt +++ b/devel/opendht/files/patch-CMakeLists.txt @@ -1,5 +1,14 @@ ---- CMakeLists.txt.orig 2022-11-06 06:47:13 UTC +--- CMakeLists.txt.orig 2023-01-10 16:45:50 UTC +++ CMakeLists.txt +@@ -61,7 +61,7 @@ if (NOT MSVC) + pkg_search_module (Nettle REQUIRED nettle) + check_include_file_cxx(msgpack.hpp HAVE_MSGPACKCXX) + if (NOT HAVE_MSGPACKCXX) +- find_package (msgpack REQUIRED) ++ find_package (msgpackc-cxx REQUIRED) + endif() + if (OPENDHT_TOOLS) + find_package (Readline 6 REQUIRED) @@ -91,8 +91,8 @@ if (NOT MSVC) endif() if (OPENDHT_PROXY_OPENSSL) diff --git a/science/mmtf-cpp/Makefile b/science/mmtf-cpp/Makefile index 01db9e8db41f..fa17eaebe812 100644 --- a/science/mmtf-cpp/Makefile +++ b/science/mmtf-cpp/Makefile @@ -30,6 +30,8 @@ post-patch: # correct paths of test data to be accessible to the test executable s|\.\./submodules/mmtf_spec|${WRKSRC}/submodules/mmtf_spec|g; \ s|\.\./temporary_test_data|${WRKSRC}/temporary_test_data|g' \ ${WRKSRC}/tests/mmtf_tests.cpp + @${REINPLACE_CMD} -e '/find_package/s|msgpack|msgpackc-cxx|' \ + ${WRKSRC}/CMakeLists.txt do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} include ${STAGEDIR}${PREFIX}