[arch-commits] Commit in xf86-input-joystick/trunk (PKGBUILD)

[Jan de Groot]

    Date: Tuesday, August 24, 2010 @ 04:56:46
  Author: jgc
Revision: 88575

upgpkg: xf86-input-joystick 1.5.0-3
Rebuild for xserver 1.9

Modified:
  xf86-input-joystick/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-24 08:55:30 UTC (rev 88574)
+++ PKGBUILD	2010-08-24 08:56:46 UTC (rev 88575)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-input-joystick
 pkgver=1.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org Joystick input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server>=1.8.0')
-conflicts=('xorg-server<1.8.0')
+makedepends=('xorg-server-devel')
+conflicts=('xorg-server<1.9.0')
 groups=('xorg-input-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE)
@@ -19,9 +19,9 @@
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/"
 }