Changes 6.0.8-3:

  * Fix to enable reading Photoshop images with a group of layers.
  * other bug fixes

6 files changed, 28 insertions, 69 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index b6ebfab1f8c..1dbc904c67f 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2004/05/19 14:11:28 adam Exp $
+# $NetBSD: Makefile,v 1.119 2004/09/27 11:04:24 adam Exp $
 
 .include "Makefile.common"
 
@@ -42,12 +42,9 @@ CFLAGS=			-O
 # Some configure_args come from Makefile.common
 CONFIGURE_ARGS+=	--without-perl
 
-# Remove the empty directory
-post-install:
-	-${RMDIR} ${PREFIX}/share/ImageMagick
-
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
+.include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 6bf34db28c5..ce5e6fc4ef9 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.15 2004/09/06 13:09:43 adam Exp $
+# $NetBSD: Makefile.common,v 1.16 2004/09/27 11:04:24 adam Exp $
 
-IM_MAJOR_VER=		6.0.7
-IM_MINOR_VER=		1
+IM_MAJOR_VER=		6.0.8
+IM_MINOR_VER=		3
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
@@ -26,4 +26,4 @@ WRKSRC=		${WRKDIR}/ImageMagick-${IM_MAJOR_VER}
 # For things for which we do not specify an explicit dependency above, disable
 # so that we don't cause implicit "hidden" dependencies.
 CONFIGURE_ARGS+=	--without-dps --without-fpx --without-hdf \
-			--without-jbig --without-threads --without-lcms
+			--without-jbig --without-threads --without-wmf
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index cdf11a4f6f8..86964b5a658 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2004/09/22 08:09:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.22 2004/09/27 11:04:24 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -89,6 +89,7 @@ include/magick/transform.h
 include/magick/type.h
 include/magick/utility.h
 include/magick/version.h
+include/magick/widget.h
 include/magick/xwindow.h
 include/wand/drawing_wand.h
 include/wand/magick_wand.h
@@ -111,7 +112,6 @@ lib/libWand.la
 lib/pkgconfig/ImageMagick++.pc
 lib/pkgconfig/ImageMagick.pc
 lib/pkgconfig/Wand.pc
-man/man1/ImageMagick.1
 man/man1/Magick++-config.1
 man/man1/Magick-config.1
 man/man1/Wand-config.1
@@ -127,9 +127,9 @@ man/man1/mogrify.1
 man/man1/montage.1
 man/man4/miff.4
 man/man5/quantize.5
+share/ImageMagick-${IM_MAJOR_LIB_VER}/ChangeLog
 share/ImageMagick-${IM_MAJOR_LIB_VER}/LICENSE
-share/ImageMagick-${IM_MAJOR_LIB_VER}/Magick.pdf
-share/ImageMagick-${IM_MAJOR_LIB_VER}/NOTICE
+share/ImageMagick-${IM_MAJOR_LIB_VER}/NEWS
 share/ImageMagick-${IM_MAJOR_LIB_VER}/config/coder.mgk
 share/ImageMagick-${IM_MAJOR_LIB_VER}/config/log.mgk
 share/ImageMagick-${IM_MAJOR_LIB_VER}/config/magic.mgk
@@ -152,7 +152,6 @@ share/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/profile.html
 share/ImageMagick-${IM_MAJOR_LIB_VER}/www/compare.html
 share/ImageMagick-${IM_MAJOR_LIB_VER}/www/download.html
 share/ImageMagick-${IM_MAJOR_LIB_VER}/www/index.html
-share/ImageMagick-${IM_MAJOR_VER}/QuickStart.txt
 share/ImageMagick-${IM_MAJOR_VER}/images/ImageMagick.jpg
 share/ImageMagick-${IM_MAJOR_VER}/images/background.gif
 share/ImageMagick-${IM_MAJOR_VER}/images/devlib.gif
@@ -162,56 +161,6 @@ share/ImageMagick-${IM_MAJOR_VER}/images/logo.png
 share/ImageMagick-${IM_MAJOR_VER}/images/magick.png
 share/ImageMagick-${IM_MAJOR_VER}/images/networkeleven.png
 share/ImageMagick-${IM_MAJOR_VER}/images/pair.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/bricks.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/checkerboard.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/circles.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/crosshatch.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/crosshatch30.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/crosshatch45.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/fishscales.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray0.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray10.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray100.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray15.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray20.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray25.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray30.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray35.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray40.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray45.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray5.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray50.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray55.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray60.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray65.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray70.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray75.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray80.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray85.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray90.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray95.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/hexagons.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/horizontal.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/horizontalsaw.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_bdiagonal.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_cross.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_diagcross.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_fdiagonal.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_horizontal.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_vertical.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/left30.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/left45.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/leftshingle.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/octagons.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/right30.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/right45.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/rightshingle.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/smallfishscales.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/vertical.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalbricks.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalleftshingle.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalrightshingle.png
-share/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalsaw.png
 share/ImageMagick-${IM_MAJOR_VER}/images/promote.png
 share/ImageMagick-${IM_MAJOR_VER}/images/right_triangle.png
 share/ImageMagick-${IM_MAJOR_VER}/images/right_triangle_option.png
@@ -336,7 +285,6 @@ share/ImageMagick-${IM_MAJOR_VER}/www/windows.html
 @dirrm share/ImageMagick-${IM_MAJOR_VER}/www/api
 @dirrm share/ImageMagick-${IM_MAJOR_VER}/www/Magick++
 @dirrm share/ImageMagick-${IM_MAJOR_VER}/www
-@dirrm share/ImageMagick-${IM_MAJOR_VER}/images/patterns
 @dirrm share/ImageMagick-${IM_MAJOR_VER}/images
 @dirrm share/ImageMagick-${IM_MAJOR_VER}/config
 @dirrm share/ImageMagick-${IM_MAJOR_VER}
diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
index 40891ef95fb..39ac4c11dbe 100644
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/18 09:12:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/09/27 11:04:24 adam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 IMAGEMAGICK_BUILDLINK3_MK:=	${IMAGEMAGICK_BUILDLINK3_MK}+
@@ -17,6 +17,7 @@ BUILDLINK_PKGSRCDIR.ImageMagick?=	../../graphics/ImageMagick
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
+.include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 9f80c775b68..0067765964c 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.25 2004/09/06 13:09:43 adam Exp $
+$NetBSD: distinfo,v 1.26 2004/09/27 11:04:24 adam Exp $
 
-SHA1 (ImageMagick-6.0.7-1.tar.bz2) = ce1a1370a28211da8c562b30721a21677b727a9e
-Size (ImageMagick-6.0.7-1.tar.bz2) = 5752309 bytes
+SHA1 (ImageMagick-6.0.8-3.tar.bz2) = d195cd6e3e3603c53e77f7d00164b87769734403
+Size (ImageMagick-6.0.8-3.tar.bz2) = 4526568 bytes
+SHA1 (patch-aa) = baee08cc63534a2b3364a67d30f12a18f5e4edad
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
new file mode 100644
index 00000000000..b3b17bdf333
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.22 2004/09/27 11:04:24 adam Exp $
+
+--- configure.orig	2004-09-27 12:34:15.000000000 +0000
++++ configure
+@@ -26397,7 +26397,6 @@ fi
+ # of whether modules are built or not.
+ with_ltdl='no'
+ if test "$libtool_build_shared_libs" != 'no' ; then
+-  with_ltdl='yes'
+ fi
+ 
+