maj xorg#1.9.0-1, les pilotes sont intégrés au port

10 files changed, 135 insertions, 140 deletions

diff --git a/xorg/xorg-driver/.footprint b/xorg/xorg-driver/.footprint
deleted file mode 100644
index 042e5b191..000000000
--- a/xorg/xorg-driver/.footprint
+++ /dev/null
@@ -1,100 +0,0 @@
-drwxr-xr-x	root/root	lib/
-drwxr-xr-x	root/root	lib/udev/
-drwxr-xr-x	root/root	lib/udev/rules.d/
--rw-r--r--	root/root	lib/udev/rules.d/69-xorg-vmmouse.rules
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/synclient
--rwxr-xr-x	root/root	usr/bin/syndaemon
--rwxr-xr-x	root/root	usr/bin/vmmouse_detect
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/xorg/
--rw-r--r--	root/root	usr/include/xorg/evdev-properties.h
--rw-r--r--	root/root	usr/include/xorg/joystick-properties.h
--rw-r--r--	root/root	usr/include/xorg/synaptics-properties.h
--rw-r--r--	root/root	usr/include/xorg/synaptics.h
-drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/hal/
--rwxr-xr-x	root/root	usr/lib/hal/hal-probe-vmmouse
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/xorg-evdev.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/xorg-joystick.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/xorg-synaptics.pc
-drwxr-xr-x	root/root	usr/lib/xorg/
-drwxr-xr-x	root/root	usr/lib/xorg/modules/
-drwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/ati_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/ati_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/geode_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/geode_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/i128_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/i128_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/intel_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/intel_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/nv_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/nv_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeon_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeon_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeonhd_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeonhd_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vesa_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vesa_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vmware_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vmware_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vmwlegacy_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vmwlegacy_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/xgi_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/xgi_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/ztv_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/ztv_drv.so
-drwxr-xr-x	root/root	usr/lib/xorg/modules/input/
--rwxr-xr-x	root/root	usr/lib/xorg/modules/input/evdev_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/input/evdev_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/input/joystick_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/input/joystick_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/input/kbd_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/input/kbd_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/input/mouse_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/input/mouse_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/input/synaptics_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/input/synaptics_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/input/vmmouse_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/input/vmmouse_drv.so
-drwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/theatre200_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/theatre200_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/theatre_detect_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/theatre_detect_drv.so
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/theatre_drv.la
--rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/theatre_drv.so
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/X11/
-drwxr-xr-x	root/root	usr/share/X11/xorg.conf.d/
--rw-r--r--	root/root	usr/share/X11/xorg.conf.d/50-synaptics.conf
--rw-r--r--	root/root	usr/share/X11/xorg.conf.d/50-vmmouse.conf
-drwxr-xr-x	root/root	usr/share/hal/
-drwxr-xr-x	root/root	usr/share/hal/fdi/
-drwxr-xr-x	root/root	usr/share/hal/fdi/policy/
-drwxr-xr-x	root/root	usr/share/hal/fdi/policy/20thirdparty/
--rw-r--r--	root/root	usr/share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/synclient.1.gz
--rw-r--r--	root/root	usr/share/man/man1/syndaemon.1.gz
--rw-r--r--	root/root	usr/share/man/man1/vmmouse_detect.1.gz
-drwxr-xr-x	root/root	usr/share/man/man4/
--rw-r--r--	root/root	usr/share/man/man4/ati.4.gz
--rw-r--r--	root/root	usr/share/man/man4/evdev.4.gz
--rw-r--r--	root/root	usr/share/man/man4/i128.4.gz
--rw-r--r--	root/root	usr/share/man/man4/intel.4.gz
--rw-r--r--	root/root	usr/share/man/man4/joystick.4.gz
--rw-r--r--	root/root	usr/share/man/man4/kbd.4.gz
--rw-r--r--	root/root	usr/share/man/man4/mousedrv.4.gz
--rw-r--r--	root/root	usr/share/man/man4/nv.4.gz
--rw-r--r--	root/root	usr/share/man/man4/radeon.4.gz
--rw-r--r--	root/root	usr/share/man/man4/radeonhd.4.gz
--rw-r--r--	root/root	usr/share/man/man4/synaptics.4.gz
--rw-r--r--	root/root	usr/share/man/man4/vesa.4.gz
--rw-r--r--	root/root	usr/share/man/man4/vmmouse.4.gz
--rw-r--r--	root/root	usr/share/man/man4/vmware.4.gz
--rw-r--r--	root/root	usr/share/man/man4/xgi.4.gz
diff --git a/xorg/xorg-driver/.md5sum b/xorg/xorg-driver/.md5sum
deleted file mode 100644
index 407868cc8..000000000
--- a/xorg/xorg-driver/.md5sum
+++ /dev/null
@@ -1 +0,0 @@
-42a5068df09caf25017de2b8f8a0fec2  driver-1.9.0.md5
diff --git a/xorg/xorg-driver/Pkgfile b/xorg/xorg-driver/Pkgfile
deleted file mode 100755
index 17ca27f35..000000000
--- a/xorg/xorg-driver/Pkgfile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Description: Permet au serveur X de communiquer avec les différents périphériques
-# URL: http://xorg.freedesktop.org 
-# Maintainer: NuTyX core team
-# Packager: thierryn1 at hispeed dot ch
-# Depends on: xorg-server
-
-name=xorg-driver
-version=1.9.0
-release=1
-section=$(echo $name|cut -d '-' -f 2)
-source=($section-$version.md5)
-
-build() {
-for package in $(grep -v '^#' ${section}-${version}.md5 |cut -d " " -f 3)
-        do
-		wget http://xorg.freedesktop.org/releases/individual/${section}/$package
-		grep $package driver-$version.md5 |md5sum -c -
-                packagedir=$(echo $package | sed 's/.tar.bz2//')
-  		tar -xf $package
-
-		cd $packagedir
-		./configure --prefix=/usr
-		make
-		make DESTDIR=$PKG install
-		cd ..
-        done
-
-}
diff --git a/xorg/xorg-driver/check b/xorg/xorg-driver/check
deleted file mode 100644
index 38f2c89b2..000000000
--- a/xorg/xorg-driver/check
+++ /dev/null
@@ -1 +0,0 @@
-eceb6dc517c0649b772f18708a1aade8  xf86-input-evdev-2.5.0.tar.bz2
diff --git a/xorg/xorg-driver/pre-install b/xorg/xorg-driver/pre-install
deleted file mode 100644
index e5347d320..000000000
--- a/xorg/xorg-driver/pre-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-for i in xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-ati \
-	xf86-video-intel xf86-video-nv xf86-video-vesa; 
- do pkgrm xorg-$i; 
-done
diff --git a/xorg/xorg/.footprint b/xorg/xorg/.footprint
index 9c4dffa87..29b9e759e 100644
--- a/xorg/xorg/.footprint
+++ b/xorg/xorg/.footprint
@@ -1 +1,108 @@
+drwxr-xr-x	root/root	lib/
+drwxr-xr-x	root/root	lib/udev/
+drwxr-xr-x	root/root	lib/udev/rules.d/
+-rw-r--r--	root/root	lib/udev/rules.d/69-xorg-vmmouse.rules
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/synclient
+-rwxr-xr-x	root/root	usr/bin/syndaemon
+-rwxr-xr-x	root/root	usr/bin/vmmouse_detect
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/xorg/
+-rw-r--r--	root/root	usr/include/xorg/evdev-properties.h
+-rw-r--r--	root/root	usr/include/xorg/joystick-properties.h
+-rw-r--r--	root/root	usr/include/xorg/synaptics-properties.h
+-rw-r--r--	root/root	usr/include/xorg/synaptics.h
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/hal/
+-rwxr-xr-x	root/root	usr/lib/hal/hal-probe-vmmouse
+-rwxr-xr-x	root/root	usr/lib/libI810XvMC.la
+lrwxrwxrwx	root/root	usr/lib/libI810XvMC.so -> libI810XvMC.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libI810XvMC.so.1 -> libI810XvMC.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib/libI810XvMC.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib/libIntelXvMC.la
+lrwxrwxrwx	root/root	usr/lib/libIntelXvMC.so -> libIntelXvMC.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libIntelXvMC.so.1 -> libIntelXvMC.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib/libIntelXvMC.so.1.0.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/xorg-evdev.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/xorg-joystick.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/xorg-synaptics.pc
+drwxr-xr-x	root/root	usr/lib/xorg/
+drwxr-xr-x	root/root	usr/lib/xorg/modules/
+drwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/ati_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/ati_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/geode_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/geode_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/i128_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/i128_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/intel_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/intel_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/nv_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/nv_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeon_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeon_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeonhd_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/radeonhd_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vesa_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vesa_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vmware_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vmware_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vmwlegacy_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/vmwlegacy_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/xgi_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/xgi_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/ztv_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/ztv_drv.so
+drwxr-xr-x	root/root	usr/lib/xorg/modules/input/
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/input/evdev_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/input/evdev_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/input/joystick_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/input/joystick_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/input/kbd_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/input/kbd_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/input/mouse_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/input/mouse_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/input/synaptics_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/input/synaptics_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/input/vmmouse_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/input/vmmouse_drv.so
+drwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/theatre200_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/theatre200_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/theatre_detect_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/theatre_detect_drv.so
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/theatre_drv.la
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/multimedia/theatre_drv.so
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/X11/
+drwxr-xr-x	root/root	usr/share/X11/xorg.conf.d/
+-rw-r--r--	root/root	usr/share/X11/xorg.conf.d/50-synaptics.conf
+-rw-r--r--	root/root	usr/share/X11/xorg.conf.d/50-vmmouse.conf
+drwxr-xr-x	root/root	usr/share/hal/
+drwxr-xr-x	root/root	usr/share/hal/fdi/
+drwxr-xr-x	root/root	usr/share/hal/fdi/policy/
+drwxr-xr-x	root/root	usr/share/hal/fdi/policy/20thirdparty/
+-rw-r--r--	root/root	usr/share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/synclient.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/syndaemon.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/vmmouse_detect.1.gz
+drwxr-xr-x	root/root	usr/share/man/man4/
+-rw-r--r--	root/root	usr/share/man/man4/ati.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/evdev.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/i128.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/intel.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/joystick.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/kbd.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/mousedrv.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/nv.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/radeon.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/radeonhd.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/synaptics.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/vesa.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/vmmouse.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/vmware.4.gz
+-rw-r--r--	root/root	usr/share/man/man4/xgi.4.gz
diff --git a/xorg/xorg/.md5sum b/xorg/xorg/.md5sum
index e69de29bb..407868cc8 100644
--- a/xorg/xorg/.md5sum
+++ b/xorg/xorg/.md5sum
@@ -0,0 +1 @@
+42a5068df09caf25017de2b8f8a0fec2  driver-1.9.0.md5
diff --git a/xorg/xorg/Pkgfile b/xorg/xorg/Pkgfile
index 9e0961233..a31fed850 100644
--- a/xorg/xorg/Pkgfile
+++ b/xorg/xorg/Pkgfile
@@ -1,14 +1,28 @@
-# Description: x.org's implementation of X11
+# Description: Implémentation de X11 de l'organisation Xorg
 # URL: http://xorg.freedesktop.org
 # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: xorg-server, xorg-driver, dejavu-ttf, xorg-luit, xorg-xinit, xorg-xauth, xorg-rgb, xkeyboard-config, xorg-twm, xorg-xclock, xorg-xterm
+# Depends on: xorg-server, dejavu-ttf, xorg-luit, xorg-xinit, xorg-xauth, xorg-rgb, xkeyboard-config, xorg-twm, xorg-xclock, xorg-xterm
 
 name=xorg
-version=7.6
+version=1.9.0
 release=1
-source=()
+section="driver"
+source=($section-$version.md5)
 
 build() {
-	install -d $PKG/usr
+for package in $(grep -v '^#' ${section}-${version}.md5 |cut -d " " -f 3)
+        do
+                wget http://xorg.freedesktop.org/releases/individual/${section}/$package
+                grep $package driver-$version.md5 |md5sum -c -
+                packagedir=$(echo $package | sed 's/.tar.bz2//')
+                tar -xf $package
+
+                cd $packagedir
+                ./configure --prefix=/usr
+                make
+                make DESTDIR=$PKG install
+                cd ..
+        done
+
 }
diff --git a/xorg/xorg-driver/driver-1.9.0.md5 b/xorg/xorg/driver-1.9.0.md5
index fe1d6b0dc..fe1d6b0dc 100644
--- a/xorg/xorg-driver/driver-1.9.0.md5
+++ b/xorg/xorg/driver-1.9.0.md5
diff --git a/xorg/xorg/pre-install b/xorg/xorg/pre-install
new file mode 100644
index 000000000..bbffa4090
--- /dev/null
+++ b/xorg/xorg/pre-install
@@ -0,0 +1,8 @@
+for i in xf86-input-evdev xf86-input-joystick xf86-input-keyboard \
+xf86-input-mouse xf86-input-synaptics xf86-input-vmmouse \
+xf86-video-ati xf86-video-geode xf86-video-i128 xf86-video-intel xf86-video-nv xf86-video-radeonhd \
+xf86-video-vesa xf86-video-vmware xf86-video-xgi driver
+do if ( pkginfo -i| grep xorg-$i > /dev/null); then
+	pkgrm xorg-$i
+	fi
+done