From nobody Mon Sep 18 20:24:33 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 4RqGVT52Vzz4tjPD; Mon, 18 Sep 2023 20:24:33 +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 4RqGVT1rkCz4NG7; Mon, 18 Sep 2023 20:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695068673; 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=Q3F3EmjHjC6AA8nikpo8VicaJxodMws90/0d18UgE9w=; b=Izlp7to0frxpB7Oxeyn+AXFV+lQx8xtUg+X3c/Y4FO0KMEtUoBQuK3PKP4sWmTCTT7JBbQ XDPKaVxJyqyoNnKeN3RZ/wQK0xJsKViHd1i6F+A0WSbQgXF9srAUR/UTJi9nmuBMbXQ4BB rtUEq5yGSBwY58FfkH2guxlMmdVoiMORyZQBGgJCg6q0Q2Ix5LHK7C1ZXW7MHedUcjCNCT NzGWj8U6EDxbqNBv9aHtrNgBzKLolaZbS2RU6BYeHZQDkLEABndkcF6wd2Z4JTdXF5NGww mDJieQnG/uPnM0ei2Oijp8UhH0xTGLg7yP1gaiCnXK8ZmUnCkBS0cDdHR3kpaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695068673; a=rsa-sha256; cv=none; b=QSqpNTzAzl6ISzWpeuDjqZ535MD6fYCsn9VfASibinV2RaVIapI3EJIbu6FFYWoo8nabTx Mo6/ScK5pK1u0eoCWnNtzVYHw6SvP1Wk8FOla7AMWOFZtaAeKeRI4oK2z0IZJkUjhKj1UW JOnrh9iTs9Ge71kL/tf9BvojrAhtkPHvMVmB5Nni11x0KPFMDgjn+w9l/dUV4RdrwP2Lka yBbQtt36/zFG6xL/+uIjfLYIiy9z0H5nOeAqsRpSFKtDh93oTWGyQpI+bqTGS36AMPc6Sq CEy0DG5BBWmIbPyvLb7FzP5G2jM2/mgrgkVzdrv3qhoIM4hNmeFM8g5PPcAV2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695068673; 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=Q3F3EmjHjC6AA8nikpo8VicaJxodMws90/0d18UgE9w=; b=qaa1YB7Rv/JvO3pY+yOCpmJsPuuqLj2f7eEFYQFaAhxUBsT0CdCTLyoa/Qrxv3MrTdojKa irJArHZszOfxry9CxoM6eZYvoF7e6mCGjXhEDDMp8FdLJYYCfjjhYv0/AV64zbXe2wqLl/ QsZoA4sSCKFZComvkD/gxOpU/K+5CGs295D2YM0Q1gMEkvEyAV26vWYpS2KHDcAc/yejbe Bf4/6fa4lrowVpf6PdUycG0seCZz6lJVW0t/Se1BOfIffmqIvPb+YyfKnwdlCnSDanX7fC pUHs4VBGTm7vxIGStj+Cg96XHvc745b6Fi2TDuiHfGHGQblQJ2W/H+v9sQ1kAw== 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 4RqGVT0kMTzl0w; Mon, 18 Sep 2023 20:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IKOX9D095410; Mon, 18 Sep 2023 20:24:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IKOXIu095407; Mon, 18 Sep 2023 20:24:33 GMT (envelope-from git) Date: Mon, 18 Sep 2023 20:24:33 GMT Message-Id: <202309182024.38IKOXIu095407@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: ad47cbd7d792 - main - devel/cmake-core: add patch for ZLIB 1.3 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: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad47cbd7d792ef98d1de157ba9bc9d564044f17e Auto-Submitted: auto-generated The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad47cbd7d792ef98d1de157ba9bc9d564044f17e commit ad47cbd7d792ef98d1de157ba9bc9d564044f17e Author: Adriaan de Groot AuthorDate: 2023-09-18 19:25:05 +0000 Commit: Adriaan de Groot CommitDate: 2023-09-18 20:24:13 +0000 devel/cmake-core: add patch for ZLIB 1.3 Add upstream patch (which is in 3.27.4, but we don't have a CMake update going on right now) that fixes finding ZLIB 1.3 -- which is necessary for FreeBSD 14. PR: 273915 --- devel/cmake-core/Makefile | 2 +- ...t-903439495033da40f798db9ec064d9b16ea672fc.diff | 47 ++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/devel/cmake-core/Makefile b/devel/cmake-core/Makefile index d00726e36fec..018e73febdff 100644 --- a/devel/cmake-core/Makefile +++ b/devel/cmake-core/Makefile @@ -1,7 +1,7 @@ PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. DISTVERSION= ${_CMAKE_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMESUFFIX= -core diff --git a/devel/cmake-core/files/patch-git-903439495033da40f798db9ec064d9b16ea672fc.diff b/devel/cmake-core/files/patch-git-903439495033da40f798db9ec064d9b16ea672fc.diff new file mode 100644 index 000000000000..8047db8d925e --- /dev/null +++ b/devel/cmake-core/files/patch-git-903439495033da40f798db9ec064d9b16ea672fc.diff @@ -0,0 +1,47 @@ +diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake +index d0deb8778d0143c9d9b7dfe6d7ff1b40ff2056da..4e7d5d665aae8730cd74fc35c1763afe5b6a0397 100644 +--- Modules/FindZLIB.cmake ++++ Modules/FindZLIB.cmake +@@ -175,25 +175,24 @@ unset(ZLIB_NAMES_DEBUG) + mark_as_advanced(ZLIB_INCLUDE_DIR) + + if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h") +- file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$") +- +- string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}") +- string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR "${ZLIB_H}") +- string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}") +- set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}") +- +- # only append a TWEAK version if it exists: ++ file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$") ++ if(ZLIB_H MATCHES "ZLIB_VERSION \"(([0-9]+)\\.([0-9]+)(\\.([0-9]+)(\\.([0-9]+))?)?)") ++ set(ZLIB_VERSION_STRING "${CMAKE_MATCH_1}") ++ set(ZLIB_VERSION_MAJOR "${CMAKE_MATCH_2}") ++ set(ZLIB_VERSION_MINOR "${CMAKE_MATCH_3}") ++ set(ZLIB_VERSION_PATCH "${CMAKE_MATCH_5}") ++ set(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_7}") ++ else() ++ set(ZLIB_VERSION_STRING "") ++ set(ZLIB_VERSION_MAJOR "") ++ set(ZLIB_VERSION_MINOR "") ++ set(ZLIB_VERSION_PATCH "") + set(ZLIB_VERSION_TWEAK "") +- if( "${ZLIB_H}" MATCHES "ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+)") +- set(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_1}") +- string(APPEND ZLIB_VERSION_STRING ".${ZLIB_VERSION_TWEAK}") +- endif() +- +- set(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}") +- set(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}") +- set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}") +- +- set(ZLIB_VERSION ${ZLIB_VERSION_STRING}) ++ endif() ++ set(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}") ++ set(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}") ++ set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}") ++ set(ZLIB_VERSION "${ZLIB_VERSION_STRING}") + endif() + + include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)