Index: head/share/colldef/Makefile
===================================================================
--- head/share/colldef/Makefile	(revision 284286)
+++ head/share/colldef/Makefile	(revision 284287)
@@ -1,117 +1,117 @@
 # $FreeBSD$
 
 LOCALES=	bg_BG.CP1251 \
 		be_BY.CP1131 \
 		be_BY.CP1251 \
 		be_BY.ISO8859-5 \
 		ca_ES.ISO8859-1 \
 		ca_ES.ISO8859-15 \
 		cs_CZ.ISO8859-2 \
 		de_DE.ISO8859-1 \
 		de_DE.ISO8859-15 \
 		el_GR.ISO8859-7 \
 		es_ES.ISO8859-1 \
 		es_ES.ISO8859-15 \
 		et_EE.ISO8859-15 \
 		hi_IN.ISCII-DEV \
 		hr_HR.ISO8859-2 \
 		hy_AM.ARMSCII-8 \
 		is_IS.ISO8859-1 \
 		is_IS.ISO8859-15 \
 		kk_KZ.PT154 \
 		la_LN.ISO8859-1 \
 		la_LN.ISO8859-13 \
 		la_LN.ISO8859-15 \
 		la_LN.ISO8859-2 \
 		la_LN.ISO8859-4 \
 		la_LN.US-ASCII \
 		no_NO.ISO8859-1 \
 		no_NO.ISO8859-15 \
 		lt_LT.ISO8859-4 \
 		pl_PL.ISO8859-2 \
 		ru_RU.CP1251 \
 		ru_RU.CP866 \
 		ru_RU.ISO8859-5 \
 		ru_RU.KOI8-R \
 		sl_SI.ISO8859-2 \
 		sr_YU.ISO8859-5 \
 		sv_SE.ISO8859-1 \
 		sv_SE.ISO8859-15 \
 		tr_TR.ISO8859-9 \
 		uk_UA.CP1251 \
 		uk_UA.ISO8859-5 \
 		uk_UA.KOI8-U
 
 LOCALEDIR=	/usr/share/locale
 
 .SUFFIXES: .src .out
 
 .src.out:
 	colldef -I ${.CURDIR} -o ${.TARGET} ${.IMPSRC}
 
 FILES=		${LOCALES:S/$/.out/}
 FILESNAME=	LC_COLLATE
 
 .for locale in ${LOCALES}
 FILESDIR_${locale}.out= ${LOCALEDIR}/${locale}
 .if exists(${.CURDIR}/map.${locale:E})
 ${locale}.out: map.${locale:E}
 .endif
 .endfor
 
 CLEANFILES=	${FILES}
 
 ENCODINGS=	Big5 Big5HKSCS CP949 eucCN eucJP eucKR GB18030 GB2312 GBK \
 		ISO8859-1 ISO8859-2 ISO8859-13 ISO8859-15 SJIS US-ASCII UTF-8
 
 ISO8859-1_Big5=	is_IS:zh_TW
 ISO8859-1_ISO8859-1= ${ISO8859-15_ISO8859-15} pt_PT:pt_BR
 
 LATIN1LINKS=	af_ZA da_DK en_AU en_CA en_GB en_NZ en_US eu_ES fi_FI \
 		fr_BE fr_CA fr_CH fr_FR it_CH it_IT nl_BE nl_NL pt_PT
 ISO8859-15_ISO8859-15= \
 	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT \
 	de_DE:de_AT de_DE:de_CH \
 	no_NO:nb_NO no_NO:nn_NO \
 	${LATIN1LINKS:C/^/la_LN:/}
 
 LATIN2LINKS=    hu_HU ro_RO sr_YU
 ISO8859-2_ISO8859-2= ${LATIN2LINKS:C/^/la_LN:/} cs_CZ:sk_SK
 
 LATIN13LINKS=	lt_LT lv_LV
 ISO8859-13_ISO8859-13= ${LATIN13LINKS:C/^/la_LN:/}
 
 US-ASCII_Big5HKSCS= la_LN:zh_HK
 US-ASCII_CP949=	la_LN:ko_KR
 US-ASCII_eucCN=	la_LN:zh_CN
 US-ASCII_eucJP=	la_LN:ja_JP
 US-ASCII_eucKR=	la_LN:ko_KR
 US-ASCII_GB18030= la_LN:zh_CN
 US-ASCII_GB2312= la_LN:zh_CN
 US-ASCII_GBK=	la_LN:zh_CN
 US-ASCII_SJIS=	la_LN:ja_JP
 
 ASCIILINKS=	en_AU en_CA en_GB en_NZ en_US
 US-ASCII_US-ASCII= ${ASCIILINKS:C/^/la_LN:/}
 
 UTF8LINKS=	af_ZA am_ET be_BY bg_BG ca_AD ca_ES ca_FR ca_IT cs_CZ \
 		da_DK de_AT de_CH de_DE \
 		el_GR en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES \
 		fi_FI fr_BE fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM \
 		is_IS it_CH it_IT ja_JP kk_KZ ko_KR lt_LT lv_LV mn_MN \
 		nb_NO nl_BE nl_NL nn_NO no_NO pl_PL pt_BR pt_PT \
 		ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \
 		zh_TW
 US-ASCII_UTF-8=	${UTF8LINKS:C/^/la_LN:/}
 
 SYMLINKS=
 .for enc1 in ${ENCODINGS}
 .for enc2 in ${ENCODINGS}
 .for lang_terr in ${${enc1}_${enc2}}
 SYMLINKS+=	../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \
-		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}
+		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME}
 .endfor
 .endfor
 .endfor
 
 .include <bsd.prog.mk>
Index: head/share/mklocale/Makefile
===================================================================
--- head/share/mklocale/Makefile	(revision 284286)
+++ head/share/mklocale/Makefile	(revision 284287)
@@ -1,102 +1,102 @@
 # $FreeBSD$
 
 LOCALES=	UTF-8 \
 		am_ET.UTF-8 \
 		be_BY.CP1131 \
 		bg_BG.CP1251 \
 		el_GR.ISO8859-7 \
 		hi_IN.ISCII-DEV \
 		hy_AM.ARMSCII-8 \
 		ja_JP.SJIS \
 		ja_JP.eucJP \
 		kk_KZ.PT154 \
 		ko_KR.CP949 \
 		ko_KR.eucKR \
 		la_LN.ISO8859-1 \
 		la_LN.ISO8859-13 \
 		la_LN.ISO8859-15 \
 		la_LN.ISO8859-2 \
 		la_LN.ISO8859-4 \
 		la_LN.US-ASCII \
 		ru_RU.CP866 \
 		ru_RU.ISO8859-5 \
 		ru_RU.KOI8-R \
 		tr_TR.ISO8859-9 \
 		uk_UA.KOI8-U \
 		zh_CN.eucCN \
 		zh_CN.GB18030 \
 		zh_CN.GB2312 \
 		zh_CN.GBK \
 		zh_HK.Big5HKSCS \
 		zh_TW.Big5
 
 LOCALEDIR=	/usr/share/locale
 
 .SUFFIXES: .src .out
 
 .src.out:
 	mklocale -o ${.TARGET} ${.IMPSRC}
 
 FILES=		${LOCALES:S/$/.out/}
 FILESNAME=	LC_CTYPE
 
 .for locale in ${LOCALES}
 FILESDIR_${locale}.out= ${LOCALEDIR}/${locale}
 .endfor
 
 CLEANFILES=	${FILES}
 
 ENCODINGS=      CP1251 ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-5 \
 		ISO8859-13 ISO8859-15 US-ASCII UTF-8
 
 ASCIILINKS=	en_AU en_CA en_GB en_NZ en_US
 US-ASCII_US-ASCII= ${ASCIILINKS:C/^/la_LN:/}
 
 LATIN1XLINKS=	af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \
 		en_AU en_CA en_GB en_NZ en_US es_ES eu_ES \
 		fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH \
 		it_IT nb_NO nl_BE nl_NL nn_NO no_NO pt_PT sv_SE
 LATIN1LINKS=	${LATIN1XLINKS} pt_BR
 ISO8859-1_ISO8859-1= ${LATIN1LINKS:C/^/la_LN:/}
 
 LATIN15LINKS=	${LATIN1XLINKS} et_EE
 ISO8859-15_ISO8859-15= ${LATIN15LINKS:C/^/la_LN:/}
 
 LATIN2LINKS=	cs_CZ hr_HR hu_HU pl_PL sl_SI sr_YU ro_RO sk_SK
 ISO8859-2_ISO8859-2= ${LATIN2LINKS:C/^/la_LN:/}
 
 LATIN4LINKS=	lt_LT
 ISO8859-4_ISO8859-4= ${LATIN4LINKS:C/^/la_LN:/}
 
 LATIN5LINKS=	sr_YU uk_UA be_BY
 ISO8859-5_ISO8859-5= ${LATIN5LINKS:C/^/ru_RU:/}
 
 LATIN13LINKS=	lt_LT lv_LV
 ISO8859-13_ISO8859-13= ${LATIN13LINKS:C/^/la_LN:/}
 
 CP1251LINKS=    ru_RU be_BY uk_UA
 CP1251_CP1251=	${CP1251LINKS:C/^/bg_BG:/}
 
 UTF8LINKS=	af_ZA be_BY bg_BG ca_AD ca_ES ca_FR ca_IT cs_CZ \
 		da_DK de_AT de_CH de_DE el_GR \
 		en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES fi_FI \
 		fr_BE \
 		fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM is_IS it_CH it_IT \
 		ja_JP kk_KZ ko_KR lt_LT lv_LV mn_MN \
 		nb_NO nl_BE nl_NL nn_NO no_NO pl_PL pt_BR pt_PT \
 		ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \
 		zh_TW
 UTF-8_UTF-8=	${UTF8LINKS:C/^/:/}
 
 
 SYMLINKS=
 .for enc1 in ${ENCODINGS}
 .for enc2 in ${ENCODINGS}
 .for lang_terr in ${${enc1}_${enc2}}
 SYMLINKS+=	../${lang_terr:C/:.*$//:C/.+$/&./}${enc1}/${FILESNAME} \
-		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}
+		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME}
 .endfor
 .endfor
 .endfor
 
 .include <bsd.prog.mk>
Index: head/share/monetdef/Makefile
===================================================================
--- head/share/monetdef/Makefile	(revision 284286)
+++ head/share/monetdef/Makefile	(revision 284287)
@@ -1,146 +1,146 @@
 # $FreeBSD$
 
 LOCALES=	af_ZA.ISO8859-1 \
 		am_ET.UTF-8 \
 		be_BY.CP1131 \
 		be_BY.CP1251 \
 		be_BY.ISO8859-5 \
 		be_BY.UTF-8 \
 		bg_BG.CP1251 \
 		bg_BG.UTF-8 \
 		ca_ES.ISO8859-1 \
 		ca_ES.UTF-8 \
 		cs_CZ.ISO8859-2 \
 		cs_CZ.UTF-8 \
 		da_DK.ISO8859-1 \
 		de_AT.ISO8859-1 \
 		de_AT.UTF-8 \
 		de_CH.ISO8859-1 \
 		de_DE.ISO8859-1 \
 		de_DE.UTF-8 \
 		el_GR.ISO8859-7 \
 		el_GR.UTF-8 \
 		en_AU.ISO8859-1 \
 		en_CA.ISO8859-1 \
 		en_GB.ISO8859-1 \
 		en_GB.UTF-8 \
 		en_IE.UTF-8 \
 		en_NZ.ISO8859-1 \
 		en_US.ISO8859-1 \
 		es_ES.ISO8859-1 \
 		es_ES.UTF-8 \
 		et_EE.ISO8859-15 \
 		fi_FI.ISO8859-1 \
 		fi_FI.UTF-8 \
 		fr_BE.ISO8859-1 \
 		fr_BE.UTF-8 \
 		fr_CA.ISO8859-1 \
 		fr_FR.ISO8859-1 \
 		fr_FR.UTF-8 \
 		he_IL.UTF-8 \
 		hi_IN.ISCII-DEV \
 		hr_HR.ISO8859-2 \
 		hu_HU.ISO8859-2 \
 		hy_AM.ARMSCII-8 \
 		hy_AM.UTF-8 \
 		is_IS.ISO8859-1 \
 		it_IT.ISO8859-1 \
 		it_IT.UTF-8 \
 		ja_JP.eucJP \
 		ja_JP.UTF-8 \
 		kk_KZ.PT154 \
 		kk_KZ.UTF-8 \
 		ko_KR.eucKR \
 		ko_KR.UTF-8 \
 		lt_LT.ISO8859-13 \
 		lv_LV.ISO8859-13 \
 		mn_MN.UTF-8 \
 		nl_BE.ISO8859-1 \
 		nl_BE.UTF-8 \
 		nl_NL.ISO8859-1 \
 		nl_NL.UTF-8 \
 		no_NO.ISO8859-1 \
 		pl_PL.ISO8859-2 \
 		pl_PL.UTF-8 \
 		pt_BR.ISO8859-1 \
 		pt_PT.ISO8859-1 \
 		pt_PT.ISO8859-15 \
 		pt_PT.UTF-8 \
 		ro_RO.ISO8859-2 \
 		ru_RU.CP1251 \
 		ru_RU.CP866 \
 		ru_RU.ISO8859-5 \
 		ru_RU.KOI8-R \
 		ru_RU.UTF-8 \
 		sk_SK.ISO8859-2 \
 		sl_SI.ISO8859-2 \
 		sr_YU.ISO8859-2 \
 		sr_YU.ISO8859-5 \
 		sr_YU.UTF-8 \
 		sv_SE.ISO8859-1 \
 		tr_TR.ISO8859-9 \
 		uk_UA.CP1251 \
 		uk_UA.ISO8859-5 \
 		uk_UA.KOI8-U \
 		uk_UA.UTF-8 \
 		zh_CN.eucCN \
 		zh_CN.GB18030 \
 		zh_CN.GB2312 \
 		zh_CN.UTF-8 \
 		zh_HK.UTF-8 \
 		zh_TW.Big5
 
 LOCALEDIR=	/usr/share/locale
 
 .SUFFIXES: .src .out
 
 .src.out:
 	grep -v '^#' < ${.IMPSRC} > ${.TARGET}
 
 FILES=		${LOCALES:S/$/.out/}
 FILESNAME=	LC_MONETARY
 
 .for lang in ${LOCALES}
 FILESDIR_${lang}.out= ${LOCALEDIR}/${lang}
 .endfor
 
 CLEANFILES=	${FILES}
 
 ENCODINGS=	Big5 Big5HKSCS CP949 eucJP eucKR GB2312 GBK \
 		ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-7 ISO8859-9 \
 		ISO8859-13 ISO8859-15 SJIS US-ASCII UTF-8
 
 Big5_UTF-8=	zh_TW
 eucJP_SJIS=	ja_JP
 eucKR_CP949=	ko_KR
 GB2312_GBK=	zh_CN
 ISO8859-1_ISO8859-1= ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT es_ES:eu_ES \
 		de_CH:fr_CH de_CH:it_CH no_NO:nb_NO no_NO:nn_NO
 ISO8859-1_ISO8859-15= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH de_DE \
 		en_AU en_CA en_GB en_NZ en_US es_ES \
 		fi_FI fr_BE fr_CA fr_CH fr_FR \
 		is_IS it_IT it_CH nl_BE nl_NL nb_NO nn_NO no_NO sv_SE
 ISO8859-1_US-ASCII= en_AU en_CA en_GB en_NZ en_US
 ISO8859-1_UTF-8= af_ZA da_DK de_CH en_AU en_CA en_NZ en_US \
 		fr_CA is_IS nb_NO nn_NO no_NO pt_BR sv_SE
 ISO8859-2_UTF-8= hr_HR hu_HU ro_RO sk_SK sl_SI
 ISO8859-9_UTF-8= tr_TR
 ISO8859-13_ISO8859-4= lt_LT
 ISO8859-13_UTF-8= lt_LT lv_LV
 ISO8859-15_ISO8859-15= es_ES:eu_ES
 ISO8859-15_UTF-8= et_EE
 UTF-8_Big5HKSCS= zh_HK
 UTF-8_UTF-8=	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT \
 		es_ES:eu_ES de_CH:fr_CH de_CH:it_CH
 
 SYMLINKS=
 .for enc1 in ${ENCODINGS}
 .for enc2 in ${ENCODINGS}
 .for lang_terr in ${${enc1}_${enc2}}
 SYMLINKS+=	../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \
-		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}
+		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME}
 .endfor
 .endfor
 .endfor
 
 .include <bsd.prog.mk>
Index: head/share/msgdef/Makefile
===================================================================
--- head/share/msgdef/Makefile	(revision 284286)
+++ head/share/msgdef/Makefile	(revision 284287)
@@ -1,144 +1,144 @@
 # $FreeBSD$
 
 LOCALES=	af_ZA.ISO8859-1 \
 		am_ET.UTF-8 \
 		be_BY.CP1131 \
 		be_BY.CP1251 \
 		be_BY.ISO8859-5 \
 		be_BY.UTF-8 \
 		bg_BG.CP1251 \
 		bg_BG.UTF-8 \
 		ca_ES.ISO8859-1 \
 		cs_CZ.ISO8859-2 \
 		da_DK.ISO8859-1 \
 		de_DE.ISO8859-1 \
 		el_GR.ISO8859-7 \
 		el_GR.UTF-8 \
 		en_CA.ISO8859-1 \
 		en_GB.ISO8859-1 \
 		en_US.ISO8859-1 \
 		es_ES.ISO8859-1 \
 		et_EE.ISO8859-15 \
 		eu_ES.ISO8859-1 \
 		fi_FI.ISO8859-1 \
 		fr_BE.ISO8859-1 \
 		fr_CH.ISO8859-1 \
 		fr_FR.ISO8859-1 \
 		he_IL.UTF-8 \
 		hi_IN.ISCII-DEV \
 		hr_HR.ISO8859-2 \
 		hu_HU.ISO8859-2 \
 		hy_AM.ARMSCII-8 \
 		hy_AM.UTF-8 \
 		is_IS.ISO8859-1 \
 		it_IT.ISO8859-1 \
 		ja_JP.eucJP \
 		ja_JP.SJIS \
 		ja_JP.UTF-8 \
 		kk_KZ.PT154 \
 		kk_KZ.UTF-8 \
 		ko_KR.UTF-8 \
 		ko_KR.eucKR \
 		lt_LT.ISO8859-13 \
 		lv_LV.ISO8859-13 \
 		lv_LV.UTF-8 \
 		mn_MN.UTF-8 \
 		nl_NL.ISO8859-1 \
 		no_NO.ISO8859-1 \
 		pl_PL.ISO8859-2 \
 		pt_PT.ISO8859-1 \
 		ro_RO.ISO8859-2 \
 		ru_RU.CP1251 \
 		ru_RU.CP866 \
 		ru_RU.ISO8859-5 \
 		ru_RU.KOI8-R \
 		ru_RU.UTF-8 \
 		sl_SI.ISO8859-2 \
 		sr_YU.ISO8859-2 \
 		sr_YU.ISO8859-5 \
 		sr_YU.UTF-8 \
 		sv_SE.ISO8859-1 \
 		tr_TR.ISO8859-9 \
 		uk_UA.CP1251 \
 		uk_UA.ISO8859-5 \
 		uk_UA.KOI8-U \
 		uk_UA.UTF-8 \
 		zh_CN.eucCN \
 		zh_CN.GB18030 \
 		zh_CN.GB2312 \
 		zh_CN.UTF-8 \
 		zh_TW.Big5 \
 		zh_TW.UTF-8
 
 LOCALEDIR=	/usr/share/locale
 
 .SUFFIXES: .src .out
 
 .src.out:
 	grep -v '^#' < ${.IMPSRC} > ${.TARGET}
 
 FILES=		${LOCALES:S/$/.out/}
 FILESNAME=	LC_MESSAGES
 
 .for locale in ${LOCALES}
 FILESDIR_${locale}.out= ${LOCALEDIR}/${locale}
 .endfor
 
 CLEANFILES=	${FILES}
 
 CA_LINKS=	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT
 CZ_LINKS=	cs_CZ:sk_SK
 DE_LINKS=	de_DE:de_AT de_DE:de_CH
 FR_LINKS=	fr_FR:fr_CA
 GB_LINKS=	en_GB:en_AU en_GB:en_NZ
 IT_LINKS=	it_IT:it_CH
 NL_LINKS=	nl_NL:nl_BE
 NO_LINKS=	no_NO:nb_NO no_NO:nn_NO
 PT_LINKS=	pt_PT:pt_BR
 
 ENCODINGS=	Big5 Big5HKSCS CP949 eucKR GB2312 GBK \
 		ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-9 ISO8859-13 ISO8859-15 \
 		US-ASCII UTF-8
 
 Big5_Big5HKSCS=	zh_TW:zh_HK
 eucKR_CP949=	ko_KR
 GB2312_GBK=	zh_CN
 ISO8859-1_ISO8859-1= ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 		${IT_LINKS} ${NL_LINKS} ${NO_LINKS} ${PT_LINKS}
 ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES \
 		eu_ES fi_FI fr_BE fr_CH fr_FR is_IS it_IT nl_NL no_NO \
 		pt_PT sv_SE \
 		${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 		${NL_LINKS} ${NO_LINKS}
 ISO8859-1_US-ASCII= ${GB_LINKS} en_CA en_GB en_US
 ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES eu_ES \
 		fi_FI fr_BE fr_CH fr_FR is_IS it_IT nl_NL no_NO \
 		pt_PT sv_SE
 ISO8859-2_ISO8859-2= ${CZ_LINKS}
 ISO8859-2_UTF-8= cs_CZ hr_HR hu_HU pl_PL ro_RO sl_SI
 ISO8859-9_UTF-8= tr_TR
 ISO8859-13_ISO8859-4= lt_LT
 ISO8859-13_UTF-8= lt_LT
 ISO8859-15_UTF-8= et_EE
 UTF-8_UTF-8=	${CA_LINKS} ${CZ_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 		en_GB:en_IE \
 		${IT_LINKS} ${NL_LINKS} ${NO_LINKS} ${PT_LINKS} zh_TW:zh_HK
 
 SYMLINKS=
 .for enc1 in ${ENCODINGS}
 .for enc2 in ${ENCODINGS}
 .for lang_terr in ${${enc1}_${enc2}}
 SYMLINKS+=	../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \
-		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}
+		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME}
 .endfor
 .endfor
 .endfor
 
 beforeinstall:
 .for locale in ${LOCALES}
 .if exists(${DESTDIR}${LOCALEDIR}/${locale}/LC_MESSAGES/)
 	rm -rf ${DESTDIR}${LOCALEDIR}/${locale}/LC_MESSAGES
 .endif
 .endfor
 
 .include <bsd.prog.mk>
Index: head/share/numericdef/Makefile
===================================================================
--- head/share/numericdef/Makefile	(revision 284286)
+++ head/share/numericdef/Makefile	(revision 284287)
@@ -1,132 +1,132 @@
 # $FreeBSD$
 
 LOCALES=	af_ZA.ISO8859-1 \
 		am_ET.UTF-8 \
 		be_BY.CP1251 \
 		bg_BG.CP1251 \
 		ca_ES.ISO8859-1 \
 		cs_CZ.ISO8859-2 \
 		da_DK.ISO8859-1 \
 		de_CH.ISO8859-1 \
 		de_DE.ISO8859-1 \
 		el_GR.ISO8859-7 \
 		en_US.ISO8859-1 \
 		es_ES.ISO8859-1 \
 		et_EE.ISO8859-15 \
 		eu_ES.ISO8859-1 \
 		fi_FI.ISO8859-1 \
 		fr_BE.ISO8859-1 \
 		fr_FR.ISO8859-1 \
 		hi_IN.ISCII-DEV \
 		hr_HR.ISO8859-2 \
 		hu_HU.ISO8859-2 \
 		hy_AM.ARMSCII-8 \
 		is_IS.ISO8859-1 \
 		it_IT.ISO8859-1 \
 		ja_JP.eucJP \
 		kk_KZ.PT154 \
 		ko_KR.eucKR \
 		lt_LT.ISO8859-13 \
 		mn_MN.UTF-8 \
 		nl_NL.ISO8859-1 \
 		no_NO.ISO8859-1 \
 		pl_PL.ISO8859-2 \
 		pt_BR.ISO8859-1 \
 		pt_PT.ISO8859-1 \
 		ro_RO.ISO8859-2 \
 		ru_RU.KOI8-R \
 		sk_SK.ISO8859-2 \
 		sl_SI.ISO8859-2 \
 		sr_YU.ISO8859-2 \
 		sr_YU.ISO8859-5 \
 		sv_SE.ISO8859-1 \
 		tr_TR.ISO8859-9 \
 		uk_UA.KOI8-U \
 		zh_CN.eucCN
 
 LOCALEDIR=	/usr/share/locale
 
 .SUFFIXES: .src .out
 
 .src.out:
 	grep -v '^#' < ${.IMPSRC} > ${.TARGET}
 
 FILES=		${LOCALES:S/$/.out/}
 FILESNAME=	LC_NUMERIC
 
 .for locale in ${LOCALES}
 FILESDIR_${locale}.out= ${LOCALEDIR}/${locale}
 .endfor
 
 CLEANFILES=	${FILES}
 
 ENCODINGS=	ARMSCII-8 Big5 Big5HKSCS \
 		CP1131 CP1251 CP866 CP949 \
 		eucCN eucJP eucKR GB18030 GB2312 GBK \
 		ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-5 ISO8859-7 ISO8859-9 \
 		ISO8859-13 ISO8859-15 \
 		KOI8-R KOI8-U PT154 SJIS US-ASCII UTF-8
 
 BE_LINKS=	fr_BE:nl_BE
 CA_LINKS=	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT
 DE_LINKS=	de_DE:de_AT
 FR_LINKS=	fr_FR:fr_CA fr_FR:fr_CH
 GB_LINKS=	en_GB:en_AU en_GB:en_NZ
 IT_LINKS=	it_IT:it_CH
 NO_LINKS=	no_NO:nb_NO no_NO:nn_NO
 US_LINKS=	en_US:en_CA en_US:en_GB
 
 ARMSCII-8_UTF-8= hy_AM
 Big5_UTF-8=	zh_TW:zh_HK zh_TW
 CP1251_CP1131=	be_BY
 CP1251_ISO8859-5= be_BY
 CP1251_UTF-8=	be_BY bg_BG
 CP866_UTF-8=	ru_RU
 eucCN_Big5=	zh_CN:zh_TW
 eucCN_Big5HKSCS= zh_CN:zh_HK
 eucCN_GB18030=	zh_CN
 eucCN_GB2312=	zh_CN
 eucCN_GBK=	zh_CN
 eucCN_UTF-8=	zh_CN
 eucJP_SJIS=	ja_JP
 eucJP_UTF-8=	ja_JP
 eucKR_CP949=	ko_KR
 eucKR_UTF-8=	ko_KR
 ISO8859-1_ISO8859-15= af_ZA ca_ES da_DK de_CH de_DE en_US es_ES eu_ES \
 		fi_FI fr_BE fr_FR is_IS it_IT nl_NL no_NO pt_PT sv_SE \
 		${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 		${IT_LINKS} ${NO_LINKS} ${US_LINKS}
 ISO8859-1_ISO8859-1= ${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} \
 		${GB_LINKS} ${IT_LINKS} ${NO_LINKS} ${US_LINKS}
 ISO8859-1_US-ASCII= en_US ${GB_LINKS} ${US_LINKS}
 ISO8859-1_UTF-8= af_ZA ca_ES da_DK de_CH de_DE en_US es_ES eu_ES fi_FI \
 		fr_BE fr_FR is_IS it_IT nl_NL no_NO pt_BR pt_PT sv_SE
 ISO8859-2_UTF-8= cs_CZ hr_HR hu_HU pl_PL ro_RO sk_SK sl_SI
 ISO8859-5_UTF-8= sr_YU uk_UA
 ISO8859-5_CP1251= uk_UA
 ISO8859-7_UTF-8= el_GR
 ISO8859-9_UTF-8= tr_TR
 ISO8859-13_ISO8859-4= lt_LT
 ISO8859-13_ISO8859-13= lt_LT:lv_LV
 ISO8859-13_UTF-8= lt_LT lt_LT:lv_LV
 ISO8859-15_UTF-8= et_EE
 KOI8-R_CP1251=	ru_RU
 KOI8-R_CP866=	ru_RU
 KOI8-R_ISO8859-5= ru_RU
 KOI8-U_ISO8859-5= uk_UA
 PT154_UTF-8=	kk_KZ
 US-ASCII_UTF-8=	en_US:he_IL
 UTF-8_UTF-8=	${BE_LINKS} ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 		en_GB:en_IE ${IT_LINKS} ${NO_LINKS} ${US_LINKS}
 
 SYMLINKS=
 .for enc1 in ${ENCODINGS}
 .for enc2 in ${ENCODINGS}
 .for lang_terr in ${${enc1}_${enc2}}
 SYMLINKS+=	../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \
-		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}
+		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME}
 .endfor
 .endfor
 .endfor
 
 .include <bsd.prog.mk>
Index: head/share/timedef/Makefile
===================================================================
--- head/share/timedef/Makefile	(revision 284286)
+++ head/share/timedef/Makefile	(revision 284287)
@@ -1,156 +1,156 @@
 # $FreeBSD$
 
 LOCALES=	am_ET.UTF-8 \
 		be_BY.CP1131 \
 		be_BY.CP1251 \
 		be_BY.ISO8859-5 \
 		be_BY.UTF-8 \
 		bg_BG.CP1251 \
 		bg_BG.UTF-8 \
 		ca_ES.ISO8859-1 \
 		ca_ES.UTF-8 \
 		cs_CZ.ISO8859-2 \
 		cs_CZ.UTF-8 \
 		da_DK.ISO8859-1 \
 		da_DK.UTF-8 \
 		de_AT.ISO8859-1 \
 		de_AT.UTF-8 \
 		de_DE.ISO8859-1 \
 		de_DE.UTF-8 \
 		el_GR.ISO8859-7 \
 		el_GR.UTF-8 \
 		en_GB.ISO8859-1 \
 		en_US.ISO8859-1 \
 		es_ES.ISO8859-1 \
 		es_ES.UTF-8 \
 		et_EE.ISO8859-15 \
 		et_EE.UTF-8 \
 		eu_ES.ISO8859-1 \
 		fi_FI.ISO8859-1 \
 		fi_FI.UTF-8 \
 		fr_FR.ISO8859-1 \
 		fr_FR.UTF-8 \
 		he_IL.UTF-8 \
 		hi_IN.ISCII-DEV \
 		hr_HR.ISO8859-2 \
 		hr_HR.UTF-8 \
 		hu_HU.ISO8859-2 \
 		hu_HU.UTF-8 \
 		hy_AM.ARMSCII-8 \
 		hy_AM.UTF-8 \
 		is_IS.ISO8859-1 \
 		is_IS.UTF-8 \
 		ja_JP.eucJP \
 		ja_JP.SJIS \
 		ja_JP.UTF-8 \
 		it_IT.ISO8859-1 \
 		it_IT.UTF-8 \
 		kk_KZ.PT154 \
 		kk_KZ.UTF-8 \
 		ko_KR.eucKR \
 		ko_KR.UTF-8 \
 		la_LN.ISO8859-1 \
 		lt_LT.ISO8859-4 \
 		lt_LT.ISO8859-13 \
 		lt_LT.UTF-8 \
 		lv_LV.ISO8859-13 \
 		lv_LV.UTF-8 \
 		mn_MN.UTF-8 \
 		nb_NO.ISO8859-1 \
 		nb_NO.UTF-8 \
 		nl_NL.ISO8859-1 \
 		nn_NO.ISO8859-1 \
 		nn_NO.UTF-8 \
 		pl_PL.ISO8859-2 \
 		pl_PL.UTF-8 \
 		pt_BR.ISO8859-1 \
 		pt_BR.UTF-8 \
 		pt_PT.ISO8859-1 \
 		pt_PT.UTF-8 \
 		ro_RO.ISO8859-2 \
 		ro_RO.UTF-8 \
 		ru_RU.CP1251 \
 		ru_RU.CP866 \
 		ru_RU.ISO8859-5 \
 		ru_RU.KOI8-R \
 		ru_RU.UTF-8 \
 		sk_SK.ISO8859-2 \
 		sk_SK.UTF-8 \
 		sl_SI.ISO8859-2 \
 		sl_SI.UTF-8 \
 		sr_YU.ISO8859-2 \
 		sr_YU.ISO8859-5 \
 		sr_YU.UTF-8 \
 		sv_SE.ISO8859-1 \
 		sv_SE.UTF-8 \
 		tr_TR.ISO8859-9 \
 		tr_TR.UTF-8 \
 		uk_UA.CP1251 \
 		uk_UA.ISO8859-5 \
 		uk_UA.KOI8-U \
 		uk_UA.UTF-8 \
 		zh_CN.eucCN \
 		zh_CN.GB18030 \
 		zh_CN.GB2312 \
 		zh_CN.UTF-8 \
 		zh_TW.Big5 \
 		zh_TW.UTF-8
 
 LOCALEDIR=      /usr/share/locale
 
 .SUFFIXES: .src .out
 
 .src.out:
 	grep -v '^#' < ${.IMPSRC} > ${.TARGET}
 
 FILES=		${LOCALES:S/$/.out/}
 FILESNAME=	LC_TIME
 
 .for locale in ${LOCALES}
 FILESDIR_${locale}.out= ${LOCALEDIR}/${locale}
 .endfor
 
 CLEANFILES=	${FILES}
 
 ENCODINGS=	Big5HKSCS CP949 eucKR GB2312 GBK \
 		ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-15 \
 		US-ASCII UTF-8
 
 CA_LINKS=	ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT
 DE_LINKS=	de_DE:de_CH
 FR_LINKS=	fr_FR:fr_BE fr_FR:fr_CA fr_FR:fr_CH
 IT_LINKS=	it_IT:it_CH
 NL_LINKS=	nl_NL:nl_BE
 NO_LINKS=	nb_NO:no_NO
 GB_LINKS=	en_GB:en_AU en_GB:en_CA en_GB:en_NZ
 
 eucKR_CP949=	ko_KR
 GB2312_GBK=	zh_CN
 ISO8859-1_ISO8859-1= ${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} \
 		${IT_LINKS} ${NL_LINKS} ${NO_LINKS} en_US:af_ZA
 ISO8859-1_ISO8859-15= ca_ES da_DK de_AT de_DE en_GB en_US es_ES eu_ES \
 		fi_FI fr_FR is_IS it_IT la_LN nb_NO nl_NL nn_NO no_NO pt_PT \
 		sv_SE \
 		${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 		${NL_LINKS}
 ISO8859-1_US-ASCII= ${GB_LINKS} en_GB en_US la_LN
 ISO8859-1_ISO8859-2= la_LN
 ISO8859-1_ISO8859-4= la_LN
 ISO8859-1_UTF-8= en_GB en_US eu_ES nl_NL
 ISO8859-15_ISO8859-15= en_US:af_ZA
 UTF-8_Big5HKSCS= zh_TW:zh_HK
 UTF-8_UTF-8=	${CA_LINKS} ${DE_LINKS} ${FR_LINKS} ${GB_LINKS} ${IT_LINKS} \
 		${NL_LINKS} ${NO_LINKS} \
 		en_GB:en_IE en_US:af_ZA zh_TW:zh_HK
 
 SYMLINKS=
 .for enc1 in ${ENCODINGS}
 .for enc2 in ${ENCODINGS}
 .for lang_terr in ${${enc1}_${enc2}}
 SYMLINKS+=	../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \
-		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}
+		${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}/${FILESNAME}
 .endfor
 .endfor
 .endfor
 
 .include <bsd.prog.mk>