More default config cleanups:
- remove the "Modules" section altogether: X.Org now has a reasonable default list built-in - remove the RgbPath specification that is the default - use the same FontPath on all architectures.
This commit is contained in:
parent
c7be9764cb
commit
4bfaf6bc1a
@ -36,7 +36,6 @@ Section "ServerLayout"
|
||||
EndSection
|
||||
|
||||
Section "Files"
|
||||
RgbPath "/usr/X11R6/lib/X11/rgb"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/misc/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/TTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/OTF"
|
||||
@ -44,13 +43,6 @@ Section "Files"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/75dpi/"
|
||||
EndSection
|
||||
|
||||
Section "Module"
|
||||
# Load "dbe"
|
||||
Load "freetype"
|
||||
Load "glx"
|
||||
Load "extmod"
|
||||
EndSection
|
||||
|
||||
Section "InputDevice"
|
||||
Identifier "Keyboard0"
|
||||
Driver "keyboard"
|
||||
@ -177,4 +169,4 @@ button 2 and mouse button 3 respectively.
|
||||
|
||||
problem_blurb
|
||||
|
||||
$OpenBSD: README.macppc,v 1.2 2007/08/25 23:00:07 aanriot Exp $
|
||||
$OpenBSD: README.macppc,v 1.3 2007/08/26 07:38:37 matthieu Exp $
|
||||
|
@ -69,7 +69,6 @@ Section "ServerLayout"
|
||||
EndSection
|
||||
|
||||
Section "Files"
|
||||
RgbPath "/usr/X11R6/lib/X11/rgb"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/misc/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/TTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/OTF"
|
||||
@ -77,13 +76,6 @@ Section "Files"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/75dpi/"
|
||||
EndSection
|
||||
|
||||
Section "Module"
|
||||
Load "type1"
|
||||
Load "freetype"
|
||||
Load "glx"
|
||||
Load "extmod"
|
||||
EndSection
|
||||
|
||||
# All Sun keyboards (USB Type 6, Serial Type 3/4/5/6)
|
||||
Section "InputDevice"
|
||||
Identifier "Keyboard0"
|
||||
@ -262,4 +254,4 @@ See xorg.conf(5) for more options.
|
||||
|
||||
problem_blurb
|
||||
|
||||
$OpenBSD: README.sparc64,v 1.3 2007/08/25 23:00:07 aanriot Exp $
|
||||
$OpenBSD: README.sparc64,v 1.4 2007/08/26 07:38:37 matthieu Exp $
|
||||
|
@ -6,20 +6,13 @@ Section "ServerLayout"
|
||||
EndSection
|
||||
|
||||
Section "Files"
|
||||
RgbPath "/usr/X11R6/lib/X11/rgb"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/misc/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/TTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/OTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/Type1/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/CID/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/75dpi/"
|
||||
EndSection
|
||||
|
||||
Section "Module"
|
||||
Load "type1"
|
||||
# Load "freetype"
|
||||
Load "glx"
|
||||
Load "extmod"
|
||||
EndSection
|
||||
|
||||
Section "InputDevice"
|
||||
Identifier "Keyboard0"
|
||||
Driver "kbd"
|
||||
|
@ -6,17 +6,13 @@ Section "ServerLayout"
|
||||
EndSection
|
||||
|
||||
Section "Files"
|
||||
RgbPath "/usr/X11R6/lib/X11/rgb"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/misc/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/TTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/OTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/Type1/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/75dpi/"
|
||||
EndSection
|
||||
|
||||
Section "Module"
|
||||
Load "freetype"
|
||||
Load "extmod"
|
||||
EndSection
|
||||
|
||||
Section "InputDevice"
|
||||
Identifier "Keyboard0"
|
||||
Driver "keyboard"
|
||||
|
@ -6,17 +6,13 @@ Section "ServerLayout"
|
||||
EndSection
|
||||
|
||||
Section "Files"
|
||||
RgbPath "/usr/X11R6/lib/X11/rgb"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/misc/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/TTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/OTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/Type1/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/75dpi/"
|
||||
EndSection
|
||||
|
||||
Section "Module"
|
||||
Load "freetype"
|
||||
Load "extmod"
|
||||
EndSection
|
||||
|
||||
Section "InputDevice"
|
||||
Identifier "Keyboard0"
|
||||
Driver "keyboard"
|
||||
|
@ -6,19 +6,13 @@ Section "ServerLayout"
|
||||
EndSection
|
||||
|
||||
Section "Files"
|
||||
RgbPath "/usr/X11R6/lib/X11/rgb"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/misc/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/TTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/OTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/Type1/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/CID/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/75dpi/"
|
||||
EndSection
|
||||
|
||||
Section "Module"
|
||||
Load "freetype"
|
||||
Load "glx"
|
||||
Load "extmod"
|
||||
EndSection
|
||||
|
||||
Section "InputDevice"
|
||||
Identifier "Keyboard0"
|
||||
Driver "kbd"
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# Unaccelerated, single display configuration
|
||||
#
|
||||
# $OpenBSD: xorg.conf,v 1.1 2007/03/26 19:35:30 matthieu Exp $
|
||||
# $OpenBSD: xorg.conf,v 1.2 2007/08/26 07:38:37 matthieu Exp $
|
||||
#
|
||||
Section "ServerLayout"
|
||||
Identifier "wsfb"
|
||||
@ -11,19 +11,13 @@ Section "ServerLayout"
|
||||
EndSection
|
||||
|
||||
Section "Files"
|
||||
RgbPath "/usr/X11R6/lib/X11/rgb"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/misc/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/TTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/OTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/Type1/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/CID/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/75dpi/"
|
||||
EndSection
|
||||
|
||||
Section "Module"
|
||||
Load "freetype"
|
||||
Load "glx"
|
||||
Load "extmod"
|
||||
EndSection
|
||||
|
||||
Section "InputDevice"
|
||||
Identifier "Keyboard0"
|
||||
Driver "kbd"
|
||||
|
@ -6,17 +6,13 @@ Section "ServerLayout"
|
||||
EndSection
|
||||
|
||||
Section "Files"
|
||||
RgbPath "/usr/X11R6/lib/X11/rgb"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/misc/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/TTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/OTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/Type1/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/75dpi/"
|
||||
EndSection
|
||||
|
||||
Section "Module"
|
||||
Load "freetype"
|
||||
Load "extmod"
|
||||
EndSection
|
||||
|
||||
Section "InputDevice"
|
||||
Identifier "Keyboard0"
|
||||
Driver "kbd"
|
||||
|
@ -6,19 +6,13 @@ Section "ServerLayout"
|
||||
EndSection
|
||||
|
||||
Section "Files"
|
||||
RgbPath "/usr/X11R6/lib/X11/rgb"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/misc/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/Type1/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/TTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/OTF/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/Type1/"
|
||||
FontPath "/usr/X11R6/lib/X11/fonts/75dpi/"
|
||||
EndSection
|
||||
|
||||
Section "Module"
|
||||
Load "freetype"
|
||||
Load "glx"
|
||||
Load "extmod"
|
||||
EndSection
|
||||
|
||||
Section "InputDevice"
|
||||
Identifier "Keyboard0"
|
||||
Driver "kbd"
|
||||
|
Loading…
Reference in New Issue
Block a user