[arch-commits] Commit in psiconv/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Monday, December 4, 2017 @ 21:32:21
  Author: arojas
Revision: 311616

Rebuild with libmagick6

Modified:
  psiconv/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-04 20:50:43 UTC (rev 311615)
+++ PKGBUILD	2017-12-04 21:32:21 UTC (rev 311616)
@@ -1,22 +1,30 @@
 # $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Maintainer:
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=psiconv
 pkgver=0.9.9
-pkgrel=4
+pkgrel=5
 pkgdesc="Converts Psion 5(MX) files to more commonly used file formats"
 arch=('x86_64')
 url="http://software.frodo.looijaard.name/psiconv/"
 license=('GPL')
-depends=('imagemagick')
-makedepends=('bc')
+depends=('libmagick6')
+makedepends=('bc' 'imagemagick') # for the *-config wrappers
 backup=('etc/psiconv/psiconv.conf')
 source=("http://www.frodo.looijaard.name/system/files/software/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('286e427b10f4d10aaeef1944210a2ea6')
 
+prepare() {
+  cd $pkgname-$pkgver
+  sed -e 's|Magick-config|MagickCore-config|g' -i configure.in
+  autoreconf -vi
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
+  PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig" \
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --mandir=/usr/share/man
@@ -24,6 +32,6 @@
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }