Index: tools/tools/locale/tools/cldr2def.pl
===================================================================
--- tools/tools/locale/tools/cldr2def.pl	(revision 302018)
+++ tools/tools/locale/tools/cldr2def.pl	(working copy)
@@ -595,8 +595,8 @@
 					$line =~ s/^$k\s+//;
 				}
 
-				$values{$l}{$c}{$k} = ""
-					if (!defined $values{$l}{$c}{$k});
+				$values{$l}{$f}{$c}{$k} = ""
+					if (!defined $values{$l}{$f}{$c}{$k});
 
 				$continue = ($line =~ /\/$/);
 				$line =~ s/\/$// if ($continue);
@@ -606,7 +606,7 @@
 					    s/\<([^>_]+)_([^>]+)\>/<$1 $2>/;
 				}
 				die "_ in data - $line" if ($line =~ /_/);
-				$values{$l}{$c}{$k} .= $line;
+				$values{$l}{$f}{$c}{$k} .= $line;
 
 				last if (!$continue);
 			}
@@ -723,7 +723,7 @@
 # -----------------------------------------------------------------------------
 EOF
 			foreach my $k (keys(%keys)) {
-				my $f = $keys{$k};
+				my $g = $keys{$k};
 
 				die("Unknown $k in \%DESC")
 					if (!defined $DESC{$k});
@@ -731,37 +731,38 @@
 				$output .= "#\n# $DESC{$k}\n";
 
 				# Replace one row with another
-				if ($f =~ /^>/) {
-					$k = substr($f, 1);
-					$f = $keys{$k};
+				if ($g =~ /^>/) {
+					$k = substr($g, 1);
+					$g = $keys{$k};
 				}
 
 				# Callback function
-				if ($f =~ /^\</) {
+				if ($g =~ /^\</) {
 					$callback{data}{c} = $c;
 					$callback{data}{k} = $k;
+					$callback{data}{f} = $f;
 					$callback{data}{l} = $l;
 					$callback{data}{e} = $enc;
-					my @a = split(/\</, substr($f, 1));
+					my @a = split(/\</, substr($g, 1));
 					my $rv =
-					    &{$callback{$a[0]}}($values{$l}{$c}{$a[1]});
-					$values{$l}{$c}{$k} = $rv;
-					$f = $a[2];
+					    &{$callback{$a[0]}}($values{$l}{$f}{$c}{$a[1]});
+					$values{$l}{$f}{$c}{$k} = $rv;
+					$g = $a[2];
 					$callback{data} = ();
 				}
 
-				my $v = $values{$l}{$c}{$k};
+				my $v = $values{$l}{$f}{$c}{$k};
 				$v = "undef" if (!defined $v);
 
-				if ($f eq "i") {
+				if ($g eq "i") {
 					$output .= "$v\n";
 					next;
 				}
-				if ($f eq "ai") {
+				if ($g eq "ai") {
 					$output .= "$v\n";
 					next;
 				}
-				if ($f eq "s") {
+				if ($g eq "s") {
 					$v =~ s/^"//;
 					$v =~ s/"$//;
 					my $cm = "";
@@ -785,7 +786,7 @@
 					$output .= "$v\n";
 					next;
 				}
-				if ($f eq "as") {
+				if ($g eq "as") {
 					foreach my $v (split(/;/, $v)) {
 						$v =~ s/^"//;
 						$v =~ s/"$//;
@@ -815,7 +816,7 @@
 					next;
 				}
 
-				die("$k is '$f'");
+				die("$k is '$g'");
 
 			}
 
Index: share/timedef/Makefile
===================================================================
--- share/timedef/Makefile	(revision 302018)
+++ share/timedef/Makefile	(working copy)
@@ -34,7 +34,6 @@
 LOCALES+=	el_GR.UTF-8
 LOCALES+=	en_CA.UTF-8
 LOCALES+=	en_GB.UTF-8
-LOCALES+=	en_HK.UTF-8
 LOCALES+=	en_IE.UTF-8
 LOCALES+=	en_PH.UTF-8
 LOCALES+=	en_SG.UTF-8
@@ -111,6 +110,7 @@
 LOCALES+=	sl_SI.ISO8859-2
 LOCALES+=	sl_SI.UTF-8
 LOCALES+=	sr_Cyrl_RS.ISO8859-5
+LOCALES+=	sr_Cyrl_RS.UTF-8
 LOCALES+=	sr_Latn_RS.ISO8859-2
 LOCALES+=	sr_Latn_RS.UTF-8
 LOCALES+=	sv_FI.ISO8859-15
@@ -154,11 +154,12 @@
 SAME+=		de_DE.ISO8859-15 de_CH.ISO8859-15
 SAME+=		de_DE.ISO8859-15 de_CH.ISO8859-1
 SAME+=		de_DE.UTF-8 de_CH.UTF-8
-SAME+=		en_HK.UTF-8 en_HK.ISO8859-1
-SAME+=		en_HK.UTF-8 en_AU.UTF-8
-SAME+=		en_HK.UTF-8 en_AU.US-ASCII
-SAME+=		en_HK.UTF-8 en_AU.ISO8859-15
-SAME+=		en_HK.UTF-8 en_AU.ISO8859-1
+SAME+=		en_PH.UTF-8 en_HK.UTF-8
+SAME+=		en_PH.UTF-8 en_HK.ISO8859-1
+SAME+=		en_PH.UTF-8 en_AU.UTF-8
+SAME+=		en_PH.UTF-8 en_AU.US-ASCII
+SAME+=		en_PH.UTF-8 en_AU.ISO8859-15
+SAME+=		en_PH.UTF-8 en_AU.ISO8859-1
 SAME+=		en_CA.UTF-8 en_CA.US-ASCII
 SAME+=		en_CA.UTF-8 en_CA.ISO8859-15
 SAME+=		en_CA.UTF-8 en_CA.ISO8859-1
@@ -198,7 +199,6 @@
 SAME+=		nl_NL.UTF-8 nl_NL.ISO8859-1
 SAME+=		nn_NO.ISO8859-15 nn_NO.ISO8859-1
 SAME+=		pt_PT.ISO8859-15 pt_PT.ISO8859-1
-SAME+=		sr_Latn_RS.UTF-8 sr_Cyrl_RS.UTF-8
 SAME+=		sv_FI.ISO8859-15 sv_FI.ISO8859-1
 SAME+=		sv_SE.ISO8859-15 sv_SE.ISO8859-1
 SAME+=		zh_Hans_CN.GBK zh_Hans_CN.GB18030
Index: share/timedef/en_HK.UTF-8.src
===================================================================
--- share/timedef/en_HK.UTF-8.src	(revision 302018)
+++ share/timedef/en_HK.UTF-8.src	(nonexistent)
@@ -1,87 +0,0 @@
-# Warning: Do not edit. This file is automatically generated from the
-# tools in /usr/src/tools/tools/locale. The data is obtained from the
-# CLDR project, obtained from http://cldr.unicode.org/
-# -----------------------------------------------------------------------------
-#
-# Short month names
-Jan
-Feb
-Mar
-Apr
-May
-Jun
-Jul
-Aug
-Sep
-Oct
-Nov
-Dec
-#
-# Long month names (as in a date)
-January
-February
-March
-April
-May
-June
-July
-August
-September
-October
-November
-December
-#
-# Short weekday names
-Sun
-Mon
-Tue
-Wed
-Thu
-Fri
-Sat
-#
-# Long weekday names
-Sunday
-Monday
-Tuesday
-Wednesday
-Thursday
-Friday
-Saturday
-#
-# X_fmt
-%I:%M:%S %p
-#
-# x_fmt
-%e/%m/%Y
-#
-# c_fmt
-%A %e %B %Y at %I:%M:%S %p
-#
-# AM/PM
-AM
-PM
-#
-# date_fmt
-%A %e %B %Y at %I:%M:%S %p %Z
-#
-# Long month names (without case ending)
-January
-February
-March
-April
-May
-June
-July
-August
-September
-October
-November
-December
-#
-# md_order
-m
-#
-# ampm_fmt
-%I:%M:%S %p
-# EOF

Property changes on: share/timedef/en_HK.UTF-8.src
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: share/timedef/sr_Cyrl_RS.ISO8859-5.src
===================================================================
--- share/timedef/sr_Cyrl_RS.ISO8859-5.src	(revision 302018)
+++ share/timedef/sr_Cyrl_RS.ISO8859-5.src	(working copy)
@@ -15,18 +15,7 @@
 áÕß
 ÞÚâ
 ÝÞÒ
-ÔÕæ""jan
-feb
-mar
-apr
-maj
-jun
-jul
-avg
-sep
-okt
-nov
-dec
+ÔÕæ
 #
 # Long month names (as in a date)
 øÐÝãÐà
@@ -40,18 +29,7 @@
 áÕßâÕÜÑÐà
 ÞÚâÞÑÐà
 ÝÞÒÕÜÑÐà
-ÔÕæÕÜÑÐà""januar
-februar
-mart
-april
-maj
-jun
-jul
-avgust
-septembar
-oktobar
-novembar
-decembar
+ÔÕæÕÜÑÐà
 #
 # Short weekday names
 ÝÕÔ
@@ -60,13 +38,7 @@
 áàÕ
 çÕâ
 ßÕâ
-áãÑ""ned
-pon
-uto
-sre
-cet
-pet
-sub
+áãÑ
 #
 # Long weekday names
 ÝÕÔÕùÐ
@@ -75,30 +47,23 @@
 áàÕÔÐ
 çÕâÒàâÐÚ
 ßÕâÐÚ
-áãÑÞâÐ""nedelja
-ponedeljak
-utorak
-sreda
-cetvrtak
-petak
-subota
+áãÑÞâÐ
 #
 # X_fmt
-%H.%M.%S""%H.%M.%S
+%H.%M.%S
 #
 # x_fmt
-%d.%m.%y.""%e.%m.%y.
+%d.%m.%y.
 #
 # c_fmt
-%d. %B %Y. %H.%M.%S""%d. %B %Y. %H.%M.%S %Z
+%d. %B %Y. %H.%M.%S
 #
 # AM/PM
 ßàÕ ßÞÔÝÕ
-ßÞ ßÞÔÝÕ""pre podne
-po podne
+ßÞ ßÞÔÝÕ
 #
 # date_fmt
-%d. %B %Y. %H.%M.%S %Z""%d. %B %Y. %H.%M.%S %Z
+%d. %B %Y. %H.%M.%S %Z
 #
 # Long month names (without case ending)
 øÐÝãÐà
@@ -112,22 +77,11 @@
 áÕßâÕÜÑÐà
 ÞÚâÞÑÐà
 ÝÞÒÕÜÑÐà
-ÔÕæÕÜÑÐà""januar
-februar
-mart
-april
-maj
-jun
-jul
-avgust
-septembar
-oktobar
-novembar
-decembar
+ÔÕæÕÜÑÐà
 #
 # md_order
-dmdm
+dm
 #
 # ampm_fmt
-%I.%M.%S %p""%I.%M.%S %p
+%I.%M.%S %p
 # EOF
Index: share/timedef/sr_Cyrl_RS.UTF-8.src
===================================================================
--- share/timedef/sr_Cyrl_RS.UTF-8.src	(nonexistent)
+++ share/timedef/sr_Cyrl_RS.UTF-8.src	(working copy)
@@ -0,0 +1,87 @@
+# Warning: Do not edit. This file is automatically generated from the
+# tools in /usr/src/tools/tools/locale. The data is obtained from the
+# CLDR project, obtained from http://cldr.unicode.org/
+# -----------------------------------------------------------------------------
+#
+# Short month names
+јан
+феб
+мар
+апр
+мај
+јун
+јул
+авг
+�еп
+окт
+нов
+дец
+#
+# Long month names (as in a date)
+јануар
+фебруар
+март
+април
+мај
+јун
+јул
+авгу�т
+�ептембар
+октобар
+новембар
+децембар
+#
+# Short weekday names
+нед
+пон
+уто
+�ре
+чет
+пет
+�уб
+#
+# Long weekday names
+недеља
+понедељак
+уторак
+�реда
+четвртак
+петак
+�убота
+#
+# X_fmt
+%H.%M.%S
+#
+# x_fmt
+%d.%m.%y.
+#
+# c_fmt
+%d. %B %Y. %H.%M.%S
+#
+# AM/PM
+пре подне
+по подне
+#
+# date_fmt
+%d. %B %Y. %H.%M.%S %Z
+#
+# Long month names (without case ending)
+јануар
+фебруар
+март
+април
+мај
+јун
+јул
+авгу�т
+�ептембар
+октобар
+новембар
+децембар
+#
+# md_order
+dm
+#
+# ampm_fmt
+%I.%M.%S %p
+# EOF
Index: share/timedef/sr_Latn_RS.ISO8859-2.src
===================================================================
--- share/timedef/sr_Latn_RS.ISO8859-2.src	(revision 302018)
+++ share/timedef/sr_Latn_RS.ISO8859-2.src	(working copy)
@@ -4,22 +4,11 @@
 # -----------------------------------------------------------------------------
 #
 # Short month names
-jah
+jan
 feb
 mar
 apr
 maj
-juh
-jul
-abg
-cep
-okt
-hob
-dec""jan
-feb
-mar
-apr
-maj
 jun
 jul
 avg
@@ -29,20 +18,9 @@
 dec
 #
 # Long month names (as in a date)
-jahuar
+januar
 februar
 mart
-aprjl
-maj
-juh
-jul
-abguct
-ceptembar
-oktobar
-hobembar
-decembar""januar
-februar
-mart
 april
 maj
 jun
@@ -54,13 +32,7 @@
 decembar
 #
 # Short weekday names
-hed
-poh
-uto
-cre
-èet
-pet
-cub""ned
+ned
 pon
 uto
 sre
@@ -69,13 +41,7 @@
 sub
 #
 # Long weekday names
-hedelja
-pohedeljak
-utorak
-creda
-èetbrtak
-petak
-cubota""nedelja
+nedelja
 ponedeljak
 utorak
 sreda
@@ -84,37 +50,25 @@
 subota
 #
 # X_fmt
-%H.%M.%S""%H.%M.%S
+%H.%M.%S
 #
 # x_fmt
-%d.%m.%y.""%d.%m.%y.
+%d.%m.%y.
 #
 # c_fmt
-%d. %B %Y. %H.%M.%S""%d. %B %Y. %H.%M.%S %Z
+%d. %B %Y. %H.%M.%S
 #
 # AM/PM
-pre podhe
-po podhe""pre podne
+pre podne
 po podne
 #
 # date_fmt
-%d. %B %Y. %H.%M.%S %Z""%d. %B %Y. %H.%M.%S %Z
+%d. %B %Y. %H.%M.%S %Z
 #
 # Long month names (without case ending)
-jahuar
+januar
 februar
 mart
-aprjl
-maj
-juh
-jul
-abguct
-ceptembar
-oktobar
-hobembar
-decembar""januar
-februar
-mart
 april
 maj
 jun
@@ -126,8 +80,8 @@
 decembar
 #
 # md_order
-dmdm
+dm
 #
 # ampm_fmt
-%I.%M.%S %p""%I.%M.%S %p
+%I.%M.%S %p
 # EOF

Property changes on: share/timedef/sr_Latn_RS.ISO8859-2.src
___________________________________________________________________
Modified: svn:mime-type
## -1 +1 ##
-text/plain; charset=UTF-8
\ No newline at end of property
+text/plain
\ No newline at end of property
Index: share/timedef/sr_Latn_RS.UTF-8.src
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: share/timedef/sr_Latn_RS.UTF-8.src
===================================================================
--- share/timedef/sr_Latn_RS.UTF-8.src	(revision 302018)
+++ share/timedef/sr_Latn_RS.UTF-8.src	(working copy)

Property changes on: share/timedef/sr_Latn_RS.UTF-8.src
___________________________________________________________________
Modified: svn:mime-type
## -1 +1 ##
-application/octet-stream
\ No newline at end of property
+text/plain
\ No newline at end of property