[PC-BSD Commits] r13030 - in pcbsd/current/src-qt4/pc-xgui/resources: cardDetect conf templates/header

svn at pcbsd.org svn at pcbsd.org
Wed Sep 28 10:36:10 PDT 2011


Author: kris
Date: 2011-09-28 10:36:10 -0700 (Wed, 28 Sep 2011)
New Revision: 13030

Modified:
   pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.compat
   pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.default
   pcbsd/current/src-qt4/pc-xgui/resources/conf/xorg.conf.basic
   pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati-3d-enable.xorg.conf
   pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati.xorg.conf
   pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel-3d-enable.xorg.conf
   pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel.xorg.conf
   pcbsd/current/src-qt4/pc-xgui/resources/templates/header/mga-3d-enable.xorg.conf
   pcbsd/current/src-qt4/pc-xgui/resources/templates/header/nvidia.xorg.conf
   pcbsd/current/src-qt4/pc-xgui/resources/templates/header/radeon-3d-enable.xorg.conf
   pcbsd/current/src-qt4/pc-xgui/resources/templates/header/xorg.conf.generic
Log:

Unify the font directories we search with default xorg configurations



Modified: pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.compat
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.compat	2011-09-28 17:18:16 UTC (rev 13029)
+++ pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.compat	2011-09-28 17:36:10 UTC (rev 13030)
@@ -19,6 +19,7 @@
 	FontPath     "/usr/local/lib/X11/fonts/illinoy/"
 	FontPath     "/usr/local/lib/X11/fonts/webfonts/"
 	FontPath     "/usr/local/lib/X11/fonts/misc/"
+	FontPath     "/usr/local/lib/X11/fonts/OTF/"
 	FontPath     "/usr/local/lib/X11/fonts/TTF/"
 	FontPath     "/usr/local/lib/X11/fonts/Speedo/"
 	FontPath     "/usr/local/lib/X11/fonts/Type1/"
@@ -26,10 +27,12 @@
 	FontPath     "/usr/local/lib/X11/fonts/75dpi/"
         FontPath     "/usr/local/lib/X11/fonts/100dpi/"
 	FontPath     "/usr/local/lib/X11/fonts/dejavu/"
+	FontPath     "/usr/local/lib/X11/fonts/bitstream-vera/"
 	FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
 	FontPath     "/usr/local/lib/X11/fonts/hebrew/"
 	FontPath     "/usr/local/lib/X11/fonts/vietnamese/"
 	FontPath     "/usr/local/lib/X11/fonts/indic/"
+	FontPath     "/usr/local/lib/X11/fonts/fonts-indic/"
 	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AAHS"
 	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AGA"
 	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/FS"
@@ -37,6 +40,7 @@
 	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/MCS"
 	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Shmookh"
 	FontPath     "/usr/local/lib/X11/fonts/local/"
+	FontPath     "/usr/local/lib/X11/fonts/util/"
 EndSection
 
 Section "Module"

Modified: pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.default
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.default	2011-09-28 17:18:16 UTC (rev 13029)
+++ pcbsd/current/src-qt4/pc-xgui/resources/cardDetect/XF86Config.default	2011-09-28 17:36:10 UTC (rev 13030)
@@ -14,29 +14,33 @@
 Section "Files"
 	ModulePath   "/usr/local/lib/modules"
 	ModulePath   "/usr/local/lib/xorg/modules"
-	FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
-	FontPath     "/usr/local/lib/X11/fonts/TrueType/"
-	FontPath     "/usr/local/lib/X11/fonts/illinoy/"
-	FontPath     "/usr/local/lib/X11/fonts/webfonts/"
-	FontPath     "/usr/local/lib/X11/fonts/misc/"
-	FontPath     "/usr/local/lib/X11/fonts/TTF/"
-	FontPath     "/usr/local/lib/X11/fonts/Speedo/"
-	FontPath     "/usr/local/lib/X11/fonts/Type1/"
-	FontPath     "/usr/local/lib/X11/fonts/CID/"
-	FontPath     "/usr/local/lib/X11/fonts/75dpi/"
+        FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+        FontPath     "/usr/local/lib/X11/fonts/TrueType/"
+        FontPath     "/usr/local/lib/X11/fonts/illinoy/"
+        FontPath     "/usr/local/lib/X11/fonts/webfonts/"
+        FontPath     "/usr/local/lib/X11/fonts/misc/"
+        FontPath     "/usr/local/lib/X11/fonts/OTF/"
+        FontPath     "/usr/local/lib/X11/fonts/TTF/"
+        FontPath     "/usr/local/lib/X11/fonts/Speedo/"
+        FontPath     "/usr/local/lib/X11/fonts/Type1/"
+        FontPath     "/usr/local/lib/X11/fonts/CID/"
+        FontPath     "/usr/local/lib/X11/fonts/75dpi/"
         FontPath     "/usr/local/lib/X11/fonts/100dpi/"
-	FontPath     "/usr/local/lib/X11/fonts/dejavu/"
-	FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
-	FontPath     "/usr/local/lib/X11/fonts/hebrew/"
-	FontPath     "/usr/local/lib/X11/fonts/vietnamese/"
-	FontPath     "/usr/local/lib/X11/fonts/indic/"
-	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AAHS"
-	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AGA"
-	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/FS"
-	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Kasr"
-	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/MCS"
-	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Shmookh"
-	FontPath     "/usr/local/lib/X11/fonts/local/"
+        FontPath     "/usr/local/lib/X11/fonts/dejavu/"
+        FontPath     "/usr/local/lib/X11/fonts/bitstream-vera/"
+        FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+        FontPath     "/usr/local/lib/X11/fonts/hebrew/"
+        FontPath     "/usr/local/lib/X11/fonts/vietnamese/"
+        FontPath     "/usr/local/lib/X11/fonts/indic/"
+        FontPath     "/usr/local/lib/X11/fonts/fonts-indic/"
+        FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AAHS"
+        FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AGA"
+        FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/FS"
+        FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Kasr"
+        FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/MCS"
+        FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Shmookh"
+        FontPath     "/usr/local/lib/X11/fonts/local/"
+        FontPath     "/usr/local/lib/X11/fonts/util/"
 EndSection
 
 Section "Module"

Modified: pcbsd/current/src-qt4/pc-xgui/resources/conf/xorg.conf.basic
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/conf/xorg.conf.basic	2011-09-28 17:18:16 UTC (rev 13029)
+++ pcbsd/current/src-qt4/pc-xgui/resources/conf/xorg.conf.basic	2011-09-28 17:36:10 UTC (rev 13030)
@@ -14,29 +14,33 @@
 Section "Files"
 	ModulePath   "/usr/local/lib/modules"
 	ModulePath   "/usr/local/lib/xorg/modules"
-	FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
-	FontPath     "/usr/local/lib/X11/fonts/TrueType/"
-	FontPath     "/usr/local/lib/X11/fonts/illinoy/"
-	FontPath     "/usr/local/lib/X11/fonts/webfonts/"
-	FontPath     "/usr/local/lib/X11/fonts/misc/"
-	FontPath     "/usr/local/lib/X11/fonts/TTF/"
-	FontPath     "/usr/local/lib/X11/fonts/Speedo/"
-	FontPath     "/usr/local/lib/X11/fonts/Type1/"
-	FontPath     "/usr/local/lib/X11/fonts/CID/"
-	FontPath     "/usr/local/lib/X11/fonts/75dpi/"
+        FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+        FontPath     "/usr/local/lib/X11/fonts/TrueType/"
+        FontPath     "/usr/local/lib/X11/fonts/illinoy/"
+        FontPath     "/usr/local/lib/X11/fonts/webfonts/"
+        FontPath     "/usr/local/lib/X11/fonts/misc/"
+        FontPath     "/usr/local/lib/X11/fonts/OTF/"
+        FontPath     "/usr/local/lib/X11/fonts/TTF/"
+        FontPath     "/usr/local/lib/X11/fonts/Speedo/"
+        FontPath     "/usr/local/lib/X11/fonts/Type1/"
+        FontPath     "/usr/local/lib/X11/fonts/CID/"
+        FontPath     "/usr/local/lib/X11/fonts/75dpi/"
         FontPath     "/usr/local/lib/X11/fonts/100dpi/"
-	FontPath     "/usr/local/lib/X11/fonts/dejavu/"
-	FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
-	FontPath     "/usr/local/lib/X11/fonts/hebrew/"
-	FontPath     "/usr/local/lib/X11/fonts/vietnamese/"
-	FontPath     "/usr/local/lib/X11/fonts/indic/"
-	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AAHS"
-	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AGA"
-	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/FS"
-	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Kasr"
-	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/MCS"
-	FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Shmookh"
-	FontPath     "/usr/local/lib/X11/fonts/local/"
+        FontPath     "/usr/local/lib/X11/fonts/dejavu/"
+        FontPath     "/usr/local/lib/X11/fonts/bitstream-vera/"
+        FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+        FontPath     "/usr/local/lib/X11/fonts/hebrew/"
+        FontPath     "/usr/local/lib/X11/fonts/vietnamese/"
+        FontPath     "/usr/local/lib/X11/fonts/indic/"
+        FontPath     "/usr/local/lib/X11/fonts/fonts-indic/"
+        FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AAHS"
+        FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AGA"
+        FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/FS"
+        FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Kasr"
+        FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/MCS"
+        FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Shmookh"
+        FontPath     "/usr/local/lib/X11/fonts/local/"
+        FontPath     "/usr/local/lib/X11/fonts/util/"
 EndSection
 
 Section "Module"

Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati-3d-enable.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati-3d-enable.xorg.conf	2011-09-28 17:18:16 UTC (rev 13029)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati-3d-enable.xorg.conf	2011-09-28 17:36:10 UTC (rev 13030)
@@ -15,17 +15,33 @@
 
 Section "Files"
     ModulePath      "/usr/local/lib/xorg/modules"
-    FontPath        "/usr/local/lib/X11/fonts/cyrillic/"
-    FontPath        "/usr/local/lib/X11/fonts/TrueType/"
-    FontPath        "/usr/local/lib/X11/fonts/webfonts/"
-    FontPath        "/usr/local/lib/X11/fonts/misc/"
-    FontPath        "/usr/local/lib/X11/fonts/TTF/"
-    FontPath        "/usr/local/lib/X11/fonts/Type1/"
-    FontPath        "/usr/local/lib/X11/fonts/CID/"
-    FontPath        "/usr/local/lib/X11/fonts/75dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/100dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/dejavu/"
-    FontPath        "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/TrueType/"
+    FontPath     "/usr/local/lib/X11/fonts/illinoy/"
+    FontPath     "/usr/local/lib/X11/fonts/webfonts/"
+    FontPath     "/usr/local/lib/X11/fonts/misc/"
+    FontPath     "/usr/local/lib/X11/fonts/OTF/"
+    FontPath     "/usr/local/lib/X11/fonts/TTF/"
+    FontPath     "/usr/local/lib/X11/fonts/Speedo/"
+    FontPath     "/usr/local/lib/X11/fonts/Type1/"
+    FontPath     "/usr/local/lib/X11/fonts/CID/"
+    FontPath     "/usr/local/lib/X11/fonts/75dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/100dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/dejavu/"
+    FontPath     "/usr/local/lib/X11/fonts/bitstream-vera/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/hebrew/"
+    FontPath     "/usr/local/lib/X11/fonts/vietnamese/"
+    FontPath     "/usr/local/lib/X11/fonts/indic/"
+    FontPath     "/usr/local/lib/X11/fonts/fonts-indic/"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AAHS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AGA"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/FS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Kasr"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/MCS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Shmookh"
+    FontPath     "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/util/"
 EndSection
 
 Section "Module"

Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati.xorg.conf	2011-09-28 17:18:16 UTC (rev 13029)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/ati.xorg.conf	2011-09-28 17:36:10 UTC (rev 13030)
@@ -14,17 +14,33 @@
 
 Section "Files"
     ModulePath      "/usr/local/lib/xorg/modules"
-    FontPath        "/usr/local/lib/X11/fonts/cyrillic/"
-    FontPath        "/usr/local/lib/X11/fonts/TrueType/"
-    FontPath        "/usr/local/lib/X11/fonts/webfonts/"
-    FontPath        "/usr/local/lib/X11/fonts/misc/"
-    FontPath        "/usr/local/lib/X11/fonts/TTF/"
-    FontPath        "/usr/local/lib/X11/fonts/Type1/"
-    FontPath        "/usr/local/lib/X11/fonts/CID/"
-    FontPath        "/usr/local/lib/X11/fonts/75dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/100dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/dejavu/"
-    FontPath        "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/TrueType/"
+    FontPath     "/usr/local/lib/X11/fonts/illinoy/"
+    FontPath     "/usr/local/lib/X11/fonts/webfonts/"
+    FontPath     "/usr/local/lib/X11/fonts/misc/"
+    FontPath     "/usr/local/lib/X11/fonts/OTF/"
+    FontPath     "/usr/local/lib/X11/fonts/TTF/"
+    FontPath     "/usr/local/lib/X11/fonts/Speedo/"
+    FontPath     "/usr/local/lib/X11/fonts/Type1/"
+    FontPath     "/usr/local/lib/X11/fonts/CID/"
+    FontPath     "/usr/local/lib/X11/fonts/75dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/100dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/dejavu/"
+    FontPath     "/usr/local/lib/X11/fonts/bitstream-vera/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/hebrew/"
+    FontPath     "/usr/local/lib/X11/fonts/vietnamese/"
+    FontPath     "/usr/local/lib/X11/fonts/indic/"
+    FontPath     "/usr/local/lib/X11/fonts/fonts-indic/"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AAHS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AGA"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/FS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Kasr"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/MCS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Shmookh"
+    FontPath     "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/util/"
 EndSection
 
 Section "Module"

Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel-3d-enable.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel-3d-enable.xorg.conf	2011-09-28 17:18:16 UTC (rev 13029)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel-3d-enable.xorg.conf	2011-09-28 17:36:10 UTC (rev 13030)
@@ -15,17 +15,33 @@
 
 Section "Files"
     ModulePath      "/usr/local/lib/xorg/modules"
-    FontPath        "/usr/local/lib/X11/fonts/cyrillic/"
-    FontPath        "/usr/local/lib/X11/fonts/TrueType/"
-    FontPath        "/usr/local/lib/X11/fonts/webfonts/"
-    FontPath        "/usr/local/lib/X11/fonts/misc/"
-    FontPath        "/usr/local/lib/X11/fonts/TTF/"
-    FontPath        "/usr/local/lib/X11/fonts/Type1/"
-    FontPath        "/usr/local/lib/X11/fonts/CID/"
-    FontPath        "/usr/local/lib/X11/fonts/75dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/100dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/dejavu/"
-    FontPath        "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/TrueType/"
+    FontPath     "/usr/local/lib/X11/fonts/illinoy/"
+    FontPath     "/usr/local/lib/X11/fonts/webfonts/"
+    FontPath     "/usr/local/lib/X11/fonts/misc/"
+    FontPath     "/usr/local/lib/X11/fonts/OTF/"
+    FontPath     "/usr/local/lib/X11/fonts/TTF/"
+    FontPath     "/usr/local/lib/X11/fonts/Speedo/"
+    FontPath     "/usr/local/lib/X11/fonts/Type1/"
+    FontPath     "/usr/local/lib/X11/fonts/CID/"
+    FontPath     "/usr/local/lib/X11/fonts/75dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/100dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/dejavu/"
+    FontPath     "/usr/local/lib/X11/fonts/bitstream-vera/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/hebrew/"
+    FontPath     "/usr/local/lib/X11/fonts/vietnamese/"
+    FontPath     "/usr/local/lib/X11/fonts/indic/"
+    FontPath     "/usr/local/lib/X11/fonts/fonts-indic/"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AAHS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AGA"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/FS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Kasr"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/MCS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Shmookh"
+    FontPath     "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/util/"
 EndSection
 
 Section "Module"

Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel.xorg.conf	2011-09-28 17:18:16 UTC (rev 13029)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/intel.xorg.conf	2011-09-28 17:36:10 UTC (rev 13030)
@@ -14,17 +14,33 @@
 
 Section "Files"
     ModulePath      "/usr/local/lib/xorg/modules"
-    FontPath        "/usr/local/lib/X11/fonts/cyrillic/"
-    FontPath        "/usr/local/lib/X11/fonts/TrueType/"
-    FontPath        "/usr/local/lib/X11/fonts/webfonts/"
-    FontPath        "/usr/local/lib/X11/fonts/misc/"
-    FontPath        "/usr/local/lib/X11/fonts/TTF/"
-    FontPath        "/usr/local/lib/X11/fonts/Type1/"
-    FontPath        "/usr/local/lib/X11/fonts/CID/"
-    FontPath        "/usr/local/lib/X11/fonts/75dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/100dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/dejavu/"
-    FontPath        "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/TrueType/"
+    FontPath     "/usr/local/lib/X11/fonts/illinoy/"
+    FontPath     "/usr/local/lib/X11/fonts/webfonts/"
+    FontPath     "/usr/local/lib/X11/fonts/misc/"
+    FontPath     "/usr/local/lib/X11/fonts/OTF/"
+    FontPath     "/usr/local/lib/X11/fonts/TTF/"
+    FontPath     "/usr/local/lib/X11/fonts/Speedo/"
+    FontPath     "/usr/local/lib/X11/fonts/Type1/"
+    FontPath     "/usr/local/lib/X11/fonts/CID/"
+    FontPath     "/usr/local/lib/X11/fonts/75dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/100dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/dejavu/"
+    FontPath     "/usr/local/lib/X11/fonts/bitstream-vera/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/hebrew/"
+    FontPath     "/usr/local/lib/X11/fonts/vietnamese/"
+    FontPath     "/usr/local/lib/X11/fonts/indic/"
+    FontPath     "/usr/local/lib/X11/fonts/fonts-indic/"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AAHS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AGA"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/FS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Kasr"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/MCS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Shmookh"
+    FontPath     "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/util/"
 EndSection
 
 Section "Module"

Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/mga-3d-enable.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/mga-3d-enable.xorg.conf	2011-09-28 17:18:16 UTC (rev 13029)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/mga-3d-enable.xorg.conf	2011-09-28 17:36:10 UTC (rev 13030)
@@ -14,17 +14,33 @@
 
 Section "Files"
     ModulePath      "/usr/local/lib/xorg/modules"
-    FontPath        "/usr/local/lib/X11/fonts/cyrillic/"
-    FontPath        "/usr/local/lib/X11/fonts/TrueType/"
-    FontPath        "/usr/local/lib/X11/fonts/webfonts/"
-    FontPath        "/usr/local/lib/X11/fonts/misc/"
-    FontPath        "/usr/local/lib/X11/fonts/TTF/"
-    FontPath        "/usr/local/lib/X11/fonts/Type1/"
-    FontPath        "/usr/local/lib/X11/fonts/CID/"
-    FontPath        "/usr/local/lib/X11/fonts/75dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/100dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/dejavu/"
-    FontPath        "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/TrueType/"
+    FontPath     "/usr/local/lib/X11/fonts/illinoy/"
+    FontPath     "/usr/local/lib/X11/fonts/webfonts/"
+    FontPath     "/usr/local/lib/X11/fonts/misc/"
+    FontPath     "/usr/local/lib/X11/fonts/OTF/"
+    FontPath     "/usr/local/lib/X11/fonts/TTF/"
+    FontPath     "/usr/local/lib/X11/fonts/Speedo/"
+    FontPath     "/usr/local/lib/X11/fonts/Type1/"
+    FontPath     "/usr/local/lib/X11/fonts/CID/"
+    FontPath     "/usr/local/lib/X11/fonts/75dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/100dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/dejavu/"
+    FontPath     "/usr/local/lib/X11/fonts/bitstream-vera/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/hebrew/"
+    FontPath     "/usr/local/lib/X11/fonts/vietnamese/"
+    FontPath     "/usr/local/lib/X11/fonts/indic/"
+    FontPath     "/usr/local/lib/X11/fonts/fonts-indic/"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AAHS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AGA"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/FS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Kasr"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/MCS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Shmookh"
+    FontPath     "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/util/"
 EndSection
 
 Section "Module"

Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/nvidia.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/nvidia.xorg.conf	2011-09-28 17:18:16 UTC (rev 13029)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/nvidia.xorg.conf	2011-09-28 17:36:10 UTC (rev 13030)
@@ -14,18 +14,33 @@
 
 Section "Files"
     ModulePath      "/usr/local/lib/xorg/modules"
-    FontPath        "/Programs/fonts/"
-    FontPath        "/usr/local/lib/X11/fonts/cyrillic/"
-    FontPath        "/usr/local/lib/X11/fonts/TrueType/"
-    FontPath        "/usr/local/lib/X11/fonts/webfonts/"
-    FontPath        "/usr/local/lib/X11/fonts/misc/"
-    FontPath        "/usr/local/lib/X11/fonts/TTF/"
-    FontPath        "/usr/local/lib/X11/fonts/Type1/"
-    FontPath        "/usr/local/lib/X11/fonts/CID/"
-    FontPath        "/usr/local/lib/X11/fonts/75dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/100dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/dejavu/"
-    FontPath        "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/TrueType/"
+    FontPath     "/usr/local/lib/X11/fonts/illinoy/"
+    FontPath     "/usr/local/lib/X11/fonts/webfonts/"
+    FontPath     "/usr/local/lib/X11/fonts/misc/"
+    FontPath     "/usr/local/lib/X11/fonts/OTF/"
+    FontPath     "/usr/local/lib/X11/fonts/TTF/"
+    FontPath     "/usr/local/lib/X11/fonts/Speedo/"
+    FontPath     "/usr/local/lib/X11/fonts/Type1/"
+    FontPath     "/usr/local/lib/X11/fonts/CID/"
+    FontPath     "/usr/local/lib/X11/fonts/75dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/100dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/dejavu/"
+    FontPath     "/usr/local/lib/X11/fonts/bitstream-vera/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/hebrew/"
+    FontPath     "/usr/local/lib/X11/fonts/vietnamese/"
+    FontPath     "/usr/local/lib/X11/fonts/indic/"
+    FontPath     "/usr/local/lib/X11/fonts/fonts-indic/"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AAHS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AGA"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/FS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Kasr"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/MCS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Shmookh"
+    FontPath     "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/util/"
 EndSection
 
 Section "Module"

Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/radeon-3d-enable.xorg.conf
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/radeon-3d-enable.xorg.conf	2011-09-28 17:18:16 UTC (rev 13029)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/radeon-3d-enable.xorg.conf	2011-09-28 17:36:10 UTC (rev 13030)
@@ -14,17 +14,33 @@
 
 Section "Files"
     ModulePath      "/usr/local/lib/xorg/modules"
-    FontPath        "/usr/local/lib/X11/fonts/cyrillic/"
-    FontPath        "/usr/local/lib/X11/fonts/TrueType/"
-    FontPath        "/usr/local/lib/X11/fonts/webfonts/"
-    FontPath        "/usr/local/lib/X11/fonts/misc/"
-    FontPath        "/usr/local/lib/X11/fonts/TTF/"
-    FontPath        "/usr/local/lib/X11/fonts/Type1/"
-    FontPath        "/usr/local/lib/X11/fonts/CID/"
-    FontPath        "/usr/local/lib/X11/fonts/75dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/100dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/dejavu/"
-    FontPath        "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/TrueType/"
+    FontPath     "/usr/local/lib/X11/fonts/illinoy/"
+    FontPath     "/usr/local/lib/X11/fonts/webfonts/"
+    FontPath     "/usr/local/lib/X11/fonts/misc/"
+    FontPath     "/usr/local/lib/X11/fonts/OTF/"
+    FontPath     "/usr/local/lib/X11/fonts/TTF/"
+    FontPath     "/usr/local/lib/X11/fonts/Speedo/"
+    FontPath     "/usr/local/lib/X11/fonts/Type1/"
+    FontPath     "/usr/local/lib/X11/fonts/CID/"
+    FontPath     "/usr/local/lib/X11/fonts/75dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/100dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/dejavu/"
+    FontPath     "/usr/local/lib/X11/fonts/bitstream-vera/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/hebrew/"
+    FontPath     "/usr/local/lib/X11/fonts/vietnamese/"
+    FontPath     "/usr/local/lib/X11/fonts/indic/"
+    FontPath     "/usr/local/lib/X11/fonts/fonts-indic/"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AAHS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AGA"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/FS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Kasr"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/MCS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Shmookh"
+    FontPath     "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/util/"
 EndSection
 
 Section "Module"

Modified: pcbsd/current/src-qt4/pc-xgui/resources/templates/header/xorg.conf.generic
===================================================================
--- pcbsd/current/src-qt4/pc-xgui/resources/templates/header/xorg.conf.generic	2011-09-28 17:18:16 UTC (rev 13029)
+++ pcbsd/current/src-qt4/pc-xgui/resources/templates/header/xorg.conf.generic	2011-09-28 17:36:10 UTC (rev 13030)
@@ -14,17 +14,33 @@
 
 Section "Files"
     ModulePath      "/usr/local/lib/xorg/modules"
-    FontPath        "/usr/local/lib/X11/fonts/cyrillic/"
-    FontPath        "/usr/local/lib/X11/fonts/TrueType/"
-    FontPath        "/usr/local/lib/X11/fonts/webfonts/"
-    FontPath        "/usr/local/lib/X11/fonts/misc/"
-    FontPath        "/usr/local/lib/X11/fonts/TTF/"
-    FontPath        "/usr/local/lib/X11/fonts/Type1/"
-    FontPath        "/usr/local/lib/X11/fonts/CID/"
-    FontPath        "/usr/local/lib/X11/fonts/75dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/100dpi/"
-    FontPath        "/usr/local/lib/X11/fonts/dejavu/"
-    FontPath        "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/TrueType/"
+    FontPath     "/usr/local/lib/X11/fonts/illinoy/"
+    FontPath     "/usr/local/lib/X11/fonts/webfonts/"
+    FontPath     "/usr/local/lib/X11/fonts/misc/"
+    FontPath     "/usr/local/lib/X11/fonts/OTF/"
+    FontPath     "/usr/local/lib/X11/fonts/TTF/"
+    FontPath     "/usr/local/lib/X11/fonts/Speedo/"
+    FontPath     "/usr/local/lib/X11/fonts/Type1/"
+    FontPath     "/usr/local/lib/X11/fonts/CID/"
+    FontPath     "/usr/local/lib/X11/fonts/75dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/100dpi/"
+    FontPath     "/usr/local/lib/X11/fonts/dejavu/"
+    FontPath     "/usr/local/lib/X11/fonts/bitstream-vera/"
+    FontPath     "/usr/local/lib/X11/fonts/cyrillic/"
+    FontPath     "/usr/local/lib/X11/fonts/hebrew/"
+    FontPath     "/usr/local/lib/X11/fonts/vietnamese/"
+    FontPath     "/usr/local/lib/X11/fonts/indic/"
+    FontPath     "/usr/local/lib/X11/fonts/fonts-indic/"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AAHS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/AGA"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/FS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Kasr"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/MCS"
+    FontPath     "/usr/local/lib/X11/fonts/ae_fonts1/Shmookh"
+    FontPath     "/usr/local/lib/X11/fonts/local/"
+    FontPath     "/usr/local/lib/X11/fonts/util/"
 EndSection
 
 Section "Module"



More information about the Commits mailing list