--- a/exception_lists/packaging	Fri Oct 22 17:54:54 2010 -0700
+++ b/exception_lists/packaging	Sun Oct 24 20:12:52 2010 -0700
@@ -74,10 +74,6 @@
 usr/share/man/man5/Consortium.5
 usr/share/man/man5/XProjectTeam.5
 
-# We don't ship 64-bit Xvnc, only 32-bit
-usr/lib/mdb/proc/amd64/Xvnc.so		i386
-usr/lib/mdb/proc/sparcv9/Xvnc.so	sparc
-
 # We didn't start shipping Xft until after the move to pkg-config
 # so don't need to maintain backwards compatibility with xft-config
 usr/bin/xft-config

--- a/open-src/xserver/xvnc/Makefile	Fri Oct 22 17:54:54 2010 -0700
+++ b/open-src/xserver/xvnc/Makefile	Sun Oct 24 20:12:52 2010 -0700
@@ -120,14 +120,6 @@
 INSTALL_TARGETS=$(INSTALL_TARGETS_common) $(INSTALL_TARGETS_$(BUILD_TYPE))
 INSTALL_TARGETS_SET=yes
 
-# Since we only build 64-bit versions of the Xorg servers on SPARC,
-# need to build a 32-bit version of the Xserver mdb module to allow
-# use with Xvnc on SPARC
-BUILD_TARGETS_sparc = build_mdb
-BUILD_TARGETS += $(BUILD_TARGETS_$(MACH))
-INSTALL_TARGETS_sparc = install_mdb
-INSTALL_TARGETS += $(INSTALL_TARGETS_$(MACH))
-
 # Compatibility links from /usr/X11/bin to /usr/bin
 MODULE_X11_BINCOMPAT_LINKS = Xvnc
 

--- a/pkg/manifests/x11-server-xephyr.mf	Fri Oct 22 17:54:54 2010 -0700
+++ b/pkg/manifests/x11-server-xephyr.mf	Sun Oct 24 20:12:52 2010 -0700
@@ -45,7 +45,7 @@
 $(i386_ONLY)hardlink path=usr/bin/Xephyr target=../lib/isaexec
 link path=usr/X11/bin/Xephyr target=../../bin/Xephyr
 link path=usr/lib/mdb/proc/$(ARCH64)/Xephyr.so target=Xserver.so
-link path=usr/lib/mdb/proc/Xephyr.so target=Xserver.so
+$(i386_ONLY)link path=usr/lib/mdb/proc/Xephyr.so target=Xserver.so
 depend fmri=pkg:/x11/keyboard/data-xkb type=require
 # X servers require xkbcomp & data-xkb for keyboard layouts
 depend fmri=pkg:/x11/keyboard/xkbcomp type=require

--- a/pkg/manifests/x11-server-xorg.mf	Fri Oct 22 17:54:54 2010 -0700
+++ b/pkg/manifests/x11-server-xorg.mf	Sun Oct 24 20:12:52 2010 -0700
@@ -307,7 +307,7 @@
 link path=usr/X11/bin/gtf target=../../bin/gtf
 link path=usr/X11/include/xorg target=../../include/xorg
 link path=usr/lib/mdb/proc/$(ARCH64)/Xorg.so target=Xserver.so
-link path=usr/lib/mdb/proc/Xorg.so target=Xserver.so
+$(i386_ONLY)link path=usr/lib/mdb/proc/Xorg.so target=Xserver.so
 $(sparc_ONLY)link path=usr/lib/pkgconfig/xorg-server.pc \
     target=../sparcv9/pkgconfig/xorg-server.pc
 

--- a/pkg/manifests/x11-server-xserver-common.mf	Fri Oct 22 17:54:54 2010 -0700
+++ b/pkg/manifests/x11-server-xserver-common.mf	Sun Oct 24 20:12:52 2010 -0700
@@ -69,7 +69,7 @@
 file path=usr/lib/help/auths/locale/C/X11States.html
 file path=usr/lib/help/profiles/locale/C/RtDesktopConfiguration.html
 file path=usr/lib/mdb/proc/$(ARCH64)/Xserver.so
-file path=usr/lib/mdb/proc/Xserver.so
+$(i386_ONLY)file path=usr/lib/mdb/proc/Xserver.so
 file path=usr/lib/xorg/TrustedExtensionsPolicy
 file path=usr/lib/xorg/protocol.txt
 file path=usr/share/man/man1/Xnest.1

--- a/pkg/manifests/x11-server-xvfb.mf	Fri Oct 22 17:54:54 2010 -0700
+++ b/pkg/manifests/x11-server-xvfb.mf	Sun Oct 24 20:12:52 2010 -0700
@@ -44,7 +44,7 @@
 $(i386_ONLY)hardlink path=usr/bin/Xvfb target=../lib/isaexec
 link path=usr/X11/bin/Xvfb target=../../bin/Xvfb
 link path=usr/lib/mdb/proc/$(ARCH64)/Xvfb.so target=Xserver.so
-link path=usr/lib/mdb/proc/Xvfb.so target=Xserver.so
+$(i386_ONLY)link path=usr/lib/mdb/proc/Xvfb.so target=Xserver.so
 depend fmri=pkg:/x11/keyboard/data-xkb type=require
 # X servers require xkbcomp & data-xkb for keyboard layouts
 depend fmri=pkg:/x11/keyboard/xkbcomp type=require

--- a/pkg/manifests/x11-server-xvnc.mf	Fri Oct 22 17:54:54 2010 -0700
+++ b/pkg/manifests/x11-server-xvnc.mf	Sun Oct 24 20:12:52 2010 -0700
@@ -79,7 +79,7 @@
 $(i386_ONLY)hardlink path=usr/bin/vncserver target=../lib/isaexec
 $(i386_ONLY)hardlink path=usr/bin/x0vncserver target=../lib/isaexec
 link path=usr/X11/bin/Xvnc target=../../bin/Xvnc
-link path=usr/lib/mdb/proc/Xvnc.so target=Xserver.so
+$(i386_ONLY)link path=usr/lib/mdb/proc/Xvnc.so target=Xserver.so
 link path=usr/lib/mdb/proc/$(ARCH64)/Xvnc.so target=Xserver.so
 # /usr/bin/vncserver is a perl script, but pkgdep doesn't pick up the
 # dependency automatically