From nobody Sun Oct 5 05:21:07 2025 X-Original-To: dev-commits-src-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 4cfW2q6f3Vz6BbjJ; Sun, 05 Oct 2025 05:21:07 +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 4cfW2q63pvz45L6; Sun, 05 Oct 2025 05:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759641667; 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=lV17zDdj3zfzuIwWUBNvZPGu1SylquiTRLvtOYP/FtM=; b=BV+FrGJqeSjfmbIXuct33uYTabxwgpHvNG3QVlD5EyoIJoNiSmcCqmR98dFlHNmHzORK6c HdtEnZc1cNHycpHMXzq2TKIc79j08X9JL3wAL/VYlZJA43hOYpcXJlK0cGxbxKvsT204ma Ec0kcNWA75M8AZtV4QoLJOPxtPtXtfDBYfTWcgGXnhcXSUBl8hiRkxUcVYj+xZ36KKPOl4 mR3fswb3//GvaeA1fRzCi0j7V2giL5g1PRKFIcvCeuqQzfgu7SXuS1GrCUmMmbv4AJinBp +hFc/cZwvKG2TmYYALKT/BGDHQFyA+sVLEXTm4QG4gumn/tql8JEVFtovOGKjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759641667; 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=lV17zDdj3zfzuIwWUBNvZPGu1SylquiTRLvtOYP/FtM=; b=PZLX4CU154SVFJfG0mdEJx9iZ/JivlLNVn/K6jqbtAkPGK6Kz4Du+Kepl0m/eXZfkcPPKu 4sXw7JZ/1hN/K8uEbFg26zE7iBlAW4/Gx9PfOj4Nuq05akt49wcTeGFTyp9nVZZaaTlvHx vztxoC1xd/0hHxsDYwVZLl8ihMJ4r0jTWntfasyiG/gYprVYfULp3ntMzPDZJ0HMXLzyOT a42fe64FWKyUUyeZzKzgemBtoaL2lGsCbbC8w6Hxh/uwn18Qxst50k9OVEJUHff6e1QcPn 3u3qfQlw4sv+urvO9hsNM6GOyrpR/kXXnL3ln9tiYqzNALE4OGIE4xM+R7aEwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759641667; a=rsa-sha256; cv=none; b=wZ9XvUehkA5ece0ErM8annKvW6VUkMJTGA07AaPvgahCWhqWVi+WPWx1+zOLqTz6/61o6T arqpFHoauq46233GYjnJW8POfqq5Xn5LerRcczpaT7PNWDgPBzDKp3NiYa0IMmAGtMv7eo ee4Xs99EmmDOdsdd18C2LiiVw8SwJMY+pkRQpzdQMR2BL0vd4ly3DnpVLcq+HD/HxafVc4 dxlaVbwVHb9u0rXeh5CWwUun0lSd8hj4cR6pjRAD/seLDj7B3I2oozHfUcJrRWRIYVnx8f K4KM5QzaHYSlubIUhTX4AtzUKbV7V7isn4aR/WX3+gyBg3h0XoUEtWRx4WyFQw== 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 4cfW2q5frQz1D6W; Sun, 05 Oct 2025 05:21:07 +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 5955L7es085287; Sun, 5 Oct 2025 05:21:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5955L7Q7085284; Sun, 5 Oct 2025 05:21:07 GMT (envelope-from git) Date: Sun, 5 Oct 2025 05:21:07 GMT Message-Id: <202510050521.5955L7Q7085284@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: cfcd89e6cc15 - stable/15 - libc: Move NLS catalogues to the locales packages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: cfcd89e6cc15c17d323416f26dbf634f99a96b02 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=cfcd89e6cc15c17d323416f26dbf634f99a96b02 commit cfcd89e6cc15c17d323416f26dbf634f99a96b02 Author: Lexi Winter AuthorDate: 2025-10-05 05:03:21 +0000 Commit: Lexi Winter CommitDate: 2025-10-05 05:14:15 +0000 libc: Move NLS catalogues to the locales packages We don't want to put these in clibs (where libc is) since they are not critical to system operation. Move them to locales, since anyone who is interested in translated versions of strerror() is going to have that installed anyway. While here, add some more documentation to bsd.nls.mk, particularly the NLSPACKAGE option. MFC after: 3 seconds Reviewed by: manu, kib Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52898 (cherry picked from commit 0242d4c3aea4b56ba76da440d1948d9e3d19ae87) --- lib/libc/nls/Makefile.inc | 5 +++++ share/mk/bsd.nls.mk | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/libc/nls/Makefile.inc b/lib/libc/nls/Makefile.inc index f26e04c187a5..c211026aba72 100644 --- a/lib/libc/nls/Makefile.inc +++ b/lib/libc/nls/Makefile.inc @@ -12,6 +12,11 @@ MAN+= catclose.3 catgets.3 catopen.3 # for translators. NLSNAME= libc +# We don't want libc's NLS catalogues to be installed in the clibs package. +# Put them in locales instead, since anyone interested in NLS will have +# that installed. +NLSPACKAGE= locales + NLS+= be_BY.UTF-8 NLS+= ca_ES.ISO8859-1 NLS+= de_DE.ISO8859-1 diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk index bd13fe56679d..5a28e1cdd026 100644 --- a/share/mk/bsd.nls.mk +++ b/share/mk/bsd.nls.mk @@ -1,6 +1,8 @@ # -# This include file handles building and installing Native -# Language Support (NLS) catalogs +# Handle building and installing Native Language Support (NLS) catalogs. +# This is implemented using a files group called "NLS", +# so any per-group options that bsd.files.mk supports can be used here +# with the prefix "NLS". # # +++ variables +++ # @@ -17,6 +19,9 @@ # NLSMODE National Language Support files mode. [${NOBINMODE}] # # NLSOWN National Language Support files owner. [${SHAREOWN}] +# +# NLSPACKAGE Package to install the NLS files in. +# [${PACKAGE}, or "utilities" if not set] .if !target(____) .error bsd.nls.mk cannot be included directly.