From d2c5225f2a3acabdeb7deb2cafb490935266481e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 16 Dec 2012 21:19:00 +0100
Subject: [PATCH] xf86-input-joystick: update to 1.16.1.

---
 .../files/50-joystick.conf                    |  6 ++++++
 srcpkgs/xf86-input-joystick/template          | 19 ++++++++++++-------
 .../xf86-input-joystick-devel.template        |  5 ++---
 3 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/xf86-input-joystick/files/50-joystick.conf

diff --git a/srcpkgs/xf86-input-joystick/files/50-joystick.conf b/srcpkgs/xf86-input-joystick/files/50-joystick.conf
new file mode 100644
index 00000000000..95a295ab001
--- /dev/null
+++ b/srcpkgs/xf86-input-joystick/files/50-joystick.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+	Identifier "joystick catchall"
+	MatchIsJoystick "on"
+	MatchDevicePath "/dev/input/event*"
+	Driver "joystick"
+EndSection
diff --git a/srcpkgs/xf86-input-joystick/template b/srcpkgs/xf86-input-joystick/template
index 7f11793d66c..25ac09eca1e 100644
--- a/srcpkgs/xf86-input-joystick/template
+++ b/srcpkgs/xf86-input-joystick/template
@@ -1,15 +1,20 @@
 # Template build file for 'xf86-input-joystick'.
 pkgname=xf86-input-joystick
-version=1.5.0
-distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
-depends="glibc xorg-server"
-makedepends="xorg-server-devel"
+version=1.6.1
 revision=1
+build_style=gnu-configure
+subpackages="${pkgname}-devel"
+depends="xserver-abi-input>=18<19"
+makedepends="xorg-server-devel>=1.13.1"
 short_desc="Joystick Input driver for Xorg"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=718118c5d769529f604c1ff099fe637173442cf01fc40bdef7d45f4baea282a9
+homepage="http://xorg.freedesktop.org/"
+license="MIT"
+distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
+checksum=1ded5d8f990a7687c44b45f68ad4a516f14fa94efa9da436955011ee6a9bf7f5
 long_desc="
  This is the Joystick Input driver for the Xorg X11 server."
 
-subpackages="$pkgname-devel"
+post_install() {
+	vinstall ${FILESDIR}/50-joystick.conf 644 etc/X11/xorg.conf.d
+}
diff --git a/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template b/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template
index c7aadc55850..af69d9cfbeb 100644
--- a/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template
+++ b/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template
@@ -1,14 +1,13 @@
 # Template file for 'xf86-input-joystick-devel'.
 #
-depends="xorg-server-devel xf86-input-joystick"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+noarch=yes
 
-do_install()
-{
+do_install() {
 	mkdir -p ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib