--- a/open-src/font/deja-vu/Makefile	Wed Mar 12 00:15:35 2008 -0700
+++ b/open-src/font/deja-vu/Makefile	Wed Mar 12 13:22:28 2008 -0700
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.3	08/03/10
+# @(#)Makefile	1.4	08/03/12
 #
 
 PWD:sh=pwd
@@ -56,7 +56,8 @@
 BUILD_TARGETS=$(SOURCE_DIR)/fonts.scale
 
 # Directory to install to
-DEST_DIR=$(PROTODIR)$(TRUETYPE_DIR)
+FONT_DEST_DIR=$(PROTODIR)$(TRUETYPE_DIR)
+FONTCONF_DEST_DIR=$(PROTODIR)/etc/fonts
 
 # License file
 LICENSE_FILE=LICENSE
@@ -98,11 +99,19 @@
 	 $(PROTODIR)$(X11_DIR)/bin/mkfontscale . )
 
 install_gen:: $(BUILD_TARGETS)
-	mkdir -p $(DEST_DIR)
-	-( cd $(DEST_DIR) ; rm -f $(DEJAVU_FONT_FILES) DejaVuFontsCopyright.txt )
-	( cd $(SOURCE_DIR)/ttf ; cp -p $(DEJAVU_FONT_FILES) $(DEST_DIR) )
-	cp -p $(SOURCE_DIR)/LICENSE $(DEST_DIR)/DejaVuFontsCopyright.txt 
-	touch $(DEST_DIR)/fonts.scale
-	chmod +w $(DEST_DIR)/fonts.scale
-	../merge-fonts.scale.pl -i $(DEST_DIR)/fonts.scale \
-		-i $(SOURCE_DIR)/ttf/fonts.scale -o $(DEST_DIR)/fonts.scale
+	mkdir -p $(FONT_DEST_DIR) \
+		$(FONTCONF_DEST_DIR)/conf.avail \
+		$(FONTCONF_DEST_DIR)/conf.d
+	-( cd $(FONT_DEST_DIR) ; rm -f $(DEJAVU_FONT_FILES) DejaVuFontsCopyright.txt )
+	( cd $(SOURCE_DIR)/ttf ; cp -p $(DEJAVU_FONT_FILES) $(FONT_DEST_DIR) )
+	cp -p $(SOURCE_DIR)/LICENSE $(FONT_DEST_DIR)/DejaVuFontsCopyright.txt 
+	( cd $(SOURCE_DIR)/fontconfig ; set -x ; for f in *.conf ; do \
+		rm -f $(FONTCONF_DEST_DIR)/conf.avail/$$f \
+			$(FONTCONF_DEST_DIR)/conf.d/$$f ; \
+		cp -p $$f $(FONTCONF_DEST_DIR)/conf.avail/ ; \
+		ln -s ../conf.avail/$$f $(FONTCONF_DEST_DIR)/conf.d/ ; \
+	 done )
+	touch $(FONT_DEST_DIR)/fonts.scale
+	chmod +w $(FONT_DEST_DIR)/fonts.scale
+	../merge-fonts.scale.pl -i $(FONT_DEST_DIR)/fonts.scale \
+		-i $(SOURCE_DIR)/ttf/fonts.scale -o $(FONT_DEST_DIR)/fonts.scale

--- a/packages/SUNWfontconfig-root/prototype	Wed Mar 12 00:15:35 2008 -0700
+++ b/packages/SUNWfontconfig-root/prototype	Wed Mar 12 13:22:28 2008 -0700
@@ -28,7 +28,7 @@
 #
 ###########################################################################
 #
-# ident	"@(#)prototype	1.7	08/03/11 SMI"
+# ident	"@(#)prototype	1.8	08/03/12 SMI"
 #
 # Fontconfig config files
 
@@ -80,7 +80,6 @@
 f none etc/fonts/conf.avail/80-delicious.conf		0444 root bin
 f none etc/fonts/conf.avail/90-synthetic.conf		0444 root bin
 
-!search      $HOME/fonts/conf.d
 d none etc/fonts/conf.d		0755 root sys
 s none etc/fonts/conf.d/20-fix-globaladvance.conf=../conf.avail/20-fix-globaladvance.conf
 s none etc/fonts/conf.d/20-unhint-small-vera.conf=../conf.avail/20-unhint-small-vera.conf
@@ -99,6 +98,16 @@
 s none etc/fonts/conf.d/80-delicious.conf=../conf.avail/80-delicious.conf
 s none etc/fonts/conf.d/90-synthetic.conf=../conf.avail/90-synthetic.conf
 
+# From open-src/font/deja-vu:
+f none etc/fonts/conf.avail/20-unhint-small-dejavu-experimental.conf	0444 root bin
+f none etc/fonts/conf.avail/20-unhint-small-dejavu.conf	0444 root bin
+f none etc/fonts/conf.avail/57-dejavu.conf		0444 root bin
+f none etc/fonts/conf.avail/61-dejavu-experimental.conf	0444 root bin
+s none etc/fonts/conf.d/20-unhint-small-dejavu-experimental.conf=../conf.avail/20-unhint-small-dejavu-experimental.conf
+s none etc/fonts/conf.d/20-unhint-small-dejavu.conf=../conf.avail/20-unhint-small-dejavu.conf
+s none etc/fonts/conf.d/57-dejavu.conf=../conf.avail/57-dejavu.conf
+s none etc/fonts/conf.d/61-dejavu-experimental.conf=../conf.avail/61-dejavu-experimental.conf
+
 d none var 755 root sys
 d none var/svc 755 root sys
 d none var/svc/manifest 755 root sys