From f11f0b158d445cb25bdffd0123cab687f09a85a2 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Fri, 10 Dec 2010 02:37:44 +0000
Subject: xorg-* recompile

---
 abs/core/xorg-font-utils/PKGBUILD       |  6 ++---
 abs/core/xorg-fonts-100dpi/PKGBUILD     |  2 +-
 abs/core/xorg-fonts-75dpi/PKGBUILD      |  2 +-
 abs/core/xorg-fonts-alias/PKGBUILD      |  2 +-
 abs/core/xorg-fonts-encodings/PKGBUILD  |  2 +-
 abs/core/xorg-fonts-misc/PKGBUILD       |  2 +-
 abs/core/xorg-luit/PKGBUILD             |  7 +++---
 abs/core/xorg-res-utils/LICENSE.listres | 42 +++++++++++++++++++++++++++++++++
 abs/core/xorg-res-utils/LICENSE.viewres | 42 +++++++++++++++++++++++++++++++++
 abs/core/xorg-res-utils/PKGBUILD        | 23 +++++++++++-------
 abs/core/xorg-server-utils/PKGBUILD     |  4 ++--
 abs/core/xorg-util-macros/PKGBUILD      | 27 +++++++++++++++++++++
 abs/core/xorg-utils/PKGBUILD            | 36 +++++++++++++---------------
 abs/core/xorg-x11perf/PKGBUILD          |  7 ++++--
 abs/core/xorg-xauth/PKGBUILD            |  2 +-
 abs/core/xorg-xcursorgen/PKGBUILD       |  7 ++++--
 abs/core/xorg-xinit/PKGBUILD            |  4 ++--
 abs/core/xorg-xkb-utils/PKGBUILD        |  2 +-
 abs/core/xorg-xkill/PKGBUILD            | 26 ++++++++++++++++++++
 abs/core/xorg-xpr/PKGBUILD              |  2 +-
 abs/core/xorg-xwd/PKGBUILD              |  7 ++++--
 abs/core/xorg-xwud/PKGBUILD             |  7 ++++--
 22 files changed, 206 insertions(+), 55 deletions(-)
 create mode 100644 abs/core/xorg-res-utils/LICENSE.listres
 create mode 100644 abs/core/xorg-res-utils/LICENSE.viewres
 create mode 100644 abs/core/xorg-util-macros/PKGBUILD
 create mode 100644 abs/core/xorg-xkill/PKGBUILD

diff --git a/abs/core/xorg-font-utils/PKGBUILD b/abs/core/xorg-font-utils/PKGBUILD
index 0297214..6fbb899 100644
--- a/abs/core/xorg-font-utils/PKGBUILD
+++ b/abs/core/xorg-font-utils/PKGBUILD
@@ -3,12 +3,12 @@
 
 pkgname=xorg-font-utils
 pkgver=7.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org font utilities"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('gcc-libs' 'sh' 'libxfont>=1.4.1' 'libfontenc>=1.0.5' 'xproto>=7.0.15')
+depends=('gcc-libs' 'sh' 'libxfont>=1.4.1' 'libfontenc>=1.0.5' 'xproto>=7.0.16')
 makedepends=('pkgconfig' 'bigreqsproto>=1.1.0')
 replaces=('font-util')
 provides=('font-util')
diff --git a/abs/core/xorg-fonts-100dpi/PKGBUILD b/abs/core/xorg-fonts-100dpi/PKGBUILD
index 20637d0..514311a 100644
--- a/abs/core/xorg-fonts-100dpi/PKGBUILD
+++ b/abs/core/xorg-fonts-100dpi/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-fonts-100dpi
 pkgver=1.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org 100dpi fonts"
 arch=(any)
 url="http://xorg.freedesktop.org/"
diff --git a/abs/core/xorg-fonts-75dpi/PKGBUILD b/abs/core/xorg-fonts-75dpi/PKGBUILD
index 0bca0e8..52954d7 100644
--- a/abs/core/xorg-fonts-75dpi/PKGBUILD
+++ b/abs/core/xorg-fonts-75dpi/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-fonts-75dpi
 pkgver=1.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org 75dpi fonts"
 arch=(any)
 url="http://xorg.freedesktop.org/"
diff --git a/abs/core/xorg-fonts-alias/PKGBUILD b/abs/core/xorg-fonts-alias/PKGBUILD
index bf5a60f..fcc64d2 100644
--- a/abs/core/xorg-fonts-alias/PKGBUILD
+++ b/abs/core/xorg-fonts-alias/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xorg-fonts-alias
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org font alias files"
 arch=('any')
 url="http://xorg.freedesktop.org/"
diff --git a/abs/core/xorg-fonts-encodings/PKGBUILD b/abs/core/xorg-fonts-encodings/PKGBUILD
index a69df06..c465a74 100644
--- a/abs/core/xorg-fonts-encodings/PKGBUILD
+++ b/abs/core/xorg-fonts-encodings/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xorg-fonts-encodings
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org font encoding files"
 arch=(any)
 url="http://xorg.freedesktop.org/"
diff --git a/abs/core/xorg-fonts-misc/PKGBUILD b/abs/core/xorg-fonts-misc/PKGBUILD
index 6438a0c..61a4a85 100644
--- a/abs/core/xorg-fonts-misc/PKGBUILD
+++ b/abs/core/xorg-fonts-misc/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xorg-fonts-misc
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org misc fonts"
 arch=(any)
 url="http://xorg.freedesktop.org/"
diff --git a/abs/core/xorg-luit/PKGBUILD b/abs/core/xorg-luit/PKGBUILD
index fd210c8..69b019b 100644
--- a/abs/core/xorg-luit/PKGBUILD
+++ b/abs/core/xorg-luit/PKGBUILD
@@ -3,9 +3,8 @@
 
 pkgname=xorg-luit
 pkgver=1.1.0
-pkgrel=1
-pkgdesc="Filter that can be run between an arbitrary application and
-a UTF-8 terminal emulator"
+pkgrel=2
+pkgdesc="Filter that can be run between an arbitrary application and UTF-8 terminal emulator"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -17,7 +16,7 @@ sha1sums=('fa974b417f6b65c241398d8d011207c6facb0766')
 build() {
   cd "${srcdir}/luit-${pkgver}"
   ./configure --prefix=/usr
-  make || return 1
+  make
 }
 package() {
   cd "${srcdir}/luit-${pkgver}"
diff --git a/abs/core/xorg-res-utils/LICENSE.listres b/abs/core/xorg-res-utils/LICENSE.listres
new file mode 100644
index 0000000..0c5bb16
--- /dev/null
+++ b/abs/core/xorg-res-utils/LICENSE.listres
@@ -0,0 +1,42 @@
+Copyright (c) 1989  X Consortium
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the X Consortium.
+
+  Copyright 2005  Red Hat, Inc.
+ 
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation, and that the name of Red Hat not be used in
+  advertising or publicity pertaining to distribution of the software without
+  specific, written prior permission.  Red Hat makes no
+  representations about the suitability of this software for any purpose.  It
+  is provided "as is" without express or implied warranty.
+ 
+  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
diff --git a/abs/core/xorg-res-utils/LICENSE.viewres b/abs/core/xorg-res-utils/LICENSE.viewres
new file mode 100644
index 0000000..0c5bb16
--- /dev/null
+++ b/abs/core/xorg-res-utils/LICENSE.viewres
@@ -0,0 +1,42 @@
+Copyright (c) 1989  X Consortium
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the X Consortium.
+
+  Copyright 2005  Red Hat, Inc.
+ 
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation, and that the name of Red Hat not be used in
+  advertising or publicity pertaining to distribution of the software without
+  specific, written prior permission.  Red Hat makes no
+  representations about the suitability of this software for any purpose.  It
+  is provided "as is" without express or implied warranty.
+ 
+  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
diff --git a/abs/core/xorg-res-utils/PKGBUILD b/abs/core/xorg-res-utils/PKGBUILD
index 7e062e5..33966f5 100644
--- a/abs/core/xorg-res-utils/PKGBUILD
+++ b/abs/core/xorg-res-utils/PKGBUILD
@@ -1,31 +1,38 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 36734 2009-04-27 03:02:17Z eric $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-res-utils
 pkgver=1.0.3
-pkgrel=2
+pkgrel=4
 pkgdesc="X.Org X11 resource utilities"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
+license=('custom')
 depends=('libxaw')
 makedepends=('pkgconfig')
 groups=('xorg')
 source=(${url}/releases/individual/app/appres-1.0.1.tar.bz2
         ${url}/releases/individual/app/editres-1.0.3.tar.bz2
         ${url}/releases/individual/app/listres-1.0.1.tar.bz2
-        ${url}/releases/individual/app/viewres-1.0.1.tar.bz2)
+        ${url}/releases/individual/app/viewres-1.0.1.tar.bz2
+        LICENSE.listres LICENSE.viewres)
 md5sums=('420e6cdf38bb771ec8b00228bf09e8ff' 'a25f931cc6c8d03daaed434f5db5df2d'\
-         '827a1ac5adf9aadd0c13b54a897e297b' 'cdbed540daf7975b56000420c9aa5bf9')
+         '827a1ac5adf9aadd0c13b54a897e297b' 'cdbed540daf7975b56000420c9aa5bf9'\
+         '9c9b17ae5e9be0c570dabe9e54f54f6d' '9c9b17ae5e9be0c570dabe9e54f54f6d')
 
 build() {
-  cd ${startdir}/src
+  cd ${srcdir}
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
-      ./configure --prefix=/usr --disable-xprint
+      ./configure --prefix=/usr --mandir=/usr/share/man --disable-xprint
       make || return 1
-      make DESTDIR=${startdir}/pkg install || return 1
+      make DESTDIR=${pkgdir} install || return 1
+      install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${i%-*}
       popd
     fi
   done
+#Replacing stub license files
+  install -D -m644 "${srcdir}/LICENSE.listres" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.listres"
+  install -D -m644 "${srcdir}/LICENSE.viewres" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.viewres"
 }
diff --git a/abs/core/xorg-server-utils/PKGBUILD b/abs/core/xorg-server-utils/PKGBUILD
index 5185a07..0bae947 100644
--- a/abs/core/xorg-server-utils/PKGBUILD
+++ b/abs/core/xorg-server-utils/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xorg-server-utils
 pkgver=7.5
-pkgrel=6
+pkgrel=7
 pkgdesc="X.Org utilities required by xorg-server"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxfontcache>=1.0.5' 'libxi>=1.3' 'libxaw>=1.0.6' 'libxrandr>=1.3.0' 'libxxf86vm>=1.1.0' 'mcpp>=2.7.2')
diff --git a/abs/core/xorg-util-macros/PKGBUILD b/abs/core/xorg-util-macros/PKGBUILD
new file mode 100644
index 0000000..49d073c
--- /dev/null
+++ b/abs/core/xorg-util-macros/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 97536 2010-10-31 15:33:40Z jgc $
+#Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xorg-util-macros
+pkgver=1.11.0
+pkgrel=2
+pkgdesc="X.Org Autotools macros"
+arch=(any)
+license=('custom')
+url="http://xorg.freedesktop.org/"
+source=(${url}/releases/individual/util/util-macros-${pkgver}.tar.bz2)
+sha1sums=('646188eeca4fa319d95aba7a271149bcbf9ee49e')
+
+build() {
+  cd "${srcdir}/util-macros-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+package() {
+  cd "${srcdir}/util-macros-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/lib"
+  mv "${pkgdir}/usr/share/pkgconfig" "${pkgdir}/usr/lib/"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/abs/core/xorg-utils/PKGBUILD b/abs/core/xorg-utils/PKGBUILD
index cef7e9e..8040687 100644
--- a/abs/core/xorg-utils/PKGBUILD
+++ b/abs/core/xorg-utils/PKGBUILD
@@ -1,45 +1,41 @@
-# $Id: PKGBUILD 81985 2010-06-07 13:58:47Z jgc $
+# $Id: PKGBUILD 96495 2010-10-21 21:13:19Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-utils
 pkgver=7.6
-pkgrel=2
+pkgrel=6
 pkgdesc="Collection of client utilities used to query the X server"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libxxf86dga' 'libxi' 'libxxf86misc' 'libxtst' 'libxinerama' 'libxv'
+depends=('libxxf86dga' 'libxi' 'libxtst' 'libxinerama' 'libxv'
          'libdmx' 'libxft' 'libxaw>=1.0.6' 'libgl' 'libxcomposite' 'xcb-util')
 makedepends=('pkgconfig' 'mesa' 'glproto' 'xorg-util-macros')
 groups=('xorg')
-source=(${url}/releases/individual/app/xdpyinfo-1.1.0.tar.bz2
+source=(${url}/releases/individual/app/xdpyinfo-1.2.0.tar.bz2
         ${url}/releases/individual/app/xdriinfo-1.0.3.tar.bz2
         ${url}/releases/individual/app/xev-1.0.4.tar.bz2
-        ${url}/releases/individual/app/xfd-1.0.1.tar.bz2
-        ${url}/releases/individual/app/xfontsel-1.0.2.tar.bz2
+        ${url}/releases/individual/app/xfd-1.1.0.tar.bz2
+        ${url}/releases/individual/app/xfontsel-1.0.3.tar.bz2
         ${url}/releases/individual/app/xlsatoms-1.1.0.tar.bz2
-        ${url}/releases/individual/app/xlsclients-1.1.0.tar.bz2
-        ${url}/releases/individual/app/xlsfonts-1.0.2.tar.bz2
+        ${url}/releases/individual/app/xlsclients-1.1.1.tar.bz2
+        ${url}/releases/individual/app/xlsfonts-1.0.3.tar.bz2
         ${url}/releases/individual/app/xprop-1.1.0.tar.bz2
         ${url}/releases/individual/app/xvinfo-1.1.0.tar.bz2
-        ${url}/releases/individual/app/xwininfo-1.0.5.tar.bz2
-        LICENSE.xdpyinfo
-        LICENSE.xfd
+        ${url}/releases/individual/app/xwininfo-1.1.0.tar.bz2
         LICENSE.xprop
         LICENSE.xlsfonts)
-md5sums=('d1d516610316138105cd07064b257c5c'
+md5sums=('c52fda7bbc80e74b7839f29298cb1d77'
          'cb304d1ce562ac48b68eedeba38c662f'
          '5f98c0a2725a33d60ef4956befe078fb'
-         'c72abd90f50ef459bc14b39ec9fcc7f8'
-         '288fe4cf8a990e4e602aac16dd9109fb'
+         '17d8ef0d490301158f8abf7641cca243'
+         '299fabe7d7be92b6572d814895ce3bb1'
          'c543ccb6489b629d427810d9a57d0724'
-         '550a0fee047c5043f2cbf190b41f8a1b'
-         '28958248590ff60ecd70e8f590d977b7'
+         '6d42621616da0c720f640d23873604ce'
+         'bf6f3e7074479839d5182ffed735d2be'
          'f0bacbd30f0dd1c1e9ccafe97687b7a4'
          '8cc299b2cb636b5f7fe672610789d3d4'
-         '908f8bc3255f639effa9780fb1c19ea4'
-         'b43f731a9e2684728230ce8e33f63228'
-         '9e8a82b7e9898f36c378b80509f170a6'
+         '932cb1393dee3caaf26f3515f640d783'
          '801f9850b29dad506e995d011efe2914'
          '345d6e65d71fdde292cc27f93c15e4a1')
 
diff --git a/abs/core/xorg-x11perf/PKGBUILD b/abs/core/xorg-x11perf/PKGBUILD
index 8f5d144..3d9f84d 100644
--- a/abs/core/xorg-x11perf/PKGBUILD
+++ b/abs/core/xorg-x11perf/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xorg-x11perf
 pkgver=1.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple X server performance benchmarker"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu' 'libxrender' 'libxft' 'libxext')
@@ -17,6 +17,9 @@ build() {
   cd "${srcdir}/x11perf-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+package() {
+  cd "${srcdir}/x11perf-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/abs/core/xorg-xauth/PKGBUILD b/abs/core/xorg-xauth/PKGBUILD
index bd2b8f7..4736f05 100644
--- a/abs/core/xorg-xauth/PKGBUILD
+++ b/abs/core/xorg-xauth/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-xauth
 pkgver=1.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org authorization settings program"
 arch=('i686' 'x86_64')
 license=('custom')
diff --git a/abs/core/xorg-xcursorgen/PKGBUILD b/abs/core/xorg-xcursorgen/PKGBUILD
index c2a5ba5..146cdd6 100644
--- a/abs/core/xorg-xcursorgen/PKGBUILD
+++ b/abs/core/xorg-xcursorgen/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xorg-xcursorgen
 pkgver=1.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Create an X cursor file from PNG images"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxcursor' 'libpng')
@@ -17,6 +17,9 @@ build() {
   cd "${srcdir}/xcursorgen-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+package() {
+  cd "${srcdir}/xcursorgen-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/abs/core/xorg-xinit/PKGBUILD b/abs/core/xorg-xinit/PKGBUILD
index 6705c49..9bbf6f6 100644
--- a/abs/core/xorg-xinit/PKGBUILD
+++ b/abs/core/xorg-xinit/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-xinit
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64')
 license=('custom')
@@ -32,7 +32,7 @@ build() {
   cd "${srcdir}/xinit-${pkgver}"
   patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
   ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
-  make || return 1
+  make
 }
 package() {
   cd "${srcdir}/xinit-${pkgver}"
diff --git a/abs/core/xorg-xkb-utils/PKGBUILD b/abs/core/xorg-xkb-utils/PKGBUILD
index ad15056..e6a1e09 100644
--- a/abs/core/xorg-xkb-utils/PKGBUILD
+++ b/abs/core/xorg-xkb-utils/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xorg-xkb-utils
 pkgver=7.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org keyboard utilities"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
diff --git a/abs/core/xorg-xkill/PKGBUILD b/abs/core/xorg-xkill/PKGBUILD
new file mode 100644
index 0000000..9dc8133
--- /dev/null
+++ b/abs/core/xorg-xkill/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xorg-xkill
+pkgver=1.0.3
+pkgrel=1
+pkgdesc="Kill a client by its X resource"
+arch=('i686' 'x86_64')
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('libx11' 'libxmu')
+makedepends=('xorg-util-macros')
+source=(http://xorg.freedesktop.org/archive/individual/app/xkill-${pkgver}.tar.bz2)
+sha1sums=('bab7b9c7f3bc053d743eb339cf5fa496bace57e5')
+
+build() {
+  cd "${srcdir}/xkill-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+package() {
+  cd "${srcdir}/xkill-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/abs/core/xorg-xpr/PKGBUILD b/abs/core/xorg-xpr/PKGBUILD
index 63a7b59..9fa513a 100644
--- a/abs/core/xorg-xpr/PKGBUILD
+++ b/abs/core/xorg-xpr/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=xorg-xpr
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Print an X window dump from xwd"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
diff --git a/abs/core/xorg-xwd/PKGBUILD b/abs/core/xorg-xwd/PKGBUILD
index 6586725..5fd334d 100644
--- a/abs/core/xorg-xwd/PKGBUILD
+++ b/abs/core/xorg-xwd/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xorg-xwd
 pkgver=1.0.4
-pkgrel=1
+pkgrel=5
 pkgdesc="X Window System image dumping utility"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
@@ -17,6 +17,9 @@ build() {
   cd "${srcdir}/xwd-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+package() {
+  cd "${srcdir}/xwd-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/abs/core/xorg-xwud/PKGBUILD b/abs/core/xorg-xwud/PKGBUILD
index 7ed437a..aaef609 100644
--- a/abs/core/xorg-xwud/PKGBUILD
+++ b/abs/core/xorg-xwud/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xorg-xwud
 pkgver=1.0.3
-pkgrel=1
+pkgrel=3
 pkgdesc="X Window System image undumping utility"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11')
@@ -17,6 +17,9 @@ build() {
   cd "${srcdir}/xwud-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+package() {
+  cd "${srcdir}/xwud-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-- 
cgit v0.12

