From owner-dev-commits-src-all@freebsd.org Fri Aug 6 12:38:03 2021 Return-Path: Delivered-To: dev-commits-src-all@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 A310965526E; Fri, 6 Aug 2021 12:38:03 +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 4Gh4kz3qNrz4YDQ; Fri, 6 Aug 2021 12:38:03 +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 60DA55BC9; Fri, 6 Aug 2021 12:38:03 +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 176Cc3Wv092226; Fri, 6 Aug 2021 12:38:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 176Cc30B092225; Fri, 6 Aug 2021 12:38:03 GMT (envelope-from git) Date: Fri, 6 Aug 2021 12:38:03 GMT Message-Id: <202108061238.176Cc30B092225@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 86c71e97d19f - main - pkgbase: locales: Also tag the files dir MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86c71e97d19f8b82b8ab79a56b20998ada7ee868 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2021 12:38:03 -0000 The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=86c71e97d19f8b82b8ab79a56b20998ada7ee868 commit 86c71e97d19f8b82b8ab79a56b20998ada7ee868 Author: Emmanuel Vadot AuthorDate: 2021-08-06 12:36:06 +0000 Commit: Emmanuel Vadot CommitDate: 2021-08-06 12:37:45 +0000 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 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 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 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 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 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 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