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

[Eric Bélanger]

    Date: Monday, February 23, 2009 @ 21:03:10
  Author: eric
Revision: 27630

fixed svn conflict

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

----------+
 PKGBUILD |   23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)


Property changes on: fbida/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /fbida/trunk:1
   + /fbida/trunk:1-27629

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-24 02:01:37 UTC (rev 27629)
+++ extra-i686/PKGBUILD	2009-02-24 02:03:10 UTC (rev 27630)
@@ -1,26 +1,29 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
 
 pkgname=fbida
-pkgver=2.06
+pkgver=2.07
 pkgrel=1
 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://linux.bytesex.org/fbida/"
-depends=('libungif' 'libtiff' 'libexif' 'lesstif' 'libxpm' 'libpng' 'libx11' 'libxext')
-source=(http://dl.bytesex.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+license=('GPL2')
+depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libxpm' 'libpng' 'libx11' 'libxext' 'fontconfig')
+optdepends=('ghostscript: to use fbgs')
 replaces=('fbi')
 provides=('fbi')
-backup="etc/X11/app-defaults/Ida"
+backup=('etc/X11/app-defaults/Ida')
+source=(http://dl.bytesex.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('3e05910fb7c1d9b2bd3e272d96db069c')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   make Make.config || return 1
   for config in HAVE_LIB{SANE,CURL,LIRC}; do
-     sed -i "s/$config.*/$config := no/" Make.config
+     sed -i "s/$config.*/$config := no/" Make.config || return 1
   done
   make CC=gcc || return 1
-  make DESTDIR=$startdir/pkg prefix=/usr install
+  make DESTDIR=$pkgdir prefix=/usr install || return 1
 }
 
-md5sums=('1f78e9a83fb546660a024a4bc0580ace')