[arch-commits] Commit in obexftp/repos (extra-i686 extra-i686/PKGBUILD)

[Giovanni Scafora]

    Date: Wednesday, February 10, 2010 @ 12:46:52
  Author: giovanni
Revision: 68082

Merged revisions 68081 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/obexftp/trunk

........
  r68081 | giovanni | 2010-02-10 18:45:56 +0100 (mer, 10 feb 2010) | 1 line
........

Modified:
  obexftp/repos/extra-i686/	(properties)
  obexftp/repos/extra-i686/PKGBUILD

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


Property changes on: obexftp/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /obexftp/trunk:1-56269
   + /obexftp/trunk:1-68081

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-02-10 17:45:56 UTC (rev 68081)
+++ extra-i686/PKGBUILD	2010-02-10 17:46:52 UTC (rev 68082)
@@ -1,6 +1,5 @@
 # $Id$
-# Maintainer: Geoffroy Carrier <geoffroy at archlinux.org>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
 
 pkgname=obexftp
@@ -9,20 +8,22 @@
 pkgdesc="A tool for transfer files to/from any OBEX enabled device"
 arch=('i686' 'x86_64')
 url="http://openobex.triq.net/obexftp/obexftp"
-license=('GPL2')
+license=('GPL')
 depends=('openobex>=1.5' 'python>=2.6')
 makedepends=('pkgconfig')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/openobex/$pkgname-$pkgver.tar.bz2)
+source=(http://downloads.sourceforge.net/sourceforge/openobex/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('f20762061b68bc921e80be4aebc349eb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-ruby || return 1
+
+  ./configure --prefix=/usr \
+              --disable-ruby || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
 
   # remove nasty files
-  mv $startdir/pkg/usr/lib/perl5/site_perl/5.10.0 $startdir/pkg/usr/lib/perl5/site_perl/current
-  rm -f $startdir/pkg/usr/lib/perl5/core_perl/perllocal.pod
+  mv ${pkgdir}/usr/lib/perl5/site_perl/5.10.0 ${pkgdir}/usr/lib/perl5/site_perl/current
+  rm -f ${pkgdir}/usr/lib/perl5/core_perl/perllocal.pod
 }