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

[Jan Steffens]

    Date: Sunday, March 18, 2018 @ 23:50:59
  Author: heftig
Revision: 319615

6.9.9.39-2

Modified:
  imagemagick6/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-18 22:43:49 UTC (rev 319614)
+++ PKGBUILD	2018-03-18 23:50:59 UTC (rev 319615)
@@ -4,7 +4,7 @@
 pkgbase=imagemagick6
 pkgname=(libmagick6 imagemagick6)
 pkgver=6.9.9.39
-pkgrel=1
+pkgrel=2
 pkgdesc="An image viewing/manipulation program (version 6)"
 url="https://legacy.imagemagick.org/"
 arch=(x86_64)
@@ -22,8 +22,6 @@
             'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
 validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A)  # Lexie Parsimoniae
 
-shopt -s extglob
-
 prepare() {
   mkdir -p binpkg/usr/lib/pkgconfig {binpkg,docpkg}/usr/share
 
@@ -38,6 +36,7 @@
 build() {
   cd $_tarname
   ./configure \
+    PKG_CONFIG="/usr/bin/env PKG_CONFIG_PATH=/usr/lib/$pkgbase/pkgconfig pkg-config" \
     --prefix=/usr \
     --sysconfdir=/etc \
     --with-dejavu-font-dir=/usr/share/fonts/TTF \
@@ -92,11 +91,8 @@
   options=('!docs' '!emptydirs' libtool)
 
   cd $_tarname
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install pkgconfigdir="/usr/lib/$pkgbase/pkgconfig"
 
-  mkdir -p "$pkgdir/usr/lib/$pkgbase/pkgconfig"
-  mv "$pkgdir"/usr/lib/pkgconfig/!(*Q16HDRI*) "$pkgdir/usr/lib/$pkgbase/pkgconfig/"
-
   rm "$pkgdir"/etc/$_relname/type-{apple,urw-base35,windows}.xml
   rm "$pkgdir"/usr/lib/*.la