Pullup ticket 2193 - requested by tron

security update for ImageMagick, p5-PerlMagick

- pkgsrc/graphics/ImageMagick/Makefile.common		1.76
- pkgsrc/graphics/ImageMagick/PLIST			1.57
- pkgsrc/graphics/ImageMagick/distinfo			1.91
- pkgsrc/graphics/ImageMagick/patches/patch-aa		removed

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Mon Sep 24 08:03:25 UTC 2007

   Modified Files:
	   pkgsrc/graphics/ImageMagick: Makefile.common PLIST distinfo
   Removed Files:
	   pkgsrc/graphics/ImageMagick/patches: patch-aa

   Log Message:
   Update ImageMagick and p5-PerlMagick packages to version 6.3.5.10.
   The new version provides a lot of bug fixes and small enhancements and
   fixes four security vulnerabilites found by iDefense (CVE-4985, CVE-4986,
   CVE-4987 and CVE-4988). Approved by wiz@.

4 files changed, 19 insertions, 69 deletions

diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index c637e47bd53..201220911ab 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.75 2007/06/16 21:58:09 heinz Exp $
+# $NetBSD: Makefile.common,v 1.75.2.1 2007/09/24 08:53:14 ghen Exp $
 
 ###########################################################################
 #
@@ -9,8 +9,8 @@
 #
 ###########################################################################
 
-IM_MAJOR_VER=		6.3.4
-IM_MINOR_VER=		9
+IM_MAJOR_VER=		6.3.5
+IM_MINOR_VER=		10
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 08f325b0b78..d843ed3cb68 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.56 2007/06/16 21:58:09 heinz Exp $
+@comment $NetBSD: PLIST,v 1.56.2.1 2007/09/24 08:53:14 ghen Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -47,6 +47,7 @@ include/magick/constitute.h
 include/magick/decorate.h
 include/magick/delegate.h
 include/magick/deprecate.h
+include/magick/distort.h
 include/magick/display.h
 include/magick/draw.h
 include/magick/effect.h
@@ -66,6 +67,7 @@ include/magick/magic.h
 include/magick/magick-config.h
 include/magick/magick-type.h
 include/magick/magick.h
+include/magick/matrix.h
 include/magick/memory_.h
 include/magick/methods.h
 include/magick/mime.h
@@ -82,6 +84,7 @@ include/magick/quantize.h
 include/magick/quantum.h
 include/magick/random_.h
 include/magick/registry.h
+include/magick/resample.h
 include/magick/resize.h
 include/magick/resource_.h
 include/magick/segment.h
@@ -127,6 +130,7 @@ lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/colors.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/configure.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/delegates.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/english.xml
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/francais.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/locale.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-ghostscript.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-solaris.xml
@@ -187,7 +191,9 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo.eps
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/montage.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/navy.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/networkredux.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/piechart.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/radial-gradient.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/reconstruct.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/red-ball.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/red-circle.png
@@ -200,6 +206,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/images/script.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/smile.gif
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/sponsor.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/sprite.jpg
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/t-shirt.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/travelsur.gif
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/tricks.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/wand.ico
@@ -252,6 +259,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/animate.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/annotate.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/blob.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/cache.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/cache-view.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/color.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/colorspace.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/compare.html
@@ -282,6 +290,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/paint.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/pixel-iterator.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/pixel-wand.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/profile.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/property.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/quantize.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/registry.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/resize.html
@@ -304,7 +313,6 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/composite.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/conjure.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/contact.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/convert.html
-share/doc/ImageMagick-${IM_MAJOR_VER}/www/cvs.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/display.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/download.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/examples.html
@@ -324,6 +332,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/magick-vector-graphics.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/magick.css
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/mailing-list.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/miff.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/mirrors.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/mogrify.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/montage.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/motion-picture.html
@@ -335,6 +344,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/sitemap.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/sponsors.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/stream.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/subversion.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/t-shirt.html
 @dirrm share/doc/ImageMagick-${IM_MAJOR_VER}/www/api
 @dirrm share/doc/ImageMagick-${IM_MAJOR_VER}/www/Magick++
 @dirrm share/doc/ImageMagick-${IM_MAJOR_VER}/www
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index acc26ff3ea6..55c774f45e8 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.90 2007/06/16 21:58:10 heinz Exp $
+$NetBSD: distinfo,v 1.90.2.1 2007/09/24 08:53:15 ghen Exp $
 
-SHA1 (ImageMagick-6.3.4-9.tar.bz2) = 5869d2ee1d63b849b899637c7a39320d96022ab4
-RMD160 (ImageMagick-6.3.4-9.tar.bz2) = cab331e23c1a49ac9db403d823fa807efbf69a40
-Size (ImageMagick-6.3.4-9.tar.bz2) = 5813934 bytes
-SHA1 (patch-aa) = e58cbaed0673513d9fed764081c1b3a73d5cc8ba
+SHA1 (ImageMagick-6.3.5-10.tar.bz2) = f2fb1b73895a335c553c40b705af7ea179700316
+RMD160 (ImageMagick-6.3.5-10.tar.bz2) = b8436a7a5ada2793177f47621d031c89753b770c
+Size (ImageMagick-6.3.5-10.tar.bz2) = 7571418 bytes
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
deleted file mode 100644
index 959ec440661..00000000000
--- a/graphics/ImageMagick/patches/patch-aa
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-aa,v 1.44 2007/06/16 21:58:10 heinz Exp $
-
---- configure.orig	2007-06-09 19:41:57.000000000 +0200
-+++ configure
-@@ -19095,9 +19095,6 @@ fi
- # Enable building/use of libltdl if we are building shared libraries regardless
- # of whether modules are built or not.
- with_ltdl='no'
--if test "$libtool_build_shared_libs" != 'no' ; then
--    with_ltdl='yes'
--fi
- 
-  if test "$with_ltdl" != 'no'; then
-   WITH_LTDL_TRUE=
-@@ -19603,7 +19600,7 @@ if test "x$with_windows_font_dir" = "xno
-     with_windows_font_dir=
- fi
- if test "$with_windows_font_dir" != '' ; then
--    DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-windows-font-dir==$with_windows_font_dir "
-+    DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-windows-font-dir=$with_windows_font_dir "
- fi
- 
- 
-@@ -34749,7 +34746,7 @@ cat >>confdefs.h <<\_ACEOF
- #define HasFONTCONFIG 1
- _ACEOF
- 
--    if test "$with_modules" == 'no' ; then
-+    if test "$with_modules" = 'no' ; then
-     CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS"
-     fi
- fi
-@@ -36921,7 +36918,7 @@ cat >>confdefs.h <<\_ACEOF
- #define HasGVC 1
- _ACEOF
- 
--    if test "$with_modules" == 'no' ; then
-+    if test "$with_modules" = 'no' ; then
-         CPPFLAGS="$GVC_CFLAGS $CPPFLAGS"
-     fi
- fi
-@@ -37464,7 +37461,7 @@ cat >>confdefs.h <<\_ACEOF
- #define HasOPENEXR 1
- _ACEOF
- 
--    if test "$with_modules" == 'no' ; then
-+    if test "$with_modules" = 'no' ; then
-         CPPFLAGS="$OPENEXR_CFLAGS $CPPFLAGS"
-     fi
- fi
-@@ -37576,7 +37573,7 @@ cat >>confdefs.h <<\_ACEOF
- #define HasRSVG 1
- _ACEOF
- 
--    if test "$with_modules" == 'no' ; then
-+    if test "$with_modules" = 'no' ; then
-         CPPFLAGS="$RSVG_CFLAGS $CPPFLAGS"
-     fi
- fi