--- a/pkg/manifests/system-font-truetype-dejavu.p5m	Thu Jul 21 11:08:35 2011 -0700
+++ b/pkg/manifests/system-font-truetype-dejavu.p5m	Thu Jul 21 11:18:06 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -83,3 +83,5 @@
     target=../conf.avail/57-dejavu-sans.conf
 link path=etc/fonts/conf.d/57-dejavu-serif.conf \
     target=../conf.avail/57-dejavu-serif.conf
+link path=usr/X11/lib/X11/fonts/TrueType \
+    target=../../../../share/fonts/TrueType

--- a/pkg/manifests/system-font-xorg-iso8859-1.p5m	Thu Jul 21 11:08:35 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-1.p5m	Thu Jul 21 11:18:06 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -452,3 +452,7 @@
     target=../../../usr/share/fonts/X11/misc-ISO8859-1
 link path=etc/X11/fontpath.d/misc-ISO8859-1:unscaled:pri=15 \
     target=../../../usr/share/fonts/X11/misc-ISO8859-1
+link path=usr/X11/lib/X11/fonts/100dpi \
+    target=../../../../share/fonts/X11/100dpi-ISO8859-1
+link path=usr/X11/lib/X11/fonts/75dpi \
+    target=../../../../share/fonts/X11/75dpi-ISO8859-1

--- a/pkg/manifests/system-font-xorg-xorg-core.p5m	Thu Jul 21 11:08:35 2011 -0700
+++ b/pkg/manifests/system-font-xorg-xorg-core.p5m	Thu Jul 21 11:18:06 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -28,6 +28,10 @@
 dir path=etc/X11
 dir path=etc/X11/fontpath.d
 dir path=usr
+dir path=usr/X11
+dir path=usr/X11/lib
+dir path=usr/X11/lib/X11
+dir path=usr/X11/lib/X11/fonts
 dir path=usr/share
 dir path=usr/share/fonts
 dir path=usr/share/fonts/X11
@@ -659,3 +663,4 @@
     target=../../../usr/share/fonts/X11/misc
 link path=etc/X11/fontpath.d/misc:unscaled:pri=17 \
     target=../../../usr/share/fonts/X11/misc
+link path=usr/X11/lib/X11/fonts/misc target=../../../../share/fonts/X11/misc

--- a/pkg/manifests/x11-compatibility-links-xorg.p5m	Thu Jul 21 11:08:35 2011 -0700
+++ b/pkg/manifests/x11-compatibility-links-xorg.p5m	Thu Jul 21 11:18:06 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -25,19 +25,8 @@
 set name=pkg.summary value="X Window System platform compatibility links"
 dir path=usr
 dir path=usr/X11
-dir path=usr/X11/lib
-dir path=usr/X11/lib/X11
-dir path=usr/X11/lib/X11/fonts
 legacy pkg=SUNWxorg-compatlinks \
     desc="Symbolic links for X Window System software compatibility with other releases" \
     name="X11 Compatibility Links"
-link path=usr/X11/lib/X11/fonts/100dpi \
-    target=../../../../share/fonts/X11/100dpi-ISO8859-1
-link path=usr/X11/lib/X11/fonts/75dpi \
-    target=../../../../share/fonts/X11/75dpi-ISO8859-1
-link path=usr/X11/lib/X11/fonts/TrueType \
-    target=../../../../share/fonts/TrueType
-link path=usr/X11/lib/X11/fonts/misc target=../../../../share/fonts/X11/misc
-link path=usr/X11/lib/X11/xserver target=../../../lib/xorg
-link path=usr/X11R6 target=X11
-link path=usr/openwin target=X11
+link path=usr/X11R6 target=X11 facet.compat.x11-links=true
+link path=usr/openwin target=X11 facet.compat.x11-links=true

--- a/pkg/manifests/x11-server-xserver-common.p5m	Thu Jul 21 11:08:35 2011 -0700
+++ b/pkg/manifests/x11-server-xserver-common.p5m	Thu Jul 21 11:18:06 2011 -0700
@@ -72,6 +72,7 @@
 link path=usr/X11/bin/X target=../../bin/X
 link path=usr/X11/bin/Xserver target=../../bin/Xserver
 $(i386_ONLY)link path=usr/X11/bin/amd64 target=../../bin/amd64
+link path=usr/X11/lib/X11/xserver target=../../../lib/xorg
 link path=usr/bin/X target=Xserver
 # Xserver script runs /usr/bin/readlink (from GNU coreutils)
 depend fmri=pkg:/file/gnu-coreutils type=require

--- a/pkg/transforms/facets	Thu Jul 21 11:08:35 2011 -0700
+++ b/pkg/transforms/facets	Thu Jul 21 11:18:06 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -21,6 +21,9 @@
 # DEALINGS IN THE SOFTWARE.
 #
 
+## Compatibility links
+<transform dir link path=usr/X11 -> default facet.compat.x11-links true>
+
 ## Documentation
 # Man pages
 <transform dir  path=usr/share/man/.* -> default facet.doc.man true>