[arch-commits] Commit in imlib/repos (3 files)

[Eric Bélanger]

    Date: Sunday, June 14, 2009 @ 23:45:25
  Author: eric
Revision: 42504

Fixed svn conflict

Added:
  imlib/repos/extra-i686/ChangeLog
    (from rev 42502, imlib/trunk/ChangeLog)
Modified:
  imlib/repos/extra-i686/	(properties)
  imlib/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    8 ++++++++
 PKGBUILD  |   36 ++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 18 deletions(-)


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

Copied: imlib/repos/extra-i686/ChangeLog (from rev 42502, imlib/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2009-06-15 03:45:25 UTC (rev 42504)
@@ -0,0 +1,8 @@
+2009-06-14  Eric Belanger  <eric at archlinux.org>
+
+	* imlib 1.9.15-5
+	* Added libxt makedepends (close FS#15086)
+	* Changed libungif depends to giflib
+	* Updated url
+	* FHS man pages
+	* Added ChangeLog

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-06-15 03:26:05 UTC (rev 42503)
+++ extra-i686/PKGBUILD	2009-06-15 03:45:25 UTC (rev 42504)
@@ -1,28 +1,28 @@
 # $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Committer: Judd Vinet <jvinet at zeroflux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
 pkgname=imlib
 pkgver=1.9.15
-pkgrel=4
+pkgrel=5
 pkgdesc="General image handling library for X11 and Gtk"
-arch=(i686 x86_64)
-url="http://www.enlightenment.org/Libraries/Imlib.html"
+arch=('i686' 'x86_64')
+url="http://freshmeat.net/projects/imlib/"
 license=('GPL')
-depends=(gtk libungif libpng libtiff libsm)
-source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/$pkgname-$pkgver.tar.bz2
+depends=('gtk' 'giflib' 'libpng' 'libtiff' 'libsm')
+makedepends=('libxt')
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2
         debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch)
-options=(!libtool)
-md5sums=('7db987e6c52e4daf70d7d0f471238eae'
-         '5f9da697934b6bd3b497ac9160ce4f5c'
-         'b273d36aa60adbfaacaf6062234e4c1f'
-         '33b832f0dc6c9723cd0dfe9c8d0a6797')
+md5sums=('7db987e6c52e4daf70d7d0f471238eae' '5f9da697934b6bd3b497ac9160ce4f5c'\
+         'b273d36aa60adbfaacaf6062234e4c1f' '33b832f0dc6c9723cd0dfe9c8d0a6797')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i ${startdir}/src/debian-bug448360.patch || return 1
-  patch -Np1 -i ${startdir}/src/CAN-2004-1026.patch || return 1
-  patch -Np0 -i ${startdir}/src/aclocal-fixes.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-shm
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/debian-bug448360.patch" || return 1
+  patch -Np1 -i "${srcdir}/CAN-2004-1026.patch" || return 1
+  patch -Np0 -i "${srcdir}/aclocal-fixes.patch" || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR="${pkgdir}" install || return 1
 }