From nobody Sat Dec 13 04:15:20 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 4dStK451PQz6KtJK for ; Sat, 13 Dec 2025 04:15:20 +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 4dStK412ZRz4Jjp for ; Sat, 13 Dec 2025 04:15:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765599320; 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=SP+t2bq1CSN6D9SA23+G2IC31L2kiQk8Rqe3L4aMhtE=; b=lofm3uqejgeUmX841dLVUWw933E6MrcujK+fGJxzca+f1uJZAKabU/t4B9T4J9mst7wHzh VVpzL80F3Lvm94LP0862+hHCxLhuSSVaRFmJA8cWFjB2uOM9iGZUuDm52MW9PsYQgMhgrR sHzxni4eKVsjWJqoV9DmdgbUm+ca30UmHQwxWy08pjJ/izodrpYz3ddJBCUZE4fSJd2NBm Yhyg7GC6vdszp9FM9aZsGzqyqd67RuooUpftYiTnL7ASknZ3zjkP+57IYBgmFREklFzoNH GF39LyJndP3hU9kuYJQ8XINuFIeThhOQT1kU1HKueKjYwW0RlDuHFWfjKSePVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765599320; 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=SP+t2bq1CSN6D9SA23+G2IC31L2kiQk8Rqe3L4aMhtE=; b=nw/5c45c90euI/6UuotoeHzlYNPtKI6BDEfCVgFiCts0tLM+/mf6K52yZvtydfMRHjXKdz wqlLlNAt6BJmcqR5MCril08yJbcFjTX92zv2HV4PhF/FuyEU+Hz0d7qKL43KBmMdjEIcox sORxM7KekUlLaQUuZ5EPpe63HUNvZ3gQ7cYtbGTQlsdyZGYSpM+G1iCfikhq5Qmd74A3CR PTV1qVD2jzcLDDvUXL7hOt9qbHPEaCnQCpyHhaHCloJGKOpyuO+XOMGK91RJ9GPrjW5ykt ctChZyWi6dFT97JSqovDkA/eTBq0db/TXAoClM7Zm+HKYVBI4aVpLYQQQ6cJeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765599320; a=rsa-sha256; cv=none; b=W2n8N3nvmZJI1sk2SUUxr6EZYdWqHy1cjGSU1+dwG8+8BBP29pBY8iPeGswybLL7AsfeL+ 2wPxAwblfmyyEY0OauuVAol5CICfcy9XjUSGiP0t13PTn3lOQpDhIY0WTUD3mjCErU5x5P 0SChIhutLQuFIHOuQYChF+OtEENSETxWNip+q/pXFeRV9jhtGBitrZWE7qtR+0gguy0obZ CvXXMY/fimE+9xyQwTfeZD6KvjXEjbffOWx/KV6JuAYPMjbkjAl/myHSl8tvqPZCheJZy0 dXAJi8Irtc2AcJgJt4r0cxSfe+3W7i8g0t+IvKJNQSAUzQJrsawpmiUdg4zBhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dStK40RwzznK0 for ; Sat, 13 Dec 2025 04:15:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a704 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Dec 2025 04:15:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: e1ab892e25f1 - stable/15 - cldr2def.pl: Fix make install 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e1ab892e25f10271532719b65aa4e200e7cdba76 Auto-Submitted: auto-generated Date: Sat, 13 Dec 2025 04:15:20 +0000 Message-Id: <693ce858.3a704.682f90fc@gitrepo.freebsd.org> The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=e1ab892e25f10271532719b65aa4e200e7cdba76 commit e1ab892e25f10271532719b65aa4e200e7cdba76 Author: Jose Luis Duran AuthorDate: 2025-12-06 12:20:18 +0000 Commit: Jose Luis Duran CommitDate: 2025-12-13 04:13:44 +0000 cldr2def.pl: Fix make install Follow up on 86c71e97d19f ("pkgbase: locales: Also tag the files dir"), and adapt cldr2def.pl script in order to fix make install. Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53961 (cherry picked from commit 95f37aa3e51ce46821059b2c9dbb02fef5c4bec5) --- tools/tools/locale/tools/cldr2def.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl index 998e176de918..f0aaf07c02d9 100755 --- a/tools/tools/locale/tools/cldr2def.pl +++ b/tools/tools/locale/tools/cldr2def.pl @@ -923,6 +923,7 @@ sub make_makefile { ".for f t in \${LOCALES_MAPPED}\n" . "FILES+=\t\$t.LC_COLLATE\n" . "FILESDIR_\$t.LC_COLLATE=\t\${LOCALEDIR}/\$t\n" . + "FILESDIR_\$t.LC_COLLATEPACKAGE=\tlocales\n" . "\$t.LC_COLLATE: \${.CURDIR}/\$f.src\n" . "\tlocaledef \${LOCALEDEF_ENDIAN} -D -U " . "-i \${.ALLSRC} \\\n" . @@ -1102,6 +1103,7 @@ SYMLINKS+= ../\$f/\${FILESNAME} \\ .for f in \${LOCALES} FILESDIR_\${f}.${SRCOUT2}= \${LOCALEDIR}/\${f} +FILESDIR_\${f}.${SRCOUT2}PACKAGE= locales .endfor ${SRCOUT3}.include