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

[Jan de Groot]

    Date: Tuesday, August 24, 2010 @ 04:50:12
  Author: jgc
Revision: 88569

upgpkg: xf86-input-fpit 1.3.0-6
Rebuild for xserver 1.9

Modified:
  xf86-input-fpit/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-24 08:47:30 UTC (rev 88568)
+++ PKGBUILD	2010-08-24 08:50:12 UTC (rev 88569)
@@ -3,14 +3,14 @@
 
 pkgname=xf86-input-fpit
 pkgver=1.3.0
-pkgrel=5
+pkgrel=6
 pkgdesc="X.Org Fujitsu Stylistic Tablet PC 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')
 backup=(etc/X11/xorg.conf.d/50-fpit.conf)
 groups=('xorg-input-drivers')
 options=('!libtool')
@@ -25,11 +25,13 @@
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/fpit-1.3.0-abi.patch || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  patch -Np1 -i ${srcdir}/fpit-1.3.0-abi.patch
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  install -m644 "${srcdir}/50-fpit.conf" "${pkgdir}/etc/X11/xorg.conf.d/" || return 1
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -m644 "${srcdir}/50-fpit.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
 }