From nobody Mon Nov 18 05:26:40 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 4XsGMT2nNmz5dskR for ; Mon, 18 Nov 2024 05:26:45 +0000 (UTC) (envelope-from daniel.engberg.lists@pyret.net) Received: from smtp-42a9.mail.infomaniak.ch (smtp-42a9.mail.infomaniak.ch [84.16.66.169]) (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 (2048 bits) client-digest SHA256) (Client CN "relay.mail.infomaniak.ch", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XsGMS710Yz4q4W for ; Mon, 18 Nov 2024 05:26:44 +0000 (UTC) (envelope-from daniel.engberg.lists@pyret.net) Authentication-Results: mx1.freebsd.org; none Received: from smtp-4-0000.mail.infomaniak.ch (unknown [IPv6:2001:1600:7:10:40ca:feff:fe05:0]) by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4XsGMN5JYszCNQ; Mon, 18 Nov 2024 06:26:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pyret.net; s=20231006; t=1731907600; bh=NJLqHKBYc9+IT1/87rH9IAYiov0NTB4ePgxrKIuWEvY=; h=Date:Subject:From:Reply-To:To:Cc:References:In-Reply-To:From; b=d7rWJ1TN8cPe85IU2sxI2BhZCgz4H6+JZa4gALa8bjrvnQD9udvnhK4wl5rGrZtz4 ufcImIl13+0PJ44byVXyhIYmtsVah4Q+f8I9YsVSyZRIplEsjkSxkhv0WGx1cmkqTb D7b4+OBl9ZTT4DD++B1wpqNllu8aZLlihfK8wMdXoHwjtedGijXLqjuXuH8HMdHsvS LxnVQS0/ajbXxwbUSa4pycR/F9VRfQfnnBgG8QTWtOAbpecI7+wH+3GmquRmJmRobd Q1YTGoJ0BL8TopjHDNsSObpzZkuqJ+KOhBH0klromv343HVRzc32MveiqyTpc/9N2Q ZdnFeAK11zgMw== Received: from unknown by smtp-4-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4XsGMN2HTdznbZ; Mon, 18 Nov 2024 06:26:40 +0100 (CET) Message-ID: <3e942296a4626a377de1c333441e26ea@mail.infomaniak.com> Date: Mon, 18 Nov 2024 06:26:40 +0100 Subject: Re: git: f7c59ccf4e1c - main - devel/cmake-core: Remove CPACK option From: Daniel Engberg Reply-To: Daniel Engberg To: "Jason E. Hale" Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org 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: multipart/alternative; boundary="_=_swift_1731907600_ecdadcd2245a1190dd2a9f1e62e38894_=_" X-WS-User-Origin: eyJpdiI6Ii83RkV4OGdxOHN3bE9YSEphWFEvVHc9PSIsInZhbHVlIjoiZ0tERERicnh6bHIvSldWWTNiTUdwdz09IiwibWFjIjoiOTNhZDZjOTZkYjllZDFiYjFkOGQ2NGY5ODllYzc4M2U1MjRjYTZhOGFiMjE2ZTY0MTIyYjkyNGFhODI4ZjA1ZiIsInRhZyI6IiJ9 X-WS-User-Mbox: eyJpdiI6IkR1SXJILzl2NmQ2cHpzb1BtbTE3VWc9PSIsInZhbHVlIjoiVTFYbStqK1J0Q2tqK2VwbHl0aDdWdz09IiwibWFjIjoiNjcwYTBhMGJmYWQzNDg3M2YwZDFhYjc0NDFkMDBiN2JkZjUxZTJmN2ZlZjU2NzlmM2Y4MmExMDEzY2UzNzhjMyIsInRhZyI6IiJ9 X-WS-Location: eJxzKUpMKykGAAfpAmU- X-Mailer: Infomaniak Workspace (1.3.784) References: <202411180312.4AI3CmVm002646@gitrepo.freebsd.org> In-Reply-To: <202411180312.4AI3CmVm002646@gitrepo.freebsd.org> X-Infomaniak-Routing: alpha X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29222, ipnet:84.16.64.0/19, country:CH] X-Rspamd-Queue-Id: 4XsGMS710Yz4q4W X-Spamd-Bar: ---- --_=_swift_1731907600_ecdadcd2245a1190dd2a9f1e62e38894_=_ Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2024-11-18T04:12:48.000+01:00, Jason E. Hale wrote= : >=C2=A0The=C2=A0branch=C2=A0main=C2=A0has=C2=A0been=C2=A0updated= =C2=A0by=C2=A0jhale: >=C2=A0 >=C2=A0URL:=C2=A0https://cgit.FreeBSD.org/= ports/commit/?id=3Df7c59ccf4e1c6758d03659804f6877a483fac10a >=C2=A0 >= =C2=A0commit=C2=A0f7c59ccf4e1c6758d03659804f6877a483fac10a >=C2=A0 >= =C2=A0Author:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Jason=C2=A0E.=C2=A0Hale=C2=A0 >=C2=A0 >=C2=A0AuthorDate:=C2=A02024-11-18=C2=A002:55:= 11=C2=A0+0000 >=C2=A0 >=C2=A0Commit:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Jason= =C2=A0E.=C2=A0Hale=C2=A0 >=C2=A0 >=C2=A0CommitDate:= =C2=A02024-11-18=C2=A003:11:40=C2=A0+0000 >=C2=A0 >=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0devel/cmake-core:=C2=A0Remove=C2=A0CPACK=C2=A0option >= =C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 >=C2=A0 >=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0This=C2=A0option=C2=A0has=C2=A0been=C2=A0a=C2=A0point=C2=A0of= =C2=A0confusion=C2=A0several=C2=A0times.=C2=A0It=C2=A0was=C2=A0once=C2= =A0an >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0experimental=C2=A0feature,= =C2=A0but=C2=A0it=C2=A0has=C2=A0been=C2=A0on=C2=A0by=C2=A0default=C2=A0for= =C2=A0many=C2=A0years=C2=A0and >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0there=C2=A0is=C2=A0really=C2=A0no=C2=A0point=C2=A0in=C2=A0disabling= =C2=A0it=C2=A0anymore. >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 >= =C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Make=C2=A0sure=C2=A0we=C2=A0are= =C2=A0always=C2=A0linking=C2=A0to=C2=A0libarchive=C2=A0from=C2=A0base.= =C2=A0This=C2=A0was >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0previously= =C2=A0conditionalized=C2=A0to=C2=A0only=C2=A0happen=C2=A0if=C2=A0the=C2= =A0CPACK=C2=A0option=C2=A0was >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0enabled,=C2=A0so=C2=A0if=C2=A0the=C2=A0user=C2=A0had=C2=A0the=C2=A0CPACK= =C2=A0option=C2=A0disabled=C2=A0and=C2=A0had=C2=A0libarchive >=C2=A0 >= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0from=C2=A0ports=C2=A0installed,=C2=A0the= =C2=A0ports=C2=A0version=C2=A0would=C2=A0be=C2=A0linked=C2=A0to.=C2=A0[1]= >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 >=C2=A0 >=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0Add=C2=A0missing=C2=A0dns/libidn2=C2=A0dependency.=C2= =A0This=C2=A0is=C2=A0an=C2=A0optional=C2=A0dependency=C2=A0that >=C2= =A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0didn't=C2=A0manifest=C2=A0itself=C2= =A0in=C2=A0poudriere,=C2=A0but=C2=A0it=C2=A0gets=C2=A0linked=C2=A0to=C2= =A0if=C2=A0previously >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0installed= =C2=A0on=C2=A0a=C2=A0live=C2=A0system=C2=A0build. >=C2=A0 >=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Reported= =C2=A0by:=C2=A0=C2=A0=C2=A0=C2=A0vvd=C2=A0on=C2=A0#freebsd-desktop=C2=A0[1]= >=C2=A0 >=C2=A0--- >=C2=A0 >=C2=A0=C2=A0devel/cmake-core/Makefile= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0|=C2=A011=C2=A0++++-------= >=C2=A0 >=C2=A0=C2=A0devel/cmake-core/files/InitialCache.cmake.in= =C2=A0[http://InitialCache.cmake.in]=C2=A0|=C2=A020=C2=A0+++++++++---------= -- >=C2=A0 >=C2=A0=C2=A02=C2=A0files=C2=A0changed,=C2=A013=C2=A0inserti= ons(+),=C2=A018=C2=A0deletions(-) >=C2=A0 >=C2=A0diff=C2=A0--git=C2= =A0a/devel/cmake-core/Makefile=C2=A0b/devel/cmake-core/Makefile >=C2= =A0 >=C2=A0index=C2=A0632bdc648a07..bdf931045533=C2=A0100644 >=C2=A0 = >=C2=A0---=C2=A0a/devel/cmake-core/Makefile >=C2=A0 >=C2=A0+++=C2=A0b/d= evel/cmake-core/Makefile >=C2=A0 >=C2=A0@@=C2=A0-1,5=C2=A0+1,6=C2=A0@@= >=C2=A0 >=C2=A0=C2=A0PORTNAME=3D=C2=A0=C2=A0=C2=A0=C2=A0cmake >= =C2=A0 >=C2=A0=C2=A0DISTVERSION=3D=C2=A0=C2=A0=C2=A0=C2=A0${_CMAKE_VERSIO= N} >=C2=A0 >=C2=A0+PORTREVISION=3D=C2=A0=C2=A0=C2=A0=C2=A01 >=C2= =A0 >=C2=A0=C2=A0CATEGORIES=3D=C2=A0=C2=A0=C2=A0=C2=A0devel >=C2=A0 >= =C2=A0=C2=A0PKGNAMESUFFIX=3D=C2=A0=C2=A0=C2=A0=C2=A0-core >=C2=A0 >= =C2=A0=C2=A0 >=C2=A0 >=C2=A0@@=C2=A0-11,7=C2=A0+12,9=C2=A0@@=C2=A0LICEN= SE=3D=C2=A0=C2=A0=C2=A0=C2=A0BSD3CLAUSE >=C2=A0 >=C2=A0=C2=A0LICENSE_FI= LE=3D=C2=A0=C2=A0=C2=A0=C2=A0${WRKSRC}/Copyright.txt >=C2=A0 >=C2=A0= =C2=A0 >=C2=A0 >=C2=A0=C2=A0LIB_DEPENDS=3D=C2=A0=C2=A0=C2=A0=C2=A0libex= pat.so:textproc/expat2=C2=A0[http://libexpat.so:textproc/expat2]=C2=A0\ >= =C2=A0 >=C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0libidn2.so= :dns/libidn2=C2=A0[http://libidn2.so:dns/libidn2]=C2=A0\ >=C2=A0 >= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0libjsoncpp.so:d= evel/jsoncpp=C2=A0[http://libjsoncpp.so:devel/jsoncpp]=C2=A0\ >=C2=A0 >= =C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0libpkg.so=C2=A0[http= ://libpkg.so]:${PKG_ORIGIN}=C2=A0\ >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0librhash.so:security/rhash=C2=A0[http:/= /librhash.so:security/rhash]=C2=A0\ >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0libuv.so:devel/libuv=C2=A0[http://li= buv.so:devel/libuv] >=C2=A0 >=C2=A0=C2=A0 >=C2=A0 >=C2=A0@@=C2= =A0-55,15=C2=A0+58,9=C2=A0@@=C2=A0BUILD_WRKSRC=3D=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0${WRKDIR}/.build >=C2=A0 >=C2=A0=C2=A0CONFIG= URE_WRKSRC=3D=C2=A0=C2=A0=C2=A0=C2=A0${BUILD_WRKSRC} >=C2=A0 >=C2=A0= =C2=A0INSTALL_WRKSRC=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0${BU= ILD_WRKSRC} >=C2=A0 >=C2=A0=C2=A0 >=C2=A0 >=C2=A0-OPTIONS_DEFINE=3D= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0DOCS=C2=A0CPACK >=C2= =A0 >=C2=A0-OPTIONS_DEFAULT=3D=C2=A0=C2=A0=C2=A0=C2=A0CPACK >=C2=A0 >= =C2=A0+OPTIONS_DEFINE=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0DOC= S >=C2=A0 >=C2=A0=C2=A0OPTIONS_SUB=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0yes >=C2=A0 >=C2=A0=C2=A0 >=C2=A0 >=C2=A0-CPACK_D= ESC=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Enable=C2=A0FreeBSD= =C2=A0generator=C2=A0in=C2=A0CPack >=C2=A0 >=C2=A0-CPACK_LIB_DEPENDS=3D= =C2=A0=C2=A0=C2=A0=C2=A0libpkg.so=C2=A0[http://libpkg.so]:${PKG_ORIGIN} >= =C2=A0 >=C2=A0-CPACK_SUB_LIST=3D=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0CPACK_OPTION_VALUE=3D"ON" >=C2=A0 >=C2=A0-CPACK_SUB_LIST_OF= F=3D=C2=A0=C2=A0=C2=A0=C2=A0CPACK_OPTION_VALUE=3D"OFF" >=C2=A0 >=C2= =A0- >=C2=A0 >=C2=A0=C2=A0post-patch: >=C2=A0 >=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0@(${FIND}=C2=A0${WRKSRC}/Modules=C2=A0-name=C2=A0"*.cm= ake"=C2=A0-print0;=C2=A0\ >=C2=A0 >=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0${FIND}=C2=A0${WRKSRC}/Tests=C2=A0-name=C2=A0"CM= akeLists.txt"=C2=A0-print0=C2=A0)=C2=A0|=C2=A0\ >=C2=A0 >=C2=A0diff= =C2=A0--git=C2=A0a/devel/cmake-core/files/InitialCache.cmake.in=C2=A0[http:= //InitialCache.cmake.in]=C2=A0b/devel/cmake-core/files/InitialCache.cmake.i= n=C2=A0[http://InitialCache.cmake.in] >=C2=A0 >=C2=A0index=C2=A07532a78= 32dc9..15977658349d=C2=A0100644 >=C2=A0 >=C2=A0---=C2=A0a/devel/cmake-c= ore/files/InitialCache.cmake.in=C2=A0[http://InitialCache.cmake.in] >= =C2=A0 >=C2=A0+++=C2=A0b/devel/cmake-core/files/InitialCache.cmake.in= =C2=A0[http://InitialCache.cmake.in] >=C2=A0 >=C2=A0@@=C2=A0-1,17=C2= =A0+1,15=C2=A0@@ >=C2=A0 >=C2=A0=C2=A0#=C2=A0TODO:=C2=A0Add=C2=A0TEST= =C2=A0option=C2=A0to=C2=A0enable=C2=A0regression=C2=A0tests.=C2=A0The=C2= =A0tests=C2=A0require >=C2=A0 >=C2=A0=C2=A0#=C2=A0additional=C2=A0packa= ges=C2=A0to=C2=A0be=C2=A0installed=C2=A0and=C2=A0a=C2=A0small=C2=A0amount= =C2=A0of=C2=A0patching >=C2=A0 >=C2=A0=C2=A0#=C2=A0to=C2=A0account= =C2=A0for=C2=A0our=C2=A0local=C2=A0changes. >=C2=A0 >=C2=A0-set(BUILD_T= ESTING=C2=A0OFF=C2=A0CACHE=C2=A0BOOL=C2=A0"Build=C2=A0the=C2=A0testing= =C2=A0tree.") >=C2=A0 >=C2=A0+set(BUILD_TESTING=C2=A0OFF=C2=A0CACHE= =C2=A0BOOL >=C2=A0 >=C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0"Build=C2=A0the= =C2=A0testing=C2=A0tree.") >=C2=A0 >=C2=A0=C2=A0 >=C2=A0 >=C2=A0-#= =C2=A0Toggled=C2=A0by=C2=A0the=C2=A0CPACK=C2=A0option.=C2=A0Set=C2=A0to= =C2=A0ON=C2=A0by=C2=A0default. >=C2=A0 >=C2=A0-set(CPACK_ENABLE_FREEBSD= _PKG=C2=A0%%CPACK_OPTION_VALUE%%=C2=A0CACHE=C2=A0BOOL >=C2=A0 >=C2= =A0+set(CPACK_ENABLE_FREEBSD_PKG=C2=A0ON=C2=A0CACHE=C2=A0BOOL >=C2=A0 >= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0"Enable=C2=A0pkg(8)=C2=A0generator= =C2=A0in=C2=A0CPack") >=C2=A0 >=C2=A0=C2=A0 >=C2=A0 >=C2=A0-if(CPAC= K_ENABLE_FREEBSD_PKG) >=C2=A0 >=C2=A0-#=C2=A0=C2=A0=C2=A0Use=C2=A0base= =C2=A0libarchive=C2=A0instead=C2=A0of=C2=A0the=C2=A0ports=C2=A0or=C2=A0bund= led=C2=A0version,=C2=A0because >=C2=A0 >=C2=A0-#=C2=A0=C2=A0=C2=A0libpk= g=C2=A0links=C2=A0against=C2=A0base. >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2= =A0=C2=A0set(LibArchive_INCLUDE_DIR=C2=A0"/usr/include"=C2=A0CACHE=C2=A0PAT= H >=C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0"Dire= ctory=C2=A0where=C2=A0LibArchive=C2=A0headers=C2=A0are=C2=A0located.") >= =C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0set(LibArchive_LIBRARY=C2=A0"/usr/= lib/libarchive.so=C2=A0[http://libarchive.so]"=C2=A0CACHE=C2=A0PATH >= =C2=A0 >=C2=A0-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0"LibArchiv= e=C2=A0library=C2=A0to=C2=A0link=C2=A0against.") >=C2=A0 >=C2=A0-endif(= CPACK_ENABLE_FREEBSD_PKG) >=C2=A0 >=C2=A0+#=C2=A0Use=C2=A0base=C2=A0lib= archive=C2=A0instead=C2=A0of=C2=A0the=C2=A0ports=C2=A0or=C2=A0bundled=C2= =A0version,=C2=A0because >=C2=A0 >=C2=A0+#=C2=A0libpkg=C2=A0links=C2= =A0against=C2=A0base. >=C2=A0 >=C2=A0+set(LibArchive_INCLUDE_DIR=C2= =A0"/usr/include"=C2=A0CACHE=C2=A0PATH >=C2=A0 >=C2=A0+=C2=A0=C2=A0= =C2=A0=C2=A0"Directory=C2=A0where=C2=A0LibArchive=C2=A0headers=C2=A0are= =C2=A0located.") >=C2=A0 >=C2=A0+set(LibArchive_LIBRARY=C2=A0"/usr/lib/= libarchive.so=C2=A0[http://libarchive.so]"=C2=A0CACHE=C2=A0PATH >=C2= =A0 >=C2=A0+=C2=A0=C2=A0=C2=A0=C2=A0"LibArchive=C2=A0library=C2=A0to= =C2=A0link=C2=A0against.") Hi, Do we need to pull in libidn2 as a= dependency? It's never(?) been there as far as I know and we'll likely n= ever need it? Best regards, Daniel --_=_swift_1731907600_ecdadcd2245a1190dd2a9f1e62e38894_=_ Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
On 2024-11-18T04:12:48.000+01:00, Jason E. Hal= e <jhale@FreeBSD.org> wrote:


Th=
e branch main has been updated by jhale:


commit f7c59ccf4e1c6758d03659804f6877a483fac10a
Auth=
or:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-11-1=
8 02:55:11 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org><=
br>
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 o=
nce an
    experimental feature, but it has been on by defaul=
t for many years and
    there is really no point in disablin=
g it anymore.
    
    Make sure we are always =
linking to libarchive from base. This was
    previously cond=
itionalized to only happen if the CPACK option was
    enable=
d, 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. Thi=
s is an optional dependency that
    didn't manifest itself i=
n poudriere, but it gets linked to if previously
    installe=
d on a live system build.
    
    Reported by:=
    vvd on #freebsd-desktop [1]
---
 devel/cmak=
e-core/Makefile                    | 11 ++++-------
 devel/cm=
ake-core/files/=
InitialCache.cmake.in | 20 +++++++++-----------
 2 files =
changed, 13 insertions(+), 18 deletions(-)

dif=
f --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=3D=09cmake
 DISTVERSIO=
N=3D=09${_CMAKE_VERSION}
+PORTREVISION=3D=091
 =
CATEGORIES=3D=09devel
 PKGNAMESUFFIX=3D=09-core
 
@@ -11,7 +12,9 @@ LICENSE=3D=09BSD3CLAUSE
 L=
ICENSE_FILE=3D=09${WRKSRC}/Copyright.txt
 
 LIB=
_DEPENDS=3D=09libexpat.so:textproc/expat2 \
+=09=09libidn2.so:dns/libidn2 \<=
br>
+=09=09libpkg.so:${PKG_ORIGIN} \
=

 =09=09libuv.so:devel/libuv
<=
/div>
 
@@ -55,15 +58,9 @@ BUILD_WRKSRC=3D=09=09${WRKDIR}=
/.build
 CONFIGURE_WRKSRC=3D=09${BUILD_WRKSRC}
=
 INSTALL_WRKSRC=3D=09=09${BUILD_WRKSRC}
 
-OPTI=
ONS_DEFINE=3D=09=09DOCS CPACK
-OPTIONS_DEFAULT=3D=09CPACK
=

+OPTIONS_DEFINE=3D=09=09DOCS
 OPTIONS_SUB=3D=09=09=
yes
 
-CPACK_DESC=3D=09=09Enable FreeBSD genera=
tor in CPack
-CPACK_LIB_DEPENDS=3D=09libpkg.so:${PKG_ORIGIN}
-CPACK_SU=
B_LIST=3D=09=09CPACK_OPTION_VALUE=3D"ON"
-CPACK_SUB_LIST_OFF=
=3D=09CPACK_OPTION_VALUE=3D"OFF"
-
 post-patch:=

 =09@(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \
 =09=09${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 r=
equire
 # additional packages to be installed and a small amo=
unt 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 testi=
ng tree.")
 
-# Toggled by the CPACK option. Se=
t to ON by default.
-set(CPACK_ENABLE_FREEBSD_PKG %%CPACK_OPT=
ION_VALUE%% CACHE BOOL
+set(CPACK_ENABLE_FREEBSD_PKG ON CACHE=
 BOOL
     "Enable pkg(8) generator in CPack")
=
 
-if(CPACK_ENABLE_FREEBSD_PKG)
-#   Use base l=
ibarchive instead of the ports or bundled version, because
-#=
   libpkg links against base.
-    set(LibArchive_INCLUDE_DIR=
 "/usr/include" CACHE PATH
-        "Directory where LibArchi=
ve headers are located.")
-    set(LibArchive_LIBRARY "/usr/l=
ib/libarchive.so" C=
ACHE PATH
-        "LibArchive library to link against.")
=

-endif(CPACK_ENABLE_FREEBSD_PKG)
+# Use base libar=
chive instead of the ports or bundled version, because
+# lib=
pkg links against base.
+set(LibArchive_INCLUDE_DIR "/usr/inc=
lude" CACHE PATH
+    "Directory where LibArchive headers are=
 located.")
+set(LibArchive_LIBRARY "/usr/lib/libarchive.so" CACHE PATH
+    "LibArchive library to link against.")
Hi,

Do we need to pull in libidn2 as a dependency? It's never(?) been t= here as far as I know and we'll likely never need it?

Best regards,
D= aniel
--_=_swift_1731907600_ecdadcd2245a1190dd2a9f1e62e38894_=_--