--- a/make_release_packages	Thu Jun 18 16:42:21 2009 -0700
+++ b/make_release_packages	Fri Jun 19 10:28:42 2009 -0700
@@ -1,6 +1,7 @@
 #! /bin/ksh93
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -27,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-# @(#)make_release_packages	1.73	09/06/11
+# @(#)make_release_packages	1.74	09/06/18
 #
 #	Create and fill a package staging area for X
 #
@@ -62,17 +63,18 @@
     SUNWxorg-graphics-ddx SUNWxorg-headers
     SUNWxorg-server SUNWxorg-tsol-module 
     SUNWxscreensaver-hacks SUNWxscreensaver-hacks-gl
-    SUNWxsun-headers SUNWxsun-server
     SUNWxvnc SUNWxwacx SUNWxwcft SUNWxwdem SUNWxwdxm
     SUNWxwfnt SUNWxwfs SUNWxwfsw SUNWxwice SUNWxwinc
     SUNWxwman SUNWxwmod SUNWxwoft SUNWxwopt SUNWxwplr
     SUNWxwplt SUNWxwpmn SUNWxwrtl SUNWxwslb SUNWxwsvr
-    SUNWxwts SUNWxwxft"
+    SUNWxwxft"
+
+XSUN_PACKAGE_LIST="SUNWxsun-headers SUNWxsun-server SUNWxwts"
 
 # Some packages are only built for certain platforms currently
 case "${MACH}" in
     sparc)	
-    	XW_PACKAGE_LIST="$XW_PACKAGE_LIST SUNWxwpsr" 
+    	XW_PACKAGE_LIST="$XW_PACKAGE_LIST $XSUN_PACKAGE_LIST SUNWxwpsr" 
 	;;
     i386)	
     	XW_PACKAGE_LIST="$XW_PACKAGE_LIST SUNWxorg-mesa" 

--- a/packages/upgrade-X	Thu Jun 18 16:42:21 2009 -0700
+++ b/packages/upgrade-X	Fri Jun 19 10:28:42 2009 -0700
@@ -2,9 +2,10 @@
 
 ###
 #
-# @(#)upgrade-X	1.54 09/06/11
+# @(#)upgrade-X	1.55 09/06/18
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -183,8 +184,6 @@
 	SUNWxorg-tsol-module
 	SUNWxscreensaver-hacks
 	SUNWxscreensaver-hacks-gl
-	SUNWxsun-headers
-	SUNWxsun-server
 	SUNWxvnc
 	SUNWxwacx
 	SUNWxwcft
@@ -204,14 +203,19 @@
 	SUNWxwrtl
 	SUNWxwslb
 	SUNWxwsvr
+	SUNWxwxft
+"
+
+xsun_pkg_list="
+	SUNWxsun-headers
+	SUNWxsun-server
 	SUNWxwts
-	SUNWxwxft
 "
 
 # Some packages are only built for certain platforms currently
 case "${MACH}" in
     sparc)      
-        pkg_list+=" SUNWxwpsr" 
+        pkg_list+=" SUNWxwpsr ${xsun_pkg_list}" 
         ;;
     i386)       
         pkg_list+=" SUNWxorg-mesa" 
@@ -254,7 +258,9 @@
 REM_PKGS+=" SUNWxorg-devel-docs SUNWxorg-cfg"
 
 # snv_118: 6850136 Removal of Xsun-based Xvfb & Xnest servers [PSARC 2008/033]
-REM_PKGS+=" SUNWxwsrv"
+#	   6781710 Removal of Xsun on x86/x64 [PSARC 2008/033]
+REM_PKGS+=" SUNWxwsrv ${xsun_pkg_list}"
+
 
 # Check for shared SMF manifest scripts now required by our packages
 if [[ ! -f /usr/sadm/install/scripts/i.manifest ]] ; then