qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't install xorg.conf on machines with no X server.

Browse Source
This commit is contained in:
matthieu 2012-02-07 19:54:55 +00:00
parent ff8746b4a1
commit 8fd908ad5c
4 changed files with 3 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2012/01/16 08:42:38 schwarze Exp $
# $OpenBSD: Makefile,v 1.44 2012/02/07 19:54:55 matthieu Exp $
.include <bsd.own.mk>
LOCALAPPD=/usr/local/lib/X11/app-defaults
@ -42,7 +42,7 @@ beforeinstall:
${MAKE} distrib-dirs
${MAKE} includes
afterinstall:
afterinstall:
${MAKE} install-mk
${MAKE} fix-appd
${MAKE} font-cache
@ -95,8 +95,7 @@ release-clean:
release-install:
@${MAKE} install
.if ${MACHINE} == alpha || ${MACHINE} == hp300 || \
${MACHINE} == mac68k || ${MACHINE} == zaurus
.if ${MACHINE} == zaurus
@if [ -f $(DESTDIR)/etc/X11/xorg.conf ]; then \
echo "Not overwriting existing" $(DESTDIR)/etc/X11/xorg.conf; \
else set -x; \

24
etc/X11.alpha/xorg.conf
View File

@ -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"
SubSectionSub "Display"
Depth 8
EndSubSection
SubSectionSub "Display"
Depth 16
EndSubSection
SubSectionSub "Display"
Depth 24
EndSubSection
EndSection

66
etc/X11.hp300/xorg.conf
View File

@ -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"
SubSectionSub "Display"
Depth 1
EndSubSection
SubSectionSub "Display"
Depth 8
EndSubSection
EndSection

63
etc/X11.mac68k/xorg.conf
View File

@ -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"
SubSectionSub "Display"
Depth 1
EndSubSection
EndSection