From a2577758ee74f5f0a34bb175037046a78442459f Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Tue, 21 May 2013 23:41:52 +0000
Subject: [PATCH] ImageMagick-6.8.5-6

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11183 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  6 +++---
 general/genutils/imagemagick.xml   | 16 +++++++++-------
 introduction/welcome/changelog.xml |  9 +++++++++
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/general.ent b/general.ent
index 19ceec1adc..df6c9b692f 100644
--- a/general.ent
+++ b/general.ent
@@ -3,13 +3,13 @@ $LastChangedBy$
 $Date$
 -->
 
-<!ENTITY day          "19">                   <!-- Always 2 digits -->
+<!ENTITY day          "21">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2013">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "May 19th, &year;">
+<!ENTITY releasedate  "May 21st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|testing|unstable|development] -->
@@ -314,7 +314,7 @@ export -f as_root</userinput></screen>
 <!ENTITY gtk-doc-version              "1.18">
 <!ENTITY hd2u-version                 "1.0.3">
 <!ENTITY icon-naming-utils-version    "0.8.90">
-<!ENTITY imagemagick-version          "6.8.2">
+<!ENTITY imagemagick-version          "6.8.5">
 <!ENTITY intltool-version             "0.50.2">
 <!ENTITY libiodbc-version             "3.52.8">
 <!ENTITY pinentry-version             "0.8.3">
diff --git a/general/genutils/imagemagick.xml b/general/genutils/imagemagick.xml
index 9ed58db4b6..3a853f09d6 100644
--- a/general/genutils/imagemagick.xml
+++ b/general/genutils/imagemagick.xml
@@ -4,7 +4,7 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "8">
+  <!ENTITY imagemagick-patch-version "6">
   <!-- Not sure what to do here as ImageMagick is one of the fastest-moving
        targets in all of open-source. One solution is to always use the last
        version of a specific major-minor from the 'legacy' subdirectory of
@@ -15,10 +15,10 @@
 
   <!ENTITY imagemagick-download-http " ">
   <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
-  <!ENTITY imagemagick-md5sum        "c90d99ce0f0e08ebeab568eda7eedec7">
-  <!ENTITY imagemagick-size          "8.3 MB">
-  <!ENTITY imagemagick-buildsize     "450 MB (full build with all dependencies)">
-  <!ENTITY imagemagick-time          "5.0 SBU (full build - additional 20 SBU to run the test suite)">
+  <!ENTITY imagemagick-md5sum        "d2d03e8131722a5b85fc2a866d9df517">
+  <!ENTITY imagemagick-size          "7.9 MB">
+  <!ENTITY imagemagick-buildsize     "208 MB (with typical dependencies, reputedly 450 MB with all dependencies)">
+  <!ENTITY imagemagick-time          "1.9 SBU (typical build - additional 20 SBU to run the test suite)">
 ]>
 
 <!-- Editors: It is highly unlikely that the buildsize (disk space used) will
@@ -28,6 +28,8 @@
      dependencies are installed, which is what we want.
 
      Marked as 'typical' because nobody builds ALL the optional extras [ken]
+     Saved the "full" 450MB as a comment - feel free to update this iff you
+     do build all dependencies, it's probably a lot bigger now.
 
      Also, please look over the output from the configure command for any
      additional dependencies that need to be listed, as ImageMagick is
@@ -59,7 +61,7 @@ xreflabel="ImageMagick-&imagemagick-version;-&imagemagick-patch-version;">
       for Perl and C++ are also available.
     </para>
 
-    &lfs72_checked;
+    &lfs73_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -132,7 +134,7 @@ xreflabel="ImageMagick-&imagemagick-version;-&imagemagick-patch-version;">
       or <xref linkend="gnupg"/> or <xref linkend="gnupg2"/>
       (you'll have to do some hacking to use <application>GnuPG</application>),
       <xref linkend="sane"/>,
-      <ulink url="http://ufraw.sourceforge.net/">ufraw</ulink> (only for raw formats listed in
+      <ulink url="http://ufraw.sourceforge.net/">ufraw</ulink> (for raw formats listed in
       <filename>www/formats.html</filename>),
       <xref linkend="wget"/>, and
       <xref linkend="xdg-utils"/>
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 678c591d36..49cd91b9c2 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -43,6 +43,15 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>May 21st, 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - ImageMagick 6.8.5-6.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>May 19th, 2013</para>
       <itemizedlist>