[arch-commits] Commit in irda-utils/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Giovanni Scafora]

    Date: Monday, October 19, 2009 @ 05:31:59
  Author: giovanni
Revision: 56081

Merged revisions 356,56043 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/irda-utils/trunk

........
  r356 | aaron | 2008-04-18 15:56:27 -0700 (ven, 18 apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r56043 | andrea | 2009-10-18 07:44:40 -0700 (dom, 18 ott 2009) | 2 lines
  
  upgpkg: irda-utils 0.9.18-2
      fixed man path
........

Modified:
  irda-utils/repos/extra-x86_64/	(properties)
  irda-utils/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)


Property changes on: irda-utils/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /irda-utils/trunk:1
   + /irda-utils/trunk:1-56080

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-19 09:21:55 UTC (rev 56080)
+++ extra-x86_64/PKGBUILD	2009-10-19 09:31:59 UTC (rev 56081)
@@ -1,10 +1,10 @@
 # $Id$
-#Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
 # Contributor: Aurelien Foret <orelien at chez.com>
 
 pkgname=irda-utils
 pkgver=0.9.18
-pkgrel=1
+pkgrel=2
 pkgdesc="Utilities for infrared communication between devices"
 url="http://irda.sourceforge.net/"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@
 backup=(etc/conf.d/irda)
 makedepends=('pciutils')
 depends=('glib2')
-source=(http://downloads.sourceforge.net/sourceforge/irda/$pkgname-$pkgver.tar.gz
+source=(http://downloads.sourceforge.net/irda/$pkgname-$pkgver.tar.gz
         irda irda.conf.d irda.patch)
 options=(!emptydirs)
 md5sums=('84dc12aa4c3f61fccb8d8919bf4079bb'
@@ -20,15 +20,18 @@
          '1a9c76b74faa993cc900152361798c50'
          'f9e0ba20e1047ee82af17698cb115a7d')
 
-build()
-{
-  cd $startdir/src/$pkgname-$pkgver
+build(){
+  cd $srcdir/$pkgname-$pkgver
 
-  patch -Np1 -i $startdir/src/irda.patch
-  make prefix=/usr RPM_BUILD_ROOT=$startdir/pkg ROOT=$startdir/pkg || return 1
+  patch -Np1 -i $srcdir/irda.patch
+  make prefix=/usr RPM_BUILD_ROOT=$pkgdir ROOT=$pkgdir || return 1
 
-  mkdir -p $startdir/pkg/usr/{s,}bin
-  make ROOT=$startdir/pkg PREFIX=$startdir/pkg install || return 1
-  install -D -m755 ../irda $startdir/pkg/etc/rc.d/irda
-  install -D -m644 ../irda.conf.d $startdir/pkg/etc/conf.d/irda
+  mkdir -p $pkgdir/usr/{s,}bin
+  make ROOT=$pkgdir PREFIX=$pkgdir install || return 1
+  install -D -m755 ../irda $pkgdir/etc/rc.d/irda
+  install -D -m644 ../irda.conf.d $pkgdir/etc/conf.d/irda
+
+  # fix man path
+  install -d ${pkgdir}/usr/share/
+  mv ${pkgdir}/usr/man ${pkgdir}/usr/share/ || return 1
 }