Mercurial Mercurial > sustaining > oi_151a > g11n > g11n / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed building of dual versions of SUNWmp and dependencies
authorhnhn
Mon, 23 Feb 2009 11:17:06 +0100
changeset 337 7049ca851294
parent 336 ebb8ed83ce78
child 338 af173804849f
fixed building of dual versions of SUNWmp and dependencies
pkgmaps/prototype_nv.lang-ar-extra file | annotate | diff | comparison | revisions
pkgmaps/prototype_nv.lang-he-extra file | annotate | diff | comparison | revisions
pkgmaps/prototype_nv.lang-ja-extra file | annotate | diff | comparison | revisions
pkgmaps/prototype_nv.mp file | annotate | diff | comparison | revisions
src/cmd/mp/conf/Makefile file | annotate | diff | comparison | revisions
src/cmd/mp/locale/ar/Makefile file | annotate | diff | comparison | revisions
src/cmd/mp/locale/ar/mp.conf file | annotate | diff | comparison | revisions
src/cmd/mp/locale/ar/mp.conf.nv file | annotate | diff | comparison | revisions
src/cmd/mp/locale/he/Makefile file | annotate | diff | comparison | revisions
src/cmd/mp/locale/ja_JP.UTF-8/Makefile file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgmaps/prototype_nv.lang-ar-extra	Mon Feb 23 11:17:06 2009 +0100
@@ -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 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+d none usr 0755 root sys
+d none usr/lib 0755 root bin
+d none usr/lib/locale 0755 root bin
+d none usr/lib/locale/ar 0755 root bin
+f none usr/lib/locale/ar/ar.so.3 0644 root bin
+f none usr/lib/locale/ar/geo_map 0644 root bin
+d none usr/lib/locale/ar/LC_COLLATE 0755 root bin
+d none usr/lib/locale/ar/LC_CTYPE 0755 root bin
+f none usr/lib/locale/ar/LC_CTYPE/LCL_DEF 0644 root bin
+d none usr/lib/locale/ar/LC_MESSAGES 0755 root bin
+d none usr/lib/locale/ar/LC_MONETARY 0755 root bin
+d none usr/lib/locale/ar/LC_NUMERIC 0755 root bin
+f none usr/lib/locale/ar/locale_description 0644 root bin
+f none usr/lib/locale/ar/locale_map 0644 root bin
+d none usr/lib/locale/ar/LO_LTYPE 0755 root bin
+f none usr/lib/locale/ar/LO_LTYPE/ar.layout.so.1 0644 root bin
+### mp l10n files - common
+d none usr/lib/lp 0755 root lp
+d none usr/lib/lp/locale 0755 root lp
+### mp l10n files - ar
+d none usr/lib/lp/locale/ar 0755 root lp
+d none usr/lib/lp/locale/ar/mp 0755 root lp
+f none usr/lib/lp/locale/ar/mp/mp.conf=usr/lib/lp/locale/ar/mp/mp.conf.nv 0444 root lp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgmaps/prototype_nv.lang-he-extra	Mon Feb 23 11:17:06 2009 +0100
@@ -0,0 +1,49 @@
+#
+# 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 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+d none usr 0755 root sys
+d none usr/lib 0755 root bin
+d none usr/lib/locale 0755 root bin
+d none usr/lib/locale/he 0755 root bin
+f none usr/lib/locale/he/geo_map 0644 root bin
+f none usr/lib/locale/he/he.so.3 0644 root bin
+d none usr/lib/locale/he_IL 0755 root bin
+s none usr/lib/locale/he_IL/he_IL.so.3=../he/he.so.3
+d none usr/lib/locale/he/LC_COLLATE 0755 root bin
+d none usr/lib/locale/he/LC_CTYPE 0755 root bin
+f none usr/lib/locale/he/LC_CTYPE/LCL_DEF 0644 root bin
+d none usr/lib/locale/he/LC_MESSAGES 0755 root bin
+d none usr/lib/locale/he/LC_MONETARY 0755 root bin
+d none usr/lib/locale/he/LC_NUMERIC 0755 root bin
+f none usr/lib/locale/he/locale_description 0644 root bin
+f none usr/lib/locale/he/locale_map 0644 root bin
+d none usr/lib/locale/he/LO_LTYPE 0755 root bin
+f none usr/lib/locale/he/LO_LTYPE/he.layout.so.1 0644 root bin
+### mp l10n files - common
+d none usr/lib/lp 0755 root lp
+d none usr/lib/lp/locale 0755 root lp
+### mp l10n files - he
+d none usr/lib/lp/locale/he 0755 root lp
+d none usr/lib/lp/locale/he/mp 0755 root lp
+f none usr/lib/lp/locale/he/mp/mp.conf=usr/lib/lp/locale/he/mp/mp.conf.nv 0444 root lp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgmaps/prototype_nv.lang-ja-extra	Mon Feb 23 11:17:06 2009 +0100
@@ -0,0 +1,95 @@
+#
+# 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 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+### OS locale files - common
+d none usr 0755 root sys
+d none usr/lib 0755 root bin
+d none usr/lib/locale 0755 root bin
+### OS locale files - ja_JP.eucJP
+d none usr/lib/locale/ja_JP.eucJP 0755 root bin
+f none usr/lib/locale/ja_JP.eucJP/ja_JP.eucJP.so.3 0755 root bin
+#f none usr/lib/locale/ja_JP.eucJP/methods_ja_JP.eucJP.so.3 0755 root bin
+d none usr/lib/locale/ja_JP.eucJP/LC_CTYPE 0755 root bin
+#f none usr/lib/locale/ja_JP.eucJP/LC_CTYPE/ldterm.dat 0555 root bin
+f none usr/lib/locale/ja_JP.eucJP/LC_CTYPE/wdresolve.so 0555 root bin
+#f none usr/lib/locale/ja_JP.eucJP/LC_CTYPE/LCL_DEF 0555 root bin
+#d none usr/lib/locale/ja_JP.eucJP/LO_LTYPE 0755 root bin
+f none usr/lib/locale/ja_JP.eucJP/locale_description 0644 root bin
+f none usr/lib/locale/ja_JP.eucJP/locale_map 0644 root bin
+s none usr/lib/locale/ja_JP.eucJP/geo_map=../ja/geo_map
+### OS locale files - ja_JP.PCK
+d none usr/lib/locale/ja_JP.PCK 0755 root bin
+f none usr/lib/locale/ja_JP.PCK/ja_JP.PCK.so.3 0755 root bin
+#f none usr/lib/locale/ja_JP.PCK/methods_ja_JP.PCK.so.3 0755 root bin
+d none usr/lib/locale/ja_JP.PCK/LC_CTYPE 0755 root bin
+f none usr/lib/locale/ja_JP.PCK/LC_CTYPE/ldterm.dat 0555 root bin
+f none usr/lib/locale/ja_JP.PCK/LC_CTYPE/wdresolve.so 0555 root bin
+#f none usr/lib/locale/ja_JP.PCK/LC_CTYPE/LCL_DEF 0555 root bin
+d none usr/lib/locale/ja_JP.PCK/LO_LTYPE 0755 root bin
+f none usr/lib/locale/ja_JP.PCK/locale_description 0644 root bin
+f none usr/lib/locale/ja_JP.PCK/locale_map 0644 root bin
+f none usr/lib/locale/ja_JP.PCK/geo_map 0644 root bin
+### OS locale files - ja
+d none usr/lib/locale/ja 0755 root bin
+f none usr/lib/locale/ja/ja.so.3 0755 root bin
+#f none usr/lib/locale/ja/methods_ja.so.3 0755 root bin
+d none usr/lib/locale/ja/LC_CTYPE 0755 root bin
+#f none usr/lib/locale/ja/LC_CTYPE/ldterm.dat 0555 root bin
+s none usr/lib/locale/ja/LC_CTYPE/wdresolve.so=../../ja_JP.eucJP/LC_CTYPE/wdresolve.so
+#f none usr/lib/locale/ja/LC_CTYPE/LCL_DEF 0555 root bin
+d none usr/lib/locale/ja/LO_LTYPE 0755 root bin
+f none usr/lib/locale/ja/locale_description 0644 root bin
+f none usr/lib/locale/ja/locale_map 0644 root bin
+f none usr/lib/locale/ja/geo_map 0644 root bin
+### mp l10n files - common
+d none usr/lib/lp 0755 root lp
+d none usr/lib/lp/locale 0755 root lp
+### mp l10n files - ja_JP.UTF-8
+d none usr/lib/lp/locale/ja_JP.UTF-8 0755 root lp
+d none usr/lib/lp/locale/ja_JP.UTF-8/mp 0755 root lp
+f none usr/lib/lp/locale/ja_JP.UTF-8/mp/mp.conf=usr/lib/lp/locale/ja_JP.UTF-8/mp/mp.conf.nv 0444 root lp
+f none usr/lib/lp/locale/ja_JP.UTF-8/mp/xu2UTF8.so 0555 root lp
+### mp l10n files - ja_JP.eucJP
+d none usr/lib/lp/locale/ja_JP.eucJP 0755 root lp
+d none usr/lib/lp/locale/ja_JP.eucJP/mp 0755 root lp
+f none usr/lib/lp/locale/ja_JP.eucJP/mp/mp.conf 0444 root lp
+f none usr/lib/lp/locale/ja_JP.eucJP/mp/xwc2eucJP.so 0555 root lp
+### mp l10n files - ja_JP.PCK
+d none usr/lib/lp/locale/ja_JP.PCK 0755 root lp
+d none usr/lib/lp/locale/ja_JP.PCK/mp 0755 root lp
+f none usr/lib/lp/locale/ja_JP.PCK/mp/mp.conf 0444 root lp
+f none usr/lib/lp/locale/ja_JP.PCK/mp/xwc2PCK.so 0555 root lp
+### mp l10n files - ja
+s none usr/lib/lp/locale/ja=./ja_JP.eucJP
+### setterm conf file - common
+#d none usr/share 0755 root sys
+#d none usr/share/lib 0755 root sys
+#d none usr/share/lib/setterm 0755 root bin
+### setterm conf file - ja_JP.eucJP
+#s none usr/share/lib/setterm/ja_JP.eucJP=./ja
+### setterm conf file - ja_JP.PCK
+#d none usr/share/lib/setterm/ja_JP.PCK 0755 root bin
+#f none usr/share/lib/setterm/ja_JP.PCK/conf.file 0555 root bin
+### setterm conf file - ja
+#d none usr/share/lib/setterm/ja 0755 root bin
+#f none usr/share/lib/setterm/ja/conf.file 0555 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pkgmaps/prototype_nv.mp	Mon Feb 23 11:17:06 2009 +0100
@@ -0,0 +1,83 @@
+#
+# 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 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+d none lib 0755 root bin
+d none lib/lp 0755 root lp
+d none lib/lp/locale 0755 root lp
+d none lib/lp/locale/C 0755 root lp
+d none lib/lp/locale/C/mp 0755 root lp
+f none lib/lp/locale/C/mp/mp.common.ps 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.alt.ps 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.altl.ps 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.ff.ps 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.fp.ps 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.l.ps 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.ll.ps 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.ps 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.tm.ps 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.ts.ps 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.alt.xpr 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.altl.xpr 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.ff.xpr 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.fp.xpr 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.l.xpr 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.ll.xpr 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.xpr 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.tm.xpr 0644 root lp
+f none lib/lp/locale/C/mp/mp.pro.ts.xpr 0644 root lp
+d none lib/lp/locale/en_US.UTF-8 0755 root lp
+d none lib/lp/locale/en_US.UTF-8/mp 0755 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/mp.conf=lib/lp/locale/en_US.UTF-8/mp/mp.conf.nv 0444 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xuiso88591.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xuiso88592.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xuiso88594.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xuiso88595.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xuiso88597.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xuiso88599.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xuiso885910.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xubig5.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xugb2312.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xujisx0201.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xujisx0208.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xujisx0212.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xujohap92.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xugbk.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xufallback.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/xuunicode.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/ctlarabic.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/ctlthai.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/ctlhebrew.so 0555 root lp
+f none lib/lp/locale/en_US.UTF-8/mp/ctlhindi.so 0555 root lp
+d none bin 0755 root bin
+f none bin/mp 0555 root bin
+d none openwin 0755 root bin
+d none openwin/bin 0755 root bin
+s none openwin/bin/mp=../../bin/mp
+f none bin/mailp 0555 root bin
+s none bin/digestp=./mailp
+s none bin/filep=./mailp
+s none bin/filofaxp=./mailp
+s none bin/franklinp=mailp
+s none bin/newsp=./mailp
+s none bin/timemanp=./mailp
+s none bin/timesysp=./mailp
--- a/src/cmd/mp/conf/Makefile	Mon Feb 16 17:36:26 2009 +0900
+++ b/src/cmd/mp/conf/Makefile	Mon Feb 23 11:17:06 2009 +0100
@@ -2,23 +2,23 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").  
+# 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 src/OPENSOLARIS.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 src/OPENSOLARIS.LICENSE.
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"@(#)Makefile	1.0	06/03/07	SMI"
@@ -37,7 +37,7 @@
 
 TARGETDIR =	$(FILEROOT)/usr/lib/lp/locale/$(LOCALE)/mp
 
-FILES =  	mp.conf
+FILES =  	mp.conf mp.conf.nv
 
 SUBDIRS = 
 
--- a/src/cmd/mp/locale/ar/Makefile	Mon Feb 16 17:36:26 2009 +0900
+++ b/src/cmd/mp/locale/ar/Makefile	Mon Feb 23 11:17:06 2009 +0100
@@ -37,9 +37,9 @@
 
 MPSRC_FILES  	= 
 MPLD_FILES	= 
-MPCONF_FILES 	= mp.conf
+MPCONF_FILES 	= mp.conf mp.conf.nv
 
-MPLD_DIR_FILES 	= $(ROOT_MP_DIR)/$(MPCONF_FILES)
+MPLD_DIR_FILES 	= $(MPCONF_FILES:%=$(ROOT_MP_DIR)/%)
 
 CFLAGS += -G -Kpic
 
--- a/src/cmd/mp/locale/ar/mp.conf	Mon Feb 16 17:36:26 2009 +0900
+++ b/src/cmd/mp/locale/ar/mp.conf	Mon Feb 23 11:17:06 2009 +0100
@@ -5,13 +5,13 @@
 # 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 src/OPENSOLARIS.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 src/OPENSOLARIS.LICENSE.
+# 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]
@@ -22,16 +22,16 @@
 #
 #ident  "@(#)mp.conf.ar 1.2 08/04/17 SMI"
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
-FontNameAlias 	iso88591R 	TrueType	/usr/openwin/lib/X11/fonts/TrueType/CourierNew.ttf
+FontNameAlias 	iso88591R 	TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSansMono.ttf
 FontNameAlias 	prnCourierR 	Type1	Courier
 FontNameAlias 	prnCourierB 	Type1	Courier-Bold
 FontNameAlias 	prnCourierI 	Type1	Courier-Oblique
 FontNameAlias 	prnCourierBI 	Type1	Courier-BoldOblique
-FontNameAlias 	tt_ctlarabicR   TrueType	/usr/openwin/lib/locale/ar/X11/fonts/TrueType/SHAYMT.ttf
+FontNameAlias 	tt_ctlarabicR   TrueType	/usr/X11/lib/X11/fonts/TTF/DejaVuSansMono.ttf
 
 #
 # map*group entries have to be specified before mapucs4 and cnvucs4 entries.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cmd/mp/locale/ar/mp.conf.nv	Mon Feb 23 11:17:06 2009 +0100
@@ -0,0 +1,66 @@
+#
+# 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
+#
+
+#
+#ident  "@(#)mp.conf.ar 1.2 08/04/17 SMI"
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+FontNameAlias 	iso88591R 	TrueType	/usr/openwin/lib/X11/fonts/TrueType/CourierNew.ttf
+FontNameAlias 	prnCourierR 	Type1	Courier
+FontNameAlias 	prnCourierB 	Type1	Courier-Bold
+FontNameAlias 	prnCourierI 	Type1	Courier-Oblique
+FontNameAlias 	prnCourierBI 	Type1	Courier-BoldOblique
+FontNameAlias 	tt_ctlarabicR   TrueType	/usr/openwin/lib/locale/ar/X11/fonts/TrueType/SHAYMT.ttf
+
+#
+# map*group entries have to be specified before mapucs4 and cnvucs4 entries.
+#
+# keyword	fontgroupname   GroupType  Regular  Bold  Italic  BoldItalic 
+#########	#############	########   #######  ##### ######  ##########
+
+FontGroup	iso88591  	TrueType	iso88591R 
+FontGroup	tt_ctlarabic	TrueType	tt_ctlarabicR
+FontGroup	prnCourier	Type1	prnCourierR prnCourierB prnCourierI prnCourierBI
+
+#
+#
+#
+MapCode2Font	0x00000000 0x00000020	iso88591
+MapCode2Font	0x00000021 0x0000007F	prnCourier
+MapCode2Font	0x00000080 0x000000FF	iso88591  
+MapCode2Font	0xE60000AD 0xE60000FF	tt_ctlarabic
+MapCode2Font	0xE6000600 0xE60006FF	tt_ctlarabic
+MapCode2Font	0xE600FB50 0xE600FFFE	tt_ctlarabic
+
+
+#
+#
+#
+
+CnvCode2Font iso88591R _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font tt_ctlarabicR  _ctlarabic /usr/lib/lp/locale/en_US.UTF-8/mp/ctlarabic.so
+CnvCode2Font prnCourierR  _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierB  _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierI  _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
+CnvCode2Font prnCourierBI  _xu2unicode /usr/lib/lp/locale/en_US.UTF-8/mp/xuunicode.so
--- a/src/cmd/mp/locale/he/Makefile	Mon Feb 16 17:36:26 2009 +0900
+++ b/src/cmd/mp/locale/he/Makefile	Mon Feb 23 11:17:06 2009 +0100
@@ -5,20 +5,20 @@
 # 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 src/OPENSOLARIS.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 src/OPENSOLARIS.LICENSE.
+# 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 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident  "@(#)Makefile 1.2 08/04/17 SMI"
@@ -37,9 +37,9 @@
 
 MPSRC_FILES  	= 
 MPLD_FILES	= 
-MPCONF_FILES 	= mp.conf
+MPCONF_FILES 	= mp.conf mp.conf.nv
 
-MPLD_DIR_FILES 	= $(ROOT_MP_DIR)/$(MPCONF_FILES)
+MPLD_DIR_FILES 	= $(MPCONF_FILES:%=$(ROOT_MP_DIR)/%)
 
 CFLAGS += -G -Kpic
 
--- a/src/cmd/mp/locale/ja_JP.UTF-8/Makefile	Mon Feb 16 17:36:26 2009 +0900
+++ b/src/cmd/mp/locale/ja_JP.UTF-8/Makefile	Mon Feb 23 11:17:06 2009 +0100
@@ -47,11 +47,11 @@
 
 MPSRC_FILES  	= xu2UTF8.c
 MPLD_FILES	= $(MPSRC_FILES:%.c=%.so)
-MPCONF_FILES 	= mp.conf
+MPCONF_FILES 	= mp.conf mp.conf.nv
 MKTBL_SRC	= mktbl.c
 
 MPLD_DIR_FILES 	= $(ROOT_MP_DIR)/$(MPLD_FILES) \
-		  $(ROOT_MP_DIR)/$(MPCONF_FILES)
+ 		  $(MPCONF_FILES:%=$(ROOT_MP_DIR)/%)
 
 CFLAGS += -G -Kpic
sustaining/oi_151a/g11n/g11n