From 9ea497009577fc6519699c5266d1ffb8b5e4a2e7 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sat, 24 Apr 2010 16:51:38 +0200
Subject: maj xorg-server#1.8.0-1

---
 xorg/xorg-server/.footprint |  7 ++++++-
 xorg/xorg-server/.md5sum    |  2 +-
 xorg/xorg-server/Pkgfile    | 10 ++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'xorg')

diff --git a/xorg/xorg-server/.footprint b/xorg/xorg-server/.footprint
index 29352bda6..ba1379110 100644
--- a/xorg/xorg-server/.footprint
+++ b/xorg/xorg-server/.footprint
@@ -1,3 +1,7 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/X11/
+drwxr-xr-x	root/root	etc/X11/xorg.conf.d/
+-rw-r--r--	root/root	etc/X11/xorg.conf.d/10-evdev.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 lrwxrwxrwx	root/root	usr/bin/X -> Xorg
@@ -8,6 +12,7 @@ lrwxrwxrwx	root/root	usr/bin/X -> Xorg
 -rwxr-xr-x	root/root	usr/bin/cvt
 -rwxr-xr-x	root/root	usr/bin/dmxaddinput
 -rwxr-xr-x	root/root	usr/bin/dmxaddscreen
+-rwxr-xr-x	root/root	usr/bin/dmxinfo
 -rwxr-xr-x	root/root	usr/bin/dmxreconfig
 -rwxr-xr-x	root/root	usr/bin/dmxresize
 -rwxr-xr-x	root/root	usr/bin/dmxrminput
@@ -16,7 +21,6 @@ lrwxrwxrwx	root/root	usr/bin/X -> Xorg
 -rwxr-xr-x	root/root	usr/bin/dmxwininfo
 -rwxr-xr-x	root/root	usr/bin/gtf
 -rwxr-xr-x	root/root	usr/bin/vdltodmx
--rwxr-xr-x	root/root	usr/bin/xdmx
 -rwxr-xr-x	root/root	usr/bin/xdmxconfig
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/xorg/
@@ -74,6 +78,7 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/i2c_def.h
 -rw-r--r--	root/root	usr/include/xorg/input.h
 -rw-r--r--	root/root	usr/include/xorg/inputstr.h
+-rw-r--r--	root/root	usr/include/xorg/list.h
 -rw-r--r--	root/root	usr/include/xorg/mi.h
 -rw-r--r--	root/root	usr/include/xorg/mibank.h
 -rw-r--r--	root/root	usr/include/xorg/mibstore.h
diff --git a/xorg/xorg-server/.md5sum b/xorg/xorg-server/.md5sum
index 566b478cf..f939c06a5 100644
--- a/xorg/xorg-server/.md5sum
+++ b/xorg/xorg-server/.md5sum
@@ -1 +1 @@
-4c63b22cad9ed8ae8b86561f0f92c327  xorg-server-1.7.3.tar.bz2
+7cec3a11890bb53f4a07854319360348  xorg-server-1.8.0.tar.bz2
diff --git a/xorg/xorg-server/Pkgfile b/xorg/xorg-server/Pkgfile
index 589427fec..fdc4fbca2 100755
--- a/xorg/xorg-server/Pkgfile
+++ b/xorg/xorg-server/Pkgfile
@@ -1,10 +1,11 @@
-# Description: X Window System server
+# Description: Serveur X Window
 # URL: http://xorg.freedesktop.org
-# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
+# Maintainer: NuTyX core team
+# Packager: thierryn1 at hispeed dot ch
 # Depends on: mesa3d, xorg-bdftopcf, xorg-mkfontdir, xorg-mkfontscale, xorg-xf86driproto, xorg-dri2proto, xorg-libxkbui, xorg-xcmiscproto, xorg-scrnsaverproto, xorg-bigreqsproto, xorg-libxtst, xorg-libdmx, xorg-libxxf86misc, xorg-libxaw, xorg-libxvmc, xorg-libxi, xorg-libxres, xorg-libxcomposite, xorg-libxinerama, xorg-libxrandr, xorg-libxft, xorg-libxcursor, xorg-libxxf86dga, xorg-libpixman, xorg-libpciaccess, xorg-libxscrnsaver
 
 name=xorg-server
-version=1.7.3
+version=1.8.0
 release=1
 source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.bz2)
 
@@ -14,8 +15,9 @@ build() {
 	./configure --prefix=/usr --enable-dri \
 		--disable-config-hal \
 	            --localstatedir=/var \
+		--sysconfdir=/etc/X11 \
 	            --with-xkb-output=/var/lib/xkb
-
+	sed -i 's|xorgconfddir = $(prefix)|xorgconfddir = |' config/Makefile
 	make
 	make DESTDIR=$PKG install
 
-- 
cgit v1.2.3-54-g00ecf