--- a/open-src/util/compat-links/Makefile	Fri Jul 23 17:40:52 2010 -0700
+++ b/open-src/util/compat-links/Makefile	Tue Jul 27 11:04:24 2010 -0700
@@ -79,3 +79,27 @@
 	ln -s X11 $@
 
 install_links: $(INSTALL_LINKS)
+
+# Font links so that Java fontconfig.properties can find the fonts they use
+# (see CR 6905518 & 6972032)
+
+FONT_LINKDIR = $(DESTDIR)/usr/X11/lib/X11/fonts
+FONT_LINKS = 75dpi 100dpi misc TrueType
+FONT_LINKPATHS = $(FONT_LINKS:%=$(FONT_LINKDIR)/%)
+
+install_links: $(FONT_LINKPATHS)
+
+$(FONT_LINKDIR): $(DESTDIR)/usr/X11
+	mkdir -p $@
+
+$(FONT_LINKDIR)/75dpi $(FONT_LINKDIR)/100dpi: $(FONT_LINKDIR)
+	@rm -f $@
+	ln -s ../../../../share/fonts/X11/$(@F)-ISO8859-1 $@
+
+$(FONT_LINKDIR)/misc: $(FONT_LINKDIR)
+	@rm -f $@
+	ln -s ../../../../share/fonts/X11/misc $@
+
+$(FONT_LINKDIR)/TrueType: $(FONT_LINKDIR)
+	@rm -f $@
+	ln -s ../../../../share/fonts/TrueType $@

--- a/pkg/manifests/x11-compatibility-links-xorg.mf	Fri Jul 23 17:40:52 2010 -0700
+++ b/pkg/manifests/x11-compatibility-links-xorg.mf	Tue Jul 27 11:04:24 2010 -0700
@@ -25,8 +25,18 @@
 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/X11R6 target=X11
 link path=usr/openwin target=X11