Update to fontconfig 2.8.0. Tested on a full ports build by naddy@.

11 files changed, 237 insertions, 192 deletions

diff --git a/lib/fontconfig/conf.d/25-unhint-nonlatin.conf b/lib/fontconfig/conf.d/25-unhint-nonlatin.conf
index 3799853e6..ffb70c69f 100644
--- a/lib/fontconfig/conf.d/25-unhint-nonlatin.conf
+++ b/lib/fontconfig/conf.d/25-unhint-nonlatin.conf
@@ -76,22 +76,22 @@
 			<bool>false</bool>
 		</edit>
 	</match>
-        <match target="font">
-                <test name="family" compare="eq">
-                        <string>AR PL ShanHeiSun Uni</string>
-                </test>
-                <edit name="hinting" mode="assign">
-                        <bool>false</bool>
-                </edit>
-        </match>
-        <match target="font">
-                <test name="family" compare="eq">
-                        <string>AR PL KaitiM Big5</string>
-                </test>
-                <edit name="hinting" mode="assign">
-                        <bool>false</bool>
-                </edit>
-        </match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>AR PL ShanHeiSun Uni</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq">
+			<string>AR PL KaitiM Big5</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
 	<match target="font">
 		<test name="family" compare="eq">
 			<string>AR PL ZenKai Uni</string>
diff --git a/lib/fontconfig/conf.d/30-metric-aliases.conf b/lib/fontconfig/conf.d/30-metric-aliases.conf
index 87e44938b..702a495ea 100644
--- a/lib/fontconfig/conf.d/30-metric-aliases.conf
+++ b/lib/fontconfig/conf.d/30-metric-aliases.conf
@@ -51,21 +51,21 @@
 <!-- Map specifics to generics -->
 
 	<!-- PostScript -->
-        <alias binding="same">
+	<alias binding="same">
 	  <family>Nimbus Sans L</family>
 	  <default>
 	  <family>Helvetica</family>
 	  </default>
 	</alias>
 
-        <alias binding="same">
+	<alias binding="same">
 	  <family>Nimbus Roman No9 L</family>
 	  <default>
 	  <family>Times</family>
 	  </default>
 	</alias>
 
-        <alias binding="same">
+	<alias binding="same">
 	  <family>Nimbus Mono L</family>
 	  <default>
 	  <family>Courier</family>
@@ -74,8 +74,8 @@
 
 
 	<!-- Microsoft -->
-        <alias binding="same">
-          <family>Liberation Sans</family>
+	<alias binding="same">
+	  <family>Liberation Sans</family>
 	  <family>Albany</family>
 	  <family>Albany AMT</family>
 	  <default>
@@ -83,8 +83,8 @@
 	  </default>
 	</alias>
 
-        <alias binding="same">
-          <family>Liberation Serif</family>
+	<alias binding="same">
+	  <family>Liberation Serif</family>
 	  <family>Thorndale</family>
 	  <family>Thorndale AMT</family>
 	  <default>
@@ -92,8 +92,8 @@
 	  </default>
 	</alias>
 
-        <alias binding="same">
-          <family>Liberation Mono</family>
+	<alias binding="same">
+	  <family>Liberation Mono</family>
 	  <family>Cumberland</family>
 	  <family>Cumberland AMT</family>
 	  <default>
@@ -107,21 +107,21 @@
 
 
 	<!-- PostScript -->
-        <alias>
+	<alias>
 	  <family>Helvetica</family>
 	  <default>
 	  <family>Arial</family>
 	  </default>
 	</alias>
 
-        <alias>
+	<alias>
 	  <family>Times</family>
 	  <default>
 	  <family>Times New Roman</family>
 	  </default>
 	</alias>
 
-        <alias>
+	<alias>
 	  <family>Courier</family>
 	  <default>
 	  <family>Courier New</family>
@@ -130,21 +130,21 @@
 
 
 	<!-- Microsoft -->
-        <alias>
+	<alias>
 	  <family>Arial</family>
 	  <default>
 	  <family>Helvetica</family>
 	  </default>
 	</alias>
 
-        <alias>
+	<alias>
 	  <family>Times New Roman</family>
 	  <default>
 	  <family>Times</family>
 	  </default>
 	</alias>
 
-        <alias>
+	<alias>
 	  <family>Courier New</family>
 	  <default>
 	  <family>Courier</family>
@@ -157,21 +157,21 @@
 
 
 	<!-- PostScript -->
-        <alias binding="same">
+	<alias binding="same">
 	  <family>Helvetica</family>
 	  <accept>
 	  <family>Nimbus Sans L</family>
 	  </accept>
 	</alias>
 
-        <alias binding="same">
+	<alias binding="same">
 	  <family>Times</family>
 	  <accept>
 	  <family>Nimbus Roman No9 L</family>
 	  </accept>
 	</alias>
 
-        <alias binding="same">
+	<alias binding="same">
 	  <family>Courier</family>
 	  <accept>
 	  <family>Nimbus Mono L</family>
@@ -180,28 +180,28 @@
 
 
 	<!-- Microsoft -->
-        <alias binding="same">
+	<alias binding="same">
 	  <family>Arial</family>
 	  <accept>
-          <family>Liberation Sans</family>
+	  <family>Liberation Sans</family>
 	  <family>Albany</family>
 	  <family>Albany AMT</family>
 	  </accept>
 	</alias>
 
-        <alias binding="same">
+	<alias binding="same">
 	  <family>Times New Roman</family>
 	  <accept>
-          <family>Liberation Serif</family>
+	  <family>Liberation Serif</family>
 	  <family>Thorndale</family>
 	  <family>Thorndale AMT</family>
 	  </accept>
 	</alias>
 
-        <alias binding="same">
+	<alias binding="same">
 	  <family>Courier New</family>
 	  <accept>
-          <family>Liberation Mono</family>
+	  <family>Liberation Mono</family>
 	  <family>Cumberland</family>
 	  <family>Cumberland AMT</family>
 	  </accept>
diff --git a/lib/fontconfig/conf.d/30-urw-aliases.conf b/lib/fontconfig/conf.d/30-urw-aliases.conf
index 6bab15b67..9d5920306 100644
--- a/lib/fontconfig/conf.d/30-urw-aliases.conf
+++ b/lib/fontconfig/conf.d/30-urw-aliases.conf
@@ -5,27 +5,27 @@
   URW provides metric and shape compatible fonts for some Adobe families.
   Helvetica, Courier, and Times are handled in 30-metric-aliases.conf.
   -->
-        <alias binding="same">
-          <family>Avant Garde</family>
-          <accept><family>URW Gothic L</family></accept>
-        </alias>
-        <alias binding="same">
-          <family>Bookman</family>
-          <accept><family>URW Bookman L</family></accept>
-        </alias>
-        <alias binding="same">
-          <family>New Century Schoolbook</family>
-          <accept><family>Century Schoolbook L</family></accept>
-        </alias>
-        <alias binding="same">
-          <family>Palatino</family>
-          <accept><family>URW Palladio L</family></accept>
-        </alias>
-        <alias binding="same">
+	<alias binding="same">
+	  <family>Avant Garde</family>
+	  <accept><family>URW Gothic L</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Bookman</family>
+	  <accept><family>URW Bookman L</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>New Century Schoolbook</family>
+	  <accept><family>Century Schoolbook L</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Palatino</family>
+	  <accept><family>URW Palladio L</family></accept>
+	</alias>
+	<alias binding="same">
 	  <family>Zapf Chancery</family>
 	  <accept><family>URW Chancery L</family></accept>
 	</alias>
-        <alias binding="same">
+	<alias binding="same">
 	  <family>Zapf Dingbats</family>
 	  <accept><family>Dingbats</family></accept>
 	</alias>
diff --git a/lib/fontconfig/conf.d/45-latin.conf b/lib/fontconfig/conf.d/45-latin.conf
index bdd164a04..7e4126468 100644
--- a/lib/fontconfig/conf.d/45-latin.conf
+++ b/lib/fontconfig/conf.d/45-latin.conf
@@ -44,6 +44,7 @@
 		<family>Bitstream Vera Sans Mono</family>
 		<family>DejaVu Sans Mono</family>
 		<family>Liberation Mono</family>
+		<family>Inconsolata</family>
 		<family>Courier New</family>
 		<family>Courier</family>
 		<family>Andale Mono</family>
diff --git a/lib/fontconfig/conf.d/50-user.conf b/lib/fontconfig/conf.d/50-user.conf
index 3052cdcb6..3f8901296 100644
--- a/lib/fontconfig/conf.d/50-user.conf
+++ b/lib/fontconfig/conf.d/50-user.conf
@@ -2,5 +2,6 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 	<!-- Load per-user customization file -->
+	<include ignore_missing="yes">~/.fonts.conf.d</include>
 	<include ignore_missing="yes">~/.fonts.conf</include>
 </fontconfig>
diff --git a/lib/fontconfig/conf.d/60-latin.conf b/lib/fontconfig/conf.d/60-latin.conf
index 62bf0d461..2107e31e4 100644
--- a/lib/fontconfig/conf.d/60-latin.conf
+++ b/lib/fontconfig/conf.d/60-latin.conf
@@ -34,6 +34,7 @@
 		<prefer>
 			<family>Bitstream Vera Sans Mono</family>
 			<family>DejaVu Sans Mono</family>
+			<family>Inconsolata</family>
 			<family>Andale Mono</family>
 			<family>Courier New</family>
 			<family>Cumberland AMT</family>
diff --git a/lib/fontconfig/conf.d/65-fonts-persian.conf b/lib/fontconfig/conf.d/65-fonts-persian.conf
index 97b783ec4..0033675a4 100644
--- a/lib/fontconfig/conf.d/65-fonts-persian.conf
+++ b/lib/fontconfig/conf.d/65-fonts-persian.conf
@@ -18,7 +18,7 @@
 
   SHARIF FARSIWEB, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
   INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
   CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
   DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
   TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
@@ -36,151 +36,151 @@
 <!-- Deprecated fonts are discouraged -->
 
 	<!-- Nesf[2] is officially deprecated and has problematic tables -->
-        <alias binding="same">
-          <family>Nesf</family>
-          <accept><family>Nesf2</family></accept>
-        </alias>
-        <alias binding="same">
-          <family>Nesf2</family>
-          <accept><family>Persian_sansserif_default</family></accept>
-        </alias>
+	<alias binding="same">
+	  <family>Nesf</family>
+	  <accept><family>Nesf2</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Nesf2</family>
+	  <accept><family>Persian_sansserif_default</family></accept>
+	</alias>
 
 <!-- Name changes and spelling variant aliases -->
 
-        <alias binding="same">
-          <family>Nazanin</family>
-          <accept><family>Nazli</family></accept>
-        </alias>
-        <alias binding="same">
-          <family>Lotus</family>
-          <accept><family>Lotoos</family></accept>
-        </alias>
-        <alias binding="same">
-          <family>Yaqut</family>
-          <accept><family>Yaghoot</family></accept>
-        </alias>
-        <alias binding="same">
-          <family>Yaghut</family>
-          <accept><family>Yaghoot</family></accept>
-        </alias>
-        <alias binding="same">
-          <family>Traffic</family>
-          <accept><family>Terafik</family></accept>
-        </alias>
-        <alias binding="same">
-          <family>Ferdowsi</family>
-          <accept><family>Ferdosi</family></accept>
-        </alias>
-        <alias binding="same">
-          <family>Fantezy</family>
-          <accept><family>Fantezi</family></accept>
-        </alias>
+	<alias binding="same">
+	  <family>Nazanin</family>
+	  <accept><family>Nazli</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Lotus</family>
+	  <accept><family>Lotoos</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Yaqut</family>
+	  <accept><family>Yaghoot</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Yaghut</family>
+	  <accept><family>Yaghoot</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Traffic</family>
+	  <accept><family>Terafik</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Ferdowsi</family>
+	  <accept><family>Ferdosi</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Fantezy</family>
+	  <accept><family>Fantezi</family></accept>
+	</alias>
 
 
 <!-- Classify fonts. -->
 
 	<!-- Persian_title class -->
-        <alias binding="same">
-          <family>Jadid</family>
-          <accept><family>Persian_title</family></accept>
-        </alias>
-        <alias binding="same">
-          <family>Titr</family>
-          <accept><family>Persian_title</family></accept>
-        </alias>
+	<alias binding="same">
+	  <family>Jadid</family>
+	  <accept><family>Persian_title</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Titr</family>
+	  <accept><family>Persian_title</family></accept>
+	</alias>
 
 	<!-- Persian_fantasy class -->
-        <alias binding="same">
-          <family>Kamran</family>
-          <accept>
+	<alias binding="same">
+	  <family>Kamran</family>
+	  <accept>
 	  <family>Persian_fantasy</family>
 	  <family>Homa</family>
 	  </accept>
-        </alias>
-        <alias binding="same">
-          <family>Homa</family>
-          <accept>
+	</alias>
+	<alias binding="same">
+	  <family>Homa</family>
+	  <accept>
 	  <family>Persian_fantasy</family>
 	  <family>Kamran</family>
 	  </accept>
-        </alias>
-        <alias binding="same">
-          <family>Fantezi</family>
-          <accept><family>Persian_fantasy</family></accept>
-        </alias>
-        <alias binding="same">
-          <family>Tabassom</family>
-          <accept><family>Persian_fantasy</family></accept>
-        </alias>
+	</alias>
+	<alias binding="same">
+	  <family>Fantezi</family>
+	  <accept><family>Persian_fantasy</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Tabassom</family>
+	  <accept><family>Persian_fantasy</family></accept>
+	</alias>
 
 	<!-- Persian_square class -->
-        <alias binding="same">
-          <family>Arshia</family>
-          <accept><family>Persian_square</family></accept>
-        </alias>
-        <alias binding="same">
-          <family>Nasim</family>
-          <accept><family>Persian_square</family></accept>
-        </alias>
-        <alias binding="same">
-          <family>Elham</family>
-          <accept>
+	<alias binding="same">
+	  <family>Arshia</family>
+	  <accept><family>Persian_square</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Nasim</family>
+	  <accept><family>Persian_square</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Elham</family>
+	  <accept>
 	  <family>Persian_square</family>
 	  <family>Farnaz</family>
 	  </accept>
-        </alias>
-        <alias binding="same">
+	</alias>
+	<alias binding="same">
 	  <family>Farnaz</family>
-          <accept>
+	  <accept>
 	  <family>Persian_square</family>
-          <family>Elham</family>
+	  <family>Elham</family>
 	  </accept>
-        </alias>
-        <alias binding="same">
-          <family>Sina</family>
-          <accept><family>Persian_square</family></accept>
-        </alias>
+	</alias>
+	<alias binding="same">
+	  <family>Sina</family>
+	  <accept><family>Persian_square</family></accept>
+	</alias>
 
 <!-- Font ordering per class -->
 
 	<!-- Persian_title class -->
-        <alias binding="same">
+	<alias binding="same">
 	  <family>Persian_title</family>
-          <accept>
+	  <accept>
 	  <family>Titr</family>
 	  <family>Jadid</family>
-          <family>Persian_serif</family>
+	  <family>Persian_serif</family>
 	  </accept>
-        </alias>
+	</alias>
 
 	<!-- Persian_fantasy class -->
-        <alias binding="same">
+	<alias binding="same">
 	  <family>Persian_fantasy</family>
-          <accept>
+	  <accept>
 	  <family>Homa</family>
 	  <family>Kamran</family>
 	  <family>Fantezi</family>
 	  <family>Tabassom</family>
-          <family>Persian_square</family>
+	  <family>Persian_square</family>
 	  </accept>
-        </alias>
+	</alias>
 
 	<!-- Persian_square class -->
-        <alias binding="same">
+	<alias binding="same">
 	  <family>Persian_square</family>
-          <accept>
+	  <accept>
 	  <family>Arshia</family>
 	  <family>Elham</family>
 	  <family>Farnaz</family>
 	  <family>Nasim</family>
 	  <family>Sina</family>
-          <family>Persian_serif</family>
+	  <family>Persian_serif</family>
 	  </accept>
-        </alias>
+	</alias>
 
 <!-- Register the fonts that we actually do have -->
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Elham</string>
 		</test>
@@ -189,7 +189,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Homa</string>
 		</test>
@@ -198,7 +198,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Koodak</string>
 		</test>
@@ -207,7 +207,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Nazli</string>
 		</test>
@@ -216,7 +216,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Roya</string>
 		</test>
@@ -225,7 +225,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Terafik</string>
 		</test>
@@ -234,7 +234,7 @@
 		</edit>
 	</match>
 
-	<match target="font">
+	<match target="scan">
 		<test name="family">
 			<string>Titr</string>
 		</test>
diff --git a/lib/fontconfig/conf.d/65-nonlatin.conf b/lib/fontconfig/conf.d/65-nonlatin.conf
index 4b3a946c9..53ac064b0 100644
--- a/lib/fontconfig/conf.d/65-nonlatin.conf
+++ b/lib/fontconfig/conf.d/65-nonlatin.conf
@@ -6,8 +6,7 @@
 		<prefer>
 			<family>Artsounk</family> <!-- armenian -->
 			<family>BPG UTF8 M</family> <!-- georgian -->
-			<family>Phaisarn</family> <!-- thai -->
-			<family>Phaisarn98</family> <!-- thai -->
+			<family>Kinnari</family> <!-- thai -->
 			<family>Norasi</family> <!-- thai -->
 			<family>Frank Ruehl</family> <!-- hebrew -->
 			<family>Dror</family>  <!-- hebrew -->
@@ -28,6 +27,8 @@
 			<family>UmePlus P Gothic</family> <!-- han (ja) -->
 			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
 			<family>PMingLiu</family> <!-- han (zh-tw) -->
+			<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+			<family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
 			<family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
 			<family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
 			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
@@ -49,9 +50,16 @@
 			<family>Lohit Bengali</family>
  			<family>Lohit Gujarati</family>
  			<family>Lohit Hindi</family>
+			<family>Lohit Marathi</family>
+			<family>Lohit Maithili</family>
+			<family>Lohit Kashmiri</family>
+			<family>Lohit Konkani</family>
+			<family>Lohit Nepali</family>
+			<family>Lohit Sindhi</family>
  			<family>Lohit Punjabi</family>
  			<family>Lohit Tamil</family>
- 			<family>Lohit Malayalam</family>
+			<family>Meera</family>
+			<family>Lohit Malayalam</family>
  			<family>Lohit Kannada</family>
  			<family>Lohit Telugu</family>
  			<family>Lohit Oriya</family>
@@ -68,7 +76,10 @@
 			<family>ArmNet Helvetica</family> <!-- armenian -->
 			<family>Artsounk</family> <!-- armenian -->
 			<family>BPG UTF8 M</family> <!-- georgian -->
-			<family>Norasi</family> <!-- thai -->
+			<family>Waree</family> <!-- thai -->
+			<family>Loma</family> <!-- thai -->
+			<family>Garuda</family> <!-- thai -->
+			<family>Umpush</family> <!-- thai -->
 			<family>Saysettha Unicode</family> <!-- lao? -->
 			<family>JG Lao Old Arial</family> <!-- lao -->
 			<family>GF Zemen Unicode</family> <!-- ethiopic -->
@@ -88,6 +99,8 @@
 			<!-- chinese fonts are actually serifed -->
 			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
 			<family>PMingLiu</family> <!-- han (zh-tw) -->
+			<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+			<family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
 			<family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
 			<family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
 			<family>MgOpen Modata</family>
@@ -111,8 +124,15 @@
 			<family>Lohit Bengali</family>
  			<family>Lohit Gujarati</family>
  			<family>Lohit Hindi</family>
+			<family>Lohit Marathi</family>
+			<family>Lohit Maithili</family>
+			<family>Lohit Kashmiri</family>
+			<family>Lohit Konkani</family>
+			<family>Lohit Nepali</family>
+			<family>Lohit Sindhi</family>
  			<family>Lohit Punjabi</family>
  			<family>Lohit Tamil</family>
+			<family>Meera</family>
  			<family>Lohit Malayalam</family>
  			<family>Lohit Kannada</family>
  			<family>Lohit Telugu</family>
@@ -145,7 +165,10 @@
 			<family>Baekmuk Batang</family> <!-- hangul -->
 			<family>Baekmuk Dotum</family>
 			<family>Baekmuk Gulim</family>
-			<family>Courier MonoThai</family> <!-- thai -->
+			<family>TlwgTypo</family> <!-- thai -->
+			<family>TlwgTypist</family> <!-- thai -->
+			<family>TlwgTypewriter</family> <!-- thai -->
+			<family>TlwgMono</family> <!-- thai -->
 			<family>Hasida</family> <!-- hebrew -->
 			<family>Mitra Mono</family> <!-- bengali -->
 			<family>GF Zemen Unicode</family> <!-- ethiopic -->
@@ -153,13 +176,20 @@
 			<family>Lohit Bengali</family>
 			<family>Lohit Gujarati</family>
 			<family>Lohit Hindi</family>
+			<family>Lohit Marathi</family>
+			<family>Lohit Maithili</family>
+			<family>Lohit Kashmiri</family>
+			<family>Lohit Konkani</family>
+			<family>Lohit Nepali</family>
+			<family>Lohit Sindhi</family>
 			<family>Lohit Punjabi</family>
- 			<family>Lohit Tamil</family>
- 			<family>Lohit Malayalam</family>
- 			<family>Lohit Kannada</family>
- 			<family>Lohit Telugu</family>
- 			<family>Lohit Oriya</family>
- 			<family>LKLUG</family>
+			<family>Lohit Tamil</family>
+			<family>Meera</family>
+			<family>Lohit Malayalam</family>
+			<family>Lohit Kannada</family>
+			<family>Lohit Telugu</family>
+			<family>Lohit Oriya</family>
+			<family>LKLUG</family>
 		</prefer>
 	</alias>
 </fontconfig>
diff --git a/lib/fontconfig/conf.d/90-synthetic.conf b/lib/fontconfig/conf.d/90-synthetic.conf
index 63d9b891b..b8d1e85e1 100644
--- a/lib/fontconfig/conf.d/90-synthetic.conf
+++ b/lib/fontconfig/conf.d/90-synthetic.conf
@@ -27,10 +27,10 @@
 		<edit name="slant" mode="assign">
 			<const>oblique</const>
 		</edit>
-                <!-- and disable embedded bitmaps for artificial oblique -->
-                <edit name="embeddedbitmap" mode="assign">
-                        <bool>false</bool>
-                </edit>
+		<!-- and disable embedded bitmaps for artificial oblique -->
+		<edit name="embeddedbitmap" mode="assign">
+			<bool>false</bool>
+		</edit>
 	</match>
 
 <!--
diff --git a/lib/fontconfig/conf.d/Makefile.am b/lib/fontconfig/conf.d/Makefile.am
index 9d396cef4..a50f0e51a 100644
--- a/lib/fontconfig/conf.d/Makefile.am
+++ b/lib/fontconfig/conf.d/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:42:50 matthieu Exp $
+#  fontconfig/conf.d/Makefile.am
 # 
 #  Copyright © 2005 Keith Packard
 # 
@@ -13,9 +13,9 @@
 #  representations about the suitability of this software for any purpose.  It
 #  is provided "as is" without express or implied warranty.
 # 
-#  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 #  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-#  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
 #  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
 #  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
@@ -90,3 +90,10 @@ install-data-local:
 		echo rm -f $$i";" ln -s ../conf.avail/$$i .; \
 		ln -s ../conf.avail/$$i .; \
 	 done)
+uninstall-local:
+	@(echo cd ${DESTDIR}${confddir}; \
+	 cd ${DESTDIR}${confddir}; \
+	 for i in ${CONF_LINKS}; do \
+		echo rm -f $$i; \
+		rm -f $$i; \
+	 done)
diff --git a/lib/fontconfig/conf.d/Makefile.in b/lib/fontconfig/conf.d/Makefile.in
index 67bd33aaa..7f02a4f0e 100644
--- a/lib/fontconfig/conf.d/Makefile.in
+++ b/lib/fontconfig/conf.d/Makefile.in
@@ -15,7 +15,7 @@
 @SET_MAKE@
 
 # 
-#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:42:50 matthieu Exp $
+#  fontconfig/conf.d/Makefile.am
 # 
 #  Copyright © 2005 Keith Packard
 # 
@@ -29,9 +29,9 @@
 #  representations about the suitability of this software for any purpose.  It
 #  is provided "as is" without express or implied warranty.
 # 
-#  KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 #  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-#  EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
 #  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
 #  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
@@ -110,7 +110,6 @@ CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
-DOCDIR = @DOCDIR@
 DOCMAN3 = @DOCMAN3@
 DOCSRC = @DOCSRC@
 DOLT_BASH = @DOLT_BASH@
@@ -135,6 +134,7 @@ FC_FONTPATH = @FC_FONTPATH@
 FFLAGS = @FFLAGS@
 FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
 FREETYPE_LIBS = @FREETYPE_LIBS@
+GREP = @GREP@
 HASDOCBOOK = @HASDOCBOOK@
 HAVE_EXPAT = @HAVE_EXPAT@
 HAVE_XMLPARSE_H = @HAVE_XMLPARSE_H@
@@ -166,7 +166,6 @@ MS_LIB_AVAILABLE_TRUE = @MS_LIB_AVAILABLE_TRUE@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-ORTH_FILES = @ORTH_FILES@
 OS_WIN32_FALSE = @OS_WIN32_FALSE@
 OS_WIN32_TRUE = @OS_WIN32_TRUE@
 PACKAGE = @PACKAGE@
@@ -178,6 +177,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+RM = @RM@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -186,18 +186,9 @@ USEDOCBOOK_FALSE = @USEDOCBOOK_FALSE@
 USEDOCBOOK_TRUE = @USEDOCBOOK_TRUE@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
-ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
-ac_ct_NMEDIT = @ac_ct_NMEDIT@
-ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -215,6 +206,9 @@ build_os = @build_os@
 build_vendor = @build_vendor@
 confdir = @confdir@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 fc_cachedir = @fc_cachedir@
 ft_config = @ft_config@
@@ -223,18 +217,22 @@ host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -483,7 +481,7 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-confavailDATA uninstall-confdDATA \
-	uninstall-info-am
+	uninstall-info-am uninstall-local
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
@@ -495,7 +493,7 @@ uninstall-am: uninstall-confavailDATA uninstall-confdDATA \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-confavailDATA \
-	uninstall-confdDATA uninstall-info-am
+	uninstall-confdDATA uninstall-info-am uninstall-local
 
 
 install-data-local:
@@ -507,6 +505,13 @@ install-data-local:
 		echo rm -f $$i";" ln -s ../conf.avail/$$i .; \
 		ln -s ../conf.avail/$$i .; \
 	 done)
+uninstall-local:
+	@(echo cd ${DESTDIR}${confddir}; \
+	 cd ${DESTDIR}${confddir}; \
+	 for i in ${CONF_LINKS}; do \
+		echo rm -f $$i; \
+		rm -f $$i; \
+	 done)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: