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.
This commit is contained in:
parent
e06b8f1128
commit
86c71e97d1
@ -136,6 +136,7 @@ CLEANFILES= ${FILES}
|
|||||||
|
|
||||||
.for f t in ${SAME}
|
.for f t in ${SAME}
|
||||||
DIRS+= LOCALEDIR_$t
|
DIRS+= LOCALEDIR_$t
|
||||||
|
LOCALEDIR_${t}PACKAGE= locales
|
||||||
LOCALEDIR_$t= ${LOCALEDIR}/$t
|
LOCALEDIR_$t= ${LOCALEDIR}/$t
|
||||||
SYMLINKS+= ../$f/${FILESNAME} \
|
SYMLINKS+= ../$f/${FILESNAME} \
|
||||||
${LOCALEDIR}/$t/${FILESNAME}
|
${LOCALEDIR}/$t/${FILESNAME}
|
||||||
@ -143,11 +144,13 @@ SYMLINKS+= ../$f/${FILESNAME} \
|
|||||||
|
|
||||||
.for f in ${LOCALES}
|
.for f in ${LOCALES}
|
||||||
FILESDIR_${f}.LC_COLLATE= ${LOCALEDIR}/${f}
|
FILESDIR_${f}.LC_COLLATE= ${LOCALEDIR}/${f}
|
||||||
|
FILESDIR_${f}.LC_COLLATEPACKAGE= locales
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
.for f t in ${LOCALES_MAPPED}
|
.for f t in ${LOCALES_MAPPED}
|
||||||
FILES+= $t.LC_COLLATE
|
FILES+= $t.LC_COLLATE
|
||||||
FILESDIR_$t.LC_COLLATE= ${LOCALEDIR}/$t
|
FILESDIR_$t.LC_COLLATE= ${LOCALEDIR}/$t
|
||||||
|
FILESDIR_${t}.LC_COLLATEPACKAGE= locales
|
||||||
$t.LC_COLLATE: ${.CURDIR}/$f.src
|
$t.LC_COLLATE: ${.CURDIR}/$f.src
|
||||||
localedef ${LOCALEDEF_ENDIAN} -D -U -i ${.ALLSRC} \
|
localedef ${LOCALEDEF_ENDIAN} -D -U -i ${.ALLSRC} \
|
||||||
-V ${CLDR_VERSION} \
|
-V ${CLDR_VERSION} \
|
||||||
|
@ -115,11 +115,13 @@ SYMLINKS+= ../$f/${FILESNAME} \
|
|||||||
|
|
||||||
.for f in ${LOCALES}
|
.for f in ${LOCALES}
|
||||||
FILESDIR_${f}.LC_COLLATE= ${LOCALEDIR}/${f}
|
FILESDIR_${f}.LC_COLLATE= ${LOCALEDIR}/${f}
|
||||||
|
FILESDIR_${f}.LC_COLLATEPACKAGE= locales
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
.for f t in ${LOCALES_MAPPED}
|
.for f t in ${LOCALES_MAPPED}
|
||||||
FILES+= $t.LC_COLLATE
|
FILES+= $t.LC_COLLATE
|
||||||
FILESDIR_$t.LC_COLLATE= ${LOCALEDIR}/$t
|
FILESDIR_$t.LC_COLLATE= ${LOCALEDIR}/$t
|
||||||
|
FILESDIR_$t.LC_COLLATEPACKAGE= locales
|
||||||
$t.LC_COLLATE: ${.CURDIR}/$f.src
|
$t.LC_COLLATE: ${.CURDIR}/$f.src
|
||||||
localedef ${LOCALEDEF_ENDIAN} -D -U -i ${.ALLSRC} \
|
localedef ${LOCALEDEF_ENDIAN} -D -U -i ${.ALLSRC} \
|
||||||
-V ${CLDR_VERSION} \
|
-V ${CLDR_VERSION} \
|
||||||
|
@ -231,6 +231,7 @@ SYMLINKS+= ../$f/${FILESNAME} \
|
|||||||
|
|
||||||
.for f in ${LOCALES}
|
.for f in ${LOCALES}
|
||||||
FILESDIR_${f}.LC_CTYPE= ${LOCALEDIR}/${f}
|
FILESDIR_${f}.LC_CTYPE= ${LOCALEDIR}/${f}
|
||||||
|
FILESDIR_${f}.LC_CTYPEPACKAGE= locales
|
||||||
.endfor
|
.endfor
|
||||||
ALWAYSDIR_C.UTF-8.LC_CTYPE= ${LOCALEDIR}/C.UTF-8
|
ALWAYSDIR_C.UTF-8.LC_CTYPE= ${LOCALEDIR}/C.UTF-8
|
||||||
|
|
||||||
|
@ -140,6 +140,7 @@ SYMLINKS+= ../$f/${FILESNAME} \
|
|||||||
|
|
||||||
.for f in ${LOCALES}
|
.for f in ${LOCALES}
|
||||||
FILESDIR_${f}.out= ${LOCALEDIR}/${f}
|
FILESDIR_${f}.out= ${LOCALEDIR}/${f}
|
||||||
|
FILESDIR_${f}.outPACKAGE= locales
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -107,6 +107,7 @@ SYMLINKS+= ../$f/${FILESNAME} \
|
|||||||
|
|
||||||
.for f in ${LOCALES}
|
.for f in ${LOCALES}
|
||||||
FILESDIR_${f}.out= ${LOCALEDIR}/${f}
|
FILESDIR_${f}.out= ${LOCALEDIR}/${f}
|
||||||
|
FILESDIR_${f}.outPACKAGE= locales
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -133,6 +133,7 @@ SYMLINKS+= ../$f/${FILESNAME} \
|
|||||||
|
|
||||||
.for f in ${LOCALES}
|
.for f in ${LOCALES}
|
||||||
FILESDIR_${f}.out= ${LOCALEDIR}/${f}
|
FILESDIR_${f}.out= ${LOCALEDIR}/${f}
|
||||||
|
FILESDIR_${f}.outPACKAGE= locales
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -107,6 +107,7 @@ SYMLINKS+= ../$f/${FILESNAME} \
|
|||||||
|
|
||||||
.for f in ${LOCALES}
|
.for f in ${LOCALES}
|
||||||
FILESDIR_${f}.out= ${LOCALEDIR}/${f}
|
FILESDIR_${f}.out= ${LOCALEDIR}/${f}
|
||||||
|
FILESDIR_${f}.outPACKAGE= locales
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -136,6 +136,7 @@ SYMLINKS+= ../$f/${FILESNAME} \
|
|||||||
|
|
||||||
.for f in ${LOCALES}
|
.for f in ${LOCALES}
|
||||||
FILESDIR_${f}.out= ${LOCALEDIR}/${f}
|
FILESDIR_${f}.out= ${LOCALEDIR}/${f}
|
||||||
|
FILESDIR_${f}.outPACKAGE= locales
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -107,6 +107,7 @@ SYMLINKS+= ../$f/${FILESNAME} \
|
|||||||
|
|
||||||
.for f in ${LOCALES}
|
.for f in ${LOCALES}
|
||||||
FILESDIR_${f}.out= ${LOCALEDIR}/${f}
|
FILESDIR_${f}.out= ${LOCALEDIR}/${f}
|
||||||
|
FILESDIR_${f}.outPACKAGE= locales
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
@ -219,6 +219,7 @@ SYMLINKS+= ../$f/${FILESNAME} \
|
|||||||
|
|
||||||
.for f in ${LOCALES}
|
.for f in ${LOCALES}
|
||||||
FILESDIR_${f}.out= ${LOCALEDIR}/${f}
|
FILESDIR_${f}.out= ${LOCALEDIR}/${f}
|
||||||
|
FILESDIR_${f}.outPACKAGE= locales
|
||||||
.endfor
|
.endfor
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
Loading…
Reference in New Issue
Block a user