From afd322c24cf05a5f03cc55f01defdb5c01d0cc0b Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Sat, 10 May 2008 17:25:39 +0000
Subject: [PATCH] Updated to ImageMagick-6.3.5-10

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@7436 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 general/genutils/imagemagick.xml   | 20 ++++++++++++++------
 introduction/welcome/changelog.xml |  9 +++++++++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/general.ent b/general.ent
index 52e4c6619c..c22a166aa3 100644
--- a/general.ent
+++ b/general.ent
@@ -3,7 +3,7 @@ $LastChangedBy$
 $Date$
 -->
 
-<!ENTITY day          "09">                   <!-- Always 2 digits -->
+<!ENTITY day          "10">                   <!-- Always 2 digits -->
 <!ENTITY month        "05">                   <!-- Always 2 digits -->
 <!ENTITY year         "2008">
 <!ENTITY version      "svn-&year;&month;&day;">
diff --git a/general/genutils/imagemagick.xml b/general/genutils/imagemagick.xml
index 2bb5212685..4260364d00 100644
--- a/general/genutils/imagemagick.xml
+++ b/general/genutils/imagemagick.xml
@@ -4,13 +4,21 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY imagemagick-patch-version "3">
+  <!ENTITY imagemagick-patch-version "10">
+  <!-- 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
+       the path in these URL's. Otherwise these links are broken within days
+       after updates :-(  -->
+  <!ENTITY imagemagick-download-http "http://downloads.sourceforge.net/imagemagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.bz2">
+  <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.net/pub/ImageMagick/legacy/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.bz2">
+  <!-- Commenting these out to use the legacy version for the BLFS-6.3 release 
   <!ENTITY imagemagick-download-http "http://www.imagemagick.org/download/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.bz2">
-  <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.net/pub/ImageMagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.bz2">
-  <!ENTITY imagemagick-md5sum        "8e3dbc80d5185a45e8989660ac3e13e0">
-  <!ENTITY imagemagick-size          "5.9 MB">
-  <!ENTITY imagemagick-buildsize     "140 MB (additional 70 MB if you run the Image::Magick demo)">
-  <!ENTITY imagemagick-time          "3.8 SBU (Additional 1.3 SBU to run the test suite)">
+  <!ENTITY imagemagick-download-ftp  "ftp://ftp.imagemagick.net/pub/ImageMagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.bz2"> -->
+  <!ENTITY imagemagick-md5sum        "0e638f94ab70272a645b4d6ae06201d8">
+  <!ENTITY imagemagick-size          "7.5 MB">
+  <!ENTITY imagemagick-buildsize     "211 MB (additional 75 MB if you run the Image::Magick demo)">
+  <!ENTITY imagemagick-time          "4.2 SBU (Additional 1.8 SBU to run the test suite)">
 ]>
 
 <!-- Editors: It is highly unlikely that the buildsize (disk space used) will
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 5dc6563087..e5668871df 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,15 @@
 
 -->
 
+    <listitem>
+      <para>May 10th, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[randy] - Updated to ImageMagick-6.3.5-10.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>May 9th, 2008</para>
       <itemizedlist>