Index: projects/collation/share/Makefile
===================================================================
--- projects/collation/share/Makefile	(revision 286459)
+++ projects/collation/share/Makefile	(revision 286460)
@@ -1,103 +1,105 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 # Do not include `info' in the SUBDIR list, it is handled separately.
 
 SUBDIR=	${_colldef} \
 	${_ctypedef} \
 	${_dict} \
 	${_doc} \
 	${_dtrace} \
 	${_examples} \
 	${_i18n} \
 	keys \
+	${_locale-links} \
 	${_man} \
 	${_me} \
 	misc \
 	${_mk} \
 	${_mklocale} \
 	${_monetdef} \
 	${_msgdef} \
 	${_numericdef} \
 	${_sendmail} \
 	skel \
 	${_snmp} \
 	${_syscons} \
 	tabset \
 	termcap \
 	${_tests} \
 	${_timedef} \
 	${_vt} \
 	${_zoneinfo}
 
 # NB: keep these sorted by MK_* knobs
 
 .if ${MK_BSNMP} != "no"
 _snmp=		snmp
 .endif
 
 .if ${MK_CDDL} != "no"
 _dtrace=	dtrace
 .endif
 
 .if ${MK_DICT} != "no"
 _dict=		dict
 .endif
 
 .if ${MK_EXAMPLES} != "no"
 _examples=	examples
 .endif
 
 .if ${MK_GROFF} != "no"
 _me=		me
 .endif
 
 .if ${MK_ICONV} != "no"
 _i18n=		i18n
 .endif
 
 .if ${MK_LOCALES} != "no"
-_colldef =	colldef
-_ctypedef =	ctypedef
-_mklocale =	mklocale
-_monetdef =	monetdef
-_msgdef =	msgdef
-_numericdef =	numericdef
-_timedef =	timedef
+_colldef=	colldef
+_ctypedef=	ctypedef
+_locale-links=	locale-links
+_mklocale=	mklocale
+_monetdef=	monetdef
+_msgdef=	msgdef
+_numericdef=	numericdef
+_timedef=	timedef
 .endif
 
 .if ${MK_MAKE} != "no"
 _mk=		mk
 .endif
 
 .if ${MK_MAN} != "no"
 _man=		man
 .endif
 
 .if ${MK_SENDMAIL} != "no"
 _sendmail=	 sendmail
 .endif
 
 .if ${MK_SHAREDOCS} != "no"
 _doc=		doc
 .endif
 
 .if ${MK_SYSCONS} != "no"
 _syscons=	syscons
 .endif
 
 .if ${MK_TESTS} != "no"
 _tests=		tests
 .endif
 
 .if ${MK_VT} != "no"
 _vt=		vt
 .endif
 
 .if ${MK_ZONEINFO} != "no"
 _zoneinfo=	zoneinfo
 .endif
 
 .include <bsd.subdir.mk>
Index: projects/collation/share/locale-links/Makefile
===================================================================
--- projects/collation/share/locale-links/Makefile	(nonexistent)
+++ projects/collation/share/locale-links/Makefile	(revision 286460)
@@ -0,0 +1,67 @@
+# This creates short versions of locales as symlinks to full versions
+# e.g. zh_Hant_TW is a symlink to zh_Hant_TW.UTF-8.
+
+UTF8=	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_HK en_IE en_NZ en_PH en_SG en_US es_AR \
+	es_CR es_ES es_MX et_EE eu_ES fi_FI fr_BE fr_CA \
+	fr_CH fr_FR he_IL hi_IN hr_HR hu_HU hy_AM is_IS \
+	it_CH it_IT ja_JP kk_KZ ko_KR lt_LT lv_LV nb_NO \
+	nl_BE nl_NL nn_NO pl_PL pt_BR pt_PT ro_RO ru_RU \
+	se_FI se_NO sk_SK sl_SI sv_FI sv_SE tr_TR uk_UA \
+	mn_Cyrl_MN \
+	sr_Cyrl_RS \
+	sr_Latn_RS \
+	zh_Hans_CN \
+	zh_Hant_HK \
+	zh_Hant_TW
+
+EURO=	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 en_ZA es_ES \
+	et_EE 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 pt_BR pt_PT \
+	sv_FI sv_SE
+
+STD1=	${EURO:Net_EE} en_HK en_PH en_SG es_AR es_CR es_MX
+STD2=	cs_CZ hr_HR hu_HU pl_PL ro_RO sk_SK sl_SI sr_Latn_RS
+STD5=	be_BY ru_RU uk_UA sr_Cyrl_RS
+MANUAL=	lt_LT el_GR tr_TR lv_LV
+
+LOCALEDIR=	/usr/share/locale
+
+SYMLINKS=	lt_LT.ISO8859-4  ${LOCALEDIR}/lt_LT \
+		el_GR.ISO8859-7  ${LOCALEDIR}/el_GR \
+		tr_TR.ISO8859-9  ${LOCALEDIR}/tr_TR \
+		lv_LV.ISO8859-13 ${LOCALEDIR}/lv_LV \
+		en_US.ISO8859-1  ${LOCALEDIR}/en_US.ISO-8859-1 \
+		en_US.ISO8859-15 ${LOCALEDIR}/en_US.ISO-8859-15 \
+		ja_JP.eucJP      ${LOCALEDIR}/ja_JP.eucjp
+.for symdir in ${STD1}
+SYMLINKS+=	${symdir}.ISO8859-1 ${LOCALEDIR}/${symdir}
+.endfor
+.for symdir in ${STD2}
+SYMLINKS+=	${symdir}.ISO8859-2 ${LOCALEDIR}/${symdir}
+.endfor
+.for symdir in ${STD5}
+SYMLINKS+=	${symdir}.ISO8859-5 ${LOCALEDIR}/${symdir}
+.endfor
+.for symdir in ${UTF8}
+.  if ! (${STD1:M${symdir}} || ${STD2:M${symdir}} || \
+         ${STD5:M${symdir}} || ${MANUAL:M${symdir}})
+SYMLINKS+=	${symdir}.UTF-8 ${LOCALEDIR}/${symdir}
+.  endif
+SYMLINKS+=	${symdir}.UTF-8 ${LOCALEDIR}/${symdir}.UTF8
+.endfor
+.for symdir in ${EURO}
+SYMLINKS+=	${symdir}.ISO8859-15 ${LOCALEDIR}/${symdir}@euro
+SYMLINKS+=	${symdir}.ISO8859-15 ${LOCALEDIR}/${symdir}.ISO-8859-15@euro
+.endfor
+
+# We need to keep zh_CN.* around as aliases to zh_Hans_CN.* because some
+# of the lang catalogs use zh_CN still (e.g. vi), plus people may expect it
+# We won't alias zh_Hans_CN or zh_Hans_UTF8 though
+.for CN in GB18030 GB2312 GBK UTF-8 eucCN
+SYMLINKS+=	zh_Hans_CN.${CN} ${LOCALEDIR}/zh_CN.${CN}
+.endfor
+
+.include <bsd.prog.mk>

Property changes on: projects/collation/share/locale-links/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property