From nobody Tue Nov 08 19:58:46 2022 X-Original-To: dev-commits-ports-main@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 4N6Jnf3pB6z4XQWC; Tue, 8 Nov 2022 19:58:46 +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 4N6Jnf30tBz4c1h; Tue, 8 Nov 2022 19:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667937526; 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=iFCzM1NCl+CcK9BiEuTh7g0/ewNBCVuI6WvUXD9Fl7I=; b=iioNqDZQAB9Y+GNtVJ6yEkcqS7NiD5VYPCe5RiFiwyFBHV8MHtU8HQxyKtLwDVchWWhf4Q vYuHenlw1nSaql1TDJEDBF2ycgzmU5AXVZhYyXgCjA/xaFQzEtBvGPXlg/MWYwFaAZKX1/ SYvjxTQvslaYyHtwI2rze+xMTkzjszJBto+DKxR1G6bHNy6yuTpLGskzsBLdVd3c7OXMl/ opuirEba26xEYbOwHhaXtSbBEDozxwuHTEbzAIkOEXyHFvY1ss5TskFJbMvmwAO6JoW1C7 OE/kt8q3v/fwovYpaK5mpGztdM4OQ3TBbdl9IAdgc0n/R9PI6xxHZIoWAuWo1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667937526; 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=iFCzM1NCl+CcK9BiEuTh7g0/ewNBCVuI6WvUXD9Fl7I=; b=ySu/7/istUfu0klenn6Tm7v7TDiX/94a2/89MJ3t2gGWy39PZmumgydBeQnzqkzYdQ922A dShD/zno9vVFQqQc9gFEKkqUJQzESvX4Ghb6bYBADiB384P/2mFAT+iPeZh9WfZhIjc0mm 992ZKEEK+43yPwgbBc3bdC/cy+OmwrQhBPmO6RCCBd7d7FY2TIweLngdqkjXA+HWD5Gw/J gP+F4tfv2D1wG1g6n9zaH5WuxJEwIImwXk8pQMmrRowy1FODrisefTt3wpT62zPbQZ2aV7 /Ey2VqLA91YWdV1pzUtIxjv+aS4vVvvoZIWL4BF6yGdcVNoubPXpQduCm/9brA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667937526; a=rsa-sha256; cv=none; b=f9eyjKHQZDXXEx5bs/eRNYU7rTrrJvHod1/AFXDeRvzGUGZu4GkbSIsxAUglfvfWi1ckxT TpI6T2EWNHWYQVlCTaH+v1/boIs5Sv17Fk8dnYAVUNOmTsGoxDLvRHVwmLaINH8pJTWmsw SsrbgznzKvFZUjsbqbjCJs2g9sKB18yYNHOlNzg6MCIrWcFbn+09xOGfBSca905pqITK4Z w8v9kapUgDEHLSsllQJFHQr34Pllsd+saOFWx/SpNUNVJD1fCBAXVlm6gkXSQwJq69XIMZ joUkyM6QIo0HQEmk8X0UQN3yVbn/eDVH4EYm9YgLm+SL3xx8W5qZP2hg/V1QNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N6Jnf23bszvSZ; Tue, 8 Nov 2022 19:58:46 +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 2A8JwkUI070580; Tue, 8 Nov 2022 19:58:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A8JwkAI070579; Tue, 8 Nov 2022 19:58:46 GMT (envelope-from git) Date: Tue, 8 Nov 2022 19:58:46 GMT Message-Id: <202211081958.2A8JwkAI070579@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: cbdb82ae536d - main - devel/cmake-core: drop dependency on some external libs to avoid a loop cycle (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbdb82ae536d83e4c7ffa8ef4b6fb150afe3f1c7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbdb82ae536d83e4c7ffa8ef4b6fb150afe3f1c7 commit cbdb82ae536d83e4c7ffa8ef4b6fb150afe3f1c7 Author: Dima Panov AuthorDate: 2022-11-08 19:55:10 +0000 Commit: Dima Panov CommitDate: 2022-11-08 19:55:10 +0000 devel/cmake-core: drop dependency on some external libs to avoid a loop cycle (+) Switch to bundled libcurl+libnghttp2 to utilize fetch ability for cmake Always use system libarchive/zlib Discussed with: tcberner --- devel/cmake-core/Makefile | 20 ++++++++++++++------ .../files/patch-Utilities_cmcurl_lib_url.c | 13 +++++++++++++ devel/cmake-core/pkg-plist | 2 ++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/devel/cmake-core/Makefile b/devel/cmake-core/Makefile index 4561410066f5..89e4989ea782 100644 --- a/devel/cmake-core/Makefile +++ b/devel/cmake-core/Makefile @@ -1,9 +1,8 @@ PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. DISTVERSION= ${_CMAKE_VERSION} +PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \ - https://www.cmake.org/files/v${PORTVERSION}/ PKGNAMESUFFIX= -core MAINTAINER= kde@FreeBSD.org @@ -13,8 +12,7 @@ WWW= https://www.cmake.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt -LIB_DEPENDS= libcurl.so:ftp/curl \ - libexpat.so:textproc/expat2 \ +LIB_DEPENDS= libexpat.so:textproc/expat2 \ libjsoncpp.so:devel/jsoncpp \ libuv.so:devel/libuv \ librhash.so:security/rhash @@ -27,7 +25,17 @@ CONFIGURE_ENV= MAKE=make CONFIGURE_ARGS= --prefix=${PREFIX} \ --datadir="/${DATADIR_REL}" \ --docdir="/${DOCSDIR_REL}" \ - --system-libs \ + --system-expat \ + --system-jsoncpp \ + --system-zlib \ + --system-zstd \ + --system-bzip2 \ + --system-liblzma \ + --system-libarchive \ + --system-librhash \ + --system-libuv \ + --no-system-curl \ + --no-system-nghttp2 \ --parallel=${MAKE_JOBS_NUMBER} \ --init="${WRKSRC}/InitialCache.cmake" @@ -36,7 +44,7 @@ OPTIONS_SUB= yes CPACK_DESC= Enable FreeBSD generator in CPack (experimental) CPACK_LIB_DEPENDS= libpkg.so:${PKG_ORIGIN} -CPACK_USES_OFF= libarchive +# CPACK_USES_OFF= libarchive # When CPACK is on, uses base libarchive and won't pass stage-qa CXXFLAGS+= -D__BSD_VISIBLE diff --git a/devel/cmake-core/files/patch-Utilities_cmcurl_lib_url.c b/devel/cmake-core/files/patch-Utilities_cmcurl_lib_url.c new file mode 100644 index 000000000000..bfb9c287ed71 --- /dev/null +++ b/devel/cmake-core/files/patch-Utilities_cmcurl_lib_url.c @@ -0,0 +1,13 @@ +--- Utilities/cmcurl/lib/url.c.orig 2022-08-04 13:53:57 UTC ++++ Utilities/cmcurl/lib/url.c +@@ -626,6 +626,10 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) + CURL_HTTP_VERSION_1_1 + #endif + ; ++#if defined(__FreeBSD_version) ++ /* different handling of signals and threads */ ++ set->no_signal = TRUE; ++#endif + Curl_http2_init_userset(set); + return result; + } diff --git a/devel/cmake-core/pkg-plist b/devel/cmake-core/pkg-plist index 1b0f4255343f..44e0fc3b467b 100644 --- a/devel/cmake-core/pkg-plist +++ b/devel/cmake-core/pkg-plist @@ -3091,6 +3091,8 @@ share/bash-completion/completions/ctest %%DATADIR%%/Templates/Windows/Windows_TemporaryKey.pfx %%DATADIR%%/include/cmCPluginAPI.h %%PORTDOCS%%%%DOCSDIR%%/Copyright.txt +%%PORTDOCS%%%%DOCSDIR%%/cmcurl/COPYING +%%PORTDOCS%%%%DOCSDIR%%/cmnghttp2/COPYING %%PORTDOCS%%%%DOCSDIR%%/cmsys/Copyright.txt share/emacs/site-lisp/cmake-mode.el share/vim/vimfiles/indent/cmake.vim