3 files changed, 34 insertions, 18 deletions
diff --git a/abs/core/libx11/PKGBUILD b/abs/core/libx11/PKGBUILD
index 8d1c59d..af9afab 100644
--- a/abs/core/libx11/PKGBUILD
+++ b/abs/core/libx11/PKGBUILD
@@ -1,36 +1,37 @@
-# $Id: PKGBUILD 88397 2010-08-23 08:25:08Z jgc $
+# $Id$
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libx11
-pkgver=1.3.99.903
-pkgrel=1
+pkgver=1.4.3
+pkgrel=2
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
-depends=('libxcb>=1.7' 'kbproto>=1.0.5')
-makedepends=('xproto>=7.0.18' 'xextproto>=7.1.2' 'xf86bigfontproto>=1.2.0' 'xtrans>=1.2.5' 'inputproto>=2.0' 'xorg-util-macros>=1.10.0')
+depends=('libxcb' 'xproto' 'kbproto')
+makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto')
 options=('!libtool')
-license=('custom:XFREE86')
+license=('custom')
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2
-        xorg.sh)
+        xorg.sh
+        xorg.csh)
+sha1sums=('174270a0e51614b5077026fc6c20701d4e09aef8'
+          '4b756387426afb2a5bb7a155631ec42348abf5c1'
+          '45b0b310776cf5d9a94b4a18a5c63ddad9de6ba8')
 
 build() {
   cd "${srcdir}/libX11-${pkgver}"
-  ./configure --prefix=/usr \
-      --with-xcb --disable-static
-  make || return 1
-  make check || return 1
+  ./configure --prefix=/usr --disable-static --disable-xf86bigfont
+  make
+  make check
 }
+
 package() {
   cd "${srcdir}/libX11-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/etc/profile.d"
-  install -m755 "${srcdir}/xorg.sh" "${pkgdir}/etc/profile.d/"
+  install -m755 "${srcdir}/"xorg.{sh,csh} "${pkgdir}/etc/profile.d/"
 
   install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
-
-md5sums=('3e8ed7a91f70bb819b5dab9c124a7062'
-         '942ff006e69e041f0307c1316e0dec5d')
diff --git a/abs/core/libx11/xorg.csh b/abs/core/libx11/xorg.csh
new file mode 100644
index 0000000..26c49a2
--- /dev/null
+++ b/abs/core/libx11/xorg.csh
@@ -0,0 +1,15 @@
+setenv XDG_DATA_HOME ${HOME}/.local/share
+setenv XDG_CONFIG_HOME ${HOME}/.config
+setenv XDG_CACHE_HOME ${HOME}/.cache
+
+if (! ($?XDG_DATA_DIRS) ) then
+  	setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/
+else
+	setenv XDG_DATA_DIRS /usr/share/:/usr/local/share/:${XDG_DATA_DIRS}
+endif
+
+if (! ($?XDG_CONFIG_DIRS) ) then
+	setenv XDG_CONFIG_DIRS /etc/xdg
+else
+	setenv XDG_CONFIG_DIRS /etc/xdg:${XDG_CONFIG_DIRS}
+endif
diff --git a/abs/core/libx11/xorg.sh b/abs/core/libx11/xorg.sh
index 9b37312..e1de686 100644
--- a/abs/core/libx11/xorg.sh
+++ b/abs/core/libx11/xorg.sh
@@ -3,9 +3,9 @@ export XDG_CONFIG_HOME=$HOME/.config
 export XDG_CACHE_HOME=$HOME/.cache
 
 if [ -z $XDG_DATA_DIRS ]; then
-	export XDG_DATA_DIRS=/usr/share:/usr/local/share
+	export XDG_DATA_DIRS=/usr/share/:/usr/local/share/
 else
-	export XDG_DATA_DIRS=/usr/share:/usr/local/share:$XDG_DATA_DIRS
+	export XDG_DATA_DIRS=/usr/share/:/usr/local/share/:$XDG_DATA_DIRS
 fi
 
 if [ -z $XDG_CONFIG_DIRS ]; then