From nobody Sun Oct 5 05:13:25 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 4cfVsx623gz6BbMY; Sun, 05 Oct 2025 05:13:25 +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 4cfVsx5VZfz44Qd; Sun, 05 Oct 2025 05:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759641205; 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=3dww+1omS7ywcTtTI3hH+MeDDyWNTR5HRR/C7ncymII=; b=GHZ8jEtK6tG7V5p+rva8etoK0V9SDuMrlHw/z/fQFaa+8ZOYGndb6A8YK0B8sfw+okiz+7 7iFcDFbBjF3hmWAzPc1TgTPz06bqjLmeVimswHJVUkHcstSz2PtcU+4s549Ph6ni5lGZe4 kzGZwXQSFhjcoqLez6tRK+yUlyGs1XKk+gfJZfxmlPsAQKjwuK4s66ZX7O5cVcBAcCwwpe tZfyExOtP3eSBNTp1sLlnqtNTWg7C76K4+PZLZ3dUNWnC/iCHqxHAcaO2awGfZeHURTFV9 yEWslrKAU4Xc5yawHBfGnrYX79ZqWtQOkLn6/6sg0Cgqo/1PiMkHHNqOnnp84w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759641205; 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=3dww+1omS7ywcTtTI3hH+MeDDyWNTR5HRR/C7ncymII=; b=syEAebUxKujWSOpB5+BuBQk1IVJj/qp+ooNRwIS4U7xQa7KBACLHpS9/i05BKJEkj4mkp6 bp/Doj7Cb0AHZ8lCw7UKg04JEGXATSzT0MYC7D6HP+q44vF2Iobsvc0wzsonMLAofgmhLY 5IIaHZvmHAIsEuONJyh9rcIg9yrh/6LTKboyoVkVKXi8YNFjY0/JmXUkC+6zOVYiINjKnj tSfduDpGCokh9eGsZG7yD9CWWa3oG7zJPevKg8mvLWrpb/0SUvce/b3VjRJcKhJ3APqVQq WOTmi8GhRGdL4yBF03zID+A0rX1PLiRq3bsgh5CXp+mWG1ABXg0UTaVBMf3Iig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759641205; a=rsa-sha256; cv=none; b=IlrCdW4mFcFRTop7fXX34zLusyapTyYVxSbf0bASqH73axUAQxsOsWr9sc+tm8k9HiNt+L ze+oK6VNjOWNjCFf8RJhul/P2GG009KS1CuNS2l0ZN/B3jb+4RkSPA/b4FrE1wP3gdtUux eXekJdbawn0+V+NwpDlSS9tU/79IK9X8h8v8fO87zj75leEKloAUsJqlPDzgdyxQs3m9K/ /pDWB6+wCQhAfAmTlBwkM5kzCIA4ctVhmOxwPoCg4RRE7gXSTxBykxES1yqXfHdmVKF5g+ oCTtAm9MFiLXj7gmGaPeYkXhKPox386LztOtGOfhN/G6Y5nBdQRKHW34+a6PDQ== 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 4cfVsx53w9z1Cpj; Sun, 05 Oct 2025 05:13:25 +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 5955DPcB073334; Sun, 5 Oct 2025 05:13:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5955DPs1073331; Sun, 5 Oct 2025 05:13:25 GMT (envelope-from git) Date: Sun, 5 Oct 2025 05:13:25 GMT Message-Id: <202510050513.5955DPs1073331@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: 0242d4c3aea4 - main - libc: Move NLS catalogues to the locales packages 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: 0242d4c3aea4b56ba76da440d1948d9e3d19ae87 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=0242d4c3aea4b56ba76da440d1948d9e3d19ae87 commit 0242d4c3aea4b56ba76da440d1948d9e3d19ae87 Author: Lexi Winter AuthorDate: 2025-10-05 05:03:21 +0000 Commit: Lexi Winter CommitDate: 2025-10-05 05:12:54 +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 --- 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.