[PC-BSD Commits] r3087 - in pcbsd/trunk/system-overlay/PCBSD/xorg-gui: cardDetect conf/.fluxbox templates/header

svn at pcbsd.org svn at pcbsd.org
Wed Dec 17 09:04:10 PST 2008


Author: kris
Date: 2008-12-17 09:04:09 -0800 (Wed, 17 Dec 2008)
New Revision: 3087

Modified:
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/XF86Config.compat
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/XF86Config.default
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/conf/.fluxbox/init
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia.xorg.conf
   pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic
Log:

Fixed our first slew of bugs relating to the new LOCALBASE



Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/XF86Config.compat
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/XF86Config.compat	2008-12-17 16:34:33 UTC (rev 3086)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/XF86Config.compat	2008-12-17 17:04:09 UTC (rev 3087)
@@ -14,32 +14,32 @@
 EndSection
 			  
 Section "Files"
-	RgbPath      "/usr/local/lib/X11/rgb"
-	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/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/"
+	RgbPath      "/PCBSD/local/lib/X11/rgb"
+	ModulePath   "/PCBSD/local/lib/modules"
+	ModulePath   "/PCBSD/local/lib/xorg/modules"
+	FontPath     "/PCBSD/local/lib/X11/fonts/cyrillic/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/TrueType/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/illinoy/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/webfonts/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/misc/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/TTF/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/Speedo/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/Type1/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/CID/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/75dpi/"
+        FontPath     "/PCBSD/local/lib/X11/fonts/100dpi/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/dejavu/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/cyrillic/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/hebrew/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/vietnamese/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/indic/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/ae_fonts1/AAHS"
+	FontPath     "/PCBSD/local/lib/X11/fonts/ae_fonts1/AGA"
+	FontPath     "/PCBSD/local/lib/X11/fonts/ae_fonts1/FS"
+	FontPath     "/PCBSD/local/lib/X11/fonts/ae_fonts1/Kasr"
+	FontPath     "/PCBSD/local/lib/X11/fonts/ae_fonts1/MCS"
+	FontPath     "/PCBSD/local/lib/X11/fonts/ae_fonts1/Shmookh"
+	FontPath     "/PCBSD/local/lib/X11/fonts/local/"
 EndSection
 
 Section "Module"
@@ -58,7 +58,7 @@
 	Driver      "keyboard"
 	Option      "XkbModel"   "pc105"
 	Option      "XkbLayout"  "us"
-    	Option      "XkbVariant" "intl"
+    	Option      "XkbVariant" ""
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/XF86Config.default
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/XF86Config.default	2008-12-17 16:34:33 UTC (rev 3086)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/cardDetect/XF86Config.default	2008-12-17 17:04:09 UTC (rev 3087)
@@ -14,32 +14,32 @@
 EndSection
 			  
 Section "Files"
-	RgbPath      "/usr/local/lib/X11/rgb"
-	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/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/"
+	RgbPath      "/PCBSD/local/lib/X11/rgb"
+	ModulePath   "/PCBSD/local/lib/modules"
+	ModulePath   "/PCBSD/local/lib/xorg/modules"
+	FontPath     "/PCBSD/local/lib/X11/fonts/cyrillic/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/TrueType/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/illinoy/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/webfonts/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/misc/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/TTF/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/Speedo/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/Type1/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/CID/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/75dpi/"
+        FontPath     "/PCBSD/local/lib/X11/fonts/100dpi/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/dejavu/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/cyrillic/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/hebrew/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/vietnamese/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/indic/"
+	FontPath     "/PCBSD/local/lib/X11/fonts/ae_fonts1/AAHS"
+	FontPath     "/PCBSD/local/lib/X11/fonts/ae_fonts1/AGA"
+	FontPath     "/PCBSD/local/lib/X11/fonts/ae_fonts1/FS"
+	FontPath     "/PCBSD/local/lib/X11/fonts/ae_fonts1/Kasr"
+	FontPath     "/PCBSD/local/lib/X11/fonts/ae_fonts1/MCS"
+	FontPath     "/PCBSD/local/lib/X11/fonts/ae_fonts1/Shmookh"
+	FontPath     "/PCBSD/local/lib/X11/fonts/local/"
 EndSection
 
 Section "Module"
@@ -58,7 +58,7 @@
 	Driver      "keyboard"
 	Option      "XkbModel"   "pc105"
 	Option      "XkbLayout"  "us"
-    	Option      "XkbVariant" "intl"
+    	Option      "XkbVariant" ""
 EndSection
 
 Section "InputDevice"

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/conf/.fluxbox/init
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/conf/.fluxbox/init	2008-12-17 16:34:33 UTC (rev 3086)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/conf/.fluxbox/init	2008-12-17 17:04:09 UTC (rev 3087)
@@ -40,7 +40,7 @@
 session.screen0.tab.width:	64
 session.screen0.tab.height:	16
 session.screen0.workspacewarping:	true
-session.screen0.rootCommand:	xv -root -quit -max /usr/local/share/wallpapers/pcbsd-default.png
+session.screen0.rootCommand:	xv -root -quit -max /PCBSD/local/share/wallpapers/pcbsd-default.png
 session.screen0.menuMode:	Delay
 session.screen0.windowMenu:	
 session.screen0.resizeMode:	Bottom
@@ -92,4 +92,4 @@
 session.appsFile:	~/.fluxbox/apps
 session.groupFile:	~/.fluxbox/groups
 session.forcePseudoTransparency:	false
-session.styleFile:	/usr/local/share/fluxbox/styles/Clean
+session.styleFile:	/PCBSD/local/share/fluxbox/styles/Clean

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf	2008-12-17 16:34:33 UTC (rev 3086)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati-3d-enable.xorg.conf	2008-12-17 17:04:09 UTC (rev 3087)
@@ -10,20 +10,20 @@
 EndSection
 
 Section "Files"
-    RgbPath         "/usr/local/lib/X11/rgb"
-    ModulePath      "/usr/local/lib/xorg/modules"
+    RgbPath         "/PCBSD/local/lib/X11/rgb"
+    ModulePath      "/PCBSD/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        "/PCBSD/local/lib/X11/fonts/cyrillic/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/TrueType/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/webfonts/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/misc/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/TTF/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/Type1/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/CID/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/75dpi/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/100dpi/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/dejavu/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/local/"
 EndSection
 
 Section "Module"

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati.xorg.conf	2008-12-17 16:34:33 UTC (rev 3086)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/ati.xorg.conf	2008-12-17 17:04:09 UTC (rev 3087)
@@ -9,20 +9,20 @@
 EndSection
 
 Section "Files"
-    RgbPath         "/usr/local/lib/X11/rgb"
-    ModulePath      "/usr/local/lib/xorg/modules"
+    RgbPath         "/PCBSD/local/lib/X11/rgb"
+    ModulePath      "/PCBSD/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        "/PCBSD/local/lib/X11/fonts/cyrillic/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/TrueType/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/webfonts/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/misc/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/TTF/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/Type1/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/CID/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/75dpi/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/100dpi/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/dejavu/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/local/"
 EndSection
 
 Section "Module"

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf	2008-12-17 16:34:33 UTC (rev 3086)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel-3d-enable.xorg.conf	2008-12-17 17:04:09 UTC (rev 3087)
@@ -10,20 +10,20 @@
 EndSection
 
 Section "Files"
-    RgbPath         "/usr/local/lib/X11/rgb"
-    ModulePath      "/usr/local/lib/xorg/modules"
+    RgbPath         "/PCBSD/local/lib/X11/rgb"
+    ModulePath      "/PCBSD/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        "/PCBSD/local/lib/X11/fonts/cyrillic/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/TrueType/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/webfonts/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/misc/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/TTF/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/Type1/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/CID/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/75dpi/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/100dpi/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/dejavu/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/local/"
 EndSection
 
 Section "Module"

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel.xorg.conf	2008-12-17 16:34:33 UTC (rev 3086)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/intel.xorg.conf	2008-12-17 17:04:09 UTC (rev 3087)
@@ -9,20 +9,20 @@
 EndSection
 
 Section "Files"
-    RgbPath         "/usr/local/lib/X11/rgb"
-    ModulePath      "/usr/local/lib/xorg/modules"
+    RgbPath         "/PCBSD/local/lib/X11/rgb"
+    ModulePath      "/PCBSD/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        "/PCBSD/local/lib/X11/fonts/cyrillic/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/TrueType/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/webfonts/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/misc/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/TTF/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/Type1/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/CID/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/75dpi/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/100dpi/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/dejavu/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/local/"
 EndSection
 
 Section "Module"

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf	2008-12-17 16:34:33 UTC (rev 3086)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/mga-3d-enable.xorg.conf	2008-12-17 17:04:09 UTC (rev 3087)
@@ -9,20 +9,20 @@
 EndSection
 
 Section "Files"
-    RgbPath         "/usr/local/lib/X11/rgb"
-    ModulePath      "/usr/local/lib/xorg/modules"
+    RgbPath         "/PCBSD/local/lib/X11/rgb"
+    ModulePath      "/PCBSD/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        "/PCBSD/local/lib/X11/fonts/cyrillic/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/TrueType/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/webfonts/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/misc/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/TTF/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/Type1/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/CID/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/75dpi/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/100dpi/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/dejavu/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/local/"
 EndSection
 
 Section "Module"

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia.xorg.conf
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia.xorg.conf	2008-12-17 16:34:33 UTC (rev 3086)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/nvidia.xorg.conf	2008-12-17 17:04:09 UTC (rev 3087)
@@ -8,20 +8,20 @@
 EndSection
 
 Section "Files"
-    RgbPath         "/usr/local/lib/X11/rgb"
-    ModulePath      "/usr/local/lib/xorg/modules"
+    RgbPath         "/PCBSD/local/lib/X11/rgb"
+    ModulePath      "/PCBSD/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        "/PCBSD/local/lib/X11/fonts/cyrillic/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/TrueType/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/webfonts/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/misc/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/TTF/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/Type1/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/CID/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/75dpi/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/100dpi/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/dejavu/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/local/"
 EndSection
 
 Section "Module"

Modified: pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic	2008-12-17 16:34:33 UTC (rev 3086)
+++ pcbsd/trunk/system-overlay/PCBSD/xorg-gui/templates/header/xorg.conf.generic	2008-12-17 17:04:09 UTC (rev 3087)
@@ -9,20 +9,20 @@
 EndSection
 
 Section "Files"
-    RgbPath         "/usr/local/lib/X11/rgb"
-    ModulePath      "/usr/local/lib/xorg/modules"
+    RgbPath         "/PCBSD/local/lib/X11/rgb"
+    ModulePath      "/PCBSD/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        "/PCBSD/local/lib/X11/fonts/cyrillic/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/TrueType/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/webfonts/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/misc/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/TTF/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/Type1/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/CID/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/75dpi/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/100dpi/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/dejavu/"
+    FontPath        "/PCBSD/local/lib/X11/fonts/local/"
 EndSection
 
 Section "Module"



More information about the Commits mailing list