8038 untangle data from usr/src/cmd

Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Alexander Pyhalov <alp@rsu.ru> Reviewed by: Robert Mustacchi <rm@joyent.com> Approved by: Hans Rosenfeld <hans.rosenfeld@joyent.com>
author: Yuri Pankov <yuri.pankov@nexenta.com> 2017-03-29 17:42:07 +0300
committer: Hans Rosenfeld <hans.rosenfeld@joyent.com> 2017-05-02 07:49:37 +0200
commit: 503609a9497e27f206d815a06ce90a747d2ce573 (patch)
tree: 1f9c48e41ef129dee29d66ddad42068b33041dd0 /usr
parent: 48d8443e35c27b5e39226cd33f279567424ad20a (diff)
download: illumos-joyent-503609a9497e27f206d815a06ce90a747d2ce573.tar.gz
361 files changed, 1053 insertions, 811 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile
index 09530d48da..4f77662d45 100644
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -38,7 +38,7 @@ include Makefile.master
 # it defines TARGETDIRS and ROOTDIRS.
 include Targetdirs
 
-COMMON_SUBDIRS=	uts lib cmd ucblib ucbcmd psm man test
+COMMON_SUBDIRS=	data uts lib cmd ucblib ucbcmd psm man test
 sparc_SUBDIRS= stand
 i386_SUBDIRS= grub boot
 
@@ -64,7 +64,7 @@ PARALLEL_HEADERS = sysheaders userheaders libheaders cmdheaders
 #
 # Directories that can be built in parallel
 #
-PARALLEL_DIRS = uts lib man
+PARALLEL_DIRS = data uts lib man
 
 # The check target also causes smf(5) service manifests to be validated.
 CHKMFSTSUBDIRS=	cmd
@@ -72,7 +72,7 @@ CHKMFSTSUBDIRS=	cmd
 # And man page formats
 CHKMANSUBDIRS = man
 
-MSGSUBDIRS=	cmd ucbcmd lib
+MSGSUBDIRS=	cmd ucbcmd lib data
 DOMAINS= \
 	SUNW_OST_ADMIN \
 	SUNW_OST_NETRPC \
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index 8d6f184994..4e85ec2489 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -192,6 +192,9 @@ TAR=		/usr/bin/tar
 ASTBINDIR=	/usr/ast/bin
 MSGCC=		$(ASTBINDIR)/msgcc
 MSGFMT=		/usr/bin/msgfmt -s
+LCDEF=		$(ONBLD_TOOLS)/bin/$(MACH)/localedef
+TIC=		$(ONBLD_TOOLS)/bin/$(MACH)/tic
+ZIC=		$(ONBLD_TOOLS)/bin/$(MACH)/zic
 
 FILEMODE=	644
 DIRMODE=	755
diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile
index 22a031cbdb..08841eb06d 100644
--- a/usr/src/cmd/Makefile
+++ b/usr/src/cmd/Makefile
@@ -199,7 +199,6 @@ COMMON_SUBDIRS=		\
 	hostname	\
 	hotplug		\
 	hotplugd	\
-	hwdata		\
 	ibd_upgrade	\
 	iconv		\
 	id		\
@@ -410,7 +409,6 @@ COMMON_SUBDIRS=		\
 	tbl		\
 	tcopy		\
 	tcpd		\
-	terminfo	\
 	th_tools	\
 	tic		\
 	time		\
@@ -828,9 +826,8 @@ _dc: $(DCSUBDIRS)
 #
 # Dependencies
 #
-fs.d: fstyp
+fs.d:	fstyp
 ksh:	shcomp isaexec
-mdb:	terminfo
 print:	lp
 fmt:	mailx
 
diff --git a/usr/src/cmd/localedef/Makefile b/usr/src/cmd/localedef/Makefile
index 9cb289c1a5..43e583ed77 100644
--- a/usr/src/cmd/localedef/Makefile
+++ b/usr/src/cmd/localedef/Makefile
@@ -16,388 +16,37 @@
 # Copyright 2016 Joyent, Inc.
 #
 
-PROG=localedef
+include		$(SRC)/cmd/Makefile.cmd
+include		$(SRC)/cmd/Makefile.ctf
+include		$(SRC)/cmd/localedef/Makefile.common
 
-NDIR=native
-NPROG=$(NDIR)/localedef
-
-include ../Makefile.cmd
-
-OBJS = 	charmap.o collate.o ctype.o messages.o monetary.o numeric.o time.o \
-	scanner.o localedef.o wide.o parser.tab.o
-NOBJS = $(OBJS:%.o=native/%.o) native/avl.o native/mkdirp.o
-
-HDRS	= localedef.h
-
-SRCS   = $(OBJS:%.o=%.c)
-
-CPPFLAGS	+= -I $(SRC)/lib/libc/port/locale
-NATIVE_CPPFLAGS	+= -I $(SRC)/lib/libc/port/locale -DNATIVE
-CERRWARN	+= -_gcc=-Wno-unused-label
-LDLIBS		+= -lgen
-LDLIBS 		+= -lavl
-
-NATIVELDLIBS=
-
-YFLAGS		= -d -b parser
-
-CLEANFILES	= $(NOBJS) $(OBJS) parser.tab.c parser.tab.h
-CLEANFILES	+= \
-		UTF-8.cm UTF-8.ct \
-		8859-1.cm 8859-2.cm 8859-3.cm 8859-4.cm \
-		8859-5.cm 8859-5.cm 8859-6.cm 8859-7.cm \
-		8859-8.cm 8859-9.cm 8859-9.cm 8859-10.cm \
-		8859-11.cm 8859-13.cm 8859-14.cm 8859-15.cm \
-		8859-16.cm \
-		KOI8-R.cm
-CLOBBERFILES	= $(PROG) $(NPROG) $(POFILE) \
-		GB18030.cm UTF-8.cm
-
-PIFILES		= $(OBJS:%.o=%.i)
-POFILE		= localedef_cmd.po
-
-ISO8859_1_LOCALES	= \
-		da_DK \
-		de_CH de_DE \
-		en_AU en_CA en_GB en_NZ en_US \
-		es_AR es_BO es_CL es_CO es_EC es_ES es_GT es_MX es_NI es_PA \
-		es_PE es_SV es_UY es_VE \
-		fr_CA fr_CH fr_FR \
-		is_IS \
-		it_CH it_IT \
-		sv_SE
-
-ISO8859_2_LOCALES	= \
-		cs_CZ \
-		hr_HR \
-		hu_HU \
-		pl_PL \
-		sq_AL
-
-ISO8859_5_LOCALES	= \
-		bg_BG \
-		mk_MK \
-		ru_RU
-
-ISO8859_6_LOCALES	= 
-
-ISO8859_7_LOCALES	= \
-		el_GR
-
-ISO8859_9_LOCALES	= \
-		tr_TR
-
-ISO8859_11_LOCALES	= \
-		th_TH
-
-ISO8859_13_LOCALES	= \
-		lt_LT \
-		lv_LV
-
-ISO8859_15_LOCALES	= \
-		ca_ES \
-		da_DK \
-		de_AT de_DE \
-		en_GB en_IE en_US \
-		es_ES \
-		fi_FI \
-		fr_BE fr_FR \
-		it_IT \
-		nl_BE nl_NL \
-		pt_PT \
-		sv_FI sv_SE
-
-KOI8_R_LOCALES		= \
-		ru_RU
-
-GB18030_LOCALES		= \
-		zh_CN
-
-#
-# All new locales should be in UTF-8 form.
-#
-UTF_8_LOCALES		= \
-		af_ZA \
-		ar_AE ar_BH ar_DZ ar_EG ar_IQ ar_JO ar_KW ar_LB ar_LY ar_MA \
-		ar_OM ar_QA ar_SA ar_TN ar_YE \
-		as_IN \
-		az_AZ \
-		be_BY \
-		bg_BG \
-		bn_BD bn_IN \
-		bo_CN bo_IN \
-		bs_BA \
-		ca_ES \
-		cs_CZ \
-		da_DK \
-		de_AT de_BE de_CH de_DE de_LI de_LU \
-		el_CY el_GR \
-		en_AU en_BW en_BZ en_CA en_GB en_HK en_IE en_IN en_JM en_MH \
-		en_MT en_NA en_NZ en_PH en_PK en_SG en_TT en_US en_ZA en_ZW \
-		es_AR es_BO es_CL es_CO es_CR es_DO es_EC es_ES es_GQ es_GT \
-		es_HN es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY \
-		es_VE \
-		et_EE \
-		fi_FI \
-		fil_PH \
-		fr_BE fr_CA fr_CF fr_CH fr_FR fr_GN fr_LU fr_MC fr_MG fr_ML \
-		fr_NE fr_SN \
-		ga_IE \
-		gu_IN \
-		he_IL \
-		hi_IN \
-		hr_HR \
-		hu_HU \
-		hy_AM \
-		id_ID \
-		ii_CN \
-		is_IS \
-		it_CH it_IT \
-		ja_JP \
-		ka_GE \
-		kk_KZ \
-		km_KH \
-		kn_IN \
-		ko_KR \
-		kok_IN \
-		lt_LT \
-		lv_LV \
-		mk_MK \
-		ml_IN \
-		mn_CN mn_MN \
-		mr_IN \
-		ms_MY \
-		mt_MT \
-		ne_IN ne_NP \
-		nl_BE nl_NL \
-		nb_NO \
-		nn_NO \
-		or_IN \
-		pa_IN pa_PK \
-		pl_PL \
-		pt_BR pt_GW pt_MZ pt_PT \
-		ro_MD ro_RO \
-		ru_MD ru_RU ru_UA \
-		sa_IN \
-		si_LK \
-		sk_SK \
-		sl_SI \
-		sq_AL \
-		sr_BA sr_ME sr_RS \
-		sv_FI sv_SE \
-		ta_IN ta_LK \
-		te_IN \
-		th_TH \
-		tr_TR \
-		uk_UA \
-		ug_CN \
-		ur_IN ur_PK \
-		vi_VN \
-		zh_CN zh_HK zh_MO zh_SG zh_TW \
-		zz_AA
-
-UTF8SRCS	= $(UTF_8_LOCALES:%=data/%.UTF-8.src)
-
-LOCNAMES	= \
-		$(ISO8859_1_LOCALES:%=%.ISO8859-1) \
-		$(ISO8859_2_LOCALES:%=%.ISO8859-2) \
-		$(ISO8859_5_LOCALES:%=%.ISO8859-5) \
-		$(ISO8859_6_LOCALES:%=%.ISO8859-6) \
-		$(ISO8859_7_LOCALES:%=%.ISO8859-7) \
-		$(ISO8859_9_LOCALES:%=%.ISO8859-9) \
-		$(ISO8859_11_LOCALES:%=%.ISO8859-11) \
-		$(ISO8859_13_LOCALES:%=%.ISO8859-13) \
-		$(ISO8859_15_LOCALES:%=%.ISO8859-15) \
-		$(KOI8_R_LOCALES:%=%.KOI8-R) \
-		$(GB18030_LOCALES:%=%.GB18030) \
-		$(UTF_8_LOCALES:%=%.UTF-8)
-
-LOCDIRS		= $(LOCNAMES:%=locale/%)
-
-STAMPFILES	= $(LOCDIRS:%=%/stamp)
-
-CATDIRS		= \
-		$(LOCDIRS:%=%/LC_COLLATE) \
-		$(LOCDIRS:%=%/LC_CTYPE) \
-		$(LOCDIRS:%=%/LC_MESSAGES) \
-		$(LOCDIRS:%=%/LC_MONETARY) \
-		$(LOCDIRS:%=%/LC_NUMERIC) \
-		$(LOCDIRS:%=%/LC_TIME)
-
-DATA		= $(CATDIRS:%=%/LCL_DATA)
-
-.PARALLEL:
-# The output from yacc must be emitted serially
-.NO_PARALLEL: parser.tab.c parser.tab.h
-
-DCOLL		= LC_COLLATE/LCL_DATA
-DCTYPE		= LC_CTYPE/LCL_DATA
-DMSGS		= LC_MESSAGES/LCL_DATA
-DMON		= LC_MONETARY/LCL_DATA
-DNUM		= LC_NUMERIC/LCL_DATA
-DTIME		= LC_TIME/LCL_DATA
-
-ROOTLOCDIRS	= $(LOCDIRS:%=$(ROOTLIB)/%)
-ROOTCATDIRS	= $(CATDIRS:%=$(ROOTLIB)/%)
-ROOTDATA	= $(DATA:%=$(ROOTLIB)/%)
-
-#
-# This is a list of locales that happen to have translations for them
-# present in the gate.
-#
-TRANSDIR	= translations
-TRANSLOCS	= \
-		zz_AA.UTF-8
-TRANSMOS	= $(TRANSLOCS:%=$(TRANSDIR)/%.mo)
-
-OSTMOFILE	= LC_MESSAGES/SUNW_OST_OSLIB.mo
-
-PRIVTRANSLOCS	= \
-		zz_AA.UTF-8
-PRIVFILE	= LC_MESSAGES/priv_names
-
-ROOTTRANSLATIONS = $(TRANSLOCS:%=$(ROOTLIB)/locale/%/$(OSTMOFILE))
-ROOTPRIVTRANS = $(PRIVTRANSLOCS:%=$(ROOTLIB)/locale/%/$(PRIVFILE))
-
-$(ROOTDATA)	:= FILEMODE=0444
+LDLIBS=		-lavl -lgen
 
 .KEEP_STATE:
 
-all: $(PROG) $(DATA)
-
-translate: $(ROOTTRANSLATIONS) $(ROOTPRIVTRANS)
-
-install: all $(ROOTPROG) $(ROOTDATA) $(ROOTTRANSLATIONS) $(ROOTPRIVTRANS)
-
-$(NDIR):
-	-@mkdir -p $@
-
-$(NDIR)/%.o: %.c
-	$(NATIVECC) $(NATIVE_CFLAGS) $(NATIVE_CPPFLAGS) -o $@ -c $<
-
-$(NDIR)/avl.o : ../../common/avl/avl.c
-	$(NATIVECC) $(NATIVE_CFLAGS) $(NATIVE_CPPFLAGS) -o $@ -c \
-	  ../../common/avl/avl.c
-
-$(NDIR)/mkdirp.o : ../../lib/libgen/common/mkdirp.c
-	$(NATIVECC) $(NATIVE_CFLAGS) $(NATIVE_CPPFLAGS) -o $@ -c \
-	  ../../lib/libgen/common/mkdirp.c
+all:		$(PROG)
 
-$(NPROG): $(NDIR) .WAIT $(NOBJS)
-	$(LINK.c) $(NOBJS) -o $@ $(NATIVELDLIBS)
-	$(POST_PROCESS)
+parser.tab.c parser.tab.h: parser.y localedef.h
+		$(YACC) $(YFLAGS) parser.y
 
-$(PROG): $(OBJS)
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
+$(OBJS):	parser.tab.h
 
-$(OBJS) $(NOBJS):	parser.tab.h
-
-parser.tab.c parser.tab.h: parser.y $(HDRS)
-	$(YACC) $(YFLAGS) parser.y
-
-lint:	$(SRCS)
-	$(LINT.c) $(CPPFLAGS) $(SRCS)
-
-clean:
-	$(RM) $(CLEANFILES)
-	$(RM) $(STAMPFILES)
-
-clobber: clean
-	$(RM) $(CLOBBERFILES)
-	$(RM) -r $(LOCDIRS)
-	$(RM) -r $(NDIR)
-	$(RM) $(TRANSMOS)
+$(PROG):	$(OBJS)
+		$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
+		$(POST_PROCESS)
 
 $(POFILE):	$(PIFILES)
-	$(RM) $@
-	$(RM) messages.po
-	$(XGETTEXT) -s $(PIFILES)
-	$(SED) -e '/domain/d' messages.po > $@
-	$(RM) $(PIFILES) messages.po
-
-locale $(ROOTLOCDIRS) $(ROOTCATDIRS):
-	$(INS.dir)
-
-$(ROOTBIN)/%: $(ROOTBIN) %
-	$(INS.file)
+		$(RM) $@
+		$(RM) messages.po
+		$(XGETTEXT) -s $(PIFILES)
+		$(SED) -e '/domain/d' messages.po > $@
+		$(RM) $(PIFILES) messages.po
 
-# Strip LC_CTYPE contents for UTF-8 locales and replace them
-# with UTF-8.ct we compiled
-locale/%.UTF-8/stamp:		data/%.UTF-8.src UTF-8.cm \
-				UTF-8.ct locale $(NPROG)
-	$(SED) '/^LC_CTYPE/,/^END LC_CTYPE/d;$$r UTF-8.ct' $< | \
-		./$(NPROG) -U -w data/widths.txt -f UTF-8.cm $(@D)
-	$(TOUCH) $@
-# Convert EURO_SIGN to CURRENCY_SIGN for the ISO8859-1 locales
-locale/%.ISO8859-1/stamp:	data/%.UTF-8.src 8859-1.cm locale $(NPROG)
-	sed 's/EURO_SIGN/CURRENCY_SIGN/' $< > $<.tmp
-	./$(NPROG) -U -w data/widths.txt -i $<.tmp -f 8859-1.cm $(@D)
-	rm -f $<.tmp
-	$(TOUCH) $@
-locale/%.ISO8859-2/stamp:	data/%.UTF-8.src 8859-2.cm locale $(NPROG)
-	./$(NPROG) -U -w data/widths.txt -i $< -f 8859-2.cm $(@D)
-	$(TOUCH) $@
-locale/%.ISO8859-5/stamp:	data/%.UTF-8.src 8859-5.cm locale $(NPROG)
-	./$(NPROG) -U -w data/widths.txt -i $< -f 8859-5.cm $(@D)
-	$(TOUCH) $@
-locale/%.ISO8859-7/stamp:	data/%.UTF-8.src 8859-7.cm locale $(NPROG)
-	./$(NPROG) -U -w data/widths.txt -i $< -f 8859-7.cm $(@D)
-	$(TOUCH) $@
-locale/%.ISO8859-6/stamp:	data/%.UTF-8.src 8859-6.cm locale $(NPROG)
-	./$(NPROG) -U -w data/widths.txt -i $< -f 8859-6.cm $(@D)
-	$(TOUCH) $@
-locale/%.ISO8859-9/stamp:	data/%.UTF-8.src 8859-9.cm locale $(NPROG)
-	./$(NPROG) -U -w data/widths.txt -i $< -f 8859-9.cm $(@D)
-	$(TOUCH) $@
-locale/%.ISO8859-11/stamp:	data/%.UTF-8.src 8859-11.cm locale $(NPROG)
-	./$(NPROG) -U -w data/widths.txt -i $< -f 8859-11.cm $(@D)
-	$(TOUCH) $@
-locale/%.ISO8859-13/stamp:	data/%.UTF-8.src 8859-13.cm locale $(NPROG)
-	./$(NPROG) -U -w data/widths.txt -i $< -f 8859-13.cm $(@D)
-	$(TOUCH) $@
-locale/%.ISO8859-15/stamp:	data/%.UTF-8.src 8859-15.cm locale $(NPROG)
-	./$(NPROG) -U -w data/widths.txt -i $< -f 8859-15.cm $(@D)
-	$(TOUCH) $@
-locale/%.KOI8-R/stamp:		data/%.UTF-8.src KOI8-R.cm locale $(NPROG)
-	./$(NPROG) -U -w data/widths.txt -i $< -f KOI8-R.cm $(@D)
-	$(TOUCH) $@
-locale/%.GB18030/stamp:		data/%.UTF-8.src GB18030.cm locale $(NPROG)
-	./$(NPROG) -U -w data/widths.txt -i $< -f GB18030.cm $(@D)
-	$(TOUCH) $@
+install:	all $(ROOTPROG)
 
-locale/%/$(DCOLL):	locale/%/stamp
-locale/%/$(DCTYPE):	locale/%/stamp
-locale/%/$(DMSGS):	locale/%/stamp
-locale/%/$(DMON):	locale/%/stamp
-locale/%/$(DNUM):	locale/%/stamp
-locale/%/$(DTIME):	locale/%/stamp
+lint:		lint_SRCS
 
-UTF-8.cm: data/UTF-8.cm
-	$(LN) -sf data/UTF-8.cm  $@
-
-UTF-8.ct: data/ctype.sh data/manual-input.UTF-8 $(UTF8SRCS)
-	$(SH) data/ctype.sh $(UTF8SRCS) > $@
-
-GB18030.cm: data/GB18030.cm
-	$(LN) -sf data/GB18030.cm  $@
-
-%.cm: data/%.TXT UTF-8.cm
-	$(RM) $@
-	$(PERL) data/convert_map.pl $< > $@
-
-$(ROOTDATA):	$(ROOTLOCDIRS) $(ROOTCATDIRS) $(DATA)
-	$(RM) $@
-	$(CP) $(@:$(ROOTLIB)/%=%) $@
-	$(CHMOD) 0444 $@
-
-%.mo: %.po
-	$(MSGFMT) -o $@ $<
-
-$(ROOTLIB)/locale/%/$(OSTMOFILE): $(TRANSDIR)/%.mo
-	$(INS.rename)
-	$(CHMOD) 0444 $@
+clean:
+		$(RM) $(CLEANFILES)
 
-$(ROOTLIB)/locale/%/$(PRIVFILE): $(TRANSDIR)/%.priv
-	$(INS.rename)
-	$(CHMOD) 0444 $@
+include		$(SRC)/cmd/Makefile.targ
diff --git a/usr/src/cmd/localedef/Makefile.common b/usr/src/cmd/localedef/Makefile.common
new file mode 100644
index 0000000000..738f253ebb
--- /dev/null
+++ b/usr/src/cmd/localedef/Makefile.common
@@ -0,0 +1,45 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2017 Nexenta Systems, Inc.
+# Copyright 2011 EveryCity Ltd. All rights reserved.
+# Copyright 2013 DEY Storage Systems, Inc.
+# Copyright 2016 Joyent, Inc.
+#
+
+PROG=		localedef
+
+OBJS=		charmap.o \
+		collate.o \
+		ctype.o \
+		messages.o \
+		monetary.o \
+		numeric.o \
+		time.o \
+		scanner.o \
+		localedef.o \
+		wide.o \
+		parser.tab.o
+SRCS=		$(OBJS:%.o=%.c)
+
+CPPFLAGS +=	-I$(SRC)/lib/libc/port/locale
+
+CERRWARN +=	-_gcc=-Wno-char-subscripts
+CERRWARN +=	-_gcc=-Wno-uninitialized
+CERRWARN +=	-_gcc=-Wno-unused-label
+
+YFLAGS=		-d -b parser
+
+CLEANFILES=	$(OBJS) parser.tab.c parser.tab.h
+
+PIFILES=	$(OBJS:%.o=%.i)
+POFILE=		localedef_cmd.po
diff --git a/usr/src/cmd/tic/Makefile b/usr/src/cmd/tic/Makefile
index e4d3c127b1..892e57fe5d 100644
--- a/usr/src/cmd/tic/Makefile
+++ b/usr/src/cmd/tic/Makefile
@@ -18,54 +18,34 @@
 #
 # CDDL HEADER END
 #
+
 #
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+# Copyright 2017 Nexenta Systems, Inc.
 #
 
-PROG= tic
-
-OBJS= \
-	tic_captab.o \
-	tic_error.o \
-	tic_hash.o \
-	tic_main.o \
-	tic_parse.o \
-	tic_read.o \
-	tic_scan.o
-
-SRCS= $(OBJS:%.o=%.c)
-
-include ../Makefile.cmd
-
-LDLIBS += -lcurses
-CPPFLAGS += -I../../lib/libcurses/screen
-MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB)
-LDFLAGS += $(MAPFILES:%=-M%)
-
-CERRWARN += -_gcc=-Wno-char-subscripts
-CERRWARN += -_gcc=-Wno-implicit-function-declaration
-CERRWARN += -_gcc=-Wno-parentheses
-CERRWARN += -_gcc=-Wno-uninitialized
+include		$(SRC)/cmd/Makefile.cmd
+include		$(SRC)/cmd/Makefile.ctf
+include		$(SRC)/cmd/tic/Makefile.common
 
 .KEEP_STATE:
 
-all: $(PROG) 
-
-$(PROG): $(OBJS) $(MAPFILES)
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
+all:		$(PROG)
 
-$(POFILE): $(POFILES)
-	$(RM) $@
-	cat $(POFILES) > $@
+$(PROG):	$(OBJS) $(MAPFILES)
+		$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
+		$(POST_PROCESS)
 
+$(POFILE):	$(POFILES)
+		$(RM) $@
+		cat $(POFILES) > $@
 
-install: all $(ROOTPROG)
+install:	all $(ROOTPROG)
 
 clean:
-	$(RM) $(OBJS)
+		$(RM) $(OBJS)
 
-lint: lint_SRCS
+lint:		lint_SRCS
 
-include ../Makefile.targ
+include		$(SRC)/cmd/Makefile.targ
diff --git a/usr/src/cmd/tic/Makefile.common b/usr/src/cmd/tic/Makefile.common
new file mode 100644
index 0000000000..c9c53005af
--- /dev/null
+++ b/usr/src/cmd/tic/Makefile.common
@@ -0,0 +1,47 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+# Copyright 2017 Nexenta Systems, Inc.
+#
+
+PROG=		tic
+OBJS=		tic_captab.o \
+		tic_error.o \
+		tic_hash.o \
+		tic_main.o \
+		tic_parse.o \
+		tic_read.o \
+		tic_scan.o
+SRCS=		$(OBJS:%.o=%.c)
+
+CPPFLAGS +=	-I$(SRC)/lib/libcurses/screen
+
+LDLIBS +=	-lcurses
+MAPFILES=	$(MAPFILE.INT) $(MAPFILE.NGB)
+LDFLAGS +=	$(MAPFILES:%=-M%)
+
+CERRWARN +=	-_gcc=-Wno-char-subscripts
+CERRWARN +=	-_gcc=-Wno-implicit-function-declaration
+CERRWARN +=	-_gcc=-Wno-parentheses
+CERRWARN +=	-_gcc=-Wno-uninitialized
diff --git a/usr/src/cmd/zic/Makefile b/usr/src/cmd/zic/Makefile
index 5984f9a689..55aaec54de 100644
--- a/usr/src/cmd/zic/Makefile
+++ b/usr/src/cmd/zic/Makefile
@@ -3,132 +3,32 @@
 # Use is subject to license terms.
 #
 
-NATIVE=native
-PROG= zic
-KSHPROG= tzselect
-NPROG= $(NATIVE)/$(PROG)
+include		$(SRC)/cmd/Makefile.cmd
+include		$(SRC)/cmd/Makefile.ctf
+include		$(SRC)/cmd/zic/Makefile.common
 
-# "etcetera" must be listed before "backward" because it sets up links that
-# "backward" needs.
-TZFILES= africa antarctica asia australasia etcetera europe \
-	 factory northamerica pacificnew solar87 solar88 solar89 \
-	 southamerica backward
-# Don't build the systemv timezones, but do install the source file.
-SRCFILES = $(TZFILES) systemv README
-TABFILES = continent.tab country.tab zone_sun.tab
-
-OBJS= zic.o scheck.o ialloc.o
-SRCS= $(OBJS:%.o=%.c)
-NOBJS= $(OBJS:%=$(NATIVE)/%)
-
-CLOBBERFILES= $(NOBJS) $(KSHPROG) $(NPROG) $(NATIVE)/zic.c $(NATIVE)/tzfile.h
-
-include ../Makefile.cmd
-
-NCPPFLAGS=	-I$(NATIVE)
-ROOTTZD=	$(ROOTSHLIB)/zoneinfo
-ROOTTZSRCD=	$(ROOTSHLIB)/zoneinfo/src
-ROOTTZTABD=	$(ROOTSHLIB)/zoneinfo/tab
-DIRS=  $(ROOTTZSRCD) $(ROOTTZTABD)
-
-CERRWARN +=	-_gcc=-Wno-unused-variable
-CERRWARN +=	-_gcc=-Wno-uninitialized
-
-ROOTLIBTZSRCFILES=	$(SRCFILES:%=$(ROOTTZSRCD)/%)
-ROOTLIBTZTABFILES=	$(TABFILES:%=$(ROOTTZTABD)/%)
+KSHPROG=	tzselect
 ROOTKSHPROG=	$(ROOTBIN)/$(KSHPROG)
+CLOBBERFILES +=	$(KSHPROG)
 
-$(ROOTLIBTZSRCFILES):=	FILEMODE=	0644
-$(ROOTLIBTZTABFILES):=	FILEMODE=	0644
-
-#
 # Message catalog
-#
-POFILE2=tzselect.po
-POFILE3=zoneinfo.po
-POFILES3=$(TABFILES)
-TEXT_DOMAIN2=SUNW_OST_ZONEINFO
-MSGDOMAIN2=$(MSGROOT)/$(TEXT_DOMAIN2)
-
-# NB: $(POFILE2) is under SCM.
-CLOBBERFILES += $(POFILE) $(POFILE3)
+POFILE2=	tzselect.po
+TEXT_DOMAIN2=	SUNW_OST_ZONEINFO
+MSGDOMAIN2=	$(MSGROOT)/$(TEXT_DOMAIN2)
 
 .KEEP_STATE:
 
-all: $(PROG) $(NPROG) $(KSHPROG)
-
-$(PROG): $(OBJS)
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
-
-install: all $(DIRS) $(ROOTTZSRCD) $(ROOTTZTABD) $(ROOTUSRSBINPROG) \
-		$(ROOTLIBTZSRCFILES) $(ROOTLIBTZTABFILES) $(ROOTKSHPROG)
-	$(NPROG) -d $(ROOTTZD) $(TZFILES)
-
-$(NPROG): $(NATIVE) $(NOBJS)
-	$(NATIVECC) $(NATIVE_CFLAGS) -o $@ $(NOBJS)
-
-#
-# XXX
-# There is a .ksh rule in Makefile.targ, but we need our custom POFILE rules.
-#
-$(KSHPROG):	$(KSHPROG).ksh
-	$(RM) $@
-	$(CAT) $(KSHPROG).ksh > $@
-	$(CHMOD) +x $@
-
-$(ROOTTZSRCD)/%: %
-	$(INS.file)
+all:		$(PROG) $(KSHPROG)
 
-$(ROOTTZTABD)/%: %
-	$(INS.file)
+$(PROG):	$(OBJS)
+		$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
+		$(POST_PROCESS)
 
-$(DIRS):
-	$(INS.dir)
-
-$(NATIVE):
-	-@mkdir -p $@
+install:	all $(ROOTUSRSBINPROG) $(ROOTKSHPROG)
 
 clean:
-	$(RM) $(OBJS)
-
-lint: lint_SRCS
-
-$(NOBJS): $$(@F:.o=.c)
-	$(NATIVECC) -O $(NATIVE_CFLAGS) $(NCPPFLAGS) -c -o $@ $(@F:.o=.c)
-
-$(NATIVE)/zic.o: $(NATIVE)/tzfile.h
-
-$(NATIVE)/tzfile.h: $(ROOT)/usr/include/tzfile.h
-	$(RM) $@; cp $(ROOT)/usr/include/tzfile.h $@
-
-#
-# From ../Makefile.targ
-#
-clobber: clean
-	-$(RM) $(PROG) $(CLOBBERFILES)
-
-lint_PROG:
-	$(LINT.c) $(PROG).c $(LDLIBS)
-
-lint_SRCS:
-	$(LINT.c) $(SRCS) $(LDLIBS)
-
-#
-# For message catalogue files
-#
-_msg: $(MSGDOMAIN) $(POFILE) $(POFILE2) $(MSGDOMAIN2) $(POFILE3)
-	$(RM) $(MSGDOMAIN)/$(POFILE)
-	$(CP) $(POFILE) $(MSGDOMAIN)
-	$(RM) $(MSGDOMAIN)/$(POFILE2)
-	$(CP) $(POFILE2) $(MSGDOMAIN)
-	$(RM) $(MSGDOMAIN2)/$(POFILE3)
-	$(CP) $(POFILE3) $(MSGDOMAIN2)/$(POFILE3)
+		$(RM) $(OBJS)
 
-$(MSGDOMAIN) $(DCMSGDOMAIN) $(MSGDOMAIN2):
-	$(INS.dir)
+lint:		lint_SRCS
 
-$(POFILE3):	$(POFILES3)
-	$(RM) $@
-	@/bin/sh ./do_pofile.sh > $@
- 
+include		$(SRC)/cmd/Makefile.targ
diff --git a/usr/src/cmd/zic/Makefile.common b/usr/src/cmd/zic/Makefile.common
new file mode 100644
index 0000000000..4f8526020c
--- /dev/null
+++ b/usr/src/cmd/zic/Makefile.common
@@ -0,0 +1,14 @@
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+PROG=		zic
+
+OBJS=		ialloc.o \
+		scheck.o \
+		zic.o
+SRCS=		$(OBJS:%.o=%.c)
+
+CERRWARN +=	-_gcc=-Wno-unused-variable
+CERRWARN +=	-_gcc=-Wno-uninitialized
diff --git a/usr/src/data/Makefile b/usr/src/data/Makefile
new file mode 100644
index 0000000000..2c74ec2223
--- /dev/null
+++ b/usr/src/data/Makefile
@@ -0,0 +1,38 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2017 Nexenta Systems, Inc.
+#
+
+SUBDIRS=	hwdata \
+		locale \
+		terminfo \
+		zoneinfo
+
+MSGSUBDIRS= 	zoneinfo
+
+all :=		TARGET=all
+clean :=	TARGET=clean
+clobber :=	TARGET=clobber
+install :=	TARGET=install
+_msg :=		TARGET=_msg
+
+.KEEP_STATE:
+
+all clean clobber install: $(SUBDIRS)
+
+_msg:		$(MSGSUBDIRS)
+
+$(SUBDIRS):	FRC
+		cd $@; pwd; $(MAKE) $(TARGET)
+
+FRC:
diff --git a/usr/src/data/Makefile.data b/usr/src/data/Makefile.data
new file mode 100644
index 0000000000..946bb97cbd
--- /dev/null
+++ b/usr/src/data/Makefile.data
@@ -0,0 +1,20 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2017 Nexenta Systems, Inc.
+#
+
+include		$(SRC)/Makefile.master
+
+ROOTETC=	$(ROOT)/etc
+ROOTLIB=	$(ROOT)/usr/lib
+ROOTSHLIB=	$(ROOT)/usr/share/lib
diff --git a/usr/src/data/Makefile.targ b/usr/src/data/Makefile.targ
new file mode 100644
index 0000000000..d48f433745
--- /dev/null
+++ b/usr/src/data/Makefile.targ
@@ -0,0 +1,17 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2017 Nexenta Systems, Inc.
+#
+
+clobber:	clean
+		-$(RM) $(CLOBBERFILES)
diff --git a/usr/src/cmd/hwdata/Makefile b/usr/src/data/hwdata/Makefile
index f4cc584df3..881c051214 100644
--- a/usr/src/cmd/hwdata/Makefile
+++ b/usr/src/data/hwdata/Makefile
@@ -24,50 +24,48 @@
 # Copyright 2015, OmniTI Computer Consulting, Inc. All rights reserved.
 #
 
-include ../Makefile.cmd
+include		$(SRC)/data/Makefile.data
 
-HWDATA =	pci.ids usb.ids
-HWDATADIR =	$(ROOT)/usr/share/hwdata
-ROOTHWDATA =	$(HWDATA:%=$(HWDATADIR)/%)
+HWDATA=		pci.ids usb.ids
+HWDATADIR=	$(ROOT)/usr/share/hwdata
+ROOTHWDATA=	$(HWDATA:%=$(HWDATADIR)/%)
 
-$(ROOTHWDATA) :=	FILEMODE = 444
+CLOBBERFILES=	THIRDPARTYLICENSE.pciids
 
-CLOBBERFILES += THIRDPARTYLICENSE.pciids
+$(ROOTHWDATA):=	FILEMODE = 444
 
-all install: THIRDPARTYLICENSE.pciids
+all install:	THIRDPARTYLICENSE.pciids
 
 THIRDPARTYLICENSE.pciids: pci.ids THIRDPARTYLICENSE.pciids.tmpl
-	$(RM) $@
-	$(SED) -e '/^$$/,$$ d' < pci.ids > $@
-	$(CAT) THIRDPARTYLICENSE.pciids.tmpl >> $@
+		$(RM) $@
+		$(SED) -e '/^$$/,$$ d' < pci.ids > $@
+		$(CAT) THIRDPARTYLICENSE.pciids.tmpl >> $@
 
-install: $(ROOTHWDATA)
+install:	$(ROOTHWDATA)
 
 $(HWDATADIR)/%: %
-	$(INS.file)
+		$(INS.file)
 
-lint check clean clobber:
+clean:
 
 # The "update" target family allows a simple pull-from-the-source update.
 # One can then use revision-control diffs to see what actually changed.
-update: usb.update pci.update
+update:		usb.update pci.update
 
 # URLs for PCI IDs and USB IDs
-PCIURL=http://pci-ids.ucw.cz/v2.2/pci.ids
-USBURL=http://www.linux-usb.org/usb.ids
+PCIURL=		http://pci-ids.ucw.cz/v2.2/pci.ids
+USBURL=		http://www.linux-usb.org/usb.ids
 
 # These could move into Makefile.master
-URL_FETCH=wget
+URL_FETCH=	wget
 URL_FETCHARGS=
 
 pci.update:
-	$(RM) pci.ids
-	$(URL_FETCH) $(URL_FETCHARGS) $(PCIURL)
+		$(RM) pci.ids
+		$(URL_FETCH) $(URL_FETCHARGS) $(PCIURL)
 
 usb.update:
-	$(RM) usb.ids
-	$(URL_FETCH) $(URL_FETCHARGS) $(USBURL)
+		$(RM) usb.ids
+		$(URL_FETCH) $(URL_FETCHARGS) $(USBURL)
 
-FRC:
-
-include ../Makefile.targ
+include		$(SRC)/data/Makefile.targ
diff --git a/usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids.descrip b/usr/src/data/hwdata/THIRDPARTYLICENSE.pciids.descrip
index 9f4c02db23..9f4c02db23 100644
--- a/usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids.descrip
+++ b/usr/src/data/hwdata/THIRDPARTYLICENSE.pciids.descrip
diff --git a/usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids.tmpl b/usr/src/data/hwdata/THIRDPARTYLICENSE.pciids.tmpl
index 5230814331..5230814331 100644
--- a/usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids.tmpl
+++ b/usr/src/data/hwdata/THIRDPARTYLICENSE.pciids.tmpl
diff --git a/usr/src/cmd/hwdata/pci.ids b/usr/src/data/hwdata/pci.ids
index 4bf2919ad9..4bf2919ad9 100644
--- a/usr/src/cmd/hwdata/pci.ids
+++ b/usr/src/data/hwdata/pci.ids
diff --git a/usr/src/cmd/hwdata/usb.ids b/usr/src/data/hwdata/usb.ids
index c35afff77f..c35afff77f 100644
--- a/usr/src/cmd/hwdata/usb.ids
+++ b/usr/src/data/hwdata/usb.ids
diff --git a/usr/src/data/locale/Makefile b/usr/src/data/locale/Makefile
new file mode 100644
index 0000000000..5ee34e7fee
--- /dev/null
+++ b/usr/src/data/locale/Makefile
@@ -0,0 +1,182 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2017 Nexenta Systems, Inc.
+# Copyright 2011 EveryCity Ltd. All rights reserved.
+# Copyright 2013 DEY Storage Systems, Inc.
+# Copyright 2016 Joyent, Inc.
+#
+
+include		$(SRC)/data/Makefile.data
+
+CLEANFILES += \
+		data/8859-1.cm data/8859-2.cm data/8859-3.cm data/8859-4.cm \
+		data/8859-5.cm data/8859-5.cm data/8859-6.cm data/8859-7.cm \
+		data/8859-8.cm data/8859-9.cm data/8859-9.cm data/8859-10.cm \
+		data/8859-11.cm data/8859-13.cm data/8859-14.cm \
+		data/8859-15.cm data/8859-16.cm data/KOI8-R.cm \
+		data/UTF-8.ct
+
+include		Makefile.locales
+
+UTF8SRCS=	$(UTF_8_LOCALES:%=data/%.UTF-8.src)
+
+LOCNAMES= \
+		$(ISO8859_1_LOCALES:%=%.ISO8859-1) \
+		$(ISO8859_2_LOCALES:%=%.ISO8859-2) \
+		$(ISO8859_5_LOCALES:%=%.ISO8859-5) \
+		$(ISO8859_6_LOCALES:%=%.ISO8859-6) \
+		$(ISO8859_7_LOCALES:%=%.ISO8859-7) \
+		$(ISO8859_9_LOCALES:%=%.ISO8859-9) \
+		$(ISO8859_11_LOCALES:%=%.ISO8859-11) \
+		$(ISO8859_13_LOCALES:%=%.ISO8859-13) \
+		$(ISO8859_15_LOCALES:%=%.ISO8859-15) \
+		$(KOI8_R_LOCALES:%=%.KOI8-R) \
+		$(GB18030_LOCALES:%=%.GB18030) \
+		$(UTF_8_LOCALES:%=%.UTF-8)
+
+LOCDIRS=	$(LOCNAMES:%=locale/%)
+
+STAMPFILES=	$(LOCDIRS:%=%/stamp)
+
+CATDIRS= \
+		$(LOCDIRS:%=%/LC_COLLATE) \
+		$(LOCDIRS:%=%/LC_CTYPE) \
+		$(LOCDIRS:%=%/LC_MESSAGES) \
+		$(LOCDIRS:%=%/LC_MONETARY) \
+		$(LOCDIRS:%=%/LC_NUMERIC) \
+		$(LOCDIRS:%=%/LC_TIME)
+
+DATA=		$(CATDIRS:%=%/LCL_DATA)
+
+.PARALLEL:
+
+DCOLL=		LC_COLLATE/LCL_DATA
+DCTYPE=		LC_CTYPE/LCL_DATA
+DMSGS=		LC_MESSAGES/LCL_DATA
+DMON=		LC_MONETARY/LCL_DATA
+DNUM=		LC_NUMERIC/LCL_DATA
+DTIME=		LC_TIME/LCL_DATA
+
+ROOTLOCDIRS=	$(LOCDIRS:%=$(ROOTLIB)/%)
+ROOTCATDIRS=	$(CATDIRS:%=$(ROOTLIB)/%)
+ROOTDATA=	$(DATA:%=$(ROOTLIB)/%)
+
+# This is a list of locales that happen to have translations for them
+# present in the gate.
+TRANSLOCS= \
+		zz_AA.UTF-8
+
+PRIVTRANSLOCS= \
+		zz_AA.UTF-8
+
+TRANSDIR=	translations
+TRANSMOS=	$(TRANSLOCS:%=$(TRANSDIR)/%.mo)
+OSTMOFILE=	LC_MESSAGES/SUNW_OST_OSLIB.mo
+PRIVFILE=	LC_MESSAGES/priv_names
+
+ROOTTRANSLATIONS=$(TRANSLOCS:%=$(ROOTLIB)/locale/%/$(OSTMOFILE))
+ROOTPRIVTRANS=	$(PRIVTRANSLOCS:%=$(ROOTLIB)/locale/%/$(PRIVFILE))
+
+$(ROOTDATA):=	FILEMODE=0444
+
+.KEEP_STATE:
+
+all:		$(DATA)
+
+clean:
+		$(RM) $(CLEANFILES) $(STAMPFILES)
+
+clobber:	clean
+		$(RM) -r $(LOCDIRS)
+		$(RM) $(TRANSMOS)
+
+install:	all $(ROOTDATA) $(ROOTTRANSLATIONS) $(ROOTPRIVTRANS)
+
+translate:	$(ROOTTRANSLATIONS) $(ROOTPRIVTRANS)
+
+locale $(ROOTLOCDIRS) $(ROOTCATDIRS):
+		$(INS.dir)
+
+$(STAMPFILES):	locale
+
+# Strip LC_CTYPE contents for UTF-8 locales and replace them
+# with UTF-8.ct we compiled.
+locale/%.UTF-8/stamp: data/%.UTF-8.src data/UTF-8.cm data/UTF-8.ct
+		$(SED) '/^LC_CTYPE/,/^END LC_CTYPE/d;$$r data/UTF-8.ct' $< | \
+		$(LCDEF) -U -w data/widths.txt -f data/UTF-8.cm $(@D)
+		$(TOUCH) $@
+# Convert EURO_SIGN to CURRENCY_SIGN for the ISO8859-1 locales
+locale/%.ISO8859-1/stamp: data/%.UTF-8.src data/8859-1.cm
+		$(SED) 's/EURO_SIGN/CURRENCY_SIGN/' $< | \
+		$(LCDEF) -U -w data/widths.txt -f data/8859-1.cm $(@D)
+		$(TOUCH) $@
+locale/%.ISO8859-2/stamp: data/%.UTF-8.src data/8859-2.cm
+		$(LCDEF) -U -w data/widths.txt -i $< -f data/8859-2.cm $(@D)
+		$(TOUCH) $@
+locale/%.ISO8859-5/stamp: data/%.UTF-8.src data/8859-5.cm
+		$(LCDEF) -U -w data/widths.txt -i $< -f data/8859-5.cm $(@D)
+		$(TOUCH) $@
+locale/%.ISO8859-7/stamp: data/%.UTF-8.src data/8859-7.cm
+		$(LCDEF) -U -w data/widths.txt -i $< -f data/8859-7.cm $(@D)
+		$(TOUCH) $@
+locale/%.ISO8859-6/stamp: data/%.UTF-8.src data/8859-6.cm
+		$(LCDEF) -U -w data/widths.txt -i $< -f data/8859-6.cm $(@D)
+		$(TOUCH) $@
+locale/%.ISO8859-9/stamp: data/%.UTF-8.src data/8859-9.cm
+		$(LCDEF) -U -w data/widths.txt -i $< -f data/8859-9.cm $(@D)
+		$(TOUCH) $@
+locale/%.ISO8859-11/stamp: data/%.UTF-8.src data/8859-11.cm
+		$(LCDEF) -U -w data/widths.txt -i $< -f data/8859-11.cm $(@D)
+		$(TOUCH) $@
+locale/%.ISO8859-13/stamp: data/%.UTF-8.src data/8859-13.cm
+		$(LCDEF) -U -w data/widths.txt -i $< -f data/8859-13.cm $(@D)
+		$(TOUCH) $@
+locale/%.ISO8859-15/stamp: data/%.UTF-8.src data/8859-15.cm
+		$(LCDEF) -U -w data/widths.txt -i $< -f data/8859-15.cm $(@D)
+		$(TOUCH) $@
+locale/%.KOI8-R/stamp:	data/%.UTF-8.src data/KOI8-R.cm
+		$(LCDEF) -U -w data/widths.txt -i $< -f data/KOI8-R.cm $(@D)
+		$(TOUCH) $@
+locale/%.GB18030/stamp:	data/%.UTF-8.src data/GB18030.cm
+		$(LCDEF) -U -w data/widths.txt -i $< -f data/GB18030.cm $(@D)
+		$(TOUCH) $@
+
+locale/%/$(DCOLL): locale/%/stamp
+locale/%/$(DCTYPE): locale/%/stamp
+locale/%/$(DMSGS): locale/%/stamp
+locale/%/$(DMON): locale/%/stamp
+locale/%/$(DNUM): locale/%/stamp
+locale/%/$(DTIME): locale/%/stamp
+
+data/UTF-8.ct:	ctype.sh data/manual-input.UTF-8 $(UTF8SRCS)
+		@/bin/sh ctype.sh $(UTF8SRCS) > $@
+
+data/%.cm:	convert_map.pl data/%.TXT data/UTF-8.cm
+		$(RM) $@
+		$(PERL) convert_map.pl $< > $@
+
+$(ROOTDATA):	$(ROOTLOCDIRS) $(ROOTCATDIRS) $(DATA)
+		$(RM) $@
+		$(CP) $(@:$(ROOTLIB)/%=%) $@
+		$(CHMOD) 0444 $@
+
+%.mo:		%.po
+		$(MSGFMT) -o $@ $<
+
+$(ROOTLIB)/locale/%/$(OSTMOFILE): $(TRANSDIR)/%.mo
+		$(INS.rename)
+		$(CHMOD) 0444 $@
+
+$(ROOTLIB)/locale/%/$(PRIVFILE): $(TRANSDIR)/%.priv
+		$(INS.rename)
+		$(CHMOD) 0444 $@
diff --git a/usr/src/data/locale/Makefile.locales b/usr/src/data/locale/Makefile.locales
new file mode 100644
index 0000000000..e23f96f411
--- /dev/null
+++ b/usr/src/data/locale/Makefile.locales
@@ -0,0 +1,137 @@
+ISO8859_1_LOCALES= \
+		da_DK \
+		de_CH de_DE \
+		en_AU en_CA en_GB en_NZ en_US \
+		es_AR es_BO es_CL es_CO es_EC es_ES es_GT es_MX es_NI es_PA \
+		es_PE es_SV es_UY es_VE \
+		fr_CA fr_CH fr_FR \
+		is_IS \
+		it_CH it_IT \
+		sv_SE
+
+ISO8859_2_LOCALES= \
+		cs_CZ \
+		hr_HR \
+		hu_HU \
+		pl_PL \
+		sq_AL
+
+ISO8859_5_LOCALES= \
+		bg_BG \
+		mk_MK \
+		ru_RU
+
+ISO8859_6_LOCALES=
+
+ISO8859_7_LOCALES= \
+		el_GR
+
+ISO8859_9_LOCALES= \
+		tr_TR
+
+ISO8859_11_LOCALES= \
+		th_TH
+
+ISO8859_13_LOCALES= \
+		lt_LT \
+		lv_LV
+
+ISO8859_15_LOCALES= \
+		ca_ES \
+		da_DK \
+		de_AT de_DE \
+		en_GB en_IE en_US \
+		es_ES \
+		fi_FI \
+		fr_BE fr_FR \
+		it_IT \
+		nl_BE nl_NL \
+		pt_PT \
+		sv_FI sv_SE
+
+KOI8_R_LOCALES= \
+		ru_RU
+
+GB18030_LOCALES= \
+		zh_CN
+
+# All new locales should be in UTF-8 form.
+UTF_8_LOCALES= \
+		af_ZA \
+		ar_AE ar_BH ar_DZ ar_EG ar_IQ ar_JO ar_KW ar_LB ar_LY ar_MA \
+		ar_OM ar_QA ar_SA ar_TN ar_YE \
+		as_IN \
+		az_AZ \
+		be_BY \
+		bg_BG \
+		bn_BD bn_IN \
+		bo_CN bo_IN \
+		bs_BA \
+		ca_ES \
+		cs_CZ \
+		da_DK \
+		de_AT de_BE de_CH de_DE de_LI de_LU \
+		el_CY el_GR \
+		en_AU en_BW en_BZ en_CA en_GB en_HK en_IE en_IN en_JM en_MH \
+		en_MT en_NA en_NZ en_PH en_PK en_SG en_TT en_US en_ZA en_ZW \
+		es_AR es_BO es_CL es_CO es_CR es_DO es_EC es_ES es_GQ es_GT \
+		es_HN es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY \
+		es_VE \
+		et_EE \
+		fi_FI \
+		fil_PH \
+		fr_BE fr_CA fr_CF fr_CH fr_FR fr_GN fr_LU fr_MC fr_MG fr_ML \
+		fr_NE fr_SN \
+		ga_IE \
+		gu_IN \
+		he_IL \
+		hi_IN \
+		hr_HR \
+		hu_HU \
+		hy_AM \
+		id_ID \
+		ii_CN \
+		is_IS \
+		it_CH it_IT \
+		ja_JP \
+		ka_GE \
+		kk_KZ \
+		km_KH \
+		kn_IN \
+		ko_KR \
+		kok_IN \
+		lt_LT \
+		lv_LV \
+		mk_MK \
+		ml_IN \
+		mn_CN mn_MN \
+		mr_IN \
+		ms_MY \
+		mt_MT \
+		ne_IN ne_NP \
+		nl_BE nl_NL \
+		nb_NO \
+		nn_NO \
+		or_IN \
+		pa_IN pa_PK \
+		pl_PL \
+		pt_BR pt_GW pt_MZ pt_PT \
+		ro_MD ro_RO \
+		ru_MD ru_RU ru_UA \
+		sa_IN \
+		si_LK \
+		sk_SK \
+		sl_SI \
+		sq_AL \
+		sr_BA sr_ME sr_RS \
+		sv_FI sv_SE \
+		ta_IN ta_LK \
+		te_IN \
+		th_TH \
+		tr_TR \
+		uk_UA \
+		ug_CN \
+		ur_IN ur_PK \
+		vi_VN \
+		zh_CN zh_HK zh_MO zh_SG zh_TW \
+		zz_AA
diff --git a/usr/src/cmd/localedef/data/convert_map.pl b/usr/src/data/locale/convert_map.pl
index 5d1966a282..628a7efa30 100644
--- a/usr/src/cmd/localedef/data/convert_map.pl
+++ b/usr/src/data/locale/convert_map.pl
@@ -149,10 +149,9 @@ sub mb_str
 
 $mf = shift(@ARGV);
 
-load_utf8_cm("UTF-8.cm");
+load_utf8_cm("data/UTF-8.cm");
 load_map($mf);
 
-
 print("CHARMAP\n");
 foreach $val (sort (keys (%map))) {
     #$utf8 = $map{$val};
diff --git a/usr/src/cmd/localedef/data/ctype.sh b/usr/src/data/locale/ctype.sh
index 771585828c..771585828c 100644
--- a/usr/src/cmd/localedef/data/ctype.sh
+++ b/usr/src/data/locale/ctype.sh
diff --git a/usr/src/cmd/localedef/data/8859-1.TXT b/usr/src/data/locale/data/8859-1.TXT
index 1a990ba8d6..1a990ba8d6 100644
--- a/usr/src/cmd/localedef/data/8859-1.TXT
+++ b/usr/src/data/locale/data/8859-1.TXT
diff --git a/usr/src/cmd/localedef/data/8859-10.TXT b/usr/src/data/locale/data/8859-10.TXT
index 374a42b1a5..374a42b1a5 100644
--- a/usr/src/cmd/localedef/data/8859-10.TXT
+++ b/usr/src/data/locale/data/8859-10.TXT
diff --git a/usr/src/cmd/localedef/data/8859-11.TXT b/usr/src/data/locale/data/8859-11.TXT
index 192bd9d7cf..192bd9d7cf 100644
--- a/usr/src/cmd/localedef/data/8859-11.TXT
+++ b/usr/src/data/locale/data/8859-11.TXT
diff --git a/usr/src/cmd/localedef/data/8859-13.TXT b/usr/src/data/locale/data/8859-13.TXT
index 0cd977f0e0..0cd977f0e0 100644
--- a/usr/src/cmd/localedef/data/8859-13.TXT
+++ b/usr/src/data/locale/data/8859-13.TXT
diff --git a/usr/src/cmd/localedef/data/8859-14.TXT b/usr/src/data/locale/data/8859-14.TXT
index 73e98555ea..73e98555ea 100644
--- a/usr/src/cmd/localedef/data/8859-14.TXT
+++ b/usr/src/data/locale/data/8859-14.TXT
diff --git a/usr/src/cmd/localedef/data/8859-15.TXT b/usr/src/data/locale/data/8859-15.TXT
index 735e487ebc..735e487ebc 100644
--- a/usr/src/cmd/localedef/data/8859-15.TXT
+++ b/usr/src/data/locale/data/8859-15.TXT
diff --git a/usr/src/cmd/localedef/data/8859-16.TXT b/usr/src/data/locale/data/8859-16.TXT
index c0dcf0dac6..c0dcf0dac6 100644
--- a/usr/src/cmd/localedef/data/8859-16.TXT
+++ b/usr/src/data/locale/data/8859-16.TXT
diff --git a/usr/src/cmd/localedef/data/8859-2.TXT b/usr/src/data/locale/data/8859-2.TXT
index e45df25eb8..e45df25eb8 100644
--- a/usr/src/cmd/localedef/data/8859-2.TXT
+++ b/usr/src/data/locale/data/8859-2.TXT
diff --git a/usr/src/cmd/localedef/data/8859-3.TXT b/usr/src/data/locale/data/8859-3.TXT
index 9b6ac69dd8..9b6ac69dd8 100644
--- a/usr/src/cmd/localedef/data/8859-3.TXT
+++ b/usr/src/data/locale/data/8859-3.TXT
diff --git a/usr/src/cmd/localedef/data/8859-4.TXT b/usr/src/data/locale/data/8859-4.TXT
index 662e698ab2..662e698ab2 100644
--- a/usr/src/cmd/localedef/data/8859-4.TXT
+++ b/usr/src/data/locale/data/8859-4.TXT
diff --git a/usr/src/cmd/localedef/data/8859-5.TXT b/usr/src/data/locale/data/8859-5.TXT
index a7ed1ce2ab..a7ed1ce2ab 100644
--- a/usr/src/cmd/localedef/data/8859-5.TXT
+++ b/usr/src/data/locale/data/8859-5.TXT
diff --git a/usr/src/cmd/localedef/data/8859-7.TXT b/usr/src/data/locale/data/8859-7.TXT
index bc46b74719..bc46b74719 100644
--- a/usr/src/cmd/localedef/data/8859-7.TXT
+++ b/usr/src/data/locale/data/8859-7.TXT
diff --git a/usr/src/cmd/localedef/data/8859-8.TXT b/usr/src/data/locale/data/8859-8.TXT
index bc8da4c7fd..bc8da4c7fd 100644
--- a/usr/src/cmd/localedef/data/8859-8.TXT
+++ b/usr/src/data/locale/data/8859-8.TXT
diff --git a/usr/src/cmd/localedef/data/8859-9.TXT b/usr/src/data/locale/data/8859-9.TXT
index 22901f1077..22901f1077 100644
--- a/usr/src/cmd/localedef/data/8859-9.TXT
+++ b/usr/src/data/locale/data/8859-9.TXT
diff --git a/usr/src/cmd/localedef/data/GB18030.cm b/usr/src/data/locale/data/GB18030.cm
index ba267862b4..ba267862b4 100644
--- a/usr/src/cmd/localedef/data/GB18030.cm
+++ b/usr/src/data/locale/data/GB18030.cm
diff --git a/usr/src/cmd/localedef/data/KOI8-R.TXT b/usr/src/data/locale/data/KOI8-R.TXT
index 510561005c..510561005c 100644
--- a/usr/src/cmd/localedef/data/KOI8-R.TXT
+++ b/usr/src/data/locale/data/KOI8-R.TXT
diff --git a/usr/src/cmd/localedef/data/KOI8-U.TXT b/usr/src/data/locale/data/KOI8-U.TXT
index f6c1710804..f6c1710804 100644
--- a/usr/src/cmd/localedef/data/KOI8-U.TXT
+++ b/usr/src/data/locale/data/KOI8-U.TXT
diff --git a/usr/src/cmd/localedef/data/THIRDPARTYLICENSE b/usr/src/data/locale/data/THIRDPARTYLICENSE
index a69e8b95ac..a69e8b95ac 100644
--- a/usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+++ b/usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/cmd/localedef/data/THIRDPARTYLICENSE.descrip b/usr/src/data/locale/data/THIRDPARTYLICENSE.descrip
index 2f3b103094..2f3b103094 100644
--- a/usr/src/cmd/localedef/data/THIRDPARTYLICENSE.descrip
+++ b/usr/src/data/locale/data/THIRDPARTYLICENSE.descrip
diff --git a/usr/src/cmd/localedef/data/UTF-8.cm b/usr/src/data/locale/data/UTF-8.cm
index dc1f5838dc..dc1f5838dc 100644
--- a/usr/src/cmd/localedef/data/UTF-8.cm
+++ b/usr/src/data/locale/data/UTF-8.cm
diff --git a/usr/src/cmd/localedef/data/af_ZA.UTF-8.src b/usr/src/data/locale/data/af_ZA.UTF-8.src
index f9595353fb..f9595353fb 100644
--- a/usr/src/cmd/localedef/data/af_ZA.UTF-8.src
+++ b/usr/src/data/locale/data/af_ZA.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_AE.UTF-8.src b/usr/src/data/locale/data/ar_AE.UTF-8.src
index 963c4c8e4d..963c4c8e4d 100644
--- a/usr/src/cmd/localedef/data/ar_AE.UTF-8.src
+++ b/usr/src/data/locale/data/ar_AE.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_BH.UTF-8.src b/usr/src/data/locale/data/ar_BH.UTF-8.src
index 586470ac47..586470ac47 100644
--- a/usr/src/cmd/localedef/data/ar_BH.UTF-8.src
+++ b/usr/src/data/locale/data/ar_BH.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_DZ.UTF-8.src b/usr/src/data/locale/data/ar_DZ.UTF-8.src
index 5a3a240095..5a3a240095 100644
--- a/usr/src/cmd/localedef/data/ar_DZ.UTF-8.src
+++ b/usr/src/data/locale/data/ar_DZ.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_EG.UTF-8.src b/usr/src/data/locale/data/ar_EG.UTF-8.src
index 830d77d085..830d77d085 100644
--- a/usr/src/cmd/localedef/data/ar_EG.UTF-8.src
+++ b/usr/src/data/locale/data/ar_EG.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_IQ.UTF-8.src b/usr/src/data/locale/data/ar_IQ.UTF-8.src
index b12076c23e..b12076c23e 100644
--- a/usr/src/cmd/localedef/data/ar_IQ.UTF-8.src
+++ b/usr/src/data/locale/data/ar_IQ.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_JO.UTF-8.src b/usr/src/data/locale/data/ar_JO.UTF-8.src
index 8f9f78f7e5..8f9f78f7e5 100644
--- a/usr/src/cmd/localedef/data/ar_JO.UTF-8.src
+++ b/usr/src/data/locale/data/ar_JO.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_KW.UTF-8.src b/usr/src/data/locale/data/ar_KW.UTF-8.src
index 7d358ec982..7d358ec982 100644
--- a/usr/src/cmd/localedef/data/ar_KW.UTF-8.src
+++ b/usr/src/data/locale/data/ar_KW.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_LB.UTF-8.src b/usr/src/data/locale/data/ar_LB.UTF-8.src
index b201545eb3..b201545eb3 100644
--- a/usr/src/cmd/localedef/data/ar_LB.UTF-8.src
+++ b/usr/src/data/locale/data/ar_LB.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_LY.UTF-8.src b/usr/src/data/locale/data/ar_LY.UTF-8.src
index 0799f79cd6..0799f79cd6 100644
--- a/usr/src/cmd/localedef/data/ar_LY.UTF-8.src
+++ b/usr/src/data/locale/data/ar_LY.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_MA.UTF-8.src b/usr/src/data/locale/data/ar_MA.UTF-8.src
index 984c1b2558..984c1b2558 100644
--- a/usr/src/cmd/localedef/data/ar_MA.UTF-8.src
+++ b/usr/src/data/locale/data/ar_MA.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_OM.UTF-8.src b/usr/src/data/locale/data/ar_OM.UTF-8.src
index 2dbf4b45d8..2dbf4b45d8 100644
--- a/usr/src/cmd/localedef/data/ar_OM.UTF-8.src
+++ b/usr/src/data/locale/data/ar_OM.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_QA.UTF-8.src b/usr/src/data/locale/data/ar_QA.UTF-8.src
index 04d4114aea..04d4114aea 100644
--- a/usr/src/cmd/localedef/data/ar_QA.UTF-8.src
+++ b/usr/src/data/locale/data/ar_QA.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_SA.UTF-8.src b/usr/src/data/locale/data/ar_SA.UTF-8.src
index 6b221bae0b..6b221bae0b 100644
--- a/usr/src/cmd/localedef/data/ar_SA.UTF-8.src
+++ b/usr/src/data/locale/data/ar_SA.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_TN.UTF-8.src b/usr/src/data/locale/data/ar_TN.UTF-8.src
index c631425c4f..c631425c4f 100644
--- a/usr/src/cmd/localedef/data/ar_TN.UTF-8.src
+++ b/usr/src/data/locale/data/ar_TN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ar_YE.UTF-8.src b/usr/src/data/locale/data/ar_YE.UTF-8.src
index f7e945c11f..f7e945c11f 100644
--- a/usr/src/cmd/localedef/data/ar_YE.UTF-8.src
+++ b/usr/src/data/locale/data/ar_YE.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/as_IN.UTF-8.src b/usr/src/data/locale/data/as_IN.UTF-8.src
index 54a13bf3ad..54a13bf3ad 100644
--- a/usr/src/cmd/localedef/data/as_IN.UTF-8.src
+++ b/usr/src/data/locale/data/as_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/az_AZ.UTF-8.src b/usr/src/data/locale/data/az_AZ.UTF-8.src
index ede73045c5..ede73045c5 100644
--- a/usr/src/cmd/localedef/data/az_AZ.UTF-8.src
+++ b/usr/src/data/locale/data/az_AZ.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/be_BY.UTF-8.src b/usr/src/data/locale/data/be_BY.UTF-8.src
index 7a75d1124c..7a75d1124c 100644
--- a/usr/src/cmd/localedef/data/be_BY.UTF-8.src
+++ b/usr/src/data/locale/data/be_BY.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/bg_BG.UTF-8.src b/usr/src/data/locale/data/bg_BG.UTF-8.src
index 6b9502f6ac..6b9502f6ac 100644
--- a/usr/src/cmd/localedef/data/bg_BG.UTF-8.src
+++ b/usr/src/data/locale/data/bg_BG.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/bn_BD.UTF-8.src b/usr/src/data/locale/data/bn_BD.UTF-8.src
index abd53f4818..abd53f4818 100644
--- a/usr/src/cmd/localedef/data/bn_BD.UTF-8.src
+++ b/usr/src/data/locale/data/bn_BD.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/bn_IN.UTF-8.src b/usr/src/data/locale/data/bn_IN.UTF-8.src
index bf7abe44a4..bf7abe44a4 100644
--- a/usr/src/cmd/localedef/data/bn_IN.UTF-8.src
+++ b/usr/src/data/locale/data/bn_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/bo_CN.UTF-8.src b/usr/src/data/locale/data/bo_CN.UTF-8.src
index 69d63be24f..69d63be24f 100644
--- a/usr/src/cmd/localedef/data/bo_CN.UTF-8.src
+++ b/usr/src/data/locale/data/bo_CN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/bo_IN.UTF-8.src b/usr/src/data/locale/data/bo_IN.UTF-8.src
index 3940f06a71..3940f06a71 100644
--- a/usr/src/cmd/localedef/data/bo_IN.UTF-8.src
+++ b/usr/src/data/locale/data/bo_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/bs_BA.UTF-8.src b/usr/src/data/locale/data/bs_BA.UTF-8.src
index 73352399af..73352399af 100644
--- a/usr/src/cmd/localedef/data/bs_BA.UTF-8.src
+++ b/usr/src/data/locale/data/bs_BA.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ca_ES.UTF-8.src b/usr/src/data/locale/data/ca_ES.UTF-8.src
index 8d103338ad..8d103338ad 100644
--- a/usr/src/cmd/localedef/data/ca_ES.UTF-8.src
+++ b/usr/src/data/locale/data/ca_ES.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/cs_CZ.UTF-8.src b/usr/src/data/locale/data/cs_CZ.UTF-8.src
index e9fa41cbc8..e9fa41cbc8 100644
--- a/usr/src/cmd/localedef/data/cs_CZ.UTF-8.src
+++ b/usr/src/data/locale/data/cs_CZ.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/da_DK.UTF-8.src b/usr/src/data/locale/data/da_DK.UTF-8.src
index 4f0edf24a6..4f0edf24a6 100644
--- a/usr/src/cmd/localedef/data/da_DK.UTF-8.src
+++ b/usr/src/data/locale/data/da_DK.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/de_AT.UTF-8.src b/usr/src/data/locale/data/de_AT.UTF-8.src
index 7940933aab..7940933aab 100644
--- a/usr/src/cmd/localedef/data/de_AT.UTF-8.src
+++ b/usr/src/data/locale/data/de_AT.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/de_BE.UTF-8.src b/usr/src/data/locale/data/de_BE.UTF-8.src
index 435790f31d..435790f31d 100644
--- a/usr/src/cmd/localedef/data/de_BE.UTF-8.src
+++ b/usr/src/data/locale/data/de_BE.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/de_CH.UTF-8.src b/usr/src/data/locale/data/de_CH.UTF-8.src
index 205d9fb502..205d9fb502 100644
--- a/usr/src/cmd/localedef/data/de_CH.UTF-8.src
+++ b/usr/src/data/locale/data/de_CH.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/de_DE.UTF-8.src b/usr/src/data/locale/data/de_DE.UTF-8.src
index a5feef131f..a5feef131f 100644
--- a/usr/src/cmd/localedef/data/de_DE.UTF-8.src
+++ b/usr/src/data/locale/data/de_DE.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/de_LI.UTF-8.src b/usr/src/data/locale/data/de_LI.UTF-8.src
index 9d5b78118e..9d5b78118e 100644
--- a/usr/src/cmd/localedef/data/de_LI.UTF-8.src
+++ b/usr/src/data/locale/data/de_LI.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/de_LU.UTF-8.src b/usr/src/data/locale/data/de_LU.UTF-8.src
index 9d4eab7322..9d4eab7322 100644
--- a/usr/src/cmd/localedef/data/de_LU.UTF-8.src
+++ b/usr/src/data/locale/data/de_LU.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/el_CY.UTF-8.src b/usr/src/data/locale/data/el_CY.UTF-8.src
index d6dc001d1f..d6dc001d1f 100644
--- a/usr/src/cmd/localedef/data/el_CY.UTF-8.src
+++ b/usr/src/data/locale/data/el_CY.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/el_GR.UTF-8.src b/usr/src/data/locale/data/el_GR.UTF-8.src
index 504cc5e74c..504cc5e74c 100644
--- a/usr/src/cmd/localedef/data/el_GR.UTF-8.src
+++ b/usr/src/data/locale/data/el_GR.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_AU.UTF-8.src b/usr/src/data/locale/data/en_AU.UTF-8.src
index bf1b4d9da1..bf1b4d9da1 100644
--- a/usr/src/cmd/localedef/data/en_AU.UTF-8.src
+++ b/usr/src/data/locale/data/en_AU.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_BW.UTF-8.src b/usr/src/data/locale/data/en_BW.UTF-8.src
index 290265ffcb..290265ffcb 100644
--- a/usr/src/cmd/localedef/data/en_BW.UTF-8.src
+++ b/usr/src/data/locale/data/en_BW.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_BZ.UTF-8.src b/usr/src/data/locale/data/en_BZ.UTF-8.src
index d8da31e888..d8da31e888 100644
--- a/usr/src/cmd/localedef/data/en_BZ.UTF-8.src
+++ b/usr/src/data/locale/data/en_BZ.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_CA.UTF-8.src b/usr/src/data/locale/data/en_CA.UTF-8.src
index 12e634b26f..12e634b26f 100644
--- a/usr/src/cmd/localedef/data/en_CA.UTF-8.src
+++ b/usr/src/data/locale/data/en_CA.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_GB.UTF-8.src b/usr/src/data/locale/data/en_GB.UTF-8.src
index 63c24bab6c..63c24bab6c 100644
--- a/usr/src/cmd/localedef/data/en_GB.UTF-8.src
+++ b/usr/src/data/locale/data/en_GB.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_HK.UTF-8.src b/usr/src/data/locale/data/en_HK.UTF-8.src
index 9a0c3cdf09..9a0c3cdf09 100644
--- a/usr/src/cmd/localedef/data/en_HK.UTF-8.src
+++ b/usr/src/data/locale/data/en_HK.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_IE.UTF-8.src b/usr/src/data/locale/data/en_IE.UTF-8.src
index f9978e86b5..f9978e86b5 100644
--- a/usr/src/cmd/localedef/data/en_IE.UTF-8.src
+++ b/usr/src/data/locale/data/en_IE.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_IN.UTF-8.src b/usr/src/data/locale/data/en_IN.UTF-8.src
index 8202c4dba4..8202c4dba4 100644
--- a/usr/src/cmd/localedef/data/en_IN.UTF-8.src
+++ b/usr/src/data/locale/data/en_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_JM.UTF-8.src b/usr/src/data/locale/data/en_JM.UTF-8.src
index 7899a485d9..7899a485d9 100644
--- a/usr/src/cmd/localedef/data/en_JM.UTF-8.src
+++ b/usr/src/data/locale/data/en_JM.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_MH.UTF-8.src b/usr/src/data/locale/data/en_MH.UTF-8.src
index 913702d5b6..913702d5b6 100644
--- a/usr/src/cmd/localedef/data/en_MH.UTF-8.src
+++ b/usr/src/data/locale/data/en_MH.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_MT.UTF-8.src b/usr/src/data/locale/data/en_MT.UTF-8.src
index b0e481365a..b0e481365a 100644
--- a/usr/src/cmd/localedef/data/en_MT.UTF-8.src
+++ b/usr/src/data/locale/data/en_MT.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_NA.UTF-8.src b/usr/src/data/locale/data/en_NA.UTF-8.src
index 24272e61fc..24272e61fc 100644
--- a/usr/src/cmd/localedef/data/en_NA.UTF-8.src
+++ b/usr/src/data/locale/data/en_NA.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_NZ.UTF-8.src b/usr/src/data/locale/data/en_NZ.UTF-8.src
index af33c998b9..af33c998b9 100644
--- a/usr/src/cmd/localedef/data/en_NZ.UTF-8.src
+++ b/usr/src/data/locale/data/en_NZ.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_PH.UTF-8.src b/usr/src/data/locale/data/en_PH.UTF-8.src
index 7d1f6c07b1..7d1f6c07b1 100644
--- a/usr/src/cmd/localedef/data/en_PH.UTF-8.src
+++ b/usr/src/data/locale/data/en_PH.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_PK.UTF-8.src b/usr/src/data/locale/data/en_PK.UTF-8.src
index 3bbe75e014..3bbe75e014 100644
--- a/usr/src/cmd/localedef/data/en_PK.UTF-8.src
+++ b/usr/src/data/locale/data/en_PK.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_SG.UTF-8.src b/usr/src/data/locale/data/en_SG.UTF-8.src
index 2cb05f5080..2cb05f5080 100644
--- a/usr/src/cmd/localedef/data/en_SG.UTF-8.src
+++ b/usr/src/data/locale/data/en_SG.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_TT.UTF-8.src b/usr/src/data/locale/data/en_TT.UTF-8.src
index fc16071d3e..fc16071d3e 100644
--- a/usr/src/cmd/localedef/data/en_TT.UTF-8.src
+++ b/usr/src/data/locale/data/en_TT.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_US.UTF-8.src b/usr/src/data/locale/data/en_US.UTF-8.src
index 28623470db..28623470db 100644
--- a/usr/src/cmd/localedef/data/en_US.UTF-8.src
+++ b/usr/src/data/locale/data/en_US.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_ZA.UTF-8.src b/usr/src/data/locale/data/en_ZA.UTF-8.src
index 9b6f724484..9b6f724484 100644
--- a/usr/src/cmd/localedef/data/en_ZA.UTF-8.src
+++ b/usr/src/data/locale/data/en_ZA.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/en_ZW.UTF-8.src b/usr/src/data/locale/data/en_ZW.UTF-8.src
index 83c16e3767..83c16e3767 100644
--- a/usr/src/cmd/localedef/data/en_ZW.UTF-8.src
+++ b/usr/src/data/locale/data/en_ZW.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_AR.UTF-8.src b/usr/src/data/locale/data/es_AR.UTF-8.src
index 002e375a36..002e375a36 100644
--- a/usr/src/cmd/localedef/data/es_AR.UTF-8.src
+++ b/usr/src/data/locale/data/es_AR.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_BO.UTF-8.src b/usr/src/data/locale/data/es_BO.UTF-8.src
index d515b6424f..d515b6424f 100644
--- a/usr/src/cmd/localedef/data/es_BO.UTF-8.src
+++ b/usr/src/data/locale/data/es_BO.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_CL.UTF-8.src b/usr/src/data/locale/data/es_CL.UTF-8.src
index 9067064404..9067064404 100644
--- a/usr/src/cmd/localedef/data/es_CL.UTF-8.src
+++ b/usr/src/data/locale/data/es_CL.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_CO.UTF-8.src b/usr/src/data/locale/data/es_CO.UTF-8.src
index 355144a42a..355144a42a 100644
--- a/usr/src/cmd/localedef/data/es_CO.UTF-8.src
+++ b/usr/src/data/locale/data/es_CO.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_CR.UTF-8.src b/usr/src/data/locale/data/es_CR.UTF-8.src
index c6b2789898..c6b2789898 100644
--- a/usr/src/cmd/localedef/data/es_CR.UTF-8.src
+++ b/usr/src/data/locale/data/es_CR.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_DO.UTF-8.src b/usr/src/data/locale/data/es_DO.UTF-8.src
index 8fef150779..8fef150779 100644
--- a/usr/src/cmd/localedef/data/es_DO.UTF-8.src
+++ b/usr/src/data/locale/data/es_DO.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_EC.UTF-8.src b/usr/src/data/locale/data/es_EC.UTF-8.src
index 162298cee3..162298cee3 100644
--- a/usr/src/cmd/localedef/data/es_EC.UTF-8.src
+++ b/usr/src/data/locale/data/es_EC.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_ES.UTF-8.src b/usr/src/data/locale/data/es_ES.UTF-8.src
index a0a6693257..a0a6693257 100644
--- a/usr/src/cmd/localedef/data/es_ES.UTF-8.src
+++ b/usr/src/data/locale/data/es_ES.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_GQ.UTF-8.src b/usr/src/data/locale/data/es_GQ.UTF-8.src
index ff412553b9..ff412553b9 100644
--- a/usr/src/cmd/localedef/data/es_GQ.UTF-8.src
+++ b/usr/src/data/locale/data/es_GQ.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_GT.UTF-8.src b/usr/src/data/locale/data/es_GT.UTF-8.src
index d47ae404dc..d47ae404dc 100644
--- a/usr/src/cmd/localedef/data/es_GT.UTF-8.src
+++ b/usr/src/data/locale/data/es_GT.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_HN.UTF-8.src b/usr/src/data/locale/data/es_HN.UTF-8.src
index f25e9c74a7..f25e9c74a7 100644
--- a/usr/src/cmd/localedef/data/es_HN.UTF-8.src
+++ b/usr/src/data/locale/data/es_HN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_MX.UTF-8.src b/usr/src/data/locale/data/es_MX.UTF-8.src
index fc9ecbe640..fc9ecbe640 100644
--- a/usr/src/cmd/localedef/data/es_MX.UTF-8.src
+++ b/usr/src/data/locale/data/es_MX.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_NI.UTF-8.src b/usr/src/data/locale/data/es_NI.UTF-8.src
index 2aa1f0f4fb..2aa1f0f4fb 100644
--- a/usr/src/cmd/localedef/data/es_NI.UTF-8.src
+++ b/usr/src/data/locale/data/es_NI.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_PA.UTF-8.src b/usr/src/data/locale/data/es_PA.UTF-8.src
index e944136a83..e944136a83 100644
--- a/usr/src/cmd/localedef/data/es_PA.UTF-8.src
+++ b/usr/src/data/locale/data/es_PA.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_PE.UTF-8.src b/usr/src/data/locale/data/es_PE.UTF-8.src
index 782231a050..782231a050 100644
--- a/usr/src/cmd/localedef/data/es_PE.UTF-8.src
+++ b/usr/src/data/locale/data/es_PE.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_PR.UTF-8.src b/usr/src/data/locale/data/es_PR.UTF-8.src
index d12c45e62e..d12c45e62e 100644
--- a/usr/src/cmd/localedef/data/es_PR.UTF-8.src
+++ b/usr/src/data/locale/data/es_PR.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_PY.UTF-8.src b/usr/src/data/locale/data/es_PY.UTF-8.src
index 1ec2fa7849..1ec2fa7849 100644
--- a/usr/src/cmd/localedef/data/es_PY.UTF-8.src
+++ b/usr/src/data/locale/data/es_PY.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_SV.UTF-8.src b/usr/src/data/locale/data/es_SV.UTF-8.src
index c8c52e5c71..c8c52e5c71 100644
--- a/usr/src/cmd/localedef/data/es_SV.UTF-8.src
+++ b/usr/src/data/locale/data/es_SV.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_US.UTF-8.src b/usr/src/data/locale/data/es_US.UTF-8.src
index aacb6fad86..aacb6fad86 100644
--- a/usr/src/cmd/localedef/data/es_US.UTF-8.src
+++ b/usr/src/data/locale/data/es_US.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_UY.UTF-8.src b/usr/src/data/locale/data/es_UY.UTF-8.src
index 1ff2a243a8..1ff2a243a8 100644
--- a/usr/src/cmd/localedef/data/es_UY.UTF-8.src
+++ b/usr/src/data/locale/data/es_UY.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/es_VE.UTF-8.src b/usr/src/data/locale/data/es_VE.UTF-8.src
index f4e023203c..f4e023203c 100644
--- a/usr/src/cmd/localedef/data/es_VE.UTF-8.src
+++ b/usr/src/data/locale/data/es_VE.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/et_EE.UTF-8.src b/usr/src/data/locale/data/et_EE.UTF-8.src
index 98292d9b6d..98292d9b6d 100644
--- a/usr/src/cmd/localedef/data/et_EE.UTF-8.src
+++ b/usr/src/data/locale/data/et_EE.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/fi_FI.UTF-8.src b/usr/src/data/locale/data/fi_FI.UTF-8.src
index 5cbd93919c..5cbd93919c 100644
--- a/usr/src/cmd/localedef/data/fi_FI.UTF-8.src
+++ b/usr/src/data/locale/data/fi_FI.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/fil_PH.UTF-8.src b/usr/src/data/locale/data/fil_PH.UTF-8.src
index f06e741e09..f06e741e09 100644
--- a/usr/src/cmd/localedef/data/fil_PH.UTF-8.src
+++ b/usr/src/data/locale/data/fil_PH.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/fr_BE.UTF-8.src b/usr/src/data/locale/data/fr_BE.UTF-8.src
index 91511c084a..91511c084a 100644
--- a/usr/src/cmd/localedef/data/fr_BE.UTF-8.src
+++ b/usr/src/data/locale/data/fr_BE.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/fr_CA.UTF-8.src b/usr/src/data/locale/data/fr_CA.UTF-8.src
index fa5ed61243..fa5ed61243 100644
--- a/usr/src/cmd/localedef/data/fr_CA.UTF-8.src
+++ b/usr/src/data/locale/data/fr_CA.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/fr_CF.UTF-8.src b/usr/src/data/locale/data/fr_CF.UTF-8.src
index f46b514ae7..f46b514ae7 100644
--- a/usr/src/cmd/localedef/data/fr_CF.UTF-8.src
+++ b/usr/src/data/locale/data/fr_CF.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/fr_CH.UTF-8.src b/usr/src/data/locale/data/fr_CH.UTF-8.src
index 96b8f01d11..96b8f01d11 100644
--- a/usr/src/cmd/localedef/data/fr_CH.UTF-8.src
+++ b/usr/src/data/locale/data/fr_CH.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/fr_FR.UTF-8.src b/usr/src/data/locale/data/fr_FR.UTF-8.src
index f233d96909..f233d96909 100644
--- a/usr/src/cmd/localedef/data/fr_FR.UTF-8.src
+++ b/usr/src/data/locale/data/fr_FR.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/fr_GN.UTF-8.src b/usr/src/data/locale/data/fr_GN.UTF-8.src
index f296f74541..f296f74541 100644
--- a/usr/src/cmd/localedef/data/fr_GN.UTF-8.src
+++ b/usr/src/data/locale/data/fr_GN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/fr_LU.UTF-8.src b/usr/src/data/locale/data/fr_LU.UTF-8.src
index 098b89716b..098b89716b 100644
--- a/usr/src/cmd/localedef/data/fr_LU.UTF-8.src
+++ b/usr/src/data/locale/data/fr_LU.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/fr_MC.UTF-8.src b/usr/src/data/locale/data/fr_MC.UTF-8.src
index fc4ce95126..fc4ce95126 100644
--- a/usr/src/cmd/localedef/data/fr_MC.UTF-8.src
+++ b/usr/src/data/locale/data/fr_MC.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/fr_MG.UTF-8.src b/usr/src/data/locale/data/fr_MG.UTF-8.src
index d90916716e..d90916716e 100644
--- a/usr/src/cmd/localedef/data/fr_MG.UTF-8.src
+++ b/usr/src/data/locale/data/fr_MG.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/fr_ML.UTF-8.src b/usr/src/data/locale/data/fr_ML.UTF-8.src
index cb2d3d352b..cb2d3d352b 100644
--- a/usr/src/cmd/localedef/data/fr_ML.UTF-8.src
+++ b/usr/src/data/locale/data/fr_ML.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/fr_NE.UTF-8.src b/usr/src/data/locale/data/fr_NE.UTF-8.src
index b00a1bb53f..b00a1bb53f 100644
--- a/usr/src/cmd/localedef/data/fr_NE.UTF-8.src
+++ b/usr/src/data/locale/data/fr_NE.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/fr_SN.UTF-8.src b/usr/src/data/locale/data/fr_SN.UTF-8.src
index 2ade990edb..2ade990edb 100644
--- a/usr/src/cmd/localedef/data/fr_SN.UTF-8.src
+++ b/usr/src/data/locale/data/fr_SN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ga_IE.UTF-8.src b/usr/src/data/locale/data/ga_IE.UTF-8.src
index d483166849..d483166849 100644
--- a/usr/src/cmd/localedef/data/ga_IE.UTF-8.src
+++ b/usr/src/data/locale/data/ga_IE.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/gu_IN.UTF-8.src b/usr/src/data/locale/data/gu_IN.UTF-8.src
index d5573f46a7..d5573f46a7 100644
--- a/usr/src/cmd/localedef/data/gu_IN.UTF-8.src
+++ b/usr/src/data/locale/data/gu_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/he_IL.UTF-8.src b/usr/src/data/locale/data/he_IL.UTF-8.src
index cc88179c34..cc88179c34 100644
--- a/usr/src/cmd/localedef/data/he_IL.UTF-8.src
+++ b/usr/src/data/locale/data/he_IL.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/hi_IN.UTF-8.src b/usr/src/data/locale/data/hi_IN.UTF-8.src
index 311fb25b19..311fb25b19 100644
--- a/usr/src/cmd/localedef/data/hi_IN.UTF-8.src
+++ b/usr/src/data/locale/data/hi_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/hr_HR.UTF-8.src b/usr/src/data/locale/data/hr_HR.UTF-8.src
index 30c911ee9f..30c911ee9f 100644
--- a/usr/src/cmd/localedef/data/hr_HR.UTF-8.src
+++ b/usr/src/data/locale/data/hr_HR.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/hu_HU.UTF-8.src b/usr/src/data/locale/data/hu_HU.UTF-8.src
index 964b874841..964b874841 100644
--- a/usr/src/cmd/localedef/data/hu_HU.UTF-8.src
+++ b/usr/src/data/locale/data/hu_HU.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/hy_AM.UTF-8.src b/usr/src/data/locale/data/hy_AM.UTF-8.src
index 4fd1776c25..4fd1776c25 100644
--- a/usr/src/cmd/localedef/data/hy_AM.UTF-8.src
+++ b/usr/src/data/locale/data/hy_AM.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/id_ID.UTF-8.src b/usr/src/data/locale/data/id_ID.UTF-8.src
index d73d8c1970..d73d8c1970 100644
--- a/usr/src/cmd/localedef/data/id_ID.UTF-8.src
+++ b/usr/src/data/locale/data/id_ID.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ii_CN.UTF-8.src b/usr/src/data/locale/data/ii_CN.UTF-8.src
index 31d484ea56..31d484ea56 100644
--- a/usr/src/cmd/localedef/data/ii_CN.UTF-8.src
+++ b/usr/src/data/locale/data/ii_CN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/is_IS.UTF-8.src b/usr/src/data/locale/data/is_IS.UTF-8.src
index 8faeaff9cb..8faeaff9cb 100644
--- a/usr/src/cmd/localedef/data/is_IS.UTF-8.src
+++ b/usr/src/data/locale/data/is_IS.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/it_CH.UTF-8.src b/usr/src/data/locale/data/it_CH.UTF-8.src
index b30f723471..b30f723471 100644
--- a/usr/src/cmd/localedef/data/it_CH.UTF-8.src
+++ b/usr/src/data/locale/data/it_CH.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/it_IT.UTF-8.src b/usr/src/data/locale/data/it_IT.UTF-8.src
index d4ff6ac1d9..d4ff6ac1d9 100644
--- a/usr/src/cmd/localedef/data/it_IT.UTF-8.src
+++ b/usr/src/data/locale/data/it_IT.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ja_JP.UTF-8.src b/usr/src/data/locale/data/ja_JP.UTF-8.src
index 2ba85f2a6b..2ba85f2a6b 100644
--- a/usr/src/cmd/localedef/data/ja_JP.UTF-8.src
+++ b/usr/src/data/locale/data/ja_JP.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ka_GE.UTF-8.src b/usr/src/data/locale/data/ka_GE.UTF-8.src
index 1baf0fce4b..1baf0fce4b 100644
--- a/usr/src/cmd/localedef/data/ka_GE.UTF-8.src
+++ b/usr/src/data/locale/data/ka_GE.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/kk_KZ.UTF-8.src b/usr/src/data/locale/data/kk_KZ.UTF-8.src
index 31af7bb1b7..31af7bb1b7 100644
--- a/usr/src/cmd/localedef/data/kk_KZ.UTF-8.src
+++ b/usr/src/data/locale/data/kk_KZ.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/km_KH.UTF-8.src b/usr/src/data/locale/data/km_KH.UTF-8.src
index f01731c486..f01731c486 100644
--- a/usr/src/cmd/localedef/data/km_KH.UTF-8.src
+++ b/usr/src/data/locale/data/km_KH.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/kn_IN.UTF-8.src b/usr/src/data/locale/data/kn_IN.UTF-8.src
index cdad9ffcfa..cdad9ffcfa 100644
--- a/usr/src/cmd/localedef/data/kn_IN.UTF-8.src
+++ b/usr/src/data/locale/data/kn_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ko_KR.UTF-8.src b/usr/src/data/locale/data/ko_KR.UTF-8.src
index ed1d8d5aac..ed1d8d5aac 100644
--- a/usr/src/cmd/localedef/data/ko_KR.UTF-8.src
+++ b/usr/src/data/locale/data/ko_KR.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/kok_IN.UTF-8.src b/usr/src/data/locale/data/kok_IN.UTF-8.src
index a2e4f9a12b..a2e4f9a12b 100644
--- a/usr/src/cmd/localedef/data/kok_IN.UTF-8.src
+++ b/usr/src/data/locale/data/kok_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/lt_LT.UTF-8.src b/usr/src/data/locale/data/lt_LT.UTF-8.src
index 325284685b..325284685b 100644
--- a/usr/src/cmd/localedef/data/lt_LT.UTF-8.src
+++ b/usr/src/data/locale/data/lt_LT.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/lv_LV.UTF-8.src b/usr/src/data/locale/data/lv_LV.UTF-8.src
index 0624a2667a..0624a2667a 100644
--- a/usr/src/cmd/localedef/data/lv_LV.UTF-8.src
+++ b/usr/src/data/locale/data/lv_LV.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/manual-input.UTF-8 b/usr/src/data/locale/data/manual-input.UTF-8
index 929148b6cd..929148b6cd 100644
--- a/usr/src/cmd/localedef/data/manual-input.UTF-8
+++ b/usr/src/data/locale/data/manual-input.UTF-8
diff --git a/usr/src/cmd/localedef/data/mk_MK.UTF-8.src b/usr/src/data/locale/data/mk_MK.UTF-8.src
index 26268581f6..26268581f6 100644
--- a/usr/src/cmd/localedef/data/mk_MK.UTF-8.src
+++ b/usr/src/data/locale/data/mk_MK.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ml_IN.UTF-8.src b/usr/src/data/locale/data/ml_IN.UTF-8.src
index 76f2503a98..76f2503a98 100644
--- a/usr/src/cmd/localedef/data/ml_IN.UTF-8.src
+++ b/usr/src/data/locale/data/ml_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/mn_CN.UTF-8.src b/usr/src/data/locale/data/mn_CN.UTF-8.src
index ae75ab70ea..ae75ab70ea 100644
--- a/usr/src/cmd/localedef/data/mn_CN.UTF-8.src
+++ b/usr/src/data/locale/data/mn_CN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/mn_MN.UTF-8.src b/usr/src/data/locale/data/mn_MN.UTF-8.src
index 09c3e74e62..09c3e74e62 100644
--- a/usr/src/cmd/localedef/data/mn_MN.UTF-8.src
+++ b/usr/src/data/locale/data/mn_MN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/mr_IN.UTF-8.src b/usr/src/data/locale/data/mr_IN.UTF-8.src
index f933de275c..f933de275c 100644
--- a/usr/src/cmd/localedef/data/mr_IN.UTF-8.src
+++ b/usr/src/data/locale/data/mr_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ms_MY.UTF-8.src b/usr/src/data/locale/data/ms_MY.UTF-8.src
index 55522ee642..55522ee642 100644
--- a/usr/src/cmd/localedef/data/ms_MY.UTF-8.src
+++ b/usr/src/data/locale/data/ms_MY.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/mt_MT.UTF-8.src b/usr/src/data/locale/data/mt_MT.UTF-8.src
index 258ddb982d..258ddb982d 100644
--- a/usr/src/cmd/localedef/data/mt_MT.UTF-8.src
+++ b/usr/src/data/locale/data/mt_MT.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/nb_NO.UTF-8.src b/usr/src/data/locale/data/nb_NO.UTF-8.src
index 1f1328c31a..1f1328c31a 100644
--- a/usr/src/cmd/localedef/data/nb_NO.UTF-8.src
+++ b/usr/src/data/locale/data/nb_NO.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ne_IN.UTF-8.src b/usr/src/data/locale/data/ne_IN.UTF-8.src
index 8d45381b54..8d45381b54 100644
--- a/usr/src/cmd/localedef/data/ne_IN.UTF-8.src
+++ b/usr/src/data/locale/data/ne_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ne_NP.UTF-8.src b/usr/src/data/locale/data/ne_NP.UTF-8.src
index 12a25e0b86..12a25e0b86 100644
--- a/usr/src/cmd/localedef/data/ne_NP.UTF-8.src
+++ b/usr/src/data/locale/data/ne_NP.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/nl_BE.UTF-8.src b/usr/src/data/locale/data/nl_BE.UTF-8.src
index 713e43c0b8..713e43c0b8 100644
--- a/usr/src/cmd/localedef/data/nl_BE.UTF-8.src
+++ b/usr/src/data/locale/data/nl_BE.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/nl_NL.UTF-8.src b/usr/src/data/locale/data/nl_NL.UTF-8.src
index 8503a66f2d..8503a66f2d 100644
--- a/usr/src/cmd/localedef/data/nl_NL.UTF-8.src
+++ b/usr/src/data/locale/data/nl_NL.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/nn_NO.UTF-8.src b/usr/src/data/locale/data/nn_NO.UTF-8.src
index 318eb13f1d..318eb13f1d 100644
--- a/usr/src/cmd/localedef/data/nn_NO.UTF-8.src
+++ b/usr/src/data/locale/data/nn_NO.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/or_IN.UTF-8.src b/usr/src/data/locale/data/or_IN.UTF-8.src
index 456b2c56bf..456b2c56bf 100644
--- a/usr/src/cmd/localedef/data/or_IN.UTF-8.src
+++ b/usr/src/data/locale/data/or_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/pa_IN.UTF-8.src b/usr/src/data/locale/data/pa_IN.UTF-8.src
index 519d60b383..519d60b383 100644
--- a/usr/src/cmd/localedef/data/pa_IN.UTF-8.src
+++ b/usr/src/data/locale/data/pa_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/pa_PK.UTF-8.src b/usr/src/data/locale/data/pa_PK.UTF-8.src
index eb3a4533e9..eb3a4533e9 100644
--- a/usr/src/cmd/localedef/data/pa_PK.UTF-8.src
+++ b/usr/src/data/locale/data/pa_PK.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/pl_PL.UTF-8.src b/usr/src/data/locale/data/pl_PL.UTF-8.src
index f0cfd7171a..f0cfd7171a 100644
--- a/usr/src/cmd/localedef/data/pl_PL.UTF-8.src
+++ b/usr/src/data/locale/data/pl_PL.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/pt_BR.UTF-8.src b/usr/src/data/locale/data/pt_BR.UTF-8.src
index 444cfc1899..444cfc1899 100644
--- a/usr/src/cmd/localedef/data/pt_BR.UTF-8.src
+++ b/usr/src/data/locale/data/pt_BR.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/pt_GW.UTF-8.src b/usr/src/data/locale/data/pt_GW.UTF-8.src
index e464c62d40..e464c62d40 100644
--- a/usr/src/cmd/localedef/data/pt_GW.UTF-8.src
+++ b/usr/src/data/locale/data/pt_GW.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/pt_MZ.UTF-8.src b/usr/src/data/locale/data/pt_MZ.UTF-8.src
index 1aed17902c..1aed17902c 100644
--- a/usr/src/cmd/localedef/data/pt_MZ.UTF-8.src
+++ b/usr/src/data/locale/data/pt_MZ.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/pt_PT.UTF-8.src b/usr/src/data/locale/data/pt_PT.UTF-8.src
index 3db6d7a8ba..3db6d7a8ba 100644
--- a/usr/src/cmd/localedef/data/pt_PT.UTF-8.src
+++ b/usr/src/data/locale/data/pt_PT.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ro_MD.UTF-8.src b/usr/src/data/locale/data/ro_MD.UTF-8.src
index 969ece32ea..969ece32ea 100644
--- a/usr/src/cmd/localedef/data/ro_MD.UTF-8.src
+++ b/usr/src/data/locale/data/ro_MD.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ro_RO.UTF-8.src b/usr/src/data/locale/data/ro_RO.UTF-8.src
index 388a51aec4..388a51aec4 100644
--- a/usr/src/cmd/localedef/data/ro_RO.UTF-8.src
+++ b/usr/src/data/locale/data/ro_RO.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ru_MD.UTF-8.src b/usr/src/data/locale/data/ru_MD.UTF-8.src
index f216731a88..f216731a88 100644
--- a/usr/src/cmd/localedef/data/ru_MD.UTF-8.src
+++ b/usr/src/data/locale/data/ru_MD.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ru_RU.UTF-8.src b/usr/src/data/locale/data/ru_RU.UTF-8.src
index 775104ab25..775104ab25 100644
--- a/usr/src/cmd/localedef/data/ru_RU.UTF-8.src
+++ b/usr/src/data/locale/data/ru_RU.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ru_UA.UTF-8.src b/usr/src/data/locale/data/ru_UA.UTF-8.src
index 1334779380..1334779380 100644
--- a/usr/src/cmd/localedef/data/ru_UA.UTF-8.src
+++ b/usr/src/data/locale/data/ru_UA.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/sa_IN.UTF-8.src b/usr/src/data/locale/data/sa_IN.UTF-8.src
index 11812ffe57..11812ffe57 100644
--- a/usr/src/cmd/localedef/data/sa_IN.UTF-8.src
+++ b/usr/src/data/locale/data/sa_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/si_LK.UTF-8.src b/usr/src/data/locale/data/si_LK.UTF-8.src
index 10edddd168..10edddd168 100644
--- a/usr/src/cmd/localedef/data/si_LK.UTF-8.src
+++ b/usr/src/data/locale/data/si_LK.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/sk_SK.UTF-8.src b/usr/src/data/locale/data/sk_SK.UTF-8.src
index f534f825aa..f534f825aa 100644
--- a/usr/src/cmd/localedef/data/sk_SK.UTF-8.src
+++ b/usr/src/data/locale/data/sk_SK.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/sl_SI.UTF-8.src b/usr/src/data/locale/data/sl_SI.UTF-8.src
index 5559290e17..5559290e17 100644
--- a/usr/src/cmd/localedef/data/sl_SI.UTF-8.src
+++ b/usr/src/data/locale/data/sl_SI.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/sq_AL.UTF-8.src b/usr/src/data/locale/data/sq_AL.UTF-8.src
index 26ad64c5be..26ad64c5be 100644
--- a/usr/src/cmd/localedef/data/sq_AL.UTF-8.src
+++ b/usr/src/data/locale/data/sq_AL.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/sr_BA.UTF-8.src b/usr/src/data/locale/data/sr_BA.UTF-8.src
index 41ddc209b1..41ddc209b1 100644
--- a/usr/src/cmd/localedef/data/sr_BA.UTF-8.src
+++ b/usr/src/data/locale/data/sr_BA.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/sr_ME.UTF-8.src b/usr/src/data/locale/data/sr_ME.UTF-8.src
index f870492ca5..f870492ca5 100644
--- a/usr/src/cmd/localedef/data/sr_ME.UTF-8.src
+++ b/usr/src/data/locale/data/sr_ME.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/sr_RS.UTF-8.src b/usr/src/data/locale/data/sr_RS.UTF-8.src
index 936bf41f60..936bf41f60 100644
--- a/usr/src/cmd/localedef/data/sr_RS.UTF-8.src
+++ b/usr/src/data/locale/data/sr_RS.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/sv_FI.UTF-8.src b/usr/src/data/locale/data/sv_FI.UTF-8.src
index ae5e4abe1b..ae5e4abe1b 100644
--- a/usr/src/cmd/localedef/data/sv_FI.UTF-8.src
+++ b/usr/src/data/locale/data/sv_FI.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/sv_SE.UTF-8.src b/usr/src/data/locale/data/sv_SE.UTF-8.src
index 7af08541a4..7af08541a4 100644
--- a/usr/src/cmd/localedef/data/sv_SE.UTF-8.src
+++ b/usr/src/data/locale/data/sv_SE.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ta_IN.UTF-8.src b/usr/src/data/locale/data/ta_IN.UTF-8.src
index 18a17bc97b..18a17bc97b 100644
--- a/usr/src/cmd/localedef/data/ta_IN.UTF-8.src
+++ b/usr/src/data/locale/data/ta_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ta_LK.UTF-8.src b/usr/src/data/locale/data/ta_LK.UTF-8.src
index ef8882012b..ef8882012b 100644
--- a/usr/src/cmd/localedef/data/ta_LK.UTF-8.src
+++ b/usr/src/data/locale/data/ta_LK.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/te_IN.UTF-8.src b/usr/src/data/locale/data/te_IN.UTF-8.src
index e74265d119..e74265d119 100644
--- a/usr/src/cmd/localedef/data/te_IN.UTF-8.src
+++ b/usr/src/data/locale/data/te_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/th_TH.UTF-8.src b/usr/src/data/locale/data/th_TH.UTF-8.src
index 000d4f3501..000d4f3501 100644
--- a/usr/src/cmd/localedef/data/th_TH.UTF-8.src
+++ b/usr/src/data/locale/data/th_TH.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/tr_TR.UTF-8.src b/usr/src/data/locale/data/tr_TR.UTF-8.src
index 04489f585a..04489f585a 100644
--- a/usr/src/cmd/localedef/data/tr_TR.UTF-8.src
+++ b/usr/src/data/locale/data/tr_TR.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ug_CN.UTF-8.src b/usr/src/data/locale/data/ug_CN.UTF-8.src
index de2ddcf786..de2ddcf786 100644
--- a/usr/src/cmd/localedef/data/ug_CN.UTF-8.src
+++ b/usr/src/data/locale/data/ug_CN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/uk_UA.UTF-8.src b/usr/src/data/locale/data/uk_UA.UTF-8.src
index 22f31c40ca..22f31c40ca 100644
--- a/usr/src/cmd/localedef/data/uk_UA.UTF-8.src
+++ b/usr/src/data/locale/data/uk_UA.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ur_IN.UTF-8.src b/usr/src/data/locale/data/ur_IN.UTF-8.src
index bf674e83bd..bf674e83bd 100644
--- a/usr/src/cmd/localedef/data/ur_IN.UTF-8.src
+++ b/usr/src/data/locale/data/ur_IN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/ur_PK.UTF-8.src b/usr/src/data/locale/data/ur_PK.UTF-8.src
index 91f74932d0..91f74932d0 100644
--- a/usr/src/cmd/localedef/data/ur_PK.UTF-8.src
+++ b/usr/src/data/locale/data/ur_PK.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/vi_VN.UTF-8.src b/usr/src/data/locale/data/vi_VN.UTF-8.src
index 3d34fe3ffd..3d34fe3ffd 100644
--- a/usr/src/cmd/localedef/data/vi_VN.UTF-8.src
+++ b/usr/src/data/locale/data/vi_VN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/widths.txt b/usr/src/data/locale/data/widths.txt
index bebacdcd45..bebacdcd45 100644
--- a/usr/src/cmd/localedef/data/widths.txt
+++ b/usr/src/data/locale/data/widths.txt
diff --git a/usr/src/cmd/localedef/data/zh_CN.UTF-8.src b/usr/src/data/locale/data/zh_CN.UTF-8.src
index 548521fa88..548521fa88 100644
--- a/usr/src/cmd/localedef/data/zh_CN.UTF-8.src
+++ b/usr/src/data/locale/data/zh_CN.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/zh_HK.UTF-8.src b/usr/src/data/locale/data/zh_HK.UTF-8.src
index 7e10b006ac..7e10b006ac 100644
--- a/usr/src/cmd/localedef/data/zh_HK.UTF-8.src
+++ b/usr/src/data/locale/data/zh_HK.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/zh_MO.UTF-8.src b/usr/src/data/locale/data/zh_MO.UTF-8.src
index 9798436ff4..9798436ff4 100644
--- a/usr/src/cmd/localedef/data/zh_MO.UTF-8.src
+++ b/usr/src/data/locale/data/zh_MO.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/zh_SG.UTF-8.src b/usr/src/data/locale/data/zh_SG.UTF-8.src
index 6db4a20414..6db4a20414 100644
--- a/usr/src/cmd/localedef/data/zh_SG.UTF-8.src
+++ b/usr/src/data/locale/data/zh_SG.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/zh_TW.UTF-8.src b/usr/src/data/locale/data/zh_TW.UTF-8.src
index 53a239c3ef..53a239c3ef 100644
--- a/usr/src/cmd/localedef/data/zh_TW.UTF-8.src
+++ b/usr/src/data/locale/data/zh_TW.UTF-8.src
diff --git a/usr/src/cmd/localedef/data/zz_AA.UTF-8.src b/usr/src/data/locale/data/zz_AA.UTF-8.src
index 8a3463821d..8a3463821d 120000
--- a/usr/src/cmd/localedef/data/zz_AA.UTF-8.src
+++ b/usr/src/data/locale/data/zz_AA.UTF-8.src
diff --git a/usr/src/cmd/localedef/mkwidths.py b/usr/src/data/locale/mkwidths.py
index 19a587419d..19a587419d 100644
--- a/usr/src/cmd/localedef/mkwidths.py
+++ b/usr/src/data/locale/mkwidths.py
diff --git a/usr/src/cmd/localedef/translations/zz_AA.UTF-8.po b/usr/src/data/locale/translations/zz_AA.UTF-8.po
index e1c551233f..e1c551233f 100644
--- a/usr/src/cmd/localedef/translations/zz_AA.UTF-8.po
+++ b/usr/src/data/locale/translations/zz_AA.UTF-8.po
diff --git a/usr/src/cmd/localedef/translations/zz_AA.UTF-8.priv b/usr/src/data/locale/translations/zz_AA.UTF-8.priv
index ad14a98a70..ad14a98a70 100644
--- a/usr/src/cmd/localedef/translations/zz_AA.UTF-8.priv
+++ b/usr/src/data/locale/translations/zz_AA.UTF-8.priv
diff --git a/usr/src/cmd/localedef/widths-0.txt b/usr/src/data/locale/widths-0.txt
index cc2bf23525..cc2bf23525 100644
--- a/usr/src/cmd/localedef/widths-0.txt
+++ b/usr/src/data/locale/widths-0.txt
diff --git a/usr/src/cmd/localedef/widths-2.txt b/usr/src/data/locale/widths-2.txt
index 7487e234ec..7487e234ec 100644
--- a/usr/src/cmd/localedef/widths-2.txt
+++ b/usr/src/data/locale/widths-2.txt
diff --git a/usr/src/cmd/terminfo/Makefile b/usr/src/data/terminfo/Makefile
index 18f8296581..01b8e97821 100644
--- a/usr/src/cmd/terminfo/Makefile
+++ b/usr/src/data/terminfo/Makefile
@@ -18,36 +18,42 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-#
-# Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+# Copyright 2017 Nexenta Systems, Inc.
 #
 
-PROG=		terminfo
-TABSETSRC=	3101 beehive hds hds3 std stdcrt teleray vt100 wyse-adds xerox1720
+TABSETSRC=	3101 \
+		beehive \
+		hds \
+		hds3 \
+		std \
+		stdcrt \
+		teleray \
+		vt100 \
+		wyse-adds \
+		xerox1720
 TERMCAPSRC=	termcap.src
 TERMINFOSRC=	terminfo.src
 
-include		../Makefile.cmd
+include		$(SRC)/data/Makefile.data
 
 FILEMODE=	0644
 
-TIC=		/usr/bin/tic
+ROOTTABDIR=	$(ROOTSHLIB)/tabset
+ROOTTERMDIR=	$(ROOTSHLIB)/terminfo
+DIRS=		$(ROOTTERMDIR) $(ROOTTABDIR)
 
-ROOTSHARELIBDIR	= $(ROOT)/usr/share/lib
-ROOTTABDIR	= $(ROOTSHARELIBDIR)/tabset
-ROOTTERMDIR	= $(ROOTSHARELIBDIR)/terminfo
-DIRS		= $(ROOTTERMDIR) $(ROOTTABDIR)
+ROOTSYMLINK=	$(ROOTETC)/termcap
+RELROOTETC=	../usr/share/lib
+ROOTLIBSYMLINK=	$(ROOTLIB)/tabset
+RELROOTLIB=	../share/lib
 
-ROOTSYMLINK	= $(ROOTETC)/termcap
-RELROOTETC	= ../usr/share/lib
-ROOTLIBSYMLINK	= $(ROOTLIB)/tabset
-RELROOTLIB	= ../share/lib
+ROOTTABSET=	$(TABSETSRC:%=$(ROOTTABDIR)/%)
 
-ROOTTABSET	= $(TABSETSRC:%=$(ROOTTABDIR)/%)
-
-$(ROOTTABDIR)/%:	tabset/%
+$(ROOTTABDIR)/%: tabset/%
 		$(INS.file)
 
 .KEEP_STATE:
@@ -60,11 +66,11 @@ $(DIRS):
 $(ROOTTERMDIR)/s/sun: $(TERMINFOSRC)
 		TERMINFO=$(ROOTTERMDIR) $(TIC) $(TERMINFOSRC) 2>/dev/null
 
-$(ROOTSHARELIBDIR)/termcap:
+$(ROOTSHLIB)/termcap:
 		$(EGREP) -v '^(#|$$)' $(TERMCAPSRC) > $@
 
 install:	all $(ROOTTERMDIR) $(ROOTTERMDIR)/s/sun $(ROOTTABDIR) \
-		$(ROOTTABSET) $(ROOTSHARELIBDIR)/termcap  $(ROOTSYMLINK) \
+		$(ROOTTABSET) $(ROOTSHLIB)/termcap  $(ROOTSYMLINK) \
 		$(ROOTLIBSYMLINK)
 
 $(ROOTSYMLINK):
@@ -73,8 +79,4 @@ $(ROOTSYMLINK):
 $(ROOTLIBSYMLINK):
 		$(RM) $@; $(SYMLINK) $(RELROOTLIB)/tabset $@
 
-lint:
-
-clean:
-
-clobber:
+clean clobber:
diff --git a/usr/src/cmd/terminfo/THIRDPARTYLICENSE b/usr/src/data/terminfo/THIRDPARTYLICENSE
index 5656404c5f..5656404c5f 100644
--- a/usr/src/cmd/terminfo/THIRDPARTYLICENSE
+++ b/usr/src/data/terminfo/THIRDPARTYLICENSE
diff --git a/usr/src/cmd/terminfo/THIRDPARTYLICENSE.descrip b/usr/src/data/terminfo/THIRDPARTYLICENSE.descrip
index 8dfc1dd90a..8dfc1dd90a 100644
--- a/usr/src/cmd/terminfo/THIRDPARTYLICENSE.descrip
+++ b/usr/src/data/terminfo/THIRDPARTYLICENSE.descrip
diff --git a/usr/src/cmd/terminfo/tabset/3101 b/usr/src/data/terminfo/tabset/3101
index dab586bf65..dab586bf65 100644
--- a/usr/src/cmd/terminfo/tabset/3101
+++ b/usr/src/data/terminfo/tabset/3101
diff --git a/usr/src/cmd/terminfo/tabset/beehive b/usr/src/data/terminfo/tabset/beehive
index 6d30c69270..6d30c69270 100644
--- a/usr/src/cmd/terminfo/tabset/beehive
+++ b/usr/src/data/terminfo/tabset/beehive
diff --git a/usr/src/cmd/terminfo/tabset/hds b/usr/src/data/terminfo/tabset/hds
index 7b4df799c4..7b4df799c4 100644
--- a/usr/src/cmd/terminfo/tabset/hds
+++ b/usr/src/data/terminfo/tabset/hds
diff --git a/usr/src/cmd/terminfo/tabset/hds3 b/usr/src/data/terminfo/tabset/hds3
index 120ffae55e..120ffae55e 100644
--- a/usr/src/cmd/terminfo/tabset/hds3
+++ b/usr/src/data/terminfo/tabset/hds3
diff --git a/usr/src/cmd/terminfo/tabset/std b/usr/src/data/terminfo/tabset/std
index e93f737f0e..e93f737f0e 100644
--- a/usr/src/cmd/terminfo/tabset/std
+++ b/usr/src/data/terminfo/tabset/std
diff --git a/usr/src/cmd/terminfo/tabset/stdcrt b/usr/src/data/terminfo/tabset/stdcrt
index 66ba12f64d..66ba12f64d 100644
--- a/usr/src/cmd/terminfo/tabset/stdcrt
+++ b/usr/src/data/terminfo/tabset/stdcrt
diff --git a/usr/src/cmd/terminfo/tabset/teleray b/usr/src/data/terminfo/tabset/teleray
index bbce08edc4..bbce08edc4 100644
--- a/usr/src/cmd/terminfo/tabset/teleray
+++ b/usr/src/data/terminfo/tabset/teleray
diff --git a/usr/src/cmd/terminfo/tabset/vt100 b/usr/src/data/terminfo/tabset/vt100
index 6cd0675a97..6cd0675a97 100644
--- a/usr/src/cmd/terminfo/tabset/vt100
+++ b/usr/src/data/terminfo/tabset/vt100
diff --git a/usr/src/cmd/terminfo/tabset/wyse-adds b/usr/src/data/terminfo/tabset/wyse-adds
index 42db7300da..42db7300da 100644
--- a/usr/src/cmd/terminfo/tabset/wyse-adds
+++ b/usr/src/data/terminfo/tabset/wyse-adds
diff --git a/usr/src/cmd/terminfo/tabset/xerox1720 b/usr/src/data/terminfo/tabset/xerox1720
index 1fa7c12443..1fa7c12443 100644
--- a/usr/src/cmd/terminfo/tabset/xerox1720
+++ b/usr/src/data/terminfo/tabset/xerox1720
diff --git a/usr/src/cmd/terminfo/termcap.src b/usr/src/data/terminfo/termcap.src
index ba9fa1b3df..ba9fa1b3df 100644
--- a/usr/src/cmd/terminfo/termcap.src
+++ b/usr/src/data/terminfo/termcap.src
diff --git a/usr/src/cmd/terminfo/terminfo.src b/usr/src/data/terminfo/terminfo.src
index bd98d6cbee..bd98d6cbee 100644
--- a/usr/src/cmd/terminfo/terminfo.src
+++ b/usr/src/data/terminfo/terminfo.src
diff --git a/usr/src/data/zoneinfo/Makefile b/usr/src/data/zoneinfo/Makefile
new file mode 100644
index 0000000000..d6d7619c33
--- /dev/null
+++ b/usr/src/data/zoneinfo/Makefile
@@ -0,0 +1,76 @@
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+# "etcetera" must be listed before "backward" because it sets up links that
+# "backward" needs.
+TZFILES=	africa \
+		antarctica \
+		asia \
+		australasia \
+		etcetera \
+		europe \
+		factory \
+		northamerica \
+		pacificnew \
+		solar87 \
+		solar88 \
+		solar89 \
+		southamerica \
+		backward
+
+# Don't build the systemv timezones, but do install the source file.
+SRCFILES=	$(TZFILES) systemv README
+TABFILES=	continent.tab country.tab zone_sun.tab
+
+include		$(SRC)/data/Makefile.data
+
+ROOTTZD=	$(ROOTSHLIB)/zoneinfo
+ROOTTZSRCD=	$(ROOTSHLIB)/zoneinfo/src
+ROOTTZTABD=	$(ROOTSHLIB)/zoneinfo/tab
+DIRS=		$(ROOTTZSRCD) $(ROOTTZTABD)
+
+ROOTLIBTZSRCFILES=$(SRCFILES:%=$(ROOTTZSRCD)/%)
+ROOTLIBTZTABFILES=$(TABFILES:%=$(ROOTTZTABD)/%)
+
+$(ROOTLIBTZSRCFILES):=FILEMODE=0644
+$(ROOTLIBTZTABFILES):=FILEMODE=0644
+
+# Message catalog
+TEXT_DOMAIN=	SUNW_OST_ZONEINFO
+MSGDOMAIN=	$(MSGROOT)/$(TEXT_DOMAIN)
+POFILE=		zoneinfo.po
+
+.KEEP_STATE:
+
+all:		$(TZFILES) $(TABFILES)
+
+install:	$(DIRS) $(ROOTTZSRCD) $(ROOTTZTABD) $(ROOTLIBTZSRCFILES) \
+		$(ROOTLIBTZTABFILES)
+		$(ZIC) -d $(ROOTTZD) $(TZFILES)
+
+$(ROOTTZSRCD)/%: %
+		$(INS.file)
+
+$(ROOTTZTABD)/%: %
+		$(INS.file)
+
+$(DIRS):
+		$(INS.dir)
+
+clean:
+
+# For message catalogue files
+_msg:		$(MSGDOMAIN) $(POFILE)
+		$(RM) $(MSGDOMAIN)/$(POFILE)
+		$(CP) $(POFILE) $(MSGDOMAIN)/$(POFILE)
+
+$(MSGDOMAIN):
+		$(INS.dir)
+
+$(POFILE):	$(TABFILES) do_pofile.sh
+		$(RM) $@
+		@/bin/sh do_pofile.sh > $@
+
+include		$(SRC)/data/Makefile.targ
diff --git a/usr/src/cmd/zic/README b/usr/src/data/zoneinfo/README
index adcc2258f7..adcc2258f7 100644
--- a/usr/src/cmd/zic/README
+++ b/usr/src/data/zoneinfo/README
diff --git a/usr/src/cmd/zic/README.illumos b/usr/src/data/zoneinfo/README.illumos
index e8143cffb2..b4bbd7ee38 100644
--- a/usr/src/cmd/zic/README.illumos
+++ b/usr/src/data/zoneinfo/README.illumos
@@ -27,13 +27,13 @@ commands assume that you're inside of the directory you extracted the
 time zone files.
 
 $ cp africa antarctica asia australasia backward etcetera europe \
-northamerica pacificnew southamerica systemv $CODEMGR_WS/usr/src/cmd/zic
+  northamerica pacificnew southamerica systemv $CODEMGR_WS/usr/src/data/zoneinfo
 
 Next you need to copy the country tab and the zone tab files. These have
 different names in our source tree.
 
-$ cp iso3166.tab $CODEMGR_WS/usr/src/cmd/zic/country.tab
-$ cp zone.tab $CODEMGR_WS/usr/src/cmd/zic/zone.tab.txt
+$ cp iso3166.tab $CODEMGR_WS/usr/src/data/zoneinfo/country.tab
+$ cp zone.tab $CODEMGR_WS/usr/src/data/zoneinfo/zone.tab.txt
 
 Now, you need to manaully fix up the zone_sun.tab. zone_sun.tab has
 additional different zone names that the original does not. As things
@@ -41,7 +41,7 @@ are changed and removed, or coordinates updated, the same should be done
 in zone_sun.tab. The simplest way known to deal with it today is
 something like the following:
 
-$ cd $CODEMGR_WS/usr/src/cmd/zic
+$ cd $CODEMGR_WS/usr/src/data/zoneinfo
 $ vimdiff zone.tab.txt zone_sun.tab
 
 And as you see things that show up as egregiously different, do a 'git
diff --git a/usr/src/cmd/zic/africa b/usr/src/data/zoneinfo/africa
index d35aaa593e..d35aaa593e 100644
--- a/usr/src/cmd/zic/africa
+++ b/usr/src/data/zoneinfo/africa
diff --git a/usr/src/cmd/zic/antarctica b/usr/src/data/zoneinfo/antarctica
index 0995835752..0995835752 100644
--- a/usr/src/cmd/zic/antarctica
+++ b/usr/src/data/zoneinfo/antarctica
diff --git a/usr/src/cmd/zic/asia b/usr/src/data/zoneinfo/asia
index b2c9930853..b2c9930853 100644
--- a/usr/src/cmd/zic/asia
+++ b/usr/src/data/zoneinfo/asia
diff --git a/usr/src/cmd/zic/australasia b/usr/src/data/zoneinfo/australasia
index 85d363295b..85d363295b 100644
--- a/usr/src/cmd/zic/australasia
+++ b/usr/src/data/zoneinfo/australasia
diff --git a/usr/src/cmd/zic/backward b/usr/src/data/zoneinfo/backward
index aa23dd844e..aa23dd844e 100644
--- a/usr/src/cmd/zic/backward
+++ b/usr/src/data/zoneinfo/backward
diff --git a/usr/src/cmd/zic/continent.tab b/usr/src/data/zoneinfo/continent.tab
index 0c6d72b576..0d0ef0c143 100644
--- a/usr/src/cmd/zic/continent.tab
+++ b/usr/src/data/zoneinfo/continent.tab
@@ -2,8 +2,6 @@
 # Copyright (c) 2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 Africa	Africa
 America	Americas
 Antarctica	Antarctica
diff --git a/usr/src/cmd/zic/country.tab b/usr/src/data/zoneinfo/country.tab
index 7a8df2c7f1..7a8df2c7f1 100644
--- a/usr/src/cmd/zic/country.tab
+++ b/usr/src/data/zoneinfo/country.tab
diff --git a/usr/src/cmd/zic/do_pofile.sh b/usr/src/data/zoneinfo/do_pofile.sh
index ba5f536493..abbff4ec72 100644
--- a/usr/src/cmd/zic/do_pofile.sh
+++ b/usr/src/data/zoneinfo/do_pofile.sh
@@ -3,7 +3,6 @@
 # Copyright (c) 2001 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 #
 # Create messages file for zone_sun.tab, country.tab, continent.tab
@@ -20,7 +19,7 @@ DOMAIN=SUNW_OST_ZONEINFO
 $ECHO "domain \"$DOMAIN\""
 
 $ECHO "#"
-$ECHO "# These files are located in usr/src/cmd/zic."
+$ECHO "# These files are located in usr/src/data/zoneinfo"
 $ECHO "#"
 
 $ECHO "#"
@@ -29,10 +28,10 @@ $ECHO "#"
 
 # Get 2nd column of continent.tab file
 $AWK -F'\t' \
-	' 
+	'
 	/^#/ { next }
-	{ 
-		printf "msgid \"%s\"\n", $2 
+	{
+		printf "msgid \"%s\"\n", $2
 		printf "msgstr \"\"\n"
 	}
 	' < $CONTINENT_FILE
@@ -43,10 +42,10 @@ $ECHO "#"
 
 # Get 2nd column of country.tab file
 $AWK -F'\t' \
-	' 
+	'
 	/^#/ { next }
-	{ 
-		printf "msgid \"%s\"\n", $2 
+	{
+		printf "msgid \"%s\"\n", $2
 		printf "msgstr \"\"\n"
 	}
 	' < $COUNTRY_FILE
@@ -58,13 +57,12 @@ $ECHO "#"
 
 # Get 5th column (if it exists) of zone_sun.tab file
 $AWK -F'\t' \
-	' 
+	'
 	/^#/ { next }
-	{ 
+	{
 		if (NF > 4) {
-			printf "msgid \"%s\"\n", $5 
+			printf "msgid \"%s\"\n", $5
 			printf "msgstr \"\"\n"
 		}
 	}
 	' < $ZONE_SUN_FILE
-
diff --git a/usr/src/cmd/zic/etcetera b/usr/src/data/zoneinfo/etcetera
index f5fa4c94b4..f5fa4c94b4 100644
--- a/usr/src/cmd/zic/etcetera
+++ b/usr/src/data/zoneinfo/etcetera
diff --git a/usr/src/cmd/zic/europe b/usr/src/data/zoneinfo/europe
index a7dc350d1e..a7dc350d1e 100644
--- a/usr/src/cmd/zic/europe
+++ b/usr/src/data/zoneinfo/europe
diff --git a/usr/src/cmd/zic/factory b/usr/src/data/zoneinfo/factory
index 624ccc0c36..624ccc0c36 100644
--- a/usr/src/cmd/zic/factory
+++ b/usr/src/data/zoneinfo/factory
diff --git a/usr/src/cmd/zic/northamerica b/usr/src/data/zoneinfo/northamerica
index e1ed9e4a87..e1ed9e4a87 100644
--- a/usr/src/cmd/zic/northamerica
+++ b/usr/src/data/zoneinfo/northamerica
diff --git a/usr/src/cmd/zic/pacificnew b/usr/src/data/zoneinfo/pacificnew
index 734943486b..734943486b 100644
--- a/usr/src/cmd/zic/pacificnew
+++ b/usr/src/data/zoneinfo/pacificnew
diff --git a/usr/src/cmd/zic/solar87 b/usr/src/data/zoneinfo/solar87
index 47ee7e7aad..47ee7e7aad 100644
--- a/usr/src/cmd/zic/solar87
+++ b/usr/src/data/zoneinfo/solar87
diff --git a/usr/src/cmd/zic/solar88 b/usr/src/data/zoneinfo/solar88
index 8db590edd9..8db590edd9 100644
--- a/usr/src/cmd/zic/solar88
+++ b/usr/src/data/zoneinfo/solar88
diff --git a/usr/src/cmd/zic/solar89 b/usr/src/data/zoneinfo/solar89
index d24de4a77e..d24de4a77e 100644
--- a/usr/src/cmd/zic/solar89
+++ b/usr/src/data/zoneinfo/solar89
diff --git a/usr/src/cmd/zic/southamerica b/usr/src/data/zoneinfo/southamerica
index 532145172f..532145172f 100644
--- a/usr/src/cmd/zic/southamerica
+++ b/usr/src/data/zoneinfo/southamerica
diff --git a/usr/src/cmd/zic/systemv b/usr/src/data/zoneinfo/systemv
index d9e2995756..d9e2995756 100644
--- a/usr/src/cmd/zic/systemv
+++ b/usr/src/data/zoneinfo/systemv
diff --git a/usr/src/cmd/zic/zone.tab.txt b/usr/src/data/zoneinfo/zone.tab.txt
index cf774b5dc2..cf774b5dc2 100644
--- a/usr/src/cmd/zic/zone.tab.txt
+++ b/usr/src/data/zoneinfo/zone.tab.txt
diff --git a/usr/src/cmd/zic/zone_sun.tab b/usr/src/data/zoneinfo/zone_sun.tab
index e30c753a38..e30c753a38 100644
--- a/usr/src/cmd/zic/zone_sun.tab
+++ b/usr/src/data/zoneinfo/zone_sun.tab
diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf
index b8710ccb27..d59171f086 100644
--- a/usr/src/pkg/manifests/developer-build-onbld.mf
+++ b/usr/src/pkg/manifests/developer-build-onbld.mf
@@ -77,6 +77,7 @@ $(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/forth mode=0555
 $(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/forth_preload.so.1 mode=0555
 file path=opt/onbld/bin/$(ARCH)/install mode=0555
 file path=opt/onbld/bin/$(ARCH)/lintdump mode=0555
+file path=opt/onbld/bin/$(ARCH)/localedef mode=0555
 file path=opt/onbld/bin/$(ARCH)/make mode=0555
 $(i386_ONLY)file path=opt/onbld/bin/$(ARCH)/mbh_patch mode=0555
 file path=opt/onbld/bin/$(ARCH)/ndrgen mode=0555
@@ -85,8 +86,10 @@ file path=opt/onbld/bin/$(ARCH)/pmodes mode=0555
 file path=opt/onbld/bin/$(ARCH)/protocmp mode=0555
 file path=opt/onbld/bin/$(ARCH)/protolist mode=0555
 $(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/stabs mode=0555
+file path=opt/onbld/bin/$(ARCH)/tic mode=0555
 $(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/tokenize mode=0555
 $(sparc_ONLY)file path=opt/onbld/bin/$(ARCH)/tokenize.exe mode=0555
+file path=opt/onbld/bin/$(ARCH)/zic mode=0555
 file path=opt/onbld/bin/Install mode=0555
 file path=opt/onbld/bin/bldenv mode=0555
 file path=opt/onbld/bin/bringovercheck mode=0555
diff --git a/usr/src/pkg/manifests/locale-af.mf b/usr/src/pkg/manifests/locale-af.mf
index 350aeaced8..a4594cd091 100644
--- a/usr/src/pkg/manifests/locale-af.mf
+++ b/usr/src/pkg/manifests/locale-af.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/af_ZA.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/af_ZA.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/af_ZA.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ar.mf b/usr/src/pkg/manifests/locale-ar.mf
index 275aff672a..60bdf9f6d2 100644
--- a/usr/src/pkg/manifests/locale-ar.mf
+++ b/usr/src/pkg/manifests/locale-ar.mf
@@ -217,5 +217,5 @@ file path=usr/lib/locale/ar_YE.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ar_YE.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ar_YE.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-as.mf b/usr/src/pkg/manifests/locale-as.mf
index 096ff9821c..961411a2b9 100644
--- a/usr/src/pkg/manifests/locale-as.mf
+++ b/usr/src/pkg/manifests/locale-as.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/as_IN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/as_IN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/as_IN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-az.mf b/usr/src/pkg/manifests/locale-az.mf
index 3ec4f86fcd..60f2bf3249 100644
--- a/usr/src/pkg/manifests/locale-az.mf
+++ b/usr/src/pkg/manifests/locale-az.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/az_AZ.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/az_AZ.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/az_AZ.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-be.mf b/usr/src/pkg/manifests/locale-be.mf
index 09fa3b9230..28e4858fc8 100644
--- a/usr/src/pkg/manifests/locale-be.mf
+++ b/usr/src/pkg/manifests/locale-be.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/be_BY.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/be_BY.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/be_BY.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-bg-extra.mf b/usr/src/pkg/manifests/locale-bg-extra.mf
index f6d6b0e226..70e92d4ed1 100644
--- a/usr/src/pkg/manifests/locale-bg-extra.mf
+++ b/usr/src/pkg/manifests/locale-bg-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/bg_BG.ISO8859-5/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/bg_BG.ISO8859-5/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/bg_BG.ISO8859-5/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-bg.mf b/usr/src/pkg/manifests/locale-bg.mf
index 4186cd563a..292d9f561d 100644
--- a/usr/src/pkg/manifests/locale-bg.mf
+++ b/usr/src/pkg/manifests/locale-bg.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/bg_BG.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/bg_BG.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/bg_BG.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-bn.mf b/usr/src/pkg/manifests/locale-bn.mf
index a8798cfe30..70d38318e3 100644
--- a/usr/src/pkg/manifests/locale-bn.mf
+++ b/usr/src/pkg/manifests/locale-bn.mf
@@ -48,5 +48,5 @@ file path=usr/lib/locale/bn_IN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/bn_IN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/bn_IN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-bo.mf b/usr/src/pkg/manifests/locale-bo.mf
index 79137e2077..115d9e074b 100644
--- a/usr/src/pkg/manifests/locale-bo.mf
+++ b/usr/src/pkg/manifests/locale-bo.mf
@@ -48,5 +48,5 @@ file path=usr/lib/locale/bo_IN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/bo_IN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/bo_IN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-bs.mf b/usr/src/pkg/manifests/locale-bs.mf
index ca3f8102ac..a105f9ed54 100644
--- a/usr/src/pkg/manifests/locale-bs.mf
+++ b/usr/src/pkg/manifests/locale-bs.mf
@@ -36,5 +36,5 @@ file path=usr/lib/locale/bs_BA.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/bs_BA.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/bs_BA.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ca-extra.mf b/usr/src/pkg/manifests/locale-ca-extra.mf
index 31a62a846f..137f5785ec 100644
--- a/usr/src/pkg/manifests/locale-ca-extra.mf
+++ b/usr/src/pkg/manifests/locale-ca-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/ca_ES.ISO8859-15/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ca_ES.ISO8859-15/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ca_ES.ISO8859-15/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ca.mf b/usr/src/pkg/manifests/locale-ca.mf
index 65d9a64595..9f92c793c7 100644
--- a/usr/src/pkg/manifests/locale-ca.mf
+++ b/usr/src/pkg/manifests/locale-ca.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/ca_ES.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ca_ES.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ca_ES.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-cs-extra.mf b/usr/src/pkg/manifests/locale-cs-extra.mf
index f9d62313e9..3d50eead8d 100644
--- a/usr/src/pkg/manifests/locale-cs-extra.mf
+++ b/usr/src/pkg/manifests/locale-cs-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/cs_CZ.ISO8859-2/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/cs_CZ.ISO8859-2/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/cs_CZ.ISO8859-2/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-cs.mf b/usr/src/pkg/manifests/locale-cs.mf
index 458925d841..4bb75bb91a 100644
--- a/usr/src/pkg/manifests/locale-cs.mf
+++ b/usr/src/pkg/manifests/locale-cs.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/cs_CZ.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/cs_CZ.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/cs_CZ.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-da-extra.mf b/usr/src/pkg/manifests/locale-da-extra.mf
index 1ecf09b11b..f4e88f16f5 100644
--- a/usr/src/pkg/manifests/locale-da-extra.mf
+++ b/usr/src/pkg/manifests/locale-da-extra.mf
@@ -53,5 +53,5 @@ file path=usr/lib/locale/da_DK.ISO8859-15/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/da_DK.ISO8859-15/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/da_DK.ISO8859-15/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-da.mf b/usr/src/pkg/manifests/locale-da.mf
index da9cdbd5f0..5a4a87bea5 100644
--- a/usr/src/pkg/manifests/locale-da.mf
+++ b/usr/src/pkg/manifests/locale-da.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/da_DK.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/da_DK.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/da_DK.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-de-extra.mf b/usr/src/pkg/manifests/locale-de-extra.mf
index e27e535612..156b302914 100644
--- a/usr/src/pkg/manifests/locale-de-extra.mf
+++ b/usr/src/pkg/manifests/locale-de-extra.mf
@@ -79,5 +79,5 @@ file path=usr/lib/locale/de_DE.ISO8859-15/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/de_DE.ISO8859-15/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/de_DE.ISO8859-15/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-de.mf b/usr/src/pkg/manifests/locale-de.mf
index 3a04e8dc18..ea818d48fa 100644
--- a/usr/src/pkg/manifests/locale-de.mf
+++ b/usr/src/pkg/manifests/locale-de.mf
@@ -100,5 +100,5 @@ file path=usr/lib/locale/de_LU.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/de_LU.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/de_LU.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-el-extra.mf b/usr/src/pkg/manifests/locale-el-extra.mf
index 331595c800..4f8a3d0674 100644
--- a/usr/src/pkg/manifests/locale-el-extra.mf
+++ b/usr/src/pkg/manifests/locale-el-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/el_GR.ISO8859-7/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/el_GR.ISO8859-7/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/el_GR.ISO8859-7/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-el.mf b/usr/src/pkg/manifests/locale-el.mf
index 69c8e6637f..3c7fa16d0f 100644
--- a/usr/src/pkg/manifests/locale-el.mf
+++ b/usr/src/pkg/manifests/locale-el.mf
@@ -48,5 +48,5 @@ file path=usr/lib/locale/el_GR.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/el_GR.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/el_GR.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-en-extra.mf b/usr/src/pkg/manifests/locale-en-extra.mf
index 030f965b3f..9e112eff92 100644
--- a/usr/src/pkg/manifests/locale-en-extra.mf
+++ b/usr/src/pkg/manifests/locale-en-extra.mf
@@ -131,5 +131,5 @@ file path=usr/lib/locale/en_US.ISO8859-15/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/en_US.ISO8859-15/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/en_US.ISO8859-15/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-en.mf b/usr/src/pkg/manifests/locale-en.mf
index bc44d8b3e7..eff4c03b57 100644
--- a/usr/src/pkg/manifests/locale-en.mf
+++ b/usr/src/pkg/manifests/locale-en.mf
@@ -282,5 +282,5 @@ file path=usr/lib/locale/en_ZW.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/en_ZW.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/en_ZW.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-es-extra.mf b/usr/src/pkg/manifests/locale-es-extra.mf
index 0631679b9e..39fd71912c 100644
--- a/usr/src/pkg/manifests/locale-es-extra.mf
+++ b/usr/src/pkg/manifests/locale-es-extra.mf
@@ -222,5 +222,5 @@ file path=usr/lib/locale/es_VE.ISO8859-1/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/es_VE.ISO8859-1/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/es_VE.ISO8859-1/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-es.mf b/usr/src/pkg/manifests/locale-es.mf
index ddc3ed9cfa..3c47a71ada 100644
--- a/usr/src/pkg/manifests/locale-es.mf
+++ b/usr/src/pkg/manifests/locale-es.mf
@@ -295,5 +295,5 @@ file path=usr/lib/locale/es_VE.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/es_VE.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/es_VE.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-et.mf b/usr/src/pkg/manifests/locale-et.mf
index eb361997bc..ee58f34113 100644
--- a/usr/src/pkg/manifests/locale-et.mf
+++ b/usr/src/pkg/manifests/locale-et.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/et_EE.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/et_EE.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/et_EE.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-fi-extra.mf b/usr/src/pkg/manifests/locale-fi-extra.mf
index faada10d64..566d002e1d 100644
--- a/usr/src/pkg/manifests/locale-fi-extra.mf
+++ b/usr/src/pkg/manifests/locale-fi-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/fi_FI.ISO8859-15/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/fi_FI.ISO8859-15/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/fi_FI.ISO8859-15/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-fi.mf b/usr/src/pkg/manifests/locale-fi.mf
index fa28977a92..56c4f0eb68 100644
--- a/usr/src/pkg/manifests/locale-fi.mf
+++ b/usr/src/pkg/manifests/locale-fi.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/fi_FI.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/fi_FI.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/fi_FI.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-fil.mf b/usr/src/pkg/manifests/locale-fil.mf
index 70fd79644b..c4667fc0c7 100644
--- a/usr/src/pkg/manifests/locale-fil.mf
+++ b/usr/src/pkg/manifests/locale-fil.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/fil_PH.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/fil_PH.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/fil_PH.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-fr-extra.mf b/usr/src/pkg/manifests/locale-fr-extra.mf
index 69d9258170..8e85460df8 100644
--- a/usr/src/pkg/manifests/locale-fr-extra.mf
+++ b/usr/src/pkg/manifests/locale-fr-extra.mf
@@ -92,5 +92,5 @@ file path=usr/lib/locale/fr_FR.ISO8859-15/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/fr_FR.ISO8859-15/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/fr_FR.ISO8859-15/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-fr.mf b/usr/src/pkg/manifests/locale-fr.mf
index 6ab5a81682..8ad4e33054 100644
--- a/usr/src/pkg/manifests/locale-fr.mf
+++ b/usr/src/pkg/manifests/locale-fr.mf
@@ -178,5 +178,5 @@ file path=usr/lib/locale/fr_SN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/fr_SN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/fr_SN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ga.mf b/usr/src/pkg/manifests/locale-ga.mf
index aae833d825..a5f4242240 100644
--- a/usr/src/pkg/manifests/locale-ga.mf
+++ b/usr/src/pkg/manifests/locale-ga.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/ga_IE.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ga_IE.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ga_IE.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-gu.mf b/usr/src/pkg/manifests/locale-gu.mf
index 8e2571635d..368b69281a 100644
--- a/usr/src/pkg/manifests/locale-gu.mf
+++ b/usr/src/pkg/manifests/locale-gu.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/gu_IN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/gu_IN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/gu_IN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-he.mf b/usr/src/pkg/manifests/locale-he.mf
index 270379661a..d3a125cc54 100644
--- a/usr/src/pkg/manifests/locale-he.mf
+++ b/usr/src/pkg/manifests/locale-he.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/he_IL.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/he_IL.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/he_IL.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-hi.mf b/usr/src/pkg/manifests/locale-hi.mf
index 4a225dc81e..d0b847d13e 100644
--- a/usr/src/pkg/manifests/locale-hi.mf
+++ b/usr/src/pkg/manifests/locale-hi.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/hi_IN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/hi_IN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/hi_IN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-hr-extra.mf b/usr/src/pkg/manifests/locale-hr-extra.mf
index 9f1cb26813..39dbd6eeb3 100644
--- a/usr/src/pkg/manifests/locale-hr-extra.mf
+++ b/usr/src/pkg/manifests/locale-hr-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/hr_HR.ISO8859-2/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/hr_HR.ISO8859-2/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/hr_HR.ISO8859-2/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-hr.mf b/usr/src/pkg/manifests/locale-hr.mf
index 115d6bad21..3413b5f218 100644
--- a/usr/src/pkg/manifests/locale-hr.mf
+++ b/usr/src/pkg/manifests/locale-hr.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/hr_HR.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/hr_HR.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/hr_HR.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-hu-extra.mf b/usr/src/pkg/manifests/locale-hu-extra.mf
index f57694b882..cfd1fd6442 100644
--- a/usr/src/pkg/manifests/locale-hu-extra.mf
+++ b/usr/src/pkg/manifests/locale-hu-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/hu_HU.ISO8859-2/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/hu_HU.ISO8859-2/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/hu_HU.ISO8859-2/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-hu.mf b/usr/src/pkg/manifests/locale-hu.mf
index 2f6b1440e0..3afeb81bbf 100644
--- a/usr/src/pkg/manifests/locale-hu.mf
+++ b/usr/src/pkg/manifests/locale-hu.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/hu_HU.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/hu_HU.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/hu_HU.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-hy.mf b/usr/src/pkg/manifests/locale-hy.mf
index e961e5d529..e428bab91d 100644
--- a/usr/src/pkg/manifests/locale-hy.mf
+++ b/usr/src/pkg/manifests/locale-hy.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/hy_AM.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/hy_AM.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/hy_AM.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-id.mf b/usr/src/pkg/manifests/locale-id.mf
index 2b0ff0ba81..01a33a1e97 100644
--- a/usr/src/pkg/manifests/locale-id.mf
+++ b/usr/src/pkg/manifests/locale-id.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/id_ID.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/id_ID.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/id_ID.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ii.mf b/usr/src/pkg/manifests/locale-ii.mf
index f86589f456..01d498fe3c 100644
--- a/usr/src/pkg/manifests/locale-ii.mf
+++ b/usr/src/pkg/manifests/locale-ii.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/ii_CN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ii_CN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ii_CN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-is-extra.mf b/usr/src/pkg/manifests/locale-is-extra.mf
index 94b63358d3..29d71d1a67 100644
--- a/usr/src/pkg/manifests/locale-is-extra.mf
+++ b/usr/src/pkg/manifests/locale-is-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/is_IS.ISO8859-1/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/is_IS.ISO8859-1/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/is_IS.ISO8859-1/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-is.mf b/usr/src/pkg/manifests/locale-is.mf
index 19f7ed1b02..f56fc5f291 100644
--- a/usr/src/pkg/manifests/locale-is.mf
+++ b/usr/src/pkg/manifests/locale-is.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/is_IS.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/is_IS.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/is_IS.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-it-extra.mf b/usr/src/pkg/manifests/locale-it-extra.mf
index 6e044efde4..4cb83cb7bc 100644
--- a/usr/src/pkg/manifests/locale-it-extra.mf
+++ b/usr/src/pkg/manifests/locale-it-extra.mf
@@ -66,5 +66,5 @@ file path=usr/lib/locale/it_IT.ISO8859-15/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/it_IT.ISO8859-15/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/it_IT.ISO8859-15/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-it.mf b/usr/src/pkg/manifests/locale-it.mf
index a325e51706..3c7e52e22f 100644
--- a/usr/src/pkg/manifests/locale-it.mf
+++ b/usr/src/pkg/manifests/locale-it.mf
@@ -48,5 +48,5 @@ file path=usr/lib/locale/it_IT.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/it_IT.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/it_IT.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ja.mf b/usr/src/pkg/manifests/locale-ja.mf
index 02e520310e..42281c3917 100644
--- a/usr/src/pkg/manifests/locale-ja.mf
+++ b/usr/src/pkg/manifests/locale-ja.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/ja_JP.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ja_JP.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ja_JP.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ka.mf b/usr/src/pkg/manifests/locale-ka.mf
index c5ef9fb947..1c56ef1885 100644
--- a/usr/src/pkg/manifests/locale-ka.mf
+++ b/usr/src/pkg/manifests/locale-ka.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/ka_GE.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ka_GE.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ka_GE.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-kk.mf b/usr/src/pkg/manifests/locale-kk.mf
index 6c0dffcfa8..22b792d4bf 100644
--- a/usr/src/pkg/manifests/locale-kk.mf
+++ b/usr/src/pkg/manifests/locale-kk.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/kk_KZ.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/kk_KZ.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/kk_KZ.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-km.mf b/usr/src/pkg/manifests/locale-km.mf
index 6bdd5965ee..e163e22960 100644
--- a/usr/src/pkg/manifests/locale-km.mf
+++ b/usr/src/pkg/manifests/locale-km.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/km_KH.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/km_KH.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/km_KH.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-kn.mf b/usr/src/pkg/manifests/locale-kn.mf
index 4805cfb880..8bbd6665da 100644
--- a/usr/src/pkg/manifests/locale-kn.mf
+++ b/usr/src/pkg/manifests/locale-kn.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/kn_IN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/kn_IN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/kn_IN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ko.mf b/usr/src/pkg/manifests/locale-ko.mf
index 909be9502f..fe8da0c24c 100644
--- a/usr/src/pkg/manifests/locale-ko.mf
+++ b/usr/src/pkg/manifests/locale-ko.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/ko_KR.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ko_KR.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ko_KR.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-kok.mf b/usr/src/pkg/manifests/locale-kok.mf
index bf736c382f..b824812755 100644
--- a/usr/src/pkg/manifests/locale-kok.mf
+++ b/usr/src/pkg/manifests/locale-kok.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/kok_IN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/kok_IN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/kok_IN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-lt-extra.mf b/usr/src/pkg/manifests/locale-lt-extra.mf
index 5fc9d2960e..1d74a488f4 100644
--- a/usr/src/pkg/manifests/locale-lt-extra.mf
+++ b/usr/src/pkg/manifests/locale-lt-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/lt_LT.ISO8859-13/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/lt_LT.ISO8859-13/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/lt_LT.ISO8859-13/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-lt.mf b/usr/src/pkg/manifests/locale-lt.mf
index 995561b4f8..4b1b652081 100644
--- a/usr/src/pkg/manifests/locale-lt.mf
+++ b/usr/src/pkg/manifests/locale-lt.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/lt_LT.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/lt_LT.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/lt_LT.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-lv-extra.mf b/usr/src/pkg/manifests/locale-lv-extra.mf
index 73b8575f7c..be9728390f 100644
--- a/usr/src/pkg/manifests/locale-lv-extra.mf
+++ b/usr/src/pkg/manifests/locale-lv-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/lv_LV.ISO8859-13/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/lv_LV.ISO8859-13/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/lv_LV.ISO8859-13/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-lv.mf b/usr/src/pkg/manifests/locale-lv.mf
index 46b18e5a2a..720499b466 100644
--- a/usr/src/pkg/manifests/locale-lv.mf
+++ b/usr/src/pkg/manifests/locale-lv.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/lv_LV.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/lv_LV.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/lv_LV.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-mk-extra.mf b/usr/src/pkg/manifests/locale-mk-extra.mf
index e929070734..a54b99fb33 100644
--- a/usr/src/pkg/manifests/locale-mk-extra.mf
+++ b/usr/src/pkg/manifests/locale-mk-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/mk_MK.ISO8859-5/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/mk_MK.ISO8859-5/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/mk_MK.ISO8859-5/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-mk.mf b/usr/src/pkg/manifests/locale-mk.mf
index 7244c7f336..ac982b5350 100644
--- a/usr/src/pkg/manifests/locale-mk.mf
+++ b/usr/src/pkg/manifests/locale-mk.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/mk_MK.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/mk_MK.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/mk_MK.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ml.mf b/usr/src/pkg/manifests/locale-ml.mf
index 22e4b47a54..b991ec79e3 100644
--- a/usr/src/pkg/manifests/locale-ml.mf
+++ b/usr/src/pkg/manifests/locale-ml.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/ml_IN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ml_IN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ml_IN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-mn.mf b/usr/src/pkg/manifests/locale-mn.mf
index e4eafc8f2f..c9f06f56e5 100644
--- a/usr/src/pkg/manifests/locale-mn.mf
+++ b/usr/src/pkg/manifests/locale-mn.mf
@@ -48,5 +48,5 @@ file path=usr/lib/locale/mn_MN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/mn_MN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/mn_MN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-mr.mf b/usr/src/pkg/manifests/locale-mr.mf
index 9a059ef40c..5d7d017767 100644
--- a/usr/src/pkg/manifests/locale-mr.mf
+++ b/usr/src/pkg/manifests/locale-mr.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/mr_IN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/mr_IN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/mr_IN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ms.mf b/usr/src/pkg/manifests/locale-ms.mf
index ae3488dfbe..db7a3502c8 100644
--- a/usr/src/pkg/manifests/locale-ms.mf
+++ b/usr/src/pkg/manifests/locale-ms.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/ms_MY.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ms_MY.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ms_MY.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-mt.mf b/usr/src/pkg/manifests/locale-mt.mf
index 305e19b754..53c6af0af6 100644
--- a/usr/src/pkg/manifests/locale-mt.mf
+++ b/usr/src/pkg/manifests/locale-mt.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/mt_MT.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/mt_MT.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/mt_MT.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-nb.mf b/usr/src/pkg/manifests/locale-nb.mf
index b7656cb07c..172a64ee27 100644
--- a/usr/src/pkg/manifests/locale-nb.mf
+++ b/usr/src/pkg/manifests/locale-nb.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/nb_NO.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/nb_NO.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/nb_NO.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ne.mf b/usr/src/pkg/manifests/locale-ne.mf
index c0b679534c..80e856055c 100644
--- a/usr/src/pkg/manifests/locale-ne.mf
+++ b/usr/src/pkg/manifests/locale-ne.mf
@@ -48,5 +48,5 @@ file path=usr/lib/locale/ne_NP.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ne_NP.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ne_NP.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-nl-extra.mf b/usr/src/pkg/manifests/locale-nl-extra.mf
index 14e71739fc..b4538c67b0 100644
--- a/usr/src/pkg/manifests/locale-nl-extra.mf
+++ b/usr/src/pkg/manifests/locale-nl-extra.mf
@@ -53,5 +53,5 @@ file path=usr/lib/locale/nl_NL.ISO8859-15/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/nl_NL.ISO8859-15/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/nl_NL.ISO8859-15/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-nl.mf b/usr/src/pkg/manifests/locale-nl.mf
index 5b97ba901c..01a6dc09f8 100644
--- a/usr/src/pkg/manifests/locale-nl.mf
+++ b/usr/src/pkg/manifests/locale-nl.mf
@@ -48,5 +48,5 @@ file path=usr/lib/locale/nl_NL.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/nl_NL.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/nl_NL.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-nn.mf b/usr/src/pkg/manifests/locale-nn.mf
index 60af2da2a3..0b96496138 100644
--- a/usr/src/pkg/manifests/locale-nn.mf
+++ b/usr/src/pkg/manifests/locale-nn.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/nn_NO.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/nn_NO.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/nn_NO.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-or.mf b/usr/src/pkg/manifests/locale-or.mf
index 2b0d56526b..60e69ecaa5 100644
--- a/usr/src/pkg/manifests/locale-or.mf
+++ b/usr/src/pkg/manifests/locale-or.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/or_IN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/or_IN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/or_IN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-pa.mf b/usr/src/pkg/manifests/locale-pa.mf
index a87caa33c0..6629527962 100644
--- a/usr/src/pkg/manifests/locale-pa.mf
+++ b/usr/src/pkg/manifests/locale-pa.mf
@@ -48,5 +48,5 @@ file path=usr/lib/locale/pa_PK.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/pa_PK.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/pa_PK.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-pl-extra.mf b/usr/src/pkg/manifests/locale-pl-extra.mf
index 1b7796a4ca..960b01fc44 100644
--- a/usr/src/pkg/manifests/locale-pl-extra.mf
+++ b/usr/src/pkg/manifests/locale-pl-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/pl_PL.ISO8859-2/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/pl_PL.ISO8859-2/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/pl_PL.ISO8859-2/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-pl.mf b/usr/src/pkg/manifests/locale-pl.mf
index 53999d547b..59671fd0a3 100644
--- a/usr/src/pkg/manifests/locale-pl.mf
+++ b/usr/src/pkg/manifests/locale-pl.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/pl_PL.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/pl_PL.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/pl_PL.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-pt-extra.mf b/usr/src/pkg/manifests/locale-pt-extra.mf
index 48ac9b5871..c96b5be1e5 100644
--- a/usr/src/pkg/manifests/locale-pt-extra.mf
+++ b/usr/src/pkg/manifests/locale-pt-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/pt_PT.ISO8859-15/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/pt_PT.ISO8859-15/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/pt_PT.ISO8859-15/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-pt.mf b/usr/src/pkg/manifests/locale-pt.mf
index f56d5b0482..56ee56a3f6 100644
--- a/usr/src/pkg/manifests/locale-pt.mf
+++ b/usr/src/pkg/manifests/locale-pt.mf
@@ -74,5 +74,5 @@ file path=usr/lib/locale/pt_PT.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/pt_PT.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/pt_PT.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ro.mf b/usr/src/pkg/manifests/locale-ro.mf
index ea6d64ab9b..05eec1a5f1 100644
--- a/usr/src/pkg/manifests/locale-ro.mf
+++ b/usr/src/pkg/manifests/locale-ro.mf
@@ -48,5 +48,5 @@ file path=usr/lib/locale/ro_RO.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ro_RO.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ro_RO.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ru-extra.mf b/usr/src/pkg/manifests/locale-ru-extra.mf
index 5f96fb2151..42c84e297a 100644
--- a/usr/src/pkg/manifests/locale-ru-extra.mf
+++ b/usr/src/pkg/manifests/locale-ru-extra.mf
@@ -53,5 +53,5 @@ file path=usr/lib/locale/ru_RU.KOI8-R/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ru_RU.KOI8-R/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ru_RU.KOI8-R/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ru.mf b/usr/src/pkg/manifests/locale-ru.mf
index f338a215dd..af4685c1e4 100644
--- a/usr/src/pkg/manifests/locale-ru.mf
+++ b/usr/src/pkg/manifests/locale-ru.mf
@@ -61,5 +61,5 @@ file path=usr/lib/locale/ru_UA.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ru_UA.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ru_UA.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-sa.mf b/usr/src/pkg/manifests/locale-sa.mf
index 5bdfd62c22..1c8fa88b90 100644
--- a/usr/src/pkg/manifests/locale-sa.mf
+++ b/usr/src/pkg/manifests/locale-sa.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/sa_IN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/sa_IN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/sa_IN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-si.mf b/usr/src/pkg/manifests/locale-si.mf
index 69fd7d6af3..0a3b66b140 100644
--- a/usr/src/pkg/manifests/locale-si.mf
+++ b/usr/src/pkg/manifests/locale-si.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/si_LK.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/si_LK.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/si_LK.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-sk.mf b/usr/src/pkg/manifests/locale-sk.mf
index 7bbd89873a..07fd1acad6 100644
--- a/usr/src/pkg/manifests/locale-sk.mf
+++ b/usr/src/pkg/manifests/locale-sk.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/sk_SK.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/sk_SK.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/sk_SK.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-sl.mf b/usr/src/pkg/manifests/locale-sl.mf
index 2192122cc4..14c65f663c 100644
--- a/usr/src/pkg/manifests/locale-sl.mf
+++ b/usr/src/pkg/manifests/locale-sl.mf
@@ -36,5 +36,5 @@ file path=usr/lib/locale/sl_SI.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/sl_SI.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/sl_SI.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-sq-extra.mf b/usr/src/pkg/manifests/locale-sq-extra.mf
index c9de2b4673..262bb10ee8 100644
--- a/usr/src/pkg/manifests/locale-sq-extra.mf
+++ b/usr/src/pkg/manifests/locale-sq-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/sq_AL.ISO8859-2/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/sq_AL.ISO8859-2/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/sq_AL.ISO8859-2/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-sq.mf b/usr/src/pkg/manifests/locale-sq.mf
index ef619b0b05..22745ab6be 100644
--- a/usr/src/pkg/manifests/locale-sq.mf
+++ b/usr/src/pkg/manifests/locale-sq.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/sq_AL.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/sq_AL.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/sq_AL.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-sr.mf b/usr/src/pkg/manifests/locale-sr.mf
index 08302cea5f..05750f38b0 100644
--- a/usr/src/pkg/manifests/locale-sr.mf
+++ b/usr/src/pkg/manifests/locale-sr.mf
@@ -78,5 +78,5 @@ file path=usr/lib/locale/sr_RS.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/sr_RS.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/sr_RS.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-sv-extra.mf b/usr/src/pkg/manifests/locale-sv-extra.mf
index 8f1a940bb8..a2613561f0 100644
--- a/usr/src/pkg/manifests/locale-sv-extra.mf
+++ b/usr/src/pkg/manifests/locale-sv-extra.mf
@@ -66,5 +66,5 @@ file path=usr/lib/locale/sv_SE.ISO8859-15/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/sv_SE.ISO8859-15/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/sv_SE.ISO8859-15/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-sv.mf b/usr/src/pkg/manifests/locale-sv.mf
index 30eeeabf80..97aa053ca8 100644
--- a/usr/src/pkg/manifests/locale-sv.mf
+++ b/usr/src/pkg/manifests/locale-sv.mf
@@ -48,5 +48,5 @@ file path=usr/lib/locale/sv_SE.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/sv_SE.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/sv_SE.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ta.mf b/usr/src/pkg/manifests/locale-ta.mf
index 5a569b679d..5b7412aab6 100644
--- a/usr/src/pkg/manifests/locale-ta.mf
+++ b/usr/src/pkg/manifests/locale-ta.mf
@@ -48,5 +48,5 @@ file path=usr/lib/locale/ta_LK.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ta_LK.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ta_LK.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-te.mf b/usr/src/pkg/manifests/locale-te.mf
index 733a24df4f..cb6bcf90e5 100644
--- a/usr/src/pkg/manifests/locale-te.mf
+++ b/usr/src/pkg/manifests/locale-te.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/te_IN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/te_IN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/te_IN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-th-extra.mf b/usr/src/pkg/manifests/locale-th-extra.mf
index ddac59f6bb..59e64aa358 100644
--- a/usr/src/pkg/manifests/locale-th-extra.mf
+++ b/usr/src/pkg/manifests/locale-th-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/th_TH.ISO8859-11/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/th_TH.ISO8859-11/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/th_TH.ISO8859-11/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-th.mf b/usr/src/pkg/manifests/locale-th.mf
index d5bb51e672..713f4a532b 100644
--- a/usr/src/pkg/manifests/locale-th.mf
+++ b/usr/src/pkg/manifests/locale-th.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/th_TH.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/th_TH.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/th_TH.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-tr-extra.mf b/usr/src/pkg/manifests/locale-tr-extra.mf
index 1aa5f8e549..3ece560fed 100644
--- a/usr/src/pkg/manifests/locale-tr-extra.mf
+++ b/usr/src/pkg/manifests/locale-tr-extra.mf
@@ -40,5 +40,5 @@ file path=usr/lib/locale/tr_TR.ISO8859-9/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/tr_TR.ISO8859-9/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/tr_TR.ISO8859-9/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-tr.mf b/usr/src/pkg/manifests/locale-tr.mf
index 87ab70c7ce..40f279a402 100644
--- a/usr/src/pkg/manifests/locale-tr.mf
+++ b/usr/src/pkg/manifests/locale-tr.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/tr_TR.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/tr_TR.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/tr_TR.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ug.mf b/usr/src/pkg/manifests/locale-ug.mf
index 49523210a7..60e929222b 100644
--- a/usr/src/pkg/manifests/locale-ug.mf
+++ b/usr/src/pkg/manifests/locale-ug.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/ug_CN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ug_CN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ug_CN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-uk.mf b/usr/src/pkg/manifests/locale-uk.mf
index 7c0e5eee3e..106e58214d 100644
--- a/usr/src/pkg/manifests/locale-uk.mf
+++ b/usr/src/pkg/manifests/locale-uk.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/uk_UA.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/uk_UA.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/uk_UA.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-ur.mf b/usr/src/pkg/manifests/locale-ur.mf
index 5fe9d550d8..13d1a7a1dd 100644
--- a/usr/src/pkg/manifests/locale-ur.mf
+++ b/usr/src/pkg/manifests/locale-ur.mf
@@ -48,5 +48,5 @@ file path=usr/lib/locale/ur_PK.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/ur_PK.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/ur_PK.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-vi.mf b/usr/src/pkg/manifests/locale-vi.mf
index 98eb045a55..69106608e6 100644
--- a/usr/src/pkg/manifests/locale-vi.mf
+++ b/usr/src/pkg/manifests/locale-vi.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/vi_VN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/vi_VN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/vi_VN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-zh-cn-extra.mf b/usr/src/pkg/manifests/locale-zh-cn-extra.mf
index 90cd62af70..8a927c3b9a 100644
--- a/usr/src/pkg/manifests/locale-zh-cn-extra.mf
+++ b/usr/src/pkg/manifests/locale-zh-cn-extra.mf
@@ -36,5 +36,5 @@ file path=usr/lib/locale/zh_CN.GB18030/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/zh_CN.GB18030/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/zh_CN.GB18030/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-zh-cn.mf b/usr/src/pkg/manifests/locale-zh-cn.mf
index 62dc96af83..343bfed3c8 100644
--- a/usr/src/pkg/manifests/locale-zh-cn.mf
+++ b/usr/src/pkg/manifests/locale-zh-cn.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/zh_CN.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/zh_CN.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/zh_CN.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-zh-hk.mf b/usr/src/pkg/manifests/locale-zh-hk.mf
index b812c98cf0..67d7d0ecf7 100644
--- a/usr/src/pkg/manifests/locale-zh-hk.mf
+++ b/usr/src/pkg/manifests/locale-zh-hk.mf
@@ -36,5 +36,5 @@ file path=usr/lib/locale/zh_HK.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/zh_HK.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/zh_HK.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-zh-mo.mf b/usr/src/pkg/manifests/locale-zh-mo.mf
index a205e6d965..20c8ce918d 100644
--- a/usr/src/pkg/manifests/locale-zh-mo.mf
+++ b/usr/src/pkg/manifests/locale-zh-mo.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/zh_MO.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/zh_MO.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/zh_MO.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-zh-sg.mf b/usr/src/pkg/manifests/locale-zh-sg.mf
index 41212a7310..1b38f26b0f 100644
--- a/usr/src/pkg/manifests/locale-zh-sg.mf
+++ b/usr/src/pkg/manifests/locale-zh-sg.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/zh_SG.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/zh_SG.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/zh_SG.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/locale-zh-tw.mf b/usr/src/pkg/manifests/locale-zh-tw.mf
index 360787bb6a..5d95b5eaba 100644
--- a/usr/src/pkg/manifests/locale-zh-tw.mf
+++ b/usr/src/pkg/manifests/locale-zh-tw.mf
@@ -35,5 +35,5 @@ file path=usr/lib/locale/zh_TW.UTF-8/LC_MONETARY/LCL_DATA mode=0444
 file path=usr/lib/locale/zh_TW.UTF-8/LC_NUMERIC/LCL_DATA mode=0444
 file path=usr/lib/locale/zh_TW.UTF-8/LC_TIME/LCL_DATA mode=0444
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/localedef/data/THIRDPARTYLICENSE \
-    license=usr/src/cmd/localedef/data/THIRDPARTYLICENSE
+license usr/src/data/locale/data/THIRDPARTYLICENSE \
+    license=usr/src/data/locale/data/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/system-data-hardware-registry.mf b/usr/src/pkg/manifests/system-data-hardware-registry.mf
index 477eac8da0..f57f6dd80a 100644
--- a/usr/src/pkg/manifests/system-data-hardware-registry.mf
+++ b/usr/src/pkg/manifests/system-data-hardware-registry.mf
@@ -38,5 +38,5 @@ file path=usr/share/hwdata/usb.ids
 legacy pkg=SUNWhwdata \
     desc="ASCII databases describing various PCI, USB and other hardware" \
     name="Hardware data files"
-license usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids \
-    license=usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids
+license usr/src/data/hwdata/THIRDPARTYLICENSE.pciids \
+    license=usr/src/data/hwdata/THIRDPARTYLICENSE.pciids
diff --git a/usr/src/pkg/manifests/system-data-terminfo.mf b/usr/src/pkg/manifests/system-data-terminfo.mf
index a584a7ff1e..4612cd76f9 100644
--- a/usr/src/pkg/manifests/system-data-terminfo.mf
+++ b/usr/src/pkg/manifests/system-data-terminfo.mf
@@ -2750,6 +2750,6 @@ legacy pkg=SUNWter \
     name="Terminal Information"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license usr/src/cmd/terminfo/THIRDPARTYLICENSE \
-    license=usr/src/cmd/terminfo/THIRDPARTYLICENSE
+license usr/src/data/terminfo/THIRDPARTYLICENSE \
+    license=usr/src/data/terminfo/THIRDPARTYLICENSE
 link path=usr/lib/tabset target=../share/lib/tabset
diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile
index 54ac3aba69..2f02192e1e 100644
--- a/usr/src/tools/Makefile
+++ b/usr/src/tools/Makefile
@@ -56,7 +56,10 @@ COMMON_SUBDIRS= \
 #  special versions of commands for use only in build
 #
 UNSHIPPED_SUBDIRS = \
-	mandoc
+	localedef \
+	mandoc \
+	tic \
+	zic
 
 sparc_SUBDIRS= \
 	chk4ubin \
diff --git a/usr/src/tools/localedef/Makefile b/usr/src/tools/localedef/Makefile
new file mode 100644
index 0000000000..16263fe3a3
--- /dev/null
+++ b/usr/src/tools/localedef/Makefile
@@ -0,0 +1,56 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2017 Nexenta Systems, Inc.
+# Copyright 2011 EveryCity Ltd. All rights reserved.
+# Copyright 2013 DEY Storage Systems, Inc.
+# Copyright 2016 Joyent, Inc.
+#
+
+CMDDIR=		$(SRC)/cmd/localedef
+
+include		$(SRC)/tools/Makefile.tools
+include		$(CMDDIR)/Makefile.common
+
+OBJS +=		avl.o \
+		mkdirp.o
+
+CPPFLAGS +=	-DNATIVE -I$(CMDDIR) -I.
+
+.KEEP_STATE:
+
+all:		$(PROG)
+
+parser.tab.c parser.tab.h: $(CMDDIR)/parser.y $(CMDDIR)/localedef.h
+		$(YACC) $(YFLAGS) $(CMDDIR)/parser.y
+
+$(OBJS):	parser.tab.h
+
+$(PROG):	$(OBJS)
+		$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
+		$(POST_PROCESS)
+
+%.o:		$(CMDDIR)/%.c
+		$(COMPILE.c) -o $@ $<
+
+avl.o:		$(SRC)/common/avl/avl.c
+		$(COMPILE.c) -o $@ $(SRC)/common/avl/avl.c
+
+mkdirp.o:	$(SRC)/lib/libgen/common/mkdirp.c
+		$(COMPILE.c) -o $@ $(SRC)/lib/libgen/common/mkdirp.c
+
+install:	all $(ROOTONBLDMACHPROG)
+
+clean:
+		$(RM) $(PROG) $(CLEANFILES)
+
+include		$(SRC)/tools/Makefile.targ
diff --git a/usr/src/tools/mandoc/Makefile b/usr/src/tools/mandoc/Makefile
index eba26e75ba..6e254601a2 100644
--- a/usr/src/tools/mandoc/Makefile
+++ b/usr/src/tools/mandoc/Makefile
@@ -15,14 +15,14 @@
 
 CMDDIR=		$(SRC)/cmd/mandoc
 
-include		../Makefile.tools
+include		$(SRC)/tools/Makefile.tools
 include		$(CMDDIR)/Makefile.common
 
 .KEEP_STATE:
 
 all:		$(PROG)
 
-install:	all .WAIT $(ROOTONBLDMACHPROG)
+install:	all $(ROOTONBLDMACHPROG)
 
 clean:
 		$(RM) $(PROG) $(OBJS)
@@ -34,4 +34,4 @@ $(PROG):	$(OBJS)
 %.o:		$(CMDDIR)/%.c
 		$(COMPILE.c) -o $@ $<
 
-include		../Makefile.targ
+include		$(SRC)/tools/Makefile.targ
diff --git a/usr/src/tools/tic/Makefile b/usr/src/tools/tic/Makefile
new file mode 100644
index 0000000000..eae6ad29b0
--- /dev/null
+++ b/usr/src/tools/tic/Makefile
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+# Copyright 2017 Nexenta Systems, Inc.
+#
+
+CMDDIR=		$(SRC)/cmd/tic
+
+include		$(SRC)/tools/Makefile.tools
+include		$(CMDDIR)/Makefile.common
+
+MAPFILES=	$(CMDDIR)/$(MAPFILE.INT)
+
+.KEEP_STATE:
+
+all:		$(PROG)
+
+$(PROG):	$(OBJS) $(MAPFILES)
+		$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
+		$(POST_PROCESS)
+
+%.o:		$(CMDDIR)/%.c
+		$(COMPILE.c) -o $@ $<
+
+install:	all $(ROOTONBLDMACHPROG)
+
+clean:
+		$(RM) $(PROG) $(OBJS)
+
+include		$(SRC)/tools/Makefile.targ
diff --git a/usr/src/tools/zic/Makefile b/usr/src/tools/zic/Makefile
new file mode 100644
index 0000000000..d86e88112c
--- /dev/null
+++ b/usr/src/tools/zic/Makefile
@@ -0,0 +1,29 @@
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+CMDDIR=		$(SRC)/cmd/zic
+
+include		$(SRC)/tools/Makefile.tools
+include		$(CMDDIR)/Makefile.common
+
+CPPFLAGS +=	-I$(CMDDIR)
+
+.KEEP_STATE:
+
+all:		$(PROG)
+
+$(PROG):	$(OBJS)
+		$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
+		$(POST_PROCESS)
+
+%.o:		$(CMDDIR)/%.c
+		$(COMPILE.c) -o $@ $<
+
+install:	all $(ROOTONBLDMACHPROG)
+
+clean:
+		$(RM) $(PROG) $(OBJS)
+
+include		$(SRC)/tools/Makefile.targ
author	Yuri Pankov <yuri.pankov@nexenta.com>	2017-03-29 17:42:07 +0300
committer	Hans Rosenfeld <hans.rosenfeld@joyent.com>	2017-05-02 07:49:37 +0200
commit	503609a9497e27f206d815a06ce90a747d2ce573 (patch)
tree	1f9c48e41ef129dee29d66ddad42068b33041dd0 /usr
parent	48d8443e35c27b5e39226cd33f279567424ad20a (diff)
download	illumos-joyent-503609a9497e27f206d815a06ce90a747d2ce573.tar.gz