git: 0fa5403d493b - main - pkgbase: move locales into their own package

Tue Aug 3 16:36:44 UTC 2021

The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=0fa5403d493be24dda2bf575c04019ef2dcc9d0c

commit 0fa5403d493be24dda2bf575c04019ef2dcc9d0c
Author:     Baptiste Daroussin <bapt at FreeBSD.org>
AuthorDate: 2021-08-03 15:02:16 +0000
Commit:     Baptiste Daroussin <bapt at FreeBSD.org>
CommitDate: 2021-08-03 16:35:26 +0000

    pkgbase: move locales into their own package
    
    The only exception here being C.UTF-8 as this is the default
    locales so it needs to always be installed
    
    Reviewed by:    pkgbase (emaste)
    Differential Revision:  https://reviews.freebsd.org/D31397
---
 share/colldef/Makefile               | 1 +
 share/colldef_unicode/Makefile       | 2 ++
 share/ctypedef/Makefile              | 9 ++++++++-
 share/monetdef/Makefile              | 2 ++
 share/monetdef_unicode/Makefile      | 2 ++
 share/msgdef/Makefile                | 2 ++
 share/msgdef_unicode/Makefile        | 2 ++
 share/numericdef/Makefile            | 2 ++
 share/numericdef_unicode/Makefile    | 2 ++
 share/timedef/Makefile               | 2 ++
 tools/tools/locale/tools/cldr2def.pl | 2 ++
 11 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 66487fb76984..f7e24446342d 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	locales
 LOCALEDIR=	${SHAREDIR}/locale
 FILESNAME=	LC_COLLATE
 .SUFFIXES:	.src .LC_COLLATE
diff --git a/share/colldef_unicode/Makefile b/share/colldef_unicode/Makefile
index ea895d8e388e..f76a7a94805c 100644
--- a/share/colldef_unicode/Makefile
+++ b/share/colldef_unicode/Makefile
@@ -2,6 +2,7 @@
 # Warning: Do not edit. This file is automatically generated from the
 # tools in /usr/src/tools/tools/locale.
 
+PACKAGE=	locales
 LOCALEDIR=	${SHAREDIR}/locale
 FILESNAME=	LC_COLLATE
 .SUFFIXES:	.src .LC_COLLATE
@@ -107,6 +108,7 @@ CLEANFILES=	${FILES}
 .for f t in ${SAME}
 DIRS+=	LOCALEDIR_$t
 LOCALEDIR_$t=	${LOCALEDIR}/$t
+LOCALEDIR_$tPACKAGE=	locales
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile
index 1a57cfeb1444..912b4e6f4757 100644
--- a/share/ctypedef/Makefile
+++ b/share/ctypedef/Makefile
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+PACKAGE=	locales
+FILESGROUPS=	FILES ALWAYS
+ALWAYSPACKAGE=	runtime
 LOCALEDIR=	${SHAREDIR}/locale
 FILESNAME=	LC_CTYPE
 .SUFFIXES:	.src .LC_CTYPE
@@ -212,12 +215,15 @@ SAME+=		lv_LV.ISO8859-13 lt_LT.ISO8859-13
 SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 .endif
 
-FILES=		${LOCALES:S/$/.LC_CTYPE/}
+# C.UTF-8 is the default locale, so it should always been installed.
+ALWAYS=		C.UTF-8.LC_CTYPE
+FILES=		${LOCALES:NC.UTF-8:S/$/.LC_CTYPE/}
 CLEANFILES=	${FILES}
 
 .for f t in ${SAME}
 DIRS+=	LOCALEDIR_$t
 LOCALEDIR_$t=	${LOCALEDIR}/$t
+LOCALEDIR_$tPACKAGE=	locales
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
@@ -225,6 +231,7 @@ SYMLINKS+=	../$f/${FILESNAME} \
 .for f in ${LOCALES}
 FILESDIR_${f}.LC_CTYPE= ${LOCALEDIR}/${f}
 .endfor
+FILESDIR_C.UTF-8.LC_CTYPEPACKAGE=	runtime
 
 SYMPAIRS+=	zh_CN.eucCN.src zh_CN.GB18030.src
 SYMPAIRS+=	zh_CN.eucCN.src zh_CN.GB2312.src
diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index bec0b78d9433..dd1732bd87c6 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -2,6 +2,7 @@
 # Warning: Do not edit. This file is automatically generated from the
 # tools in /usr/src/tools/tools/locale.
 
+PACKAGE=	locales
 LOCALEDIR=	${SHAREDIR}/locale
 FILESNAME=	LC_MONETARY
 .SUFFIXES:	.src .out
@@ -132,6 +133,7 @@ CLEANFILES=	${FILES}
 .for f t in ${SAME}
 DIRS+=		LOCALEDIR_$t
 LOCALEDIR_$t=	${LOCALEDIR}/$t
+LOCALEDIR_$tPACKAGE=	locales
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/monetdef_unicode/Makefile b/share/monetdef_unicode/Makefile
index 2fa073f3981d..2ab442ad51b4 100644
--- a/share/monetdef_unicode/Makefile
+++ b/share/monetdef_unicode/Makefile
@@ -2,6 +2,7 @@
 # Warning: Do not edit. This file is automatically generated from the
 # tools in /usr/src/tools/tools/locale.
 
+PACKAGE=	locales
 LOCALEDIR=	${SHAREDIR}/locale
 FILESNAME=	LC_MONETARY
 .SUFFIXES:	.src .out
@@ -99,6 +100,7 @@ CLEANFILES=	${FILES}
 .for f t in ${SAME}
 DIRS+=		LOCALEDIR_$t
 LOCALEDIR_$t=	${LOCALEDIR}/$t
+LOCALEDIR_$tPACKAGE=	locales
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index a176d30c01fc..4cc6a45b46c6 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	locales
 LOCALEDIR=	${SHAREDIR}/locale
 FILESNAME=	LC_MESSAGES
 .SUFFIXES:	.src .out
@@ -125,6 +126,7 @@ CLEANFILES=	${FILES}
 .for f t in ${SAME}
 DIRS+=		LOCALEDIR_$t
 LOCALEDIR_$t=	${LOCALEDIR}/$t
+LOCALEDIR_$tPACKAGE=	locales
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/msgdef_unicode/Makefile b/share/msgdef_unicode/Makefile
index 34f8b30ff733..608ba8860afb 100644
--- a/share/msgdef_unicode/Makefile
+++ b/share/msgdef_unicode/Makefile
@@ -2,6 +2,7 @@
 # Warning: Do not edit. This file is automatically generated from the
 # tools in /usr/src/tools/tools/locale.
 
+PACKAGE=	locales
 LOCALEDIR=	${SHAREDIR}/locale
 FILESNAME=	LC_MESSAGES
 .SUFFIXES:	.src .out
@@ -99,6 +100,7 @@ CLEANFILES=	${FILES}
 .for f t in ${SAME}
 DIRS+=		LOCALEDIR_$t
 LOCALEDIR_$t=	${LOCALEDIR}/$t
+LOCALEDIR_$tPACKAGE=	locales
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index da04535aa4c9..90e2551570b5 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	locale
 LOCALEDIR=	${SHAREDIR}/locale
 FILESNAME=	LC_NUMERIC
 .SUFFIXES:	.src .out
@@ -128,6 +129,7 @@ CLEANFILES=	${FILES}
 .for f t in ${SAME}
 DIRS+=		LOCALEDIR_$t
 LOCALEDIR_$t=	${LOCALEDIR}/$t
+LOCALEDIR_$tPACKAGE=	locales
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/numericdef_unicode/Makefile b/share/numericdef_unicode/Makefile
index 07290250c6b5..6b7af4799efe 100644
--- a/share/numericdef_unicode/Makefile
+++ b/share/numericdef_unicode/Makefile
@@ -2,6 +2,7 @@
 # Warning: Do not edit. This file is automatically generated from the
 # tools in /usr/src/tools/tools/locale.
 
+PACKAGE=	locales
 LOCALEDIR=	${SHAREDIR}/locale
 FILESNAME=	LC_NUMERIC
 .SUFFIXES:	.src .out
@@ -99,6 +100,7 @@ CLEANFILES=	${FILES}
 .for f t in ${SAME}
 DIRS+=		LOCALEDIR_$t
 LOCALEDIR_$t=	${LOCALEDIR}/$t
+LOCALEDIR_$tPACKAGE=	locales
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index df16c038ba4c..c33461ff36bd 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+PACKAGE=	locales
 LOCALEDIR=	${SHAREDIR}/locale
 FILESNAME=	LC_TIME
 .SUFFIXES:	.src .out
@@ -211,6 +212,7 @@ CLEANFILES=	${FILES}
 .for f t in ${SAME}
 DIRS+=		LOCALEDIR_$t
 LOCALEDIR_$t=	${LOCALEDIR}/$t
+LOCALEDIR_$tPACKAGE=	locales
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl
index 78b2634b6250..e65ec30fa6d5 100755
--- a/tools/tools/locale/tools/cldr2def.pl
+++ b/tools/tools/locale/tools/cldr2def.pl
@@ -952,6 +952,7 @@ sub make_makefile {
 # Warning: Do not edit. This file is automatically generated from the
 # tools in /usr/src/tools/tools/locale.
 
+PACKAGE=	locales
 LOCALEDIR=	\${SHAREDIR}/locale
 FILESNAME=	$FILESNAMES{$TYPE}
 .SUFFIXES:	.src .${SRCOUT2}
@@ -1084,6 +1085,7 @@ CLEANFILES=	\${FILES}
 .for f t in \${SAME}
 DIRS+=		LOCALEDIR_\$t
 LOCALEDIR_\$t=	\${LOCALEDIR}/\$t
+LOCALEDIR_\$tPACKAGE=	locales
 SYMLINKS+=	../\$f/\${FILESNAME} \\
     \${LOCALEDIR}/\$t/\${FILESNAME}
 .endfor
