From e904900ee94b5cff30e0d251d265a6961db28275 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 8 Jan 2010 10:57:01 +0100
Subject: [PATCH] xorg-server: update to 1.7.4.

--HG--
extra : convert_revision : cc78446e1945173d66c13697335a4f8dd8704622
---
 srcpkgs/xorg-server/template                  | 50 +++++--------------
 .../xorg-server/xorg-server-devel.template    | 14 ++++++
 2 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 05f78d05d1f..1639824af7d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,6 +1,6 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
-version=1.7.3
+version=1.7.4
 distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--with-dri-driver-path=/usr/lib/dri
@@ -10,54 +10,28 @@ configure_args="--with-dri-driver-path=/usr/lib/dri
  --with-xkb-output=/var/lib/xkb"
 short_desc="Modular X11 server from modular X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=4b644113cd030fc77615c03c7b6529e063dc1d471ec6a990e6f62eb45a9c2db4
+checksum=b8ec11b3f2c6f84c21e8cd9804672ba6e27fda3e913d58dd947205ea253e33f8
 long_desc="
  The X.org X11 Server from the modularized source tree of X.org X11."
 
 conf_files="/etc/dbus-1/system.d/xorg-server.conf"
 subpackages="$pkgname-devel"
 
+Add_dependency run glibc
 Add_dependency build dri2proto	">=2.1"
-Add_dependency full glibc
-Add_dependency full openssl
-Add_dependency full dbus
-Add_dependency full hal
-Add_dependency full libX11
-Add_dependency full libdrm
-Add_dependency full libXdmcp
-Add_dependency full libXfont
-Add_dependency full libfontenc
-Add_dependency full libXext
-Add_dependency full libXau
-Add_dependency full libpciaccess
-Add_dependency full libXmu
-Add_dependency full libXrender
-Add_dependency full libXfixes
-Add_dependency full libXi
-Add_dependency full libXaw
-Add_dependency full libXt
-Add_dependency full libXpm
-Add_dependency full libXcomposite
-Add_dependency full libXScrnSaver
-Add_dependency full libXres
-Add_dependency full libXtst
-Add_dependency full libXxf86dga
-Add_dependency full libdmx
-Add_dependency full libxkbui
-Add_dependency full libxkbfile
-Add_dependency full libXxf86misc
-Add_dependency full libXxf86vm
-Add_dependency full libXv
-Add_dependency full libXinerama
-Add_dependency full libXrandr
-Add_dependency full MesaLib
-Add_dependency full pixman
-Add_dependency full xkbcomp
-Add_dependency full xkeyboard-config
 Add_dependency build xf86driproto
 Add_dependency build perl
 Add_dependency build pkg-config
 Add_dependency build flex
+Add_dependency full hal
+
+_deps="openssl dbus libpciaccess pixman libdmx libICE libSM libX11 libXau"
+_deps="${_deps} libXaw libXdmcp libXext libXfixes libXfont libXi libXmu"
+_deps="${_deps} libXpm libXrender libXt"
+for _dep_ in ${_deps}; do
+	Add_dependency run	${_dep_}
+	Add_dependency build	${_dep_}-devel
+done
 
 pre_configure()
 {
diff --git a/srcpkgs/xorg-server/xorg-server-devel.template b/srcpkgs/xorg-server/xorg-server-devel.template
index e79f511f438..9c5e96ba4eb 100644
--- a/srcpkgs/xorg-server/xorg-server-devel.template
+++ b/srcpkgs/xorg-server/xorg-server-devel.template
@@ -5,6 +5,20 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+Add_dependency run dri2proto  ">=2.1"
+Add_dependency run xf86driproto
+Add_dependency run perl
+Add_dependency run pkg-config
+Add_dependency run flex
+Add_dependency run hal
+
+_deps="openssl dbus libpciaccess pixman libdmx libICE libSM libX11 libXau"
+_deps="${_deps} libXaw libXdmcp libXext libXfixes libXfont libXi libXmu"
+_deps="${_deps} libXpm libXrender libXt"
+for _dep_ in ${_deps}; do
+        Add_dependency run      ${_dep_}-devel
+done
+
 Add_dependency run xorg-server
 
 do_install()