Index: stable/4/share/colldef/Makefile
===================================================================
--- stable/4/share/colldef/Makefile	(revision 89656)
+++ stable/4/share/colldef/Makefile	(revision 89657)
@@ -1,102 +1,102 @@
 # $FreeBSD$
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
 
 LOCALES=	bg_BG.CP1251 \
 		cs_CZ.ISO8859-2 \
 		de_DE.ISO8859-15 \
 		de_DE.ISO8859-1 \
 		es_ES.ISO8859-15 \
 		es_ES.ISO8859-1 \
 		is_IS.ISO8859-15 \
 		is_IS.ISO8859-1 \
 		la_LN.US-ASCII \
 		la_LN.ISO8859-15 \
 		la_LN.ISO8859-1 \
 		la_LN.ISO8859-2 \
 		la_LN.ISO8859-4 \
 		lt_LT.ISO8859-4 \
 		ru_RU.CP866 \
 		ru_RU.ISO8859-5 \
 		ru_RU.KOI8-R \
 		sv_SE.ISO8859-15 \
 		sv_SE.ISO8859-1 \
 		uk_UA.KOI8-U
 
 LOCALEDIR=      ${DESTDIR}/usr/share/locale
 
-ASCIILINKS = en_AU.US-ASCII en_CA.US-ASCII en_GB.US-ASCII \
+ASCIILINKS = en_AU.US-ASCII en_CA.US-ASCII en_GB.US-ASCII en_NZ.US-ASCII \
 	en_US.US-ASCII ko_KR.EUC ja_JP.EUC ja_JP.SJIS zh_CN.EUC
 
 ZHLINKS=	zh_TW.Big5
 
 LATIN1LINKS = \
-	da_DK en_AU en_CA en_GB en_US fi_FI \
+	da_DK en_AU en_CA en_GB en_NZ en_US fi_FI \
 	fr_BE fr_CA fr_CH fr_FR it_CH it_IT nl_BE nl_NL no_NO \
 	pt_PT
 
 LATIN2LINKS = hr_HR hu_HU pl_PL sl_SI
 
 DELINKS = de_AT de_CH
 
 .SUFFIXES: .src .out
 
 .src.out:
 	colldef -I ${.CURDIR} -o ${.TARGET} ${.IMPSRC}
 
 all: ${LOCALES:S/$/.out/g}
 
 cs_CZ.ISO8859-2.out:	map.ISO8859-2
 de_DE.ISO8859-15.out:	map.ISO8859-15
 de_DE.ISO8859-1.out:	map.ISO8859-1
 es_ES.ISO8859-15.out:	map.ISO8859-15
 es_ES.ISO8859-1.out:	map.ISO8859-1
 is_IS.ISO8859-15.out:	map.ISO8859-15
 is_IS.ISO8859-1.out:	map.ISO8859-1
 la_LN.ISO8859-15.out:	map.ISO8859-15
 la_LN.ISO8859-1.out:	map.ISO8859-1
 la_LN.ISO8859-4.out:	map.ISO8859-4
 lt_LT.ISO8859-4.out:	map.ISO8859-4
 ru_RU.CP866.out:	map.CP866
 ru_RU.ISO8859-5.out:	map.ISO8859-5
 ru_RU.KOI8-R.out:	map.KOI8-R
 sv_SE.ISO8859-15.out:	map.ISO8859-15
 sv_SE.ISO8859-1.out:	map.ISO8859-1
 uk_UA.KOI8-U.out:	map.KOI8-U
 
 afterinstall:
 .for locale in ${LOCALES}
 	${INSTALL} -c -m 644 -o ${BINOWN} -g ${BINGRP} \
 		${locale}.out ${LOCALEDIR}/${locale}/LC_COLLATE
 .endfor
 .for link in ${ASCIILINKS}
 	ln -fs ../la_LN.ASCII/LC_COLLATE \
 	       ${LOCALEDIR}/${link}/LC_COLLATE
 .endfor
 .for link in ${ZHLINKS}
 	ln -fs ../is_IS.ISO8859-1/LC_COLLATE \
 	       ${LOCALEDIR}/${link}/LC_COLLATE
 .endfor
 .for link in ${LATIN1LINKS}
 	ln -fs ../la_LN.ISO8859-1/LC_COLLATE \
 	       ${LOCALEDIR}/${link}.ISO8859-1/LC_COLLATE
 .endfor
 .for link in ${LATIN1LINKS}
 	ln -fs ../la_LN.ISO8859-15/LC_COLLATE \
 	       ${LOCALEDIR}/${link}.ISO8859-15/LC_COLLATE
 .endfor
 .for link in ${LATIN2LINKS}
 	ln -fs ../la_LN.ISO8859-2/LC_COLLATE \
 	       ${LOCALEDIR}/${link}.ISO8859-2/LC_COLLATE
 .endfor
 .for link in ${DELINKS}
 	ln -fs ../de_DE.ISO8859-1/LC_COLLATE \
 	       ${LOCALEDIR}/${link}.ISO8859-1/LC_COLLATE
 .endfor
 .for link in ${DELINKS}
 	ln -fs ../de_DE.ISO8859-15/LC_COLLATE \
 	       ${LOCALEDIR}/${link}.ISO8859-15/LC_COLLATE
 .endfor
 
 .include <bsd.prog.mk>
Index: stable/4/share/mklocale/Makefile
===================================================================
--- stable/4/share/mklocale/Makefile	(revision 89656)
+++ stable/4/share/mklocale/Makefile	(revision 89657)
@@ -1,67 +1,67 @@
 # $FreeBSD$
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
 
 LOCALES=        bg_BG.CP1251 \
 		ja_JP.EUC \
 		ja_JP.SJIS \
 		ko_KR.EUC \
 		la_LN.US-ASCII \
 		la_LN.ISO8859-1 \
 		la_LN.ISO8859-2 \
 		la_LN.ISO8859-4 \
 		la_LN.ISO8859-15 \
 		ru_RU.CP866 \
 		ru_RU.ISO8859-5 \
 		ru_RU.KOI8-R \
 		uk_UA.KOI8-U \
 		zh_CN.EUC \
 		zh_TW.Big5
 
 LOCALEDIR=	${DESTDIR}/usr/share/locale
 
-ASCIILINKS=	en_AU en_CA en_GB en_US
+ASCIILINKS=	en_AU en_CA en_GB en_NZ en_US
 LATIN1LINKS = \
-	da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES fi_FI \
+	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_CH it_IT nl_BE nl_NL no_NO \
 	pt_PT sv_SE
 
 LATIN2LINKS = cs_CZ hr_HR hu_HU pl_PL sl_SI
 
 LATIN4LINKS = lt_LT
 
 .SUFFIXES: .src .out
 
 .src.out:
 	mklocale -o ${.TARGET} ${.IMPSRC}
 
 all: ${LOCALES:S/$/.out/g}
 
 afterinstall:
 .for locale in ${LOCALES}
 	${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} \
 		${locale}.out ${LOCALEDIR}/${locale}/LC_CTYPE
 .endfor
 .for link in ${LATIN1LINKS}
 	ln -fs ../la_LN.ISO8859-1/LC_CTYPE \
 		       ${LOCALEDIR}/${link}.ISO8859-1/LC_CTYPE
 .endfor
 .for link in ${LATIN1LINKS}
 	ln -fs ../la_LN.ISO8859-15/LC_CTYPE \
 		       ${LOCALEDIR}/${link}.ISO8859-15/LC_CTYPE
 .endfor
 .for link in ${LATIN2LINKS}
 	ln -fs ../la_LN.ISO8859-2/LC_CTYPE \
 		${LOCALEDIR}/${link}.ISO8859-2/LC_CTYPE
 .endfor
 .for link in ${LATIN4LINKS}
 	ln -fs ../la_LN.ISO8859-4/LC_CTYPE \
 		${LOCALEDIR}/${link}.ISO8859-4/LC_CTYPE
 .endfor
 .for link in ${ASCIILINKS}
 	ln -fs ../la_LN.US-ASCII/LC_CTYPE \
 		${LOCALEDIR}/${link}.US-ASCII/LC_CTYPE
 .endfor
 
 .include <bsd.prog.mk>
Index: stable/4/share/timedef/Makefile
===================================================================
--- stable/4/share/timedef/Makefile	(revision 89656)
+++ stable/4/share/timedef/Makefile	(revision 89657)
@@ -1,124 +1,124 @@
 # $FreeBSD$
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
 
 LOCALES=	bg_BG.CP1251 \
 		cs_CZ.ISO8859-2 \
 		da_DK.ISO8859-1 \
 		de_AT.ISO8859-1 \
 		de_DE.ISO8859-1 \
 		en_GB.ISO8859-1 \
 		en_US.ISO8859-1 \
 		es_ES.ISO8859-1 \
 		fi_FI.ISO8859-1 \
 		fr_FR.ISO8859-1 \
 		hr_HR.ISO8859-2 \
 		hu_HU.ISO8859-2 \
 		is_IS.ISO8859-1 \
 		ja_JP.EUC       \
 		ja_JP.SJIS      \
 		it_IT.ISO8859-1 \
 		ko_KR.EUC       \
 		la_LN.ISO8859-1 \
 		lt_LT.ISO8859-4 \
 		nl_NL.ISO8859-1 \
 		no_NO.ISO8859-1 \
 		pl_PL.ISO8859-2 \
 		pt_PT.ISO8859-1 \
 		ru_RU.CP866     \
 		ru_RU.ISO8859-5 \
 		ru_RU.KOI8-R    \
 		sl_SI.ISO8859-2 \
 		sv_SE.ISO8859-1 \
 		tr_TR.ISO8859-9 \
 		uk_UA.KOI8-U    \
 		zh_CN.EUC       \
 		zh_TW.Big5
 
 LOCALEDIR=      ${DESTDIR}/usr/share/locale
 
 8859_15_LINKS = da_DK de_AT de_DE en_GB en_US es_ES fi_FI fr_FR is_IS \
 		it_IT la_LN nl_NL no_NO pt_PT sv_SE
 DE_LINKS =      de_CH
 FR_LINKS =      fr_BE fr_CA fr_CH
 IT_LINKS =      it_CH
 LN_LINKS =      la_LN.US-ASCII la_LN.ISO8859-2 la_LN.ISO8859-4
 NL_LINKS =      nl_BE
 US_LINKS =      en_CA
-GB_LINKS =      en_AU
+GB_LINKS =      en_AU en_NZ
 
 .SUFFIXES: .src .out
 
 .src.out:
 	grep -v '^#' < ${.IMPSRC} > ${.TARGET}
 
 all: ${LOCALES:S/$/.out/g}
 
 afterinstall:
 	for l in ${LOCALES}; do \
 		${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} $$l.out \
 			   ${LOCALEDIR}/$$l/LC_TIME; \
 	done
 	for l in ${8859_15_LINKS}; do \
 		ln -fs ../$$l.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${DE_LINKS}; do \
 		ln -fs ../de_DE.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
 	done
 	for l in ${DE_LINKS}; do \
 		ln -fs ../de_DE.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${IT_LINKS}; do \
 		ln -fs ../it_IT.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
 	done
 	for l in ${IT_LINKS}; do \
 		ln -fs ../it_IT.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${FR_LINKS}; do \
 		ln -fs ../fr_FR.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
 	done
 	for l in ${FR_LINKS}; do \
 		ln -fs ../fr_FR.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${LN_LINKS}; do \
 		ln -fs ../la_LN.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l/LC_TIME; \
 	done
 	for l in ${NL_LINKS}; do \
 		ln -fs ../nl_NL.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
 	done
 	for l in ${NL_LINKS}; do \
 		ln -fs ../nl_NL.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${US_LINKS}; do \
 		ln -fs ../en_US.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
 		ln -fs ../en_US.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 		ln -fs ../en_US.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.US-ASCII/LC_TIME; \
 	done
 	for l in ${GB_LINKS}; do \
 		ln -fs ../en_GB.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
 		ln -fs ../en_GB.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 		ln -fs ../en_GB.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.US-ASCII/LC_TIME; \
 	done
 	ln -fs ../en_GB.ISO8859-1/LC_TIME \
 		${LOCALEDIR}/en_GB.US-ASCII/LC_TIME
 	ln -fs ../en_US.ISO8859-1/LC_TIME \
 		${LOCALEDIR}/en_US.US-ASCII/LC_TIME
 
 .include <bsd.prog.mk>