--- a/packages/upgrade-X	Mon Feb 15 16:40:00 2010 -0800
+++ b/packages/upgrade-X	Wed Feb 17 12:30:44 2010 -0800
@@ -238,19 +238,6 @@
 	SUNWxwxft
 "
 
-xsun_pkg_list="
-	SUNWxsun-headers
-	SUNWxsun-server
-	SUNWxwts
-"
-
-# Some packages are only built for certain platforms currently
-case "${MACH}" in
-    sparc)      
-        pkg_list+=" SUNWxwpsr ${xsun_pkg_list}" 
-        ;;
-esac
-
 ####
 #
 #   Deal with changes since various older Nevada builds
@@ -287,8 +274,11 @@
 REM_PKGS+=" SUNWxorg-devel-docs SUNWxorg-cfg"
 
 # snv_118: 6850136 Removal of Xsun-based Xvfb & Xnest servers [PSARC 2008/033]
-#	   6781710 Removal of Xsun on x86/x64 [PSARC 2008/033]
-REM_PKGS+=" SUNWxwsrv ${xsun_pkg_list}"
+REM_PKGS+=" SUNWxwsrv"
+
+# snv_118: 6781710 Removal of Xsun on x86/x64 [PSARC 2008/033]
+# snv_135: 6926932 Removal of Xsun on SPARC [PSARC 2008/033]
+REM_PKGS+=" SUNWxsun-headers SUNWxsun-server SUNWxwts SUNWxwpsr"
 
 # snv_120: 6859233 Removal of Xprint [PSARC 2009/294]
 REM_PKGS+=" SUNWxprint-server SUNWxwpft"