Wed Oct 10 11:48:39 2012 UTC ()
update to 6.7.9.10
changes: many fixes and improvements
pkgsrc change: switch to lcms2


(drochner)
diff -r1.186 -r1.187 pkgsrc/graphics/ImageMagick/Makefile
diff -r1.96 -r1.97 pkgsrc/graphics/ImageMagick/Makefile.common
diff -r1.73 -r1.74 pkgsrc/graphics/ImageMagick/PLIST
diff -r1.42 -r1.43 pkgsrc/graphics/ImageMagick/buildlink3.mk
diff -r1.114 -r1.115 pkgsrc/graphics/ImageMagick/distinfo
diff -r0 -r1.48 pkgsrc/graphics/ImageMagick/patches/patch-aa
diff -r1.1 -r0 pkgsrc/graphics/ImageMagick/patches/patch-coders_png.c
cvs diff -r1.186 -r1.187 pkgsrc/graphics/ImageMagick/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile 2012/10/06 14:10:39 1.186
+++ pkgsrc/graphics/ImageMagick/Makefile 2012/10/10 11:48:39 1.187
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.186 2012/10/06 14:10:39 asau Exp $ 1# $NetBSD: Makefile,v 1.187 2012/10/10 11:48:39 drochner Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5PKGNAME= ImageMagick-${DISTVERSION} 5PKGNAME= ImageMagick-${DISTVERSION}
6PKGREVISION= 5 
7 6
8MAINTAINER= adam@NetBSD.org 7MAINTAINER= adam@NetBSD.org
9COMMENT= Package for display and interactive manipulation of images 8COMMENT= Package for display and interactive manipulation of images
10 9
11CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate' 10CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate'
12 11
13PKG_INSTALLATION_TYPES= overwrite pkgviews 12PKG_INSTALLATION_TYPES= overwrite pkgviews
14 13
15USE_LANGUAGES= c c++ c99 14USE_LANGUAGES= c c++ c99
16USE_TOOLS+= gmake pkg-config 15USE_TOOLS+= gmake pkg-config
17CONFIGURE_ARGS+= --disable-assert 16CONFIGURE_ARGS+= --disable-assert
18CONFIGURE_ARGS+= --with-fontconfig 17CONFIGURE_ARGS+= --with-fontconfig
19CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include 18CONFIGURE_ARGS+= --with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
@@ -45,45 +44,44 @@ GCC_REQD+= 3.0 @@ -45,45 +44,44 @@ GCC_REQD+= 3.0
45.if ${MACHINE_ARCH} == "mipsel" 44.if ${MACHINE_ARCH} == "mipsel"
46CFLAGS+= -O 45CFLAGS+= -O
47.endif 46.endif
48 47
49PKG_SYSCONFSUBDIR= ImageMagick 48PKG_SYSCONFSUBDIR= ImageMagick
50EGDIR= ${PREFIX}/share/examples/ImageMagick 49EGDIR= ${PREFIX}/share/examples/ImageMagick
51CONF_FILES= ${EGDIR}/coder.xml ${PKG_SYSCONFDIR}/coder.xml 50CONF_FILES= ${EGDIR}/coder.xml ${PKG_SYSCONFDIR}/coder.xml
52CONF_FILES+= ${EGDIR}/colors.xml ${PKG_SYSCONFDIR}/colors.xml 51CONF_FILES+= ${EGDIR}/colors.xml ${PKG_SYSCONFDIR}/colors.xml
53CONF_FILES+= ${EGDIR}/delegates.xml ${PKG_SYSCONFDIR}/delegates.xml 52CONF_FILES+= ${EGDIR}/delegates.xml ${PKG_SYSCONFDIR}/delegates.xml
54CONF_FILES+= ${EGDIR}/log.xml ${PKG_SYSCONFDIR}/log.xml 53CONF_FILES+= ${EGDIR}/log.xml ${PKG_SYSCONFDIR}/log.xml
55CONF_FILES+= ${EGDIR}/magic.xml ${PKG_SYSCONFDIR}/magic.xml 54CONF_FILES+= ${EGDIR}/magic.xml ${PKG_SYSCONFDIR}/magic.xml
56CONF_FILES+= ${EGDIR}/mime.xml ${PKG_SYSCONFDIR}/mime.xml 55CONF_FILES+= ${EGDIR}/mime.xml ${PKG_SYSCONFDIR}/mime.xml
57CONF_FILES+= ${EGDIR}/policy.xml ${PKG_SYSCONFDIR}/policy.xml 56CONF_FILES+= ${EGDIR}/policy.xml ${PKG_SYSCONFDIR}/policy.xml
58CONF_FILES+= ${EGDIR}/sRGB.icc ${PKG_SYSCONFDIR}/sRGB.icc 
59CONF_FILES+= ${EGDIR}/thresholds.xml ${PKG_SYSCONFDIR}/thresholds.xml 57CONF_FILES+= ${EGDIR}/thresholds.xml ${PKG_SYSCONFDIR}/thresholds.xml
60CONF_FILES+= ${EGDIR}/type-dejavu.xml ${PKG_SYSCONFDIR}/type-dejavu.xml 58CONF_FILES+= ${EGDIR}/type-dejavu.xml ${PKG_SYSCONFDIR}/type-dejavu.xml
61CONF_FILES+= ${EGDIR}/type-ghostscript.xml ${PKG_SYSCONFDIR}/type-ghostscript.xml 59CONF_FILES+= ${EGDIR}/type-ghostscript.xml ${PKG_SYSCONFDIR}/type-ghostscript.xml
62CONF_FILES+= ${EGDIR}/type-windows.xml ${PKG_SYSCONFDIR}/type-windows.xml 60CONF_FILES+= ${EGDIR}/type-windows.xml ${PKG_SYSCONFDIR}/type-windows.xml
63CONF_FILES+= ${EGDIR}/type.xml ${PKG_SYSCONFDIR}/type.xml 61CONF_FILES+= ${EGDIR}/type.xml ${PKG_SYSCONFDIR}/type.xml
64 62
65SUBST_CLASSES+= fix-cfg 63SUBST_CLASSES+= fix-cfg
66SUBST_STAGE.fix-cfg= pre-configure 64SUBST_STAGE.fix-cfg= pre-configure
67SUBST_MESSAGE.fix-cfg= Fixing configure.xml. 65SUBST_MESSAGE.fix-cfg= Fixing configure.xml.
68SUBST_FILES.fix-cfg= config/configure.xml.in 66SUBST_FILES.fix-cfg= config/configure.xml.in
69SUBST_VARS.fix-cfg= CONFIGURE_ARGS 67SUBST_VARS.fix-cfg= CONFIGURE_ARGS
70 68
71SUBST_CLASSES+= fix-etc 69SUBST_CLASSES+= fix-etc
72SUBST_STAGE.fix-etc= pre-configure 70SUBST_STAGE.fix-etc= pre-configure
73SUBST_MESSAGE.fix-etc= Handle configuration files. 71SUBST_MESSAGE.fix-etc= Handle configuration files.
74SUBST_FILES.fix-etc= Makefile.in 72SUBST_FILES.fix-etc= Makefile.in
75SUBST_SED.fix-etc= -e 's,^configlibdir =.*,configlibdir = $$(DATA_DIR)/examples/ImageMagick,' 73SUBST_SED.fix-etc= -e 's,^configlibdir =.*,configlibdir = $$(DATA_DIR)/examples/ImageMagick,'
76 74
77.include "../../archivers/bzip2/buildlink3.mk" 75.include "../../archivers/bzip2/buildlink3.mk"
78.include "../../archivers/xz/buildlink3.mk" 76.include "../../archivers/xz/buildlink3.mk"
79.include "../../devel/libltdl/buildlink3.mk" 77.include "../../devel/libltdl/buildlink3.mk"
80.include "../../fonts/fontconfig/buildlink3.mk" 78.include "../../fonts/fontconfig/buildlink3.mk"
81.include "../../graphics/freetype2/buildlink3.mk" 79.include "../../graphics/freetype2/buildlink3.mk"
82.include "../../graphics/lcms/buildlink3.mk" 80.include "../../graphics/lcms2/buildlink3.mk"
83.include "../../graphics/openexr/buildlink3.mk" 81.include "../../graphics/openexr/buildlink3.mk"
84.include "../../graphics/libwebp/buildlink3.mk" 82.include "../../graphics/libwebp/buildlink3.mk"
85.include "../../graphics/png/buildlink3.mk" 83.include "../../graphics/png/buildlink3.mk"
86.include "../../graphics/tiff/buildlink3.mk" 84.include "../../graphics/tiff/buildlink3.mk"
87.include "../../math/fftw/buildlink3.mk" 85.include "../../math/fftw/buildlink3.mk"
88.include "../../textproc/libxml2/buildlink3.mk" 86.include "../../textproc/libxml2/buildlink3.mk"
89.include "../../mk/bsd.pkg.mk" 87.include "../../mk/bsd.pkg.mk"
cvs diff -r1.96 -r1.97 pkgsrc/graphics/ImageMagick/Makefile.common (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile.common 2012/07/30 09:21:46 1.96
+++ pkgsrc/graphics/ImageMagick/Makefile.common 2012/10/10 11:48:39 1.97
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.96 2012/07/30 09:21:46 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.97 2012/10/10 11:48:39 drochner Exp $
2# 2#
3# used by graphics/p5-PerlMagick/Makefile 3# used by graphics/p5-PerlMagick/Makefile
4 4
5IM_MAJOR_VER= 6.7.6 5IM_MAJOR_VER= 6.7.9
6IM_MINOR_VER= 6 6IM_MINOR_VER= 10
7IM_MAJOR_LIB_VER= ${IM_MAJOR_VER} 7IM_MAJOR_LIB_VER= ${IM_MAJOR_VER}
8 8
9.if (${IM_MINOR_VER} != NONE) 9.if (${IM_MINOR_VER} != NONE)
10DISTSUFFIX= ${IM_MAJOR_VER}-${IM_MINOR_VER} 10DISTSUFFIX= ${IM_MAJOR_VER}-${IM_MINOR_VER}
11.else 11.else
12DISTSUFFIX= ${IM_MAJOR_VER} 12DISTSUFFIX= ${IM_MAJOR_VER}
13.endif 13.endif
14 14
15DISTNAME= ImageMagick-${DISTSUFFIX} 15DISTNAME= ImageMagick-${DISTSUFFIX}
16DISTVERSION= ${DISTSUFFIX:S/-/./} 16DISTVERSION= ${DISTSUFFIX:S/-/./}
17 17
18CATEGORIES= graphics 18CATEGORIES= graphics
19MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ \ 19MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ \
cvs diff -r1.73 -r1.74 pkgsrc/graphics/ImageMagick/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/PLIST 2012/04/20 15:22:37 1.73
+++ pkgsrc/graphics/ImageMagick/PLIST 2012/10/10 11:48:39 1.74
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.73 2012/04/20 15:22:37 adam Exp $ 1@comment $NetBSD: PLIST,v 1.74 2012/10/10 11:48:39 drochner Exp $
2bin/Magick++-config 2bin/Magick++-config
3bin/Magick-config 3bin/Magick-config
4bin/MagickCore-config 4bin/MagickCore-config
5bin/MagickWand-config 5bin/MagickWand-config
6bin/Wand-config 6bin/Wand-config
7bin/animate 7bin/animate
8bin/compare 8bin/compare
9bin/composite 9bin/composite
10bin/conjure 10bin/conjure
11bin/convert 11bin/convert
12bin/display 12bin/display
13bin/identify 13bin/identify
14bin/import 14bin/import
@@ -30,26 +30,27 @@ include/ImageMagick/Magick++/STL.h @@ -30,26 +30,27 @@ include/ImageMagick/Magick++/STL.h
30include/ImageMagick/Magick++/TypeMetric.h 30include/ImageMagick/Magick++/TypeMetric.h
31include/ImageMagick/magick/ImageMagick.h 31include/ImageMagick/magick/ImageMagick.h
32include/ImageMagick/magick/MagickCore.h 32include/ImageMagick/magick/MagickCore.h
33include/ImageMagick/magick/PreRvIcccm.h 33include/ImageMagick/magick/PreRvIcccm.h
34include/ImageMagick/magick/accelerate.h 34include/ImageMagick/magick/accelerate.h
35include/ImageMagick/magick/animate.h 35include/ImageMagick/magick/animate.h
36include/ImageMagick/magick/annotate.h 36include/ImageMagick/magick/annotate.h
37include/ImageMagick/magick/api.h 37include/ImageMagick/magick/api.h
38include/ImageMagick/magick/artifact.h 38include/ImageMagick/magick/artifact.h
39include/ImageMagick/magick/attribute.h 39include/ImageMagick/magick/attribute.h
40include/ImageMagick/magick/blob.h 40include/ImageMagick/magick/blob.h
41include/ImageMagick/magick/cache-view.h 41include/ImageMagick/magick/cache-view.h
42include/ImageMagick/magick/cache.h 42include/ImageMagick/magick/cache.h
 43include/ImageMagick/magick/channel.h
43include/ImageMagick/magick/cipher.h 44include/ImageMagick/magick/cipher.h
44include/ImageMagick/magick/client.h 45include/ImageMagick/magick/client.h
45include/ImageMagick/magick/coder.h 46include/ImageMagick/magick/coder.h
46include/ImageMagick/magick/color.h 47include/ImageMagick/magick/color.h
47include/ImageMagick/magick/colormap.h 48include/ImageMagick/magick/colormap.h
48include/ImageMagick/magick/colorspace.h 49include/ImageMagick/magick/colorspace.h
49include/ImageMagick/magick/compare.h 50include/ImageMagick/magick/compare.h
50include/ImageMagick/magick/composite.h 51include/ImageMagick/magick/composite.h
51include/ImageMagick/magick/compress.h 52include/ImageMagick/magick/compress.h
52include/ImageMagick/magick/configure.h 53include/ImageMagick/magick/configure.h
53include/ImageMagick/magick/constitute.h 54include/ImageMagick/magick/constitute.h
54include/ImageMagick/magick/decorate.h 55include/ImageMagick/magick/decorate.h
55include/ImageMagick/magick/delegate.h 56include/ImageMagick/magick/delegate.h
@@ -79,26 +80,27 @@ include/ImageMagick/magick/magick-config @@ -79,26 +80,27 @@ include/ImageMagick/magick/magick-config
79include/ImageMagick/magick/magick-type.h 80include/ImageMagick/magick/magick-type.h
80include/ImageMagick/magick/magick.h 81include/ImageMagick/magick/magick.h
81include/ImageMagick/magick/matrix.h 82include/ImageMagick/magick/matrix.h
82include/ImageMagick/magick/memory_.h 83include/ImageMagick/magick/memory_.h
83include/ImageMagick/magick/method-attribute.h 84include/ImageMagick/magick/method-attribute.h
84include/ImageMagick/magick/methods.h 85include/ImageMagick/magick/methods.h
85include/ImageMagick/magick/mime.h 86include/ImageMagick/magick/mime.h
86include/ImageMagick/magick/module.h 87include/ImageMagick/magick/module.h
87include/ImageMagick/magick/monitor.h 88include/ImageMagick/magick/monitor.h
88include/ImageMagick/magick/montage.h 89include/ImageMagick/magick/montage.h
89include/ImageMagick/magick/morphology.h 90include/ImageMagick/magick/morphology.h
90include/ImageMagick/magick/option.h 91include/ImageMagick/magick/option.h
91include/ImageMagick/magick/paint.h 92include/ImageMagick/magick/paint.h
 93include/ImageMagick/magick/pixel-accessor.h
92include/ImageMagick/magick/pixel.h 94include/ImageMagick/magick/pixel.h
93include/ImageMagick/magick/policy.h 95include/ImageMagick/magick/policy.h
94include/ImageMagick/magick/prepress.h 96include/ImageMagick/magick/prepress.h
95include/ImageMagick/magick/profile.h 97include/ImageMagick/magick/profile.h
96include/ImageMagick/magick/property.h 98include/ImageMagick/magick/property.h
97include/ImageMagick/magick/quantize.h 99include/ImageMagick/magick/quantize.h
98include/ImageMagick/magick/quantum.h 100include/ImageMagick/magick/quantum.h
99include/ImageMagick/magick/random_.h 101include/ImageMagick/magick/random_.h
100include/ImageMagick/magick/registry.h 102include/ImageMagick/magick/registry.h
101include/ImageMagick/magick/resample.h 103include/ImageMagick/magick/resample.h
102include/ImageMagick/magick/resize.h 104include/ImageMagick/magick/resize.h
103include/ImageMagick/magick/resource_.h 105include/ImageMagick/magick/resource_.h
104include/ImageMagick/magick/segment.h 106include/ImageMagick/magick/segment.h
@@ -1030,50 +1032,52 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/ww @@ -1030,50 +1032,52 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/ww
1030share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickWand/tab_r.gif 1032share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickWand/tab_r.gif
1031share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickWand/tabs.css 1033share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickWand/tabs.css
1032share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickWand/tree.html 1034share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickWand/tree.html
1033share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickWand/wand_8c.html 1035share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickWand/wand_8c.html
1034share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickWand/wand_8h-source.html 1036share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickWand/wand_8h-source.html
1035share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickWand/wand_8h.html 1037share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickWand/wand_8h.html
1036share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickWand/wandtest_8c.html 1038share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/MagickWand/wandtest_8c.html
1037share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/animate.html 1039share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/animate.html
1038share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/annotate.html 1040share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/annotate.html
1039share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/attribute.html 1041share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/attribute.html
1040share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/blob.html 1042share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/blob.html
1041share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/cache-view.html 1043share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/cache-view.html
1042share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/cache.html 1044share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/cache.html
 1045share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/channel.html
1043share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/cipher.html 1046share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/cipher.html
1044share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/color.html 1047share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/color.html
1045share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/colormap.html 1048share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/colormap.html
1046share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/colorspace.html 1049share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/colorspace.html
1047share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/compare.html 1050share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/compare.html
1048share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/composite.html 1051share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/composite.html
1049share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/constitute.html 1052share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/constitute.html
1050share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/decorate.html 1053share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/decorate.html
1051share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/deprecate.html 1054share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/deprecate.html
1052share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/display.html 1055share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/display.html
1053share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/distort.html 1056share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/distort.html
1054share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/draw.html 1057share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/draw.html
1055share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/drawing-wand.html 1058share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/drawing-wand.html
1056share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/effect.html 1059share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/effect.html
1057share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/enhance.html 1060share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/enhance.html
1058share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/exception.html 1061share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/exception.html
1059share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/feature.html 1062share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/feature.html
1060share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/fourier.html 1063share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/fourier.html
1061share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/fx.html 1064share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/fx.html
1062share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/histogram.html 1065share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/histogram.html
1063share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/image-view.html 1066share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/image-view.html
1064share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/image.html 1067share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/image.html
1065share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/layer.html 1068share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/layer.html
1066share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/list.html 1069share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/list.html
 1070share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick++-classes.html
1067share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-deprecate.html 1071share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-deprecate.html
1068share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-image.html 1072share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-image.html
1069share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-property.html 1073share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-property.html
1070share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-wand.html 1074share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-wand.html
1071share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick.html 1075share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick.html
1072share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/memory.html 1076share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/memory.html
1073share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/module.html 1077share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/module.html
1074share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/mogrify.html 1078share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/mogrify.html
1075share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/monitor.html 1079share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/monitor.html
1076share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/montage.html 1080share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/montage.html
1077share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/morphology.html 1081share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/morphology.html
1078share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/paint.html 1082share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/paint.html
1079share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/pixel-iterator.html 1083share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/pixel-iterator.html
@@ -1086,26 +1090,27 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/ww @@ -1086,26 +1090,27 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/ww
1086share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/resize.html 1090share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/resize.html
1087share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/resource.html 1091share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/resource.html
1088share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/segment.html 1092share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/segment.html
1089share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/shear.html 1093share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/shear.html
1090share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/signature.html 1094share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/signature.html
1091share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/statistic.html 1095share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/statistic.html
1092share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/stream.html 1096share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/stream.html
1093share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/transform.html 1097share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/transform.html
1094share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/version.html 1098share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/version.html
1095share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/wand-view.html 1099share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/wand-view.html
1096share/doc/ImageMagick-${IM_MAJOR_VER}/www/architecture.html 1100share/doc/ImageMagick-${IM_MAJOR_VER}/www/architecture.html
1097share/doc/ImageMagick-${IM_MAJOR_VER}/www/binary-releases.html 1101share/doc/ImageMagick-${IM_MAJOR_VER}/www/binary-releases.html
1098share/doc/ImageMagick-${IM_MAJOR_VER}/www/changelog.html 1102share/doc/ImageMagick-${IM_MAJOR_VER}/www/changelog.html
 1103share/doc/ImageMagick-${IM_MAJOR_VER}/www/channel.html
1099share/doc/ImageMagick-${IM_MAJOR_VER}/www/cipher.html 1104share/doc/ImageMagick-${IM_MAJOR_VER}/www/cipher.html
1100share/doc/ImageMagick-${IM_MAJOR_VER}/www/color.html 1105share/doc/ImageMagick-${IM_MAJOR_VER}/www/color.html
1101share/doc/ImageMagick-${IM_MAJOR_VER}/www/command-line-options.html 1106share/doc/ImageMagick-${IM_MAJOR_VER}/www/command-line-options.html
1102share/doc/ImageMagick-${IM_MAJOR_VER}/www/command-line-processing.html 1107share/doc/ImageMagick-${IM_MAJOR_VER}/www/command-line-processing.html
1103share/doc/ImageMagick-${IM_MAJOR_VER}/www/command-line-tools.html 1108share/doc/ImageMagick-${IM_MAJOR_VER}/www/command-line-tools.html
1104share/doc/ImageMagick-${IM_MAJOR_VER}/www/compare.html 1109share/doc/ImageMagick-${IM_MAJOR_VER}/www/compare.html
1105share/doc/ImageMagick-${IM_MAJOR_VER}/www/compose.html 1110share/doc/ImageMagick-${IM_MAJOR_VER}/www/compose.html
1106share/doc/ImageMagick-${IM_MAJOR_VER}/www/composite.html 1111share/doc/ImageMagick-${IM_MAJOR_VER}/www/composite.html
1107share/doc/ImageMagick-${IM_MAJOR_VER}/www/conjure.html 1112share/doc/ImageMagick-${IM_MAJOR_VER}/www/conjure.html
1108share/doc/ImageMagick-${IM_MAJOR_VER}/www/contact.html 1113share/doc/ImageMagick-${IM_MAJOR_VER}/www/contact.html
1109share/doc/ImageMagick-${IM_MAJOR_VER}/www/convert.html 1114share/doc/ImageMagick-${IM_MAJOR_VER}/www/convert.html
1110share/doc/ImageMagick-${IM_MAJOR_VER}/www/display.html 1115share/doc/ImageMagick-${IM_MAJOR_VER}/www/display.html
1111share/doc/ImageMagick-${IM_MAJOR_VER}/www/download.html 1116share/doc/ImageMagick-${IM_MAJOR_VER}/www/download.html
@@ -1169,21 +1174,18 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/ww @@ -1169,21 +1174,18 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/ww
1169share/doc/ImageMagick-${IM_MAJOR_VER}/www/sponsors.html 1174share/doc/ImageMagick-${IM_MAJOR_VER}/www/sponsors.html
1170share/doc/ImageMagick-${IM_MAJOR_VER}/www/stream.html 1175share/doc/ImageMagick-${IM_MAJOR_VER}/www/stream.html
1171share/doc/ImageMagick-${IM_MAJOR_VER}/www/subversion.html 1176share/doc/ImageMagick-${IM_MAJOR_VER}/www/subversion.html
1172share/doc/ImageMagick-${IM_MAJOR_VER}/www/t-shirt.html 1177share/doc/ImageMagick-${IM_MAJOR_VER}/www/t-shirt.html
1173share/doc/ImageMagick-${IM_MAJOR_VER}/www/wand.png 1178share/doc/ImageMagick-${IM_MAJOR_VER}/www/wand.png
1174share/examples/ImageMagick/coder.xml 1179share/examples/ImageMagick/coder.xml
1175share/examples/ImageMagick/colors.xml 1180share/examples/ImageMagick/colors.xml
1176share/examples/ImageMagick/delegates.xml 1181share/examples/ImageMagick/delegates.xml
1177share/examples/ImageMagick/log.xml 1182share/examples/ImageMagick/log.xml
1178share/examples/ImageMagick/magic.xml 1183share/examples/ImageMagick/magic.xml
1179share/examples/ImageMagick/mime.xml 1184share/examples/ImageMagick/mime.xml
1180share/examples/ImageMagick/policy.xml 1185share/examples/ImageMagick/policy.xml
1181share/examples/ImageMagick/quantization-table.xml 1186share/examples/ImageMagick/quantization-table.xml
1182share/examples/ImageMagick/sRGB.icc 
1183share/examples/ImageMagick/thresholds.xml 1187share/examples/ImageMagick/thresholds.xml
1184share/examples/ImageMagick/type-dejavu.xml 1188share/examples/ImageMagick/type-dejavu.xml
1185share/examples/ImageMagick/type-ghostscript.xml 1189share/examples/ImageMagick/type-ghostscript.xml
1186share/examples/ImageMagick/type-windows.xml 1190share/examples/ImageMagick/type-windows.xml
1187share/examples/ImageMagick/type.xml 1191share/examples/ImageMagick/type.xml
1188@pkgdir lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/filters 
1189@pkgdir lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/coders 
cvs diff -r1.42 -r1.43 pkgsrc/graphics/ImageMagick/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/buildlink3.mk 2012/08/18 08:49:43 1.42
+++ pkgsrc/graphics/ImageMagick/buildlink3.mk 2012/10/10 11:48:39 1.43
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: buildlink3.mk,v 1.42 2012/08/18 08:49:43 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.43 2012/10/10 11:48:39 drochner Exp $
2 2
3BUILDLINK_TREE+= ImageMagick 3BUILDLINK_TREE+= ImageMagick
4 4
5.if !defined(IMAGEMAGICK_BUILDLINK3_MK) 5.if !defined(IMAGEMAGICK_BUILDLINK3_MK)
6IMAGEMAGICK_BUILDLINK3_MK:= 6IMAGEMAGICK_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=5.5.7.11nb1 8BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=5.5.7.11nb1
9BUILDLINK_ABI_DEPENDS.ImageMagick+= ImageMagick>=6.7.6.6nb3 9BUILDLINK_ABI_DEPENDS.ImageMagick+= ImageMagick>=6.7.9.4
10BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick 10BUILDLINK_PKGSRCDIR.ImageMagick?= ../../graphics/ImageMagick
11 11
12pkgbase := ImageMagick 12pkgbase := ImageMagick
13.include "../../mk/pkg-build-options.mk" 13.include "../../mk/pkg-build-options.mk"
14 14
15.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mdjvu) 15.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mdjvu)
16.include "../../graphics/djvulibre-lib/buildlink3.mk" 16.include "../../graphics/djvulibre-lib/buildlink3.mk"
17.endif 17.endif
18.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mghostscript) 18.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mghostscript)
19.include "../../print/ghostscript/buildlink3.mk" 19.include "../../print/ghostscript/buildlink3.mk"
20.endif 20.endif
21.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mjasper) 21.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mjasper)
22.include "../../graphics/jasper/buildlink3.mk" 22.include "../../graphics/jasper/buildlink3.mk"
@@ -25,23 +25,23 @@ pkgbase := ImageMagick @@ -25,23 +25,23 @@ pkgbase := ImageMagick
25.include "../../graphics/libwmf/buildlink3.mk" 25.include "../../graphics/libwmf/buildlink3.mk"
26.endif 26.endif
27.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mx11) 27.if !empty(PKG_BUILD_OPTIONS.ImageMagick:Mx11)
28.include "../../x11/libX11/buildlink3.mk" 28.include "../../x11/libX11/buildlink3.mk"
29.include "../../x11/libXext/buildlink3.mk" 29.include "../../x11/libXext/buildlink3.mk"
30.include "../../x11/libXt/buildlink3.mk" 30.include "../../x11/libXt/buildlink3.mk"
31.endif 31.endif
32 32
33.include "../../archivers/bzip2/buildlink3.mk" 33.include "../../archivers/bzip2/buildlink3.mk"
34.include "../../archivers/xz/buildlink3.mk" 34.include "../../archivers/xz/buildlink3.mk"
35.include "../../devel/libltdl/buildlink3.mk" 35.include "../../devel/libltdl/buildlink3.mk"
36.include "../../fonts/fontconfig/buildlink3.mk" 36.include "../../fonts/fontconfig/buildlink3.mk"
37.include "../../graphics/freetype2/buildlink3.mk" 37.include "../../graphics/freetype2/buildlink3.mk"
38.include "../../graphics/lcms/buildlink3.mk" 38.include "../../graphics/lcms2/buildlink3.mk"
39.include "../../graphics/libwebp/buildlink3.mk" 39.include "../../graphics/libwebp/buildlink3.mk"
40.include "../../graphics/openexr/buildlink3.mk" 40.include "../../graphics/openexr/buildlink3.mk"
41.include "../../graphics/png/buildlink3.mk" 41.include "../../graphics/png/buildlink3.mk"
42.include "../../graphics/tiff/buildlink3.mk" 42.include "../../graphics/tiff/buildlink3.mk"
43.include "../../math/fftw/buildlink3.mk" 43.include "../../math/fftw/buildlink3.mk"
44.include "../../textproc/libxml2/buildlink3.mk" 44.include "../../textproc/libxml2/buildlink3.mk"
45.endif # IMAGEMAGICK_BUILDLINK3_MK 45.endif # IMAGEMAGICK_BUILDLINK3_MK
46 46
47BUILDLINK_TREE+= -ImageMagick 47BUILDLINK_TREE+= -ImageMagick
cvs diff -r1.114 -r1.115 pkgsrc/graphics/ImageMagick/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/distinfo 2012/07/30 09:20:08 1.114
+++ pkgsrc/graphics/ImageMagick/distinfo 2012/10/10 11:48:39 1.115
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.114 2012/07/30 09:20:08 wiz Exp $ 1$NetBSD: distinfo,v 1.115 2012/10/10 11:48:39 drochner Exp $
2 2
3SHA1 (ImageMagick-6.7.6-6.tar.bz2) = 7456efb55d2eb37fe7c5a8c131d0247041ce0100 3SHA1 (ImageMagick-6.7.9-10.tar.bz2) = fbde4f8925c57c9ca7c817bdf3e664082ac11e61
4RMD160 (ImageMagick-6.7.6-6.tar.bz2) = 714fa4a68049df810581fe5e8d791812c6a4b255 4RMD160 (ImageMagick-6.7.9-10.tar.bz2) = afcd65e919826acbfa40ffc3f0af7b35cdc41318
5Size (ImageMagick-6.7.6-6.tar.bz2) = 10484245 bytes 5Size (ImageMagick-6.7.9-10.tar.bz2) = 11140675 bytes
6SHA1 (patch-coders_png.c) = 07a1f14fb112d9f0b5b555446f2771c15589e55c 6SHA1 (patch-aa) = 3ab35feaf0ced569a73267643a372235fb8082c4
File Added: pkgsrc/graphics/ImageMagick/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.48 2012/10/10 11:48:39 drochner Exp $

--- tests/validate-colorspace.tap.orig	2012-08-22 17:08:31.000000000 +0000
+++ tests/validate-colorspace.tap
@@ -17,7 +17,7 @@
 . ${srcdir}/tests/common.shi
 
 depth=`eval ${CONVERT} xc:none -format '%[fx:QuantumRange]' info:-`
-if [ "X$depth" == "X255" ]; then
+if [ "X$depth" = "X255" ]; then
   echo "1..1"
   echo "ok"
   exit 0
File Deleted: pkgsrc/graphics/ImageMagick/patches/Attic/patch-coders_png.c