d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ctypedef: fix installation of C.UTF-8

Browse Source 
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:	0fa5403d49 ("pkgbase: move locales into their own package")
Differential Revision:	https://reviews.freebsd.org/D31429
This commit is contained in:
Kyle Evans 2021-08-05 13:39:36 -05:00
parent 645b46d379
commit b3e87f1334
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ObsoleteFiles.inc
View File

@ -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

3
share/ctypedef/Makefile
View File

@ -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