From 4bfaf6bc1a16d008a7e236d94ef6b6ee8891887e Mon Sep 17 00:00:00 2001 From: matthieu Date: Sun, 26 Aug 2007 07:38:37 +0000 Subject: [PATCH] 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. --- distrib/notes/README.macppc | 10 +--------- distrib/notes/README.sparc64 | 10 +--------- etc/X11.alpha/xorg.conf | 11 ++--------- etc/X11.hp300/xorg.conf | 8 ++------ etc/X11.mac68k/xorg.conf | 8 ++------ etc/X11.macppc/xorg.conf | 10 ++-------- etc/X11.sparc/xorg.conf | 12 +++--------- etc/X11.vax/xorg.conf | 8 ++------ etc/X11.zaurus/xorg.conf | 10 ++-------- 9 files changed, 17 insertions(+), 70 deletions(-) diff --git a/distrib/notes/README.macppc b/distrib/notes/README.macppc index d1d725363..a4c8d3dd2 100644 --- a/distrib/notes/README.macppc +++ b/distrib/notes/README.macppc @@ -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 $ diff --git a/distrib/notes/README.sparc64 b/distrib/notes/README.sparc64 index c47155dad..755472310 100644 --- a/distrib/notes/README.sparc64 +++ b/distrib/notes/README.sparc64 @@ -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 $ diff --git a/etc/X11.alpha/xorg.conf b/etc/X11.alpha/xorg.conf index e827102b1..965e2ee52 100644 --- a/etc/X11.alpha/xorg.conf +++ b/etc/X11.alpha/xorg.conf @@ -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" diff --git a/etc/X11.hp300/xorg.conf b/etc/X11.hp300/xorg.conf index 7ba309b59..0706a9181 100644 --- a/etc/X11.hp300/xorg.conf +++ b/etc/X11.hp300/xorg.conf @@ -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" diff --git a/etc/X11.mac68k/xorg.conf b/etc/X11.mac68k/xorg.conf index dd00656ad..845ca5062 100644 --- a/etc/X11.mac68k/xorg.conf +++ b/etc/X11.mac68k/xorg.conf @@ -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" diff --git a/etc/X11.macppc/xorg.conf b/etc/X11.macppc/xorg.conf index 2db363334..b148fe514 100644 --- a/etc/X11.macppc/xorg.conf +++ b/etc/X11.macppc/xorg.conf @@ -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" diff --git a/etc/X11.sparc/xorg.conf b/etc/X11.sparc/xorg.conf index 7f179f3ce..9ad5fdd3f 100644 --- a/etc/X11.sparc/xorg.conf +++ b/etc/X11.sparc/xorg.conf @@ -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" diff --git a/etc/X11.vax/xorg.conf b/etc/X11.vax/xorg.conf index 428bed87f..fa5580747 100644 --- a/etc/X11.vax/xorg.conf +++ b/etc/X11.vax/xorg.conf @@ -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" diff --git a/etc/X11.zaurus/xorg.conf b/etc/X11.zaurus/xorg.conf index f147ab3ce..234ca0f51 100644 --- a/etc/X11.zaurus/xorg.conf +++ b/etc/X11.zaurus/xorg.conf @@ -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"