summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2012-02-07 19:54:56 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2012-02-07 19:54:56 +0000
commit3f49d8a0312dd97ed158dbc63d74b1966eb1349f (patch)
treef041f4f01fbeea594cf76b2869ab8f8ac9cc1d24 /etc
parent56af0aa4eda4d9ad73f1ca6feb00a2f7c6008e53 (diff)
Don't install xorg.conf on machines with no X server.
Diffstat (limited to 'etc')
-rw-r--r--etc/X11.alpha/xorg.conf24
-rw-r--r--etc/X11.hp300/xorg.conf66
-rw-r--r--etc/X11.mac68k/xorg.conf63
3 files changed, 0 insertions, 153 deletions
diff --git a/etc/X11.alpha/xorg.conf b/etc/X11.alpha/xorg.conf
deleted file mode 100644
index 50c41ff4c..000000000
--- a/etc/X11.alpha/xorg.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Unaccelerated, TGA framebuffer configuration
-#
-# $OpenBSD: xorg.conf,v 1.3 2009/05/31 04:24:20 matthieu Exp $
-#
-Section "Device"
- Identifier "Wsfb0"
- Driver "wsfb"
- Option "device" "/dev/ttyC0"
-EndSection
-
-Section "Screen"
- Identifier "Screen0"
- Device "Wsfb0"
- SubSection "Display"
- Depth 8
- EndSubSection
- SubSection "Display"
- Depth 16
- EndSubSection
- SubSection "Display"
- Depth 24
- EndSubSection
-EndSection
diff --git a/etc/X11.hp300/xorg.conf b/etc/X11.hp300/xorg.conf
deleted file mode 100644
index d9a6bfa71..000000000
--- a/etc/X11.hp300/xorg.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-Section "ServerLayout"
- Identifier "wsfb"
- Screen 0 "Screen0" 0 0
- InputDevice "wsmouse0" "CorePointer"
- InputDevice "Keyboard0" "CoreKeyboard"
-EndSection
-
-Section "Files"
- 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"
- Load "fb"
- Load "xf1bpp"
- Load "xf4bpp"
- Load "shadow"
-EndSection
-
-Section "InputDevice"
- Identifier "Keyboard0"
- Driver "kbd"
- Option "Protocol" "standard"
- Option "XkbRules" "xorg"
- Option "XkbModel" "pc101"
-EndSection
-
-Section "InputDevice"
- Identifier "wsmouse0"
- Driver "mouse"
- Option "Protocol" "wsmouse"
- Option "Device" "/dev/wsmouse"
-EndSection
-
-Section "Monitor"
- Identifier "Monitor"
- VendorName "Unknown"
- ModelName "Unknown"
- HorizSync 31.5-60
- VertRefresh 50-70
-EndSection
-
-# All frame buffers
-Section "Device"
- Identifier "Wsdisplay0"
- Driver "wsfb"
- Option "device" "/dev/ttyC0"
-EndSection
-
-# All framebuffers
-Section "Screen"
- Identifier "Screen0"
- Device "Wsdisplay0"
- Monitor "Monitor"
- SubSection "Display"
- Depth 1
- EndSubSection
- SubSection "Display"
- Depth 8
- EndSubSection
-EndSection
diff --git a/etc/X11.mac68k/xorg.conf b/etc/X11.mac68k/xorg.conf
deleted file mode 100644
index 558fc5030..000000000
--- a/etc/X11.mac68k/xorg.conf
+++ /dev/null
@@ -1,63 +0,0 @@
-Section "ServerLayout"
- Identifier "wsfb"
- Screen 0 "Screen0" 0 0
- InputDevice "wsmouse0" "CorePointer"
- InputDevice "Keyboard0" "CoreKeyboard"
-EndSection
-
-Section "Files"
- 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"
- Load "fb"
- Load "xf1bpp"
- Load "xf4bpp"
- Load "shadow"
-EndSection
-
-Section "InputDevice"
- Identifier "Keyboard0"
- Driver "keyboard"
- Option "Protocol" "standard"
- Option "XkbRules" "xorg"
- Option "XkbModel" "pc101"
-EndSection
-
-Section "InputDevice"
- Identifier "wsmouse0"
- Driver "mouse"
- Option "Protocol" "wsmouse"
- Option "Device" "/dev/wsmouse"
-EndSection
-
-Section "Monitor"
- Identifier "Monitor"
- VendorName "Unknown"
- ModelName "Unknown"
- HorizSync 31.5-60
- VertRefresh 50-70
-EndSection
-
-# All frame buffers
-Section "Device"
- Identifier "Wsdisplay0"
- Driver "wsfb"
- Option "device" "/dev/ttyC0"
-EndSection
-
-# All framebuffers
-Section "Screen"
- Identifier "Screen0"
- Device "Wsdisplay0"
- Monitor "Monitor"
- SubSection "Display"
- Depth 1
- EndSubSection
-EndSection