From 06e2388e6f2e5b9bbf3ec5f07623b3a7f24c90da Mon Sep 17 00:00:00 2001
From: Cameron Nemo <camerontnorman@gmail.com>
Date: Tue, 25 Dec 2018 15:21:40 -0800
Subject: [PATCH] ImageMagick6: update to 6.9.10.20.

---
 srcpkgs/ImageMagick6/template | 18 +++++++++---------
 srcpkgs/ImageMagick6/update   |  2 --
 2 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 srcpkgs/ImageMagick6/update

diff --git a/srcpkgs/ImageMagick6/template b/srcpkgs/ImageMagick6/template
index 09966230609..4b0f5452fd5 100644
--- a/srcpkgs/ImageMagick6/template
+++ b/srcpkgs/ImageMagick6/template
@@ -1,10 +1,10 @@
 # Template file for 'ImageMagick6'
 pkgname=ImageMagick6
 _majorver=6.9.10
-_patchver=19
+_patchver=20
 version="${_majorver}.${_patchver}"
 revision=1
-wrksrc="ImageMagick-${_majorver}-${_patchver}"
+wrksrc="${pkgname}-${_majorver}-${_patchver}"
 build_style=gnu-configure
 configure_args="--without-autotrace --with-wmf=yes
  --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes
@@ -19,8 +19,8 @@ short_desc="Package for display and interactive manipulation of images"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="ImageMagick"
 homepage="https://www.imagemagick.org/"
-distfiles="https://www.imagemagick.org/download/ImageMagick-${_majorver}-${_patchver}.tar.xz"
-checksum=d3906bdfcb7c22c7d0945f6d19c992d496c3cf3acf5a555cfc8ba59a8e961889
+distfiles="https://github.com/ImageMagick/ImageMagick6/archive/${_majorver}-${_patchver}.tar.gz"
+checksum=8c0a36b441f487bb1642b8e768a4021721b9033f8ec88ed2fa9b1fd3c3fd1117
 
 keep_libtool_archives=yes
 conf_files="/etc/ImageMagick-${_majorver%%.*}/*.xml"
@@ -36,15 +36,15 @@ if [ -z "$CROSS_BUILD" ]; then
 	subpackages+=" libmagick6-perl"
 fi
 
-post_extract() {
-	sed -i '/VERSION/s/6\.9A/6.99/g' version.sh PerlMagick/Makefile.PL \
-		PerlMagick/*/Makefile.PL PerlMagick/quantum/quantum.pm
-}
-
 pre_configure() {
 	autoreconf -if
 }
 
+post_configure() {
+	sed -i '/VERSION/s/6\.9A/6.99/g' version.sh PerlMagick/Makefile.PL \
+		PerlMagick/*/Makefile.PL PerlMagick/quantum/quantum.pm
+}
+
 do_check() {
 	# Disable failing checks
 	sed -i '/validate-formats/d' Makefile
diff --git a/srcpkgs/ImageMagick6/update b/srcpkgs/ImageMagick6/update
deleted file mode 100644
index 2c400e71128..00000000000
--- a/srcpkgs/ImageMagick6/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="http://www.imagemagick.org/download/"
-pattern="${pkgname/6/}-\K6[\d.-]+(?=\.tar\.xz)"