xorg-server:

- build with udev support
- remove hal support
- various cleanups
- install synaptics and wacom input driver

packages/x11/xserver/xorg-server/build

@@ -30,9 +30,9 @@ $SCRIPTS/build libfontenc
 $SCRIPTS/build pixman
 $SCRIPTS/build fontsproto
 $SCRIPTS/build xf86bigfontproto
-#$SCRIPTS/build udev
-$SCRIPTS/build dbus
-$SCRIPTS/build hal
+$SCRIPTS/build udev
+#$SCRIPTS/build dbus
+#$SCRIPTS/build hal
 
 if [ "$XINERAMA" = "yes" ]; then
   $SCRIPTS/build libXinerama
@@ -82,9 +82,9 @@ cd $PKG_BUILD
             --enable-dbe \
             --disable-xf86bigfont \
             --disable-dpms \
-            --disable-config-udev \
-            --enable-config-dbus \
-            --enable-config-hal \
+            --enable-config-udev \
+            --disable-config-dbus \
+            --disable-config-hal \
             --enable-xfree86-utils \
             --enable-xorg \
             --disable-dmx \

packages/x11/xserver/xorg-server/config/70-xorg.rules

@@ -0,0 +1,2 @@
+SUBSYSTEM=="input", KERNEL=="event*", ENV{x11_driver}="evdev"
+SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_CLASS}=="kbd", ENV{xkb.layout}="us", ENV{xkb.options}="terminate:ctrl_alt_bksp,compose:lwin"

packages/x11/xserver/xorg-server/install

@@ -10,9 +10,9 @@ $SCRIPTS/install libXv
 $SCRIPTS/install $LIBDRM
 $SCRIPTS/install $MESA
 $SCRIPTS/install pixman
-#$SCRIPTS/install udev
-$SCRIPTS/install dbus
-$SCRIPTS/install hal
+$SCRIPTS/install udev
+#$SCRIPTS/install dbus
+#$SCRIPTS/install hal
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
@@ -54,11 +54,14 @@ cp $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia
 mkdir -p $INSTALL/etc/X11
   cp $PKG_BUILD/dix/protocol.txt $INSTALL/etc/X11
 
-mkdir -p $INSTALL/etc/dbus-1/system.d
-cp $PKG_BUILD/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d
+#mkdir -p $INSTALL/etc/dbus-1/system.d
+#  cp $PKG_BUILD/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d
 
-mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/
-cp $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
+#mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/
+#  cp $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
+
+mkdir -p $INSTALL/lib/udev/rules.d
+  cp $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d
 
 #Fonts
   $SCRIPTS/install encodings
@@ -72,6 +75,8 @@ cp $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/
 
 #Drivers
   $SCRIPTS/install xf86-input-evdev
+  $SCRIPTS/install xf86-input-synaptics
+  $SCRIPTS/install xf86-input-wacom
 
 get_graphicdrivers
 
@@ -80,4 +85,4 @@ get_graphicdrivers
   done
 
 #Tools
-  $SCRIPTS/install xrandr
+#  $SCRIPTS/install xrandr