--- a/ChangeLog	Wed Feb 04 06:36:43 2009 +0000
+++ b/ChangeLog	Wed Feb 04 08:36:25 2009 +0000
@@ -1,3 +1,17 @@
+2009-02-04  Takao Fujiwara  <[email protected]>
+
+	* SUNWdbus.spec: Updated to rename 0005.dbus.
+	* SUNWgnome-dtlogin-integration.spec: Updated to add SUNWdesktop-startup
+	* ext-sources/dtstart: Updated to work with xinitrc.d
+	* ext-sources/0010.env:
+	* ext-sources/0020.pre-localization:
+	* ext-sources/0060.sockets:
+	* ext-sources/0110.fonts:
+	* ext-sources/0120.xrdb:
+	* ext-sources/0210.im: Added
+	* ext-sources/0070.dbus: Renamed
+	* patches/SUNWgnome-dtlogin-integration-01-g11n-migration.diff: Added
+
 2009-02-04  Jeff Cai <[email protected]>
 
 	* SUNWevolution-data-server.spec: Add the dependency on SUNWlibical

--- a/SUNWdbus.spec	Wed Feb 04 06:36:43 2009 +0000
+++ b/SUNWdbus.spec	Wed Feb 04 08:36:25 2009 +0000
@@ -30,7 +30,7 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 Source1:        dbus.xml
 Source2:        svc-dbus
-Source3:        0005.dbus
+Source3:        0070.dbus
 %include default-depend.inc
 Requires:	SUNWdbus-libs
 Requires:	SUNWdbus-root
@@ -117,7 +117,7 @@
 install --mode=0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/X11
 install --mode=0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit
 install --mode=0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinitrc.d
-install --mode=0755 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinitrc.d/0005.dbus
+install --mode=0755 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinitrc.d/0070.dbus
 
 mkdir -p $RPM_BUILD_ROOT/etc/security
 echo 'solaris.smf.manage.dbus:::Manage D-BUS Service States::help=SmfDBUSStates.html' > $RPM_BUILD_ROOT/etc/security/auth_attr
@@ -217,7 +217,7 @@
 %dir %attr (0755, root, sys) %{_sysconfdir}/X11
 %dir %attr (0755, root, sys) %{_sysconfdir}/X11/xinit
 %dir %attr (0755, root, sys) %{_sysconfdir}/X11/xinit/xinitrc.d
-%{_sysconfdir}/X11/xinit/xinitrc.d/0005.dbus
+%{_sysconfdir}/X11/xinit/xinitrc.d/0070.dbus
 %dir %attr (0755, root, sys) %{_localstatedir}
 %dir %attr (0755, root, other) %{_localstatedir}/lib
 %attr (0755, root, root) %{_localstatedir}/lib/dbus
@@ -249,6 +249,8 @@
 %endif
 
 %changelog
+* Wed Feb 04 2009 - [email protected]
+- Renamed 0005.dbus to 0070.dbus.
 * Thu Oct 02 2008 - [email protected]
 - Add /etc/X11/xinit/xinitrc.d/0005.dbus to fix 6755007 so that gdm can launch
   dbus session for the user. This can be used for both gdm on nevada and OpenSolaris.

--- a/SUNWgnome-dtlogin-integration.spec	Wed Feb 04 06:36:43 2009 +0000
+++ b/SUNWgnome-dtlogin-integration.spec	Wed Feb 04 08:36:25 2009 +0000
@@ -3,7 +3,7 @@
 #
 # includes module(s): dtlogin-integration
 #
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -15,19 +15,26 @@
 %define tarball_version 0.37
 
 %include Solaris.inc
-%if %option_with_dt
+#%if %option_with_dt
 Name:                    SUNWgnome-dtlogin-integration
 SourcePackage:           SUNWgnome-dtlogin-integ-src
 Summary:                 dtlogin configuration files for the JDS desktop
-%else
-Name:                    SUNWgnome-dtstart
-Summary:                 Desktop startup scripts for JDS
-Source2:                 dtstart
-%endif
-Source3:                 0005.dbus
+#%else
+#Name:                    SUNWgnome-dtstart
+#Summary:                 Desktop startup scripts for JDS
+#%endif
 Version:                 %{default_pkg_version}
 Source:                  http://dlc.sun.com/osol/jds/downloads/extras/dtlogin-integration-%{tarball_version}.tar.bz2
 Source1:                 l10n-configure.sh
+Source2:                 dtstart
+Source11:                0010.env
+Source12:                0020.pre-localization
+Source13:                0060.sockets
+Source14:                0070.dbus
+Source15:                0110.fonts
+Source16:                0120.xrdb
+Source17:                0210.im
+Patch1:                  %{name}-01-g11n-migration.diff
 SUNW_BaseDir:            %{dtlogin_config_basedir}
 SUNW_Copyright:          SUNWgnome-dtlogin-integration.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
@@ -36,11 +43,22 @@
 Requires: SUNWgnome-session
 Requires: SUNWgnome-wm
 
+%package -n SUNWdesktop-startup
+Summary:                 Desktop startup scripts for JDS
+SUNW_BaseDir:		 /
+%include default-depend.inc
+Requires: SUNWgnome-panel
+Requires: SUNWgnome-session
+Requires: SUNWgnome-wm
+
+
 %prep
 %setup -q -n dtlogin-integration-%{tarball_version}
 
 bash -x %SOURCE1 --enable-sun-linguas
 
+%patch1 -p1
+
 %build
 export LDFLAGS="%_ldflags"
 export CFLAGS="%optflags"
@@ -68,19 +86,34 @@
 %endif
 
 %if %option_without_dt
-install --mode=0755 -d $RPM_BUILD_ROOT/usr/bin
-install --mode=0755 %SOURCE2 $RPM_BUILD_ROOT/usr/bin/dtstart
 rm -r $RPM_BUILD_ROOT%{dtlogin_config_basedir}/dt/appconfig
 rm -r $RPM_BUILD_ROOT%{dtlogin_config_basedir}/dt/config/C
 rm -r $RPM_BUILD_ROOT%{dtlogin_config_basedir}/dt/config/[a-z][a-z]*
 rm -r $RPM_BUILD_ROOT%{dtlogin_config_basedir}/dt/config/Xsession*
 %endif
 
+install --mode=0755 -d $RPM_BUILD_ROOT/usr/bin
+install --mode=0755 %SOURCE2 $RPM_BUILD_ROOT/usr/bin/dtstart
+
 # Create dbus session initialisation script for dtlogin
-%if %option_with_dt
+#%if %option_with_dt
 install --mode=0755 -d $RPM_BUILD_ROOT/%{dtlogin_config_basedir}/dt/config/Xsession.d
-install --mode=0755 %SOURCE3 $RPM_BUILD_ROOT/%{dtlogin_config_basedir}/dt/config/Xsession.d/0005.dbus
-%endif
+install --mode=0755 %SOURCE14 $RPM_BUILD_ROOT/%{dtlogin_config_basedir}/dt/config/Xsession.d
+#%endif
+
+# rough script number?
+# 1 - 50: pre configurations
+# 51 - 100: pre processes
+# 101 - 150: post configurations
+# 151 - 200: post processes
+
+install --mode=0755 -d $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/
+install --mode=0755 -d $RPM_BUILD_ROOT/%{dtlogin_config_basedir}/dt/config/Xsession.d
+for FILE in %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE15 %SOURCE16 %SOURCE17
+do
+  install --mode=0755 $FILE $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d
+  install --mode=0755 $FILE $RPM_BUILD_ROOT/%{dtlogin_config_basedir}/dt/config/Xsession.d
+done
 
 rm -rf $RPM_BUILD_ROOT/tmp
 
@@ -90,14 +123,28 @@
 %files
 %defattr (-, root, bin)
 %{dtlogin_config_basedir}/dt
-%if %option_with_dt
-%else
+#%if %option_with_dt
+#%else
+#%dir %attr (0755, root, bin) %{_bindir}
+#%{_bindir}/dtstart
+#%endif
+
+%files -n SUNWdesktop-startup
+%defattr (-, root, bin)
+%dir %attr(0755, root, sys) /etc
+%dir %attr(0755, root, sys) /etc/X11
+%dir %attr(0755, root, sys) /etc/X11/xinit
+%dir %attr(0755, root, sys) /etc/X11/xinit/xinitrc.d
+/etc/X11/xinit/xinitrc.d/*
+%dir %attr (0755, root, sys) /usr
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/dtstart
-%endif
 
 
 %changelog
+* Wed Feb 04 2009 - [email protected]
+- Add SUNWdesktop-startup for xinitrc.d scripts.
+- Add patch g11n-migration.diff
 * Thu Oct 02 2008 - [email protected]
 - Bump up tarball to 0.37. Removed dtlogin-integration-02-dbus-launch.diff 
   and dtlogin-integration-01-vte-cjk.diff  which are now upstreamed.

--- a/ext-sources/0005.dbus	Wed Feb 04 06:36:43 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#!/bin/ksh
-
-if [ -x "/usr/bin/dbus-launch" -a -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-        eval `dbus-launch --exit-with-session --sh-syntax`
-fi

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ext-sources/0010.env	Wed Feb 04 08:36:25 2009 +0000
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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.
+#
+
+
+HAS_XSCRNSVR=0
+OPENWIN_BIN=/usr/openwin/bin
+DESKTOP_SESSION=${DESKTOP_SESSION:-"xdm"}
+MAIL=${MAIL-"/var/mail/$USER"}
+SHELL=${SHELL-"/bin/sh"}
+DISPLAY=${DISPLAY-":0"}
+TERM=${TERM-"xterm"}
+
+case $DESKTOP_SESSION in
+gnome|GNOME|JDS)
+    EDITOR=${EDITOR:-"gedit"}
+    ;;
+kde|KDE)
+    EDITOR=${EDITOR:-"kedit"}
+    ;;
+*)
+    EDITOR=${EDITOR:-"vi"}
+    ;;
+esac
+
+for XPATH in `/bin/echo $PATH | /bin/tr ":" " "`
+do
+  if [ -x $XPATH/xscreensaver-demo ] ; then
+    HAS_XSCRNSVR=1
+  fi
+done
+
+if [ $HAS_XSCRNSVR -eq 0 -a -x $OPENWIN_BIN/xscreensaver-demo ] ; then
+  PATH=${PATH}:$OPENWIN_BIN
+fi
+
+export PATH EDITOR MAIL TERM SHELL DISPLAY
+
+if xmodmap | /usr/bin/grep mod4 | /usr/bin/grep Alt > /dev/null 2>/dev/null
+then
+    xmodmap -e "clear Mod1" \
+            -e "clear Mod4" \
+            -e "add Mod1 = Alt_L" \
+            -e "add Mod1 = Alt_R" \
+            -e "add Mod4 = Meta_L" \
+            -e "add Mod4 = Meta_R"
+fi
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ext-sources/0020.pre-localization	Wed Feb 04 08:36:25 2009 +0000
@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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.
+#
+
+
+if [ "x$LC_ALL" = x -a "x$LANG" = x -o "x$LANG" = xC ]; then
+  :
+else
+# Uncomment if you need 6757628
+# European locales have LC_MESSAGES=C in /etc/default/init
+#  LC_MESSAGES=$LANG; export LC_MESSAGES
+  :
+fi
+
+# To determine the character set used for filenames with
+# glib's g_filename_to/from_utf8() functions, we set the
+# environment variables G_FILENAME_ENCODING and G_BROKEN_FILENAMES.
+#
+# G_BROKEN_FILENAMES, when set, lets the functions take the
+# character set for the current locale for filename's encoding.
+#
+# G_FILENAME_ENCODING, which is introduced to glib 2.3.x and later, may be
+# set to a comma-separated list of character set names.
+# The special token "@locale" is taken to mean the character set
+# for the current locale. The first character set from the list is taken
+# as the filename encoding.
+#
+# If G_FILENAME_ENCODING is not set, but G_BROKEN_FILENAMES is, the
+# character set of the current locale is taken as the filename encoding.
+
+G_BROKEN_FILENAMES=yes
+export G_BROKEN_FILENAMES
+G_FILENAME_ENCODING=@locale,UTF-8
+export G_FILENAME_ENCODING
+
+# Fixes 6583891
+case $LANG in
+ja*) VTE_CJK_WIDTH=1; export VTE_CJK_WIDTH;;
+ko*) VTE_CJK_WIDTH=1; export VTE_CJK_WIDTH;;
+zh*) VTE_CJK_WIDTH=1; export VTE_CJK_WIDTH;;
+*) ;;
+esac
+
+# Fixes 6555226
+if [ "x$LANG" = "xzh" ] ; then
+  LANGUAGE=zh:zh_CN.EUC
+  export LANGUAGE
+fi
+
+# Locale specific .desktop files
+if [ -d /usr/share/locale/$LANG/xdg ] ; then
+  XDG_DATA_DIRS=${XDG_DATA_DIRS:-"/usr/share"}
+  XDG_DATA_DIRS=${XDG_DATA_DIRS}:/usr/share/locale/$LANG/xdg
+  export XDG_DATA_DIRS
+fi
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ext-sources/0060.sockets	Wed Feb 04 08:36:25 2009 +0000
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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.
+#
+
+
+if [ -x /usr/bin/linc-cleanup-sockets ] ; then
+  /usr/bin/linc-cleanup-sockets
+fi

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ext-sources/0070.dbus	Wed Feb 04 08:36:25 2009 +0000
@@ -0,0 +1,5 @@
+#!/bin/ksh
+
+if [ -x "/usr/bin/dbus-launch" -a -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+        eval `dbus-launch --exit-with-session --sh-syntax`
+fi

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ext-sources/0110.fonts	Wed Feb 04 08:36:25 2009 +0000
@@ -0,0 +1,189 @@
+#!/bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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.
+#
+
+
+DT_BINPATH=/usr/dt/bin
+XPREFIXES='
+/usr/X11
+/usr/openwin
+'
+
+LING=${LC_CTYPE:-"$LC_ALL"}
+LING=${LING:-"$LANG"}
+LING=${LING:-"C"}
+
+for XPATH in $XPREFIXES
+do
+  if [ -x $XPATH/bin/xset ] && [ x$XSET = x ] ; then
+    XSET=$XPATH/bin/xset
+  fi
+  if [ -f $XPATH/lib/locale/$LING/OWfontpath ] && [ x$OWFONTPATH = x ] ; then
+    OWFONTPATH=$XPATH/lib/locale/$LING/OWfontpath
+  fi
+done
+
+XSET=${XSET:-"xset"}
+OWFONTPATH=${OWFONTPATH:-"/usr/openwin/lib/locale/$LING/OWfontpath"}
+
+# Copied from /usr/dt/bin/Xsession
+# ###########################################################################
+#  
+# Append desktop font aliases to font path
+#
+# ###########################################################################
+
+
+ADDFONTPATH_LOCAL() {
+        # Combine lines together to make arguments for the xset command
+        FP=`/usr/bin/awk '
+        BEGIN { fp="fp+ " }
+        /^[     ]*$/ { fp=" +fp " ; continue }
+        { printf("%s%s", fp, $0) ; fp="," } ' $1`
+        if [ -n "$FP" ]; then
+                eval "$XSET $FP"
+        fi
+}
+
+ADDFONTPATH_REMOTE() {
+        /usr/bin/nawk '  BEGIN {
+                fp=" fp+ "
+                }
+                /^[     ]*$/ {
+                fp=" +fp " ; continue }
+                {cmd = sprintf("%s%s%s%s",XSET,fp, $0," 1>/dev/null");
+                system(cmd); } ' $1
+}
+
+
+# 
+# Reset Xserver font path to its default values
+#
+
+$XSET fp default
+
+
+# Append desktop font paths. Note: these directories should be
+# accessable by the X server. The file precedence is:
+#
+#   /etc/dt/config/xfonts/C
+#   /usr/dt/config/xfonts/C
+#   /etc/dt/config/xfonts/$LING
+#   /usr/dt/config/xfonts/$LING
+#
+
+if [ "$DTXSERVERLOCATION" != "remote" -o "$XSERVERLOCATION" != "remote" ]; then
+
+  #
+  # Since X server is local, optimize by checking local desktop
+  # font directories and making one call to xset.
+  #
+  if [ -r $OWFONTPATH ]; then
+    ADDFONTPATH_LOCAL $OWFONTPATH
+  fi
+
+  if [ -f /etc/dt/config/xfonts/C/fonts.dir ]; then
+    fontpath=/etc/dt/config/xfonts/C
+  fi
+
+  if [ -f /usr/dt/config/xfonts/C/fonts.dir ]; then
+    if [ "x$fontpath" = x ]; then
+      fontpath=/usr/dt/config/xfonts/C
+    else
+      fontpath=$fontpath,/usr/dt/config/xfonts/C
+    fi
+  fi
+
+  if [ "$LING" != "C" ]; then
+    if [ -f /etc/dt/config/xfonts/$LING/fonts.dir ]; then
+      if [ "x$fontpath" = x ]; then
+        fontpath=/etc/dt/config/xfonts/$LING
+      else
+        fontpath=$fontpath,/etc/dt/config/xfonts/$LING
+      fi
+    fi
+
+    if [ -f /usr/dt/config/xfonts/$LING/fonts.dir ]; then
+      if [ "x$fontpath" = x ]; then
+        fontpath=/usr/dt/config/xfonts/$LING
+      else
+        fontpath=$fontpath,/usr/dt/config/xfonts/$LING
+      fi
+    fi
+  fi
+
+  if [ "x$fontpath" != x ]; then
+    $XSET fp+ $fontpath
+  fi
+else
+  #
+  # Since X server not local, we don't know if the desktop font
+  # directories exist on the X server machine, so we have to
+  # set them one at a time.
+  #
+  if [ -r $OWFONTPATH ]; then
+      ADDFONTPATH_REMOTE $OWFONTPATH
+  fi
+
+  $XSET fp+ /etc/dt/config/xfonts/C 1>/dev/null
+  $XSET fp+ /usr/dt/config/xfonts/C 1>/dev/null
+
+  if [ "$LING" != "C" ]; then 
+    $XSET fp+ /etc/dt/config/xfonts/$LING 1>/dev/null
+    $XSET fp+ /usr/dt/config/xfonts/$LING 1>/dev/null
+  fi
+
+  #
+  # Append Font Server to tail of path.  
+  # Will server any "-dt-" fonts not found on the remote machine.
+  # 
+  if [ -x /usr/openwin/bin/fs ]; then
+    Hostname=`/usr/bin/hostname`
+    dom=`/usr/bin/domainname`
+    FS_HOSTNAME=''
+
+    if [ ! -z "$dom" ]; then
+            dom=".`echo $dom | /usr/bin/cut -d. -f2-`"
+    fi
+
+    if [ -x /usr/bin/getent ] && \
+       /usr/bin/getent ipnodes "${Hostname}" > /dev/null 2>&1; then
+            FS_HOSTNAME=`/usr/bin/getent ipnodes "${Hostname}" | \
+                         /usr/bin/head -1 | /usr/bin/cut -f1`
+    elif /usr/sbin/ping "${Hostname}${dom}" 1 > /dev/null 2>&1; then
+            FS_HOSTNAME="${Hostname}${dom}"
+    fi
+
+    if [ -z "$FS_HOSTNAME" ] || \
+       ! /usr/sbin/ping "$FS_HOSTNAME" 1 >/dev/null 2>&1
+    then
+            FS_HOSTNAME="${Hostname}"
+    fi
+
+    $XSET fp+ "tcp/${FS_HOSTNAME}:7100"
+  fi
+fi
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ext-sources/0120.xrdb	Wed Feb 04 08:36:25 2009 +0000
@@ -0,0 +1,70 @@
+#!/bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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.
+#
+
+
+DT_BINPATH=/usr/dt/bin
+XPATHS='
+/usr/X11/bin
+/usr/openwin/bin
+'
+
+for XPATH in $XPATHS
+do
+  if [ -x $XPATH/xrdb ] ; then
+    XRDB=$XPATH/xrdb
+  fi
+done
+
+XRDB=${XRDB:-"xrdb"}
+
+if [ -x $DT_BINPATH/dtsession_res ] ; then
+  $DT_BINPATH/dtsession_res -load -system
+  $DT_BINPATH/dtsession_res -merge -tty
+fi
+
+$XRDB -merge << EOF
+! Default CDE resources
+*WindowColor:           #8A008A008A00
+!*WindowForeground:     #FF0000000000
+!*DataBackground:       #0000FF000000
+*DataForeground:        #FF0000000000
+*WorkspaceColor:        #8A008A008A00
+*Color.Background:      #FF000000FF00
+!*Color.Foreground:     #0000FF000000
+*foreground:            #000000000000
+! Hack for Dtmail
+*XmText*background: seashell
+*XmTextField*background: seashell
+*Message_List*background: seashell
+*background:            #AE00B200C300
+Dthello*string:         Welcome to the Sun Java Desktop System
+EOF
+
+if [ -f $HOME/.Xdefaults ]; then
+    $XRDB -merge $HOME/.Xdefaults    # Load Users X11 resource database
+fi
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ext-sources/0210.im	Wed Feb 04 08:36:25 2009 +0000
@@ -0,0 +1,105 @@
+#!/bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (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.
+#
+
+
+LING=${LC_CTYPE:-"$LC_ALL"}
+LING=${LING:-"$LANG"}
+LING=${LING:-"C"}
+
+LING=`echo $LING | awk -F_ '{print $1}'`
+
+parse_gtk_im_module_file ()
+{
+  if [ ! -f $1 ] ; then
+    echo ""
+    return 1
+  fi
+
+  cat $1 | grep -v "^#" | while read line
+  do
+    id=`echo "$line" | awk -F'"' '{print $2}'`
+    def_locales=`echo "$line" | awk -F'"' '{print $10}'`
+    if [ "x$def_locales" = x ] ; then
+      continue
+    fi
+    if [ "x$def_locales" = "x*" -a "x$id" != x ] ; then
+        echo "$id"
+        return 0
+    fi
+    for locale in `echo $def_locales | tr "," " "`
+    do
+      if [ "x$LING" = "x$locale" -a "x$id" != x ] ; then
+        echo "$id"
+        return 0
+      fi
+    done
+  done
+
+  echo ""
+  return 0
+}
+
+#Startup XIM stuff
+if [ "x$XMODIFIERS" = "x" ]; then
+ if [ -f "$HOME/.xim" ]; then
+        . $HOME/.xim
+ elif [ -f "/etc/skel/.xim" ]; then
+        . /etc/skel/.xim
+ fi
+fi
+
+im_module=
+if [ "x$GTK_IM_MODULE_FILE" != x ] ; then
+  im_module=`parse_gtk_im_module_file $GTK_IM_MODULE_FILE`
+fi
+if [ "x$im_module" = x ] ; then
+  im_module=`parse_gtk_im_module_file /etc/gtk-2.0/gtk.immodules`
+
+  # Remote IM is xim.
+  if [ "x$im_module" = "xxim" ] ; then
+    im_module="iiim"
+  fi
+fi
+
+GTK_IM_MODULE=${im_module:-"iiim"}
+export GTK_IM_MODULE
+
+#Startup Input methods (SCIM->XIM)
+if [ -f /etc/scim/xsession ]; then
+        . /etc/scim/xsession
+fi
+
+#Startup Input methods (IIIM->XIM)
+if [ "x$DISABLE_IIIM_PANEL" != x  ] && [ -x /usr/bin/iiimx ] ; then
+        /usr/bin/iiimx -iiimd
+
+        DTSTARTIMS=False
+        export DTSTARTIMS
+elif [ -f /etc/iiim/xsession ]; then
+        . /etc/iiim/xsession
+fi
+

--- a/ext-sources/dtstart	Wed Feb 04 06:36:43 2009 +0000
+++ b/ext-sources/dtstart	Wed Feb 04 08:36:25 2009 +0000
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/bash
 #
 # Script for starting a desktop session
 #
@@ -23,19 +23,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
-DT_SYS_CONFIG_DIR=/usr/dt/config
-DT_SITE_CONFIG_DIR=/etc/dt/config
 MYNAME=$(basename $0)
 
 usage() {
     echo "Usage: $0 session_name"
-    echo "    session_name is the suffix of an Xinitrc script in"
-    echo "    $DT_SITE_CONFIG_DIR (local configuration location) or"
-    echo "    $DT_SYS_CONFIG_DIR (system default location)."
+    echo "This script is not designed to run directly."
+    echo "Please use /etc/X11/gdm/Xsession instead."
 }
 
 if [ $# -ne 1 ]; then
@@ -51,19 +48,24 @@
 esac
 
 SESSION_NAME="$1"
+shift
 
-if [ -x "${DT_SITE_CONFIG_DIR}/Xinitrc.${SESSION_NAME}" ]; then
-    XINITRC="${DT_SITE_CONFIG_DIR}/Xinitrc.${SESSION_NAME}"
-elif [ -x "${DT_SYS_CONFIG_DIR}/Xinitrc.${SESSION_NAME}" ]; then
-    XINITRC="${DT_SYS_CONFIG_DIR}/Xinitrc.${SESSION_NAME}"
-else
-    echo "$MYNAME: Xinitrc.${SESSION_NAME} not found in ${DT_SITE_CONFIG_DIR} or ${DT_SYS_CONFIG_DIR}" 1>&2
-    exit 1
-fi
+case "$SESSION_NAME" in
+gdm|GDM|gnome|GNOME|jds|JDS)
+     SESSION_MANAGER=/usr/bin/gnome-session ;;
+twm) SESSION_MANAGER=/usr/X11/bin/twm ;;
+xdm) SESSION_MANAGER=/usr/openwin/lib/X11/xdm/Xsession ;;
+console) exit 0 ;;
+*)
+    if [ "x$SESSION_NAME" != x ] ; then
+        SESSION_MANAGER=$SESSION_NAME
+    fi
+    if [ ! -x $SESSION_NAME ] ; then
+        echo "Not found your display manager."
+        SESSION_MANAGER=/usr/X11/bin/twm
+    fi
 
-#Startup Input methods (IIIM->XIM)
-if [ -f /etc/iiim/xsession ]; then
-        . /etc/iiim/xsession
-fi
+esac
 
-exec $XINITRC
+exec $SESSION_MANAGER $@
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/SUNWgnome-dtlogin-integration-01-g11n-migration.diff	Wed Feb 04 08:36:25 2009 +0000
@@ -0,0 +1,56 @@
+--- dtlogin-integration-0.37/config/Xinitrc.in.orig	2009-02-04 16:17:23.416565482 +0900
++++ dtlogin-integration-0.37/config/Xinitrc.in	2009-02-04 16:17:58.467807163 +0900
+@@ -10,53 +10,6 @@
+ ###
+ #####################################################################
+ 
+-if [ "x$LC_ALL" = x -a "x$LANG" = x -o "x$LANG" = xC ]; then
+-  :
+-# This is needed until fix 6533406
+-# European locales have LC_MESSAGES=C in /usr/lib/locale/*/locale_map
+-else
+-  export LC_MESSAGES=$LANG
+-fi
+-
+-# Fixes 6555226
+-if [ "x$LANG" = "xzh" ] ; then
+-  export LANGUAGE=zh:zh_CN.EUC
+-fi
+-
+-export G_FILENAME_ENCODING=@locale,UTF-8
+-export G_BROKEN_FILENAMES=yes
+-# Fixes 6583891
+-case $LANG in
+-ja*) export VTE_CJK_WIDTH=1;;
+-ko*) export VTE_CJK_WIDTH=1;;
+-zh*) export VTE_CJK_WIDTH=1;;
+-*) ;;
+-esac
+-
+-/usr/openwin/bin/xrdb -merge << EOF
+-! Default CDE resources
+-*WindowColor:           #8A008A008A00
+-!*WindowForeground:      #FF0000000000
+-!*DataBackground:        #0000FF000000
+-*DataForeground:        #FF0000000000
+-*WorkspaceColor:        #8A008A008A00
+-*Color.Background:      #FF000000FF00
+-!*Color.Foreground:      #0000FF000000
+-*foreground:            #000000000000
+-! Hack for Dtmail
+-*XmText*background: seashell
+-*XmTextField*background: seashell
+-*Message_List*background: seashell
+-*background:    #AE00B200C300
+-Dthello*string:		Welcome to the Sun Java Desktop System
+-EOF
+-
+-if [ -f $HOME/.Xdefaults ]; then
+-    xrdb -merge $HOME/.Xdefaults        # Load Users X11 resource database
+-fi
+-
+-@EXEC_PREFIX@/bin/linc-cleanup-sockets
+-
+ command=@EXEC_PREFIX@/bin/gnome-session
+ 
+ echo 'Starting gnome-session'