From 86c71e97d19f8b82b8ab79a56b20998ada7ee868 Mon Sep 17 00:00:00 2001
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Fri, 6 Aug 2021 14:36:06 +0200
Subject: [PATCH] pkgbase: locales: Also tag the files dir

Otherwise bsd.dirs.mk will create the directory with the default
package (utilities) and we end up with a bunch of empty dirs managed
by this package while it shouldn't be the case.
---
 share/colldef/Makefile            | 3 +++
 share/colldef_unicode/Makefile    | 2 ++
 share/ctypedef/Makefile           | 1 +
 share/monetdef/Makefile           | 1 +
 share/monetdef_unicode/Makefile   | 1 +
 share/msgdef/Makefile             | 1 +
 share/msgdef_unicode/Makefile     | 1 +
 share/numericdef/Makefile         | 1 +
 share/numericdef_unicode/Makefile | 1 +
 share/timedef/Makefile            | 1 +
 10 files changed, 13 insertions(+)

diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index f7e24446342d..5d94c6e77736 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -136,6 +136,7 @@ CLEANFILES=	${FILES}
 
 .for f t in ${SAME}
 DIRS+=	LOCALEDIR_$t
+LOCALEDIR_${t}PACKAGE=	locales
 LOCALEDIR_$t=	${LOCALEDIR}/$t
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
@@ -143,11 +144,13 @@ SYMLINKS+=	../$f/${FILESNAME} \
 
 .for f in ${LOCALES}
 FILESDIR_${f}.LC_COLLATE= ${LOCALEDIR}/${f}
+FILESDIR_${f}.LC_COLLATEPACKAGE=	locales
 .endfor
 
 .for f t in ${LOCALES_MAPPED}
 FILES+=	$t.LC_COLLATE
 FILESDIR_$t.LC_COLLATE=	${LOCALEDIR}/$t
+FILESDIR_${t}.LC_COLLATEPACKAGE=	locales
 $t.LC_COLLATE: ${.CURDIR}/$f.src
 	localedef ${LOCALEDEF_ENDIAN} -D -U -i ${.ALLSRC} \
 	-V ${CLDR_VERSION} \
diff --git a/share/colldef_unicode/Makefile b/share/colldef_unicode/Makefile
index f76a7a94805c..0c1b0488b86d 100644
--- a/share/colldef_unicode/Makefile
+++ b/share/colldef_unicode/Makefile
@@ -115,11 +115,13 @@ SYMLINKS+=	../$f/${FILESNAME} \
 
 .for f in ${LOCALES}
 FILESDIR_${f}.LC_COLLATE= ${LOCALEDIR}/${f}
+FILESDIR_${f}.LC_COLLATEPACKAGE=	locales
 .endfor
 
 .for f t in ${LOCALES_MAPPED}
 FILES+=	$t.LC_COLLATE
 FILESDIR_$t.LC_COLLATE=	${LOCALEDIR}/$t
+FILESDIR_$t.LC_COLLATEPACKAGE=	locales
 $t.LC_COLLATE: ${.CURDIR}/$f.src
 	localedef ${LOCALEDEF_ENDIAN} -D -U -i ${.ALLSRC} \
 	-V ${CLDR_VERSION} \
diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile
index a717e94db5e6..798576f7ad08 100644
--- a/share/ctypedef/Makefile
+++ b/share/ctypedef/Makefile
@@ -231,6 +231,7 @@ SYMLINKS+=	../$f/${FILESNAME} \
 
 .for f in ${LOCALES}
 FILESDIR_${f}.LC_CTYPE= ${LOCALEDIR}/${f}
+FILESDIR_${f}.LC_CTYPEPACKAGE=	locales
 .endfor
 ALWAYSDIR_C.UTF-8.LC_CTYPE= ${LOCALEDIR}/C.UTF-8
 
diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index dd1732bd87c6..4e62cbf4b5e3 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -140,6 +140,7 @@ SYMLINKS+=	../$f/${FILESNAME} \
 
 .for f in ${LOCALES}
 FILESDIR_${f}.out= ${LOCALEDIR}/${f}
+FILESDIR_${f}.outPACKAGE=	locales
 .endfor
 
 .include <bsd.prog.mk>
diff --git a/share/monetdef_unicode/Makefile b/share/monetdef_unicode/Makefile
index 2ab442ad51b4..4e4d9a6c1a40 100644
--- a/share/monetdef_unicode/Makefile
+++ b/share/monetdef_unicode/Makefile
@@ -107,6 +107,7 @@ SYMLINKS+=	../$f/${FILESNAME} \
 
 .for f in ${LOCALES}
 FILESDIR_${f}.out= ${LOCALEDIR}/${f}
+FILESDIR_${f}.outPACKAGE=	locales
 .endfor
 
 .include <bsd.prog.mk>
diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index 4cc6a45b46c6..f77f9c0758e0 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -133,6 +133,7 @@ SYMLINKS+=	../$f/${FILESNAME} \
 
 .for f in ${LOCALES}
 FILESDIR_${f}.out= ${LOCALEDIR}/${f}
+FILESDIR_${f}.outPACKAGE=	locales
 .endfor
 
 .include <bsd.prog.mk>
diff --git a/share/msgdef_unicode/Makefile b/share/msgdef_unicode/Makefile
index 608ba8860afb..78f581608218 100644
--- a/share/msgdef_unicode/Makefile
+++ b/share/msgdef_unicode/Makefile
@@ -107,6 +107,7 @@ SYMLINKS+=	../$f/${FILESNAME} \
 
 .for f in ${LOCALES}
 FILESDIR_${f}.out= ${LOCALEDIR}/${f}
+FILESDIR_${f}.outPACKAGE=	locales
 .endfor
 
 .include <bsd.prog.mk>
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index 12cc7dc68ab1..2890978237b3 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -136,6 +136,7 @@ SYMLINKS+=	../$f/${FILESNAME} \
 
 .for f in ${LOCALES}
 FILESDIR_${f}.out= ${LOCALEDIR}/${f}
+FILESDIR_${f}.outPACKAGE=	locales
 .endfor
 
 .include <bsd.prog.mk>
diff --git a/share/numericdef_unicode/Makefile b/share/numericdef_unicode/Makefile
index 6b7af4799efe..e8c72ac5f6bc 100644
--- a/share/numericdef_unicode/Makefile
+++ b/share/numericdef_unicode/Makefile
@@ -107,6 +107,7 @@ SYMLINKS+=	../$f/${FILESNAME} \
 
 .for f in ${LOCALES}
 FILESDIR_${f}.out= ${LOCALEDIR}/${f}
+FILESDIR_${f}.outPACKAGE=	locales
 .endfor
 
 .include <bsd.prog.mk>
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index c33461ff36bd..af0cd2ea378f 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -219,6 +219,7 @@ SYMLINKS+=	../$f/${FILESNAME} \
 
 .for f in ${LOCALES}
 FILESDIR_${f}.out= ${LOCALEDIR}/${f}
+FILESDIR_${f}.outPACKAGE=	locales
 .endfor
 
 .include <bsd.prog.mk>