From nobody Mon Nov 18 03:12:48 2024 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 4XsCNw4fLBz5dlnQ; Mon, 18 Nov 2024 03:12:48 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XsCNw4C5gz4fsW; Mon, 18 Nov 2024 03:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731899568; 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=mbLf83ZwQzM3u9dI5gIvzbRWeK0dACcBCmOwPCsY/bw=; b=usTe6mgkIeTBWP7WV9ky6jKBj3xNqy2MXkLn3aYo2A3c8twiZAYOyoCE/vhJlVpLYNjWE/ OCNa0TJSqQtvCx1fPMepXP4RMbMyO1l9MP9xeasFjaTtJ3okzBAHWMN4pqMv/PXru32ka9 3H/qMB0ln7prEDUn5Oj042r/ni8u3iZybn3Dt2njV9b+PE3+hq4vgagvbp0agYAtJa5Mtp RFdDJytGoYJ3WRovSG8VM9zSgVQuLAQlA3vhM3J/TmZJTqWcq0GlK66+Bmbl2vPIUXagic UEColMm3aW8wwEHbjF4Da+qwxqZkf6KgFNCPKuLbUOapeopu0rv/eWlg6rxFmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731899568; 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=mbLf83ZwQzM3u9dI5gIvzbRWeK0dACcBCmOwPCsY/bw=; b=BbjKErbaMgAIk/7LUNEO+Eox1SuIyiSf5D6SG+5qrLYed4EY1QC2Go3GXMigGxot+7dIpG s8ZobOtaCY2Y/BaMjF6pXz7ylWs647jsozmsMF0tqISjcRSLhPZxzBVAy3je0zTInaoGZz Ma7Oj1ippTYsfA81Ku5712WscePU4h3knQCDt+wKR3bEsXjSjKSg9C4aKjhA38i5owSXxu XvH3R10qDTo1rx+LaO72t5Kl6xsiojLLnTltr68ls3/yw/paHI4KFrdl6o8xbp4FQqACcr JbnoUj4Nuff7HTAvYVeu5TyXREZrGqv+hEGOUt15CWlHafAV1uoz8vv2IWwhTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731899568; a=rsa-sha256; cv=none; b=LdFCzMgO5CY/BAyIOg5u89RhjeZCk5Ntg6Nvuc4KeKi2hWklwLIiXUocPlX4Tn3RwLiinZ ee8F7cMILaoAb8hyTN488X4HdN+5nRAlceceu6fIonVB1C0F+rGO7Qw4Unnp4A6nxr+Sy4 Z0BpVG0j/X3MT36XKUz+OQviJLiHDBS9QU9qNGfMPQVANLlWfvXKb1fGzPv3wTO0YrgY47 XDUxwnEiho6iT8T27AHWwvDKoZ+1RKSjysxHaUJ3j2uqPhE9a6urSYNo4EU6MQP/qnaglb 5tq2eq2i5UuXBbb+Z7zoANCR1hHCG+Ikg9ekNN9J1okpGe/Q6NVtIgQgCeg7BQ== 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 4XsCNw3prYzKDn; Mon, 18 Nov 2024 03:12:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AI3Cmuk002649; Mon, 18 Nov 2024 03:12:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AI3CmVm002646; Mon, 18 Nov 2024 03:12:48 GMT (envelope-from git) Date: Mon, 18 Nov 2024 03:12:48 GMT Message-Id: <202411180312.4AI3CmVm002646@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: f7c59ccf4e1c - main - devel/cmake-core: Remove CPACK option 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7c59ccf4e1c6758d03659804f6877a483fac10a Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=f7c59ccf4e1c6758d03659804f6877a483fac10a commit f7c59ccf4e1c6758d03659804f6877a483fac10a Author: Jason E. Hale AuthorDate: 2024-11-18 02:55:11 +0000 Commit: Jason E. Hale CommitDate: 2024-11-18 03:11:40 +0000 devel/cmake-core: Remove CPACK option This option has been a point of confusion several times. It was once an experimental feature, but it has been on by default for many years and there is really no point in disabling it anymore. Make sure we are always linking to libarchive from base. This was previously conditionalized to only happen if the CPACK option was enabled, so if the user had the CPACK option disabled and had libarchive from ports installed, the ports version would be linked to. [1] Add missing dns/libidn2 dependency. This is an optional dependency that didn't manifest itself in poudriere, but it gets linked to if previously installed on a live system build. Reported by: vvd on #freebsd-desktop [1] --- devel/cmake-core/Makefile | 11 ++++------- devel/cmake-core/files/InitialCache.cmake.in | 20 +++++++++----------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/devel/cmake-core/Makefile b/devel/cmake-core/Makefile index 632bdc648a07..bdf931045533 100644 --- a/devel/cmake-core/Makefile +++ b/devel/cmake-core/Makefile @@ -1,5 +1,6 @@ PORTNAME= cmake DISTVERSION= ${_CMAKE_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMESUFFIX= -core @@ -11,7 +12,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt LIB_DEPENDS= libexpat.so:textproc/expat2 \ + libidn2.so:dns/libidn2 \ libjsoncpp.so:devel/jsoncpp \ + libpkg.so:${PKG_ORIGIN} \ librhash.so:security/rhash \ libuv.so:devel/libuv @@ -55,15 +58,9 @@ BUILD_WRKSRC= ${WRKDIR}/.build CONFIGURE_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC} -OPTIONS_DEFINE= DOCS CPACK -OPTIONS_DEFAULT= CPACK +OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes -CPACK_DESC= Enable FreeBSD generator in CPack -CPACK_LIB_DEPENDS= libpkg.so:${PKG_ORIGIN} -CPACK_SUB_LIST= CPACK_OPTION_VALUE="ON" -CPACK_SUB_LIST_OFF= CPACK_OPTION_VALUE="OFF" - post-patch: @(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \ ${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \ diff --git a/devel/cmake-core/files/InitialCache.cmake.in b/devel/cmake-core/files/InitialCache.cmake.in index 7532a7832dc9..15977658349d 100644 --- a/devel/cmake-core/files/InitialCache.cmake.in +++ b/devel/cmake-core/files/InitialCache.cmake.in @@ -1,17 +1,15 @@ # TODO: Add TEST option to enable regression tests. The tests require # additional packages to be installed and a small amount of patching # to account for our local changes. -set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") +set(BUILD_TESTING OFF CACHE BOOL + "Build the testing tree.") -# Toggled by the CPACK option. Set to ON by default. -set(CPACK_ENABLE_FREEBSD_PKG %%CPACK_OPTION_VALUE%% CACHE BOOL +set(CPACK_ENABLE_FREEBSD_PKG ON CACHE BOOL "Enable pkg(8) generator in CPack") -if(CPACK_ENABLE_FREEBSD_PKG) -# Use base libarchive instead of the ports or bundled version, because -# libpkg links against base. - set(LibArchive_INCLUDE_DIR "/usr/include" CACHE PATH - "Directory where LibArchive headers are located.") - set(LibArchive_LIBRARY "/usr/lib/libarchive.so" CACHE PATH - "LibArchive library to link against.") -endif(CPACK_ENABLE_FREEBSD_PKG) +# Use base libarchive instead of the ports or bundled version, because +# libpkg links against base. +set(LibArchive_INCLUDE_DIR "/usr/include" CACHE PATH + "Directory where LibArchive headers are located.") +set(LibArchive_LIBRARY "/usr/lib/libarchive.so" CACHE PATH + "LibArchive library to link against.")