Module Name: src
Committed By: tsutsui
Date: Fri Nov 12 17:05:49 UTC 2010
Modified Files:
src/distrib/sets/lists/xserver: md.dreamcast
src/external/mit/xorg: Makefile
Added Files:
src/external/mit/xorg/etc: Makefile
src/external/mit/xorg/etc/etc.dreamcast: Makefile.inc xorg.conf.jpkbd
xorg.conf.uskbd
Log Message:
Provide port-specific sample xorg.conf files in xserver.tgz.
No particular comments on tech-x11.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xserver/md.dreamcast
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/etc/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/etc/etc.dreamcast/Makefile.inc \
src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd \
src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xserver/md.dreamcast
diff -u src/distrib/sets/lists/xserver/md.dreamcast:1.10 src/distrib/sets/lists/xserver/md.dreamcast:1.11
--- src/distrib/sets/lists/xserver/md.dreamcast:1.10 Sat Jun 19 18:17:55 2010
+++ src/distrib/sets/lists/xserver/md.dreamcast Fri Nov 12 17:05:48 2010
@@ -1,4 +1,6 @@
-# $NetBSD: md.dreamcast,v 1.10 2010/06/19 18:17:55 tsutsui Exp $
+# $NetBSD: md.dreamcast,v 1.11 2010/11/12 17:05:48 tsutsui Exp $
+./etc/X11/xorg.conf.jpkbd -unknown- xorg
+./etc/X11/xorg.conf.uskbd -unknown- xorg
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/Xdreamcast -unknown- x11
./usr/X11R6/man/cat1/Xdreamcast.0 -unknown- x11,.cat
Index: src/external/mit/xorg/Makefile
diff -u src/external/mit/xorg/Makefile:1.7 src/external/mit/xorg/Makefile:1.8
--- src/external/mit/xorg/Makefile:1.7 Mon Sep 7 21:07:03 2009
+++ src/external/mit/xorg/Makefile Fri Nov 12 17:05:48 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2009/09/07 21:07:03 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2010/11/12 17:05:48 tsutsui Exp $
# Top level Makefile to cross build xorg inside the NetBSD tree.
.include <bsd.own.mk>
-SUBDIR= tools .WAIT include .WAIT lib .WAIT bin share server
+SUBDIR= tools .WAIT include .WAIT lib .WAIT bin share server etc
.if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
BUILDTARGETS+= cleandir
@@ -57,6 +57,7 @@
bin/xfs \
bin/xinit \
bin/xsm \
+ etc \
lib/fontconfig/etc \
lib/fontconfig/etc/conf.avail \
lib/fontconfig/etc/conf.d
Added files:
Index: src/external/mit/xorg/etc/Makefile
diff -u /dev/null src/external/mit/xorg/etc/Makefile:1.1
--- /dev/null Fri Nov 12 17:05:49 2010
+++ src/external/mit/xorg/etc/Makefile Fri Nov 12 17:05:48 2010
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2010/11/12 17:05:48 tsutsui Exp $
+
+.include <bsd.own.mk>
+
+.if exists(etc.${RELEASEMACHINE}/Makefile.inc)
+.include "etc.${RELEASEMACHINE}/Makefile.inc"
+.endif
+
+FILESDIR= ${X11ETCDIR}
+CONFIGFILES=
+CONFIGSYMLINKS=
+
+.if defined(XORGCONF_FILES)
+.for file in ${XORGCONF_FILES}
+CONFIGFILES+= ${file}
+FILESMODE_${file:T}= 644
+.endfor
+.endif
+
+.include <bsd.prog.mk>
Index: src/external/mit/xorg/etc/etc.dreamcast/Makefile.inc
diff -u /dev/null src/external/mit/xorg/etc/etc.dreamcast/Makefile.inc:1.1
--- /dev/null Fri Nov 12 17:05:49 2010
+++ src/external/mit/xorg/etc/etc.dreamcast/Makefile.inc Fri Nov 12 17:05:49 2010
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2010/11/12 17:05:49 tsutsui Exp $
+
+XORGCONF_FILES= etc.${MACHINE}/xorg.conf.jpkbd etc.${MACHINE}/xorg.conf.uskbd
Index: src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd
diff -u /dev/null src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd:1.1
--- /dev/null Fri Nov 12 17:05:49 2010
+++ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd Fri Nov 12 17:05:49 2010
@@ -0,0 +1,47 @@
+Section "ServerLayout"
+ Identifier "wsfb"
+ Screen 0 "Screen0" 0 0
+ InputDevice "Mouse0" "CorePointer"
+ InputDevice "Keyboard0" "CoreKeyboard"
+EndSection
+
+Section "Files"
+ FontPath "/usr/pkg/lib/X11/fonts/TTF/"
+EndSection
+
+Section "InputDevice"
+ Identifier "Keyboard0"
+ Driver "kbd"
+ Option "Protocol" "wskbd"
+ Option "Device" "/dev/wskbd0"
+# Option "XkbLayout" "us"
+ Option "XkbLayout" "jp(106)"
+# Option "XkbOptions" "ctrl:swapcaps"
+EndSection
+
+Section "InputDevice"
+ Identifier "Mouse0"
+ Driver "mouse"
+ Option "Protocol" "wsmouse"
+ Option "ButtonMapping" "1 2 3 2"
+EndSection
+
+Section "Device"
+ Identifier "Wsdisplay0"
+ Driver "wsfb"
+EndSection
+
+Section "Monitor"
+ Identifier "Monitor"
+EndSection
+
+Section "Screen"
+ Identifier "Screen0"
+ Device "Wsdisplay0"
+ Monitor "Monitor"
+
+ SubSection "Display"
+ Viewport 0 0
+ Depth 16
+ EndSubSection
+EndSection
Index: src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd
diff -u /dev/null src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd:1.1
--- /dev/null Fri Nov 12 17:05:49 2010
+++ src/external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd Fri Nov 12 17:05:49 2010
@@ -0,0 +1,47 @@
+Section "ServerLayout"
+ Identifier "wsfb"
+ Screen 0 "Screen0" 0 0
+ InputDevice "Mouse0" "CorePointer"
+ InputDevice "Keyboard0" "CoreKeyboard"
+EndSection
+
+Section "Files"
+ FontPath "/usr/pkg/lib/X11/fonts/TTF/"
+EndSection
+
+Section "InputDevice"
+ Identifier "Keyboard0"
+ Driver "kbd"
+ Option "Protocol" "wskbd"
+ Option "Device" "/dev/wskbd0"
+ Option "XkbLayout" "us"
+# Option "XkbLayout" "jp(106)"
+# Option "XkbOptions" "ctrl:swapcaps"
+EndSection
+
+Section "InputDevice"
+ Identifier "Mouse0"
+ Driver "mouse"
+ Option "Protocol" "wsmouse"
+ Option "ButtonMapping" "1 2 3 2"
+EndSection
+
+Section "Device"
+ Identifier "Wsdisplay0"
+ Driver "wsfb"
+EndSection
+
+Section "Monitor"
+ Identifier "Monitor"
+EndSection
+
+Section "Screen"
+ Identifier "Screen0"
+ Device "Wsdisplay0"
+ Monitor "Monitor"
+
+ SubSection "Display"
+ Viewport 0 0
+ Depth 16
+ EndSubSection
+EndSection
