Add additional English- and French-speaking countries with the appropriate

currency symbols.  Use make(1) loops, not sh(1) loops.

11 files changed, 369 insertions, 4 deletions

diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index abd8c55..b18ee7d 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -6,9 +6,14 @@ CLEANFILES+= ${LOCALES:S/$/.out/g}
 LOCALES=	af_ZA.ISO_8859-1 \
 		da_DK.ISO_8859-1 \
 		de_DE.ISO_8859-1 \
+		en_AU.ISO_8859-1 \
+		en_CA.ISO_8859-1 \
+		en_GB.ISO_8859-1 \
+		en_NZ.ISO_8859-1 \
 		en_US.ISO_8859-1 \
 		fi_FI.ISO_8859-1 \
 		fr_FR.ISO_8859-1 \
+		fr_CA.ISO_8859-1 \
 		is_IS.ISO_8859-1 \
 		nl_NL.ISO_8859-1 \
 		no_NO.ISO_8859-1 \
@@ -25,9 +30,9 @@ LOCALEDIR=      ${DESTDIR}/usr/share/locale
 all: ${LOCALES:S/$/.out/g}
 
 afterinstall:
-	for l in ${LOCALES}; do \
-		${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} $$l.out \
-			   ${LOCALEDIR}/$$l/LC_MONETARY; \
-	done
+.for lang in ${LOCALES}
+	${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} ${lang}.out \
+		${LOCALEDIR}/${lang}/LC_MONETARY
+.endfor
 
 .include <bsd.prog.mk>
diff --git a/share/monetdef/en_AU.ISO8859-1.src b/share/monetdef/en_AU.ISO8859-1.src
new file mode 100644
index 0000000..d5cf8ec
--- /dev/null
+++ b/share/monetdef/en_AU.ISO8859-1.src
@@ -0,0 +1,36 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# int_curr_symbol
+AUD
+# currency_symbol
+$
+# mon_decimal_point
+.
+# mon_thousands_sep
+,
+# mon_grouping
+3;3
+# positive_sign
+
+# negative_sign
+-
+# int_frac_digits
+2
+# frac_digits
+2
+# p_cs_precedes
+1
+# p_sep_by_space
+0
+# n_cs_precedes
+1
+# n_sep_by_space
+0
+# p_sign_posn
+1
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_AU.ISO_8859-1.src b/share/monetdef/en_AU.ISO_8859-1.src
new file mode 100644
index 0000000..d5cf8ec
--- /dev/null
+++ b/share/monetdef/en_AU.ISO_8859-1.src
@@ -0,0 +1,36 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# int_curr_symbol
+AUD
+# currency_symbol
+$
+# mon_decimal_point
+.
+# mon_thousands_sep
+,
+# mon_grouping
+3;3
+# positive_sign
+
+# negative_sign
+-
+# int_frac_digits
+2
+# frac_digits
+2
+# p_cs_precedes
+1
+# p_sep_by_space
+0
+# n_cs_precedes
+1
+# n_sep_by_space
+0
+# p_sign_posn
+1
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_CA.ISO8859-1.src b/share/monetdef/en_CA.ISO8859-1.src
new file mode 100644
index 0000000..611d55f
--- /dev/null
+++ b/share/monetdef/en_CA.ISO8859-1.src
@@ -0,0 +1,36 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# int_curr_symbol
+CAD
+# currency_symbol
+$
+# mon_decimal_point
+.
+# mon_thousands_sep
+,
+# mon_grouping
+3;3
+# positive_sign
+
+# negative_sign
+-
+# int_frac_digits
+2
+# frac_digits
+2
+# p_cs_precedes
+1
+# p_sep_by_space
+0
+# n_cs_precedes
+1
+# n_sep_by_space
+0
+# p_sign_posn
+1
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_CA.ISO_8859-1.src b/share/monetdef/en_CA.ISO_8859-1.src
new file mode 100644
index 0000000..611d55f
--- /dev/null
+++ b/share/monetdef/en_CA.ISO_8859-1.src
@@ -0,0 +1,36 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# int_curr_symbol
+CAD
+# currency_symbol
+$
+# mon_decimal_point
+.
+# mon_thousands_sep
+,
+# mon_grouping
+3;3
+# positive_sign
+
+# negative_sign
+-
+# int_frac_digits
+2
+# frac_digits
+2
+# p_cs_precedes
+1
+# p_sep_by_space
+0
+# n_cs_precedes
+1
+# n_sep_by_space
+0
+# p_sign_posn
+1
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_GB.ISO8859-1.src b/share/monetdef/en_GB.ISO8859-1.src
new file mode 100644
index 0000000..884712d
--- /dev/null
+++ b/share/monetdef/en_GB.ISO8859-1.src
@@ -0,0 +1,36 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# int_curr_symbol
+GBP
+# currency_symbol
+£
+# mon_decimal_point
+.
+# mon_thousands_sep
+,
+# mon_grouping
+3;3
+# positive_sign
+
+# negative_sign
+-
+# int_frac_digits
+2
+# frac_digits
+2
+# p_cs_precedes
+1
+# p_sep_by_space
+0
+# n_cs_precedes
+1
+# n_sep_by_space
+0
+# p_sign_posn
+1
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_GB.ISO_8859-1.src b/share/monetdef/en_GB.ISO_8859-1.src
new file mode 100644
index 0000000..884712d
--- /dev/null
+++ b/share/monetdef/en_GB.ISO_8859-1.src
@@ -0,0 +1,36 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# int_curr_symbol
+GBP
+# currency_symbol
+£
+# mon_decimal_point
+.
+# mon_thousands_sep
+,
+# mon_grouping
+3;3
+# positive_sign
+
+# negative_sign
+-
+# int_frac_digits
+2
+# frac_digits
+2
+# p_cs_precedes
+1
+# p_sep_by_space
+0
+# n_cs_precedes
+1
+# n_sep_by_space
+0
+# p_sign_posn
+1
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_NZ.ISO8859-1.src b/share/monetdef/en_NZ.ISO8859-1.src
new file mode 100644
index 0000000..e22a89d
--- /dev/null
+++ b/share/monetdef/en_NZ.ISO8859-1.src
@@ -0,0 +1,36 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# int_curr_symbol
+NZD
+# currency_symbol
+$
+# mon_decimal_point
+.
+# mon_thousands_sep
+,
+# mon_grouping
+3;3
+# positive_sign
+
+# negative_sign
+-
+# int_frac_digits
+2
+# frac_digits
+2
+# p_cs_precedes
+1
+# p_sep_by_space
+0
+# n_cs_precedes
+1
+# n_sep_by_space
+0
+# p_sign_posn
+1
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/en_NZ.ISO_8859-1.src b/share/monetdef/en_NZ.ISO_8859-1.src
new file mode 100644
index 0000000..e22a89d
--- /dev/null
+++ b/share/monetdef/en_NZ.ISO_8859-1.src
@@ -0,0 +1,36 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# int_curr_symbol
+NZD
+# currency_symbol
+$
+# mon_decimal_point
+.
+# mon_thousands_sep
+,
+# mon_grouping
+3;3
+# positive_sign
+
+# negative_sign
+-
+# int_frac_digits
+2
+# frac_digits
+2
+# p_cs_precedes
+1
+# p_sep_by_space
+0
+# n_cs_precedes
+1
+# n_sep_by_space
+0
+# p_sign_posn
+1
+# n_sign_posn
+1
+# EOF
diff --git a/share/monetdef/fr_CA.ISO8859-1.src b/share/monetdef/fr_CA.ISO8859-1.src
new file mode 100644
index 0000000..4139291
--- /dev/null
+++ b/share/monetdef/fr_CA.ISO8859-1.src
@@ -0,0 +1,36 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# int_curr_symbol
+CAD
+# currency_symbol
+$
+# mon_decimal_point
+,
+# mon_thousands_sep
+ 
+# mon_grouping
+3;3
+# positive_sign
+
+# negative_sign
+-
+# int_frac_digits
+2
+# frac_digits
+2
+# p_cs_precedes
+0
+# p_sep_by_space
+1
+# n_cs_precedes
+0
+# n_sep_by_space
+1
+# p_sign_posn
+1
+# n_sign_posn
+2
+# EOF
diff --git a/share/monetdef/fr_CA.ISO_8859-1.src b/share/monetdef/fr_CA.ISO_8859-1.src
new file mode 100644
index 0000000..4139291
--- /dev/null
+++ b/share/monetdef/fr_CA.ISO_8859-1.src
@@ -0,0 +1,36 @@
+# $FreeBSD$
+#
+# WARNING: spaces may be essential at the end of lines
+# WARNING: empty lines are essential too
+#
+# int_curr_symbol
+CAD
+# currency_symbol
+$
+# mon_decimal_point
+,
+# mon_thousands_sep
+ 
+# mon_grouping
+3;3
+# positive_sign
+
+# negative_sign
+-
+# int_frac_digits
+2
+# frac_digits
+2
+# p_cs_precedes
+0
+# p_sep_by_space
+1
+# n_cs_precedes
+0
+# n_sep_by_space
+1
+# p_sign_posn
+1
+# n_sign_posn
+2
+# EOF