From nobody Tue Sep 30 08:18:31 2025 X-Original-To: dev-commits-src-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 4cbWCr3Hpqz68gqF; Tue, 30 Sep 2025 08:18:32 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cbWCr0BVVz4FJM; Tue, 30 Sep 2025 08:18:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759220312; 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=Q75zyBfcUdechoJJ/vwJU2sHsbKGAv2RqqPCJgOhOKw=; b=PPXMc4b6HmHnolPZUFBwN8rSRB2qHZLO3I62AunV+p74/+CVltnh3SPOu3mcp+J66kuhVz eyFW0MzPK9ySqMg5vs2vdoNL3+RFiViKPdSUMi9/7ioxv3kWB2IDHAawr9TUihZJwZC9on TsxG/Syqtvz1TOoz1/flB92wDgJ3NS/roL29eSnQGH8JWX2sgQsovhB7j4cZx/+8ohJLXZ Zwvt07e2lYGWX2I/dgeEwSWB62RLypJuuqTMvntsPfOxxPxbJ4lqWJAjMHK99KFtv0Cuhy mNr9T86LZPfy9JDR2m7p1Ww2Aqfs4dWNXgWUv15JsZ9C3Ky6pLumPvmlA4dptg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759220312; 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=Q75zyBfcUdechoJJ/vwJU2sHsbKGAv2RqqPCJgOhOKw=; b=lgIMtwIBaZ4WxVqfUHwunaMZaFM0fpQGY9JR0z/aHFXqET1jbVtpJvSJlK4AEaA4kA47v8 kwzD1pBraLXH4jRbizYSYuYaB6dY4jdV8zD8LyemesPK9HTiIdeEhIPYP3mkIaTnxQUAoE qgDDqEMGg1tTy8cSpTpDkG5P+XKFNOP1IZ+wefY9KQezzmJX42lQ+uC99rgIylk26E9Cfy qyWla1xIYfb8PoONcd184VoYh+DhXQArEtEhFTMpO5Y2bpb4q78bfdMnzK5h8ftZugI/kS mQiYQZ7ouijFTsHvlaSnot9sL0ghIsD2XiwF3oLwAq4py3ZoK8ep3FPBUC8LIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759220312; a=rsa-sha256; cv=none; b=BLoRYQWYq8KtchvonW8YgBrNryXP4Ro2yPcGorGozlxVEBiru+4XPeoXqcgNREiR+VSjzK 4UrzF8C8qPhI1Xl8FPTVaQ56hcAZYjaFM6mypUWlTBiwJiQeXP95ZIhpPfWhAoK5jpgKuv 9BgmKoGb0ey99M5UuoVYYDIBM8jeoEyKKM+wBYleQzfTSISOTMKtk3KxMyqh0I5z//hc5R t8CPiSZqtNfBMCI5Hrqe0bc2CEyPfIRlNS2Kr8NyXaRLWLNtq3OgIE12BcWAD1hgb5/OHE iZuCawQWXMo3T5ujr1YIreuQsqIpV8icP/YTkybKlhWWBLIzHn12ROlIT06Wwg== 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 4cbWCq63gxzBtT; Tue, 30 Sep 2025 08:18:31 +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 58U8IVsM024793; Tue, 30 Sep 2025 08:18:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58U8IVqX024790; Tue, 30 Sep 2025 08:18:31 GMT (envelope-from git) Date: Tue, 30 Sep 2025 08:18:31 GMT Message-Id: <202509300818.58U8IVqX024790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 9124ace751eb - main - packages: Rename liblzma package to xz List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9124ace751eb9c856c50c3698cf93ede45a9897d Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=9124ace751eb9c856c50c3698cf93ede45a9897d commit 9124ace751eb9c856c50c3698cf93ede45a9897d Author: Lexi Winter AuthorDate: 2025-09-30 08:11:55 +0000 Commit: Lexi Winter CommitDate: 2025-09-30 08:14:46 +0000 packages: Rename liblzma package to xz Rename liblzma to xz, and use LIB_PACKAGE to create an xz-lib package for runtime libraries. MFC after: 1 day Reviewed by: bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52791 --- lib/liblzma/Makefile | 4 +++- release/packages/ucl/{liblzma-all.ucl => xz-all.ucl} | 7 ++++--- usr.bin/lzmainfo/Makefile | 2 ++ usr.bin/xz/Makefile | 2 ++ usr.bin/xzdec/Makefile | 2 ++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile index 27e0521f5884..9c6ece74ffd0 100644 --- a/lib/liblzma/Makefile +++ b/lib/liblzma/Makefile @@ -1,4 +1,6 @@ -PACKAGE=lib${LIB} +PACKAGE= xz +LIB_PACKAGE= + LIB= lzma LZMADIR= ${SRCTOP}/contrib/xz/src/liblzma diff --git a/release/packages/ucl/liblzma-all.ucl b/release/packages/ucl/xz-all.ucl similarity index 78% rename from release/packages/ucl/liblzma-all.ucl rename to release/packages/ucl/xz-all.ucl index d5698d48332a..16da8b76f0ac 100644 --- a/release/packages/ucl/liblzma-all.ucl +++ b/release/packages/ucl/xz-all.ucl @@ -16,11 +16,12 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -comment = "XZ LZMA library" +comment = "LZMA2 data compression" desc = < +PACKAGE=xz + PROG= xz LINKS= ${BINDIR}/xz ${BINDIR}/unxz diff --git a/usr.bin/xzdec/Makefile b/usr.bin/xzdec/Makefile index 7c43b2e03d78..6bf3dc07a408 100644 --- a/usr.bin/xzdec/Makefile +++ b/usr.bin/xzdec/Makefile @@ -1,3 +1,5 @@ +PACKAGE=xz + PROG= xzdec LINKS= ${BINDIR}/xzdec ${BINDIR}/lzdec