From owner-dev-commits-src-main@freebsd.org Fri Aug 6 03:31:50 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 161E066F3FC; Fri, 6 Aug 2021 03:31:50 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ggrcj73Fyz4vgJ; Fri, 6 Aug 2021 03:31:49 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 D87DD26656; Fri, 6 Aug 2021 03:31:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1763VnwS066900; Fri, 6 Aug 2021 03:31:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1763VncT066899; Fri, 6 Aug 2021 03:31:49 GMT (envelope-from git) Date: Fri, 6 Aug 2021 03:31:49 GMT Message-Id: <202108060331.1763VncT066899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: b3e87f133454 - main - ctypedef: fix installation of C.UTF-8 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3e87f1334547b15596a98c030c3d99278685aa5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2021 03:31:50 -0000 The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b3e87f1334547b15596a98c030c3d99278685aa5 commit b3e87f1334547b15596a98c030c3d99278685aa5 Author: Kyle Evans AuthorDate: 2021-08-05 18:39:36 +0000 Commit: Kyle Evans CommitDate: 2021-08-06 03:31:40 +0000 ctypedef: fix installation of C.UTF-8 The appropriate directory and name were assigned to the FILESDIR grouping, but not the ALWAYS grouping where C.UTF-8 is actually assigned. Add the appropriate bits for ALWAYSDIR, and remove an obsolete *PACKAGE= assignment since C.UTF-8 is explicitly not included in FILES. Prior to this change, C.UTF-8 was being installed as /usr/share/C.UTF-8.LC_CTYPE. Reviewed by: manu Fixes: 0fa5403d493b ("pkgbase: move locales into their own package") Differential Revision: https://reviews.freebsd.org/D31429 --- ObsoleteFiles.inc | 3 +++ share/ctypedef/Makefile | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index d23562072214..99db0e591090 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -40,6 +40,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20210805: C.UTF-8 installed to the wrong location +OLD_FILES+=usr/share/C.UTF-8.LC_CTYPE + # 20210619: new clang import which bumps version from 12.0.0 to 12.0.1. OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/algorithm OLD_FILES+=usr/lib/clang/12.0.0/include/cuda_wrappers/complex diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile index 912b4e6f4757..a717e94db5e6 100644 --- a/share/ctypedef/Makefile +++ b/share/ctypedef/Makefile @@ -5,6 +5,7 @@ FILESGROUPS= FILES ALWAYS ALWAYSPACKAGE= runtime LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_CTYPE +ALWAYSNAME= LC_CTYPE .SUFFIXES: .src .LC_CTYPE MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps @@ -231,7 +232,7 @@ SYMLINKS+= ../$f/${FILESNAME} \ .for f in ${LOCALES} FILESDIR_${f}.LC_CTYPE= ${LOCALEDIR}/${f} .endfor -FILESDIR_C.UTF-8.LC_CTYPEPACKAGE= runtime +ALWAYSDIR_C.UTF-8.LC_CTYPE= ${LOCALEDIR}/C.UTF-8 SYMPAIRS+= zh_CN.eucCN.src zh_CN.GB18030.src SYMPAIRS+= zh_CN.eucCN.src zh_CN.GB2312.src