diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 2de3f2e9537..4dc084a908e 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.97 2007/09/15 20:09:40 simon Exp $ +# $OpenBSD: Makefile,v 1.98 2007/09/19 18:46:55 sthen Exp $ COMMENT= image processing tools -VER= 6.3.4 -DASHVER= 1 +VER= 6.3.5 +DASHVER= 9 DISTNAME= ImageMagick-${VER}-${DASHVER} PKGNAME= ImageMagick-${VER}.${DASHVER} SHARED_LIBS= Magick++ 12.0 \ diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo index 955a85e88db..b0ffb39c767 100644 --- a/graphics/ImageMagick/distinfo +++ b/graphics/ImageMagick/distinfo @@ -1,5 +1,5 @@ -MD5 (ImageMagick-6.3.4-1.tar.gz) = FtFX3hOHDfeLcFObpDH7XQ== -RMD160 (ImageMagick-6.3.4-1.tar.gz) = F67VHu+HJbwNy1ThOopvpqEe/ug= -SHA1 (ImageMagick-6.3.4-1.tar.gz) = aiYcNf3febMBmdK8e1ef5d/zSvc= -SHA256 (ImageMagick-6.3.4-1.tar.gz) = fXXwTf7JuXJpH4TL2COj1kl7eBu+mHDPBOp3STgB5gE= -SIZE (ImageMagick-6.3.4-1.tar.gz) = 6893715 +MD5 (ImageMagick-6.3.5-9.tar.gz) = I9hjitYr9O0NLXchT6H0ng== +RMD160 (ImageMagick-6.3.5-9.tar.gz) = X3SWeHZDk2aMIvEU07EeJkRM7sw= +SHA1 (ImageMagick-6.3.5-9.tar.gz) = u/3/XexHtpdcgLCbfPFJurPrvjQ= +SHA256 (ImageMagick-6.3.5-9.tar.gz) = 6fiLWyRpU4iThWMJFkiFIN/nrFengYPdkMs5U0rfcUs= +SIZE (ImageMagick-6.3.5-9.tar.gz) = 9310482 diff --git a/graphics/ImageMagick/patches/patch-coders_png_c b/graphics/ImageMagick/patches/patch-coders_png_c index 1aad19066aa..ad815a41794 100644 --- a/graphics/ImageMagick/patches/patch-coders_png_c +++ b/graphics/ImageMagick/patches/patch-coders_png_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-coders_png_c,v 1.4 2007/05/20 19:44:47 steven Exp $ ---- coders/png.c.orig Sat May 5 02:42:11 2007 -+++ coders/png.c Wed May 16 17:41:56 2007 -@@ -1768,7 +1768,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, +$OpenBSD: patch-coders_png_c,v 1.5 2007/09/19 18:46:55 sthen Exp $ +--- coders/png.c.orig Mon Sep 17 22:18:06 2007 ++++ coders/png.c Mon Sep 17 22:18:35 2007 +@@ -1763,7 +1763,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, png_set_read_user_chunk_fn(ping, image, read_vpag_chunk_callback); #endif diff --git a/graphics/ImageMagick/patches/patch-configure_ac b/graphics/ImageMagick/patches/patch-configure_ac index c3e945dc204..0a183462272 100644 --- a/graphics/ImageMagick/patches/patch-configure_ac +++ b/graphics/ImageMagick/patches/patch-configure_ac @@ -1,20 +1,15 @@ -$OpenBSD: patch-configure_ac,v 1.7 2007/05/20 19:44:47 steven Exp $ ---- configure.ac.orig Sat Apr 28 02:41:46 2007 -+++ configure.ac Wed May 16 17:42:57 2007 -@@ -354,9 +354,9 @@ AM_CONDITIONAL(WITH_MODULES, test "$with_modules" != ' - # 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 "$libtool_build_shared_libs" != 'no' ; then -+# with_ltdl='yes' -+#fi +$OpenBSD: patch-configure_ac,v 1.8 2007/09/19 18:46:55 sthen Exp $ +--- configure.ac.orig Tue Sep 11 20:19:52 2007 ++++ configure.ac Mon Sep 17 23:14:21 2007 +@@ -390,6 +390,7 @@ with_ltdl='no' + if test "$libtool_build_shared_libs" != 'no'; then + with_ltdl='yes' + fi ++with_ltdl='no' AM_CONDITIONAL(WITH_LTDL, test "$with_ltdl" != 'no') - if test "$with_ltdl" != 'no' ; then -@@ -1997,7 +1997,7 @@ AC_SUBST(PERLMAINCC) + if test "$with_ltdl" != 'no'; then +@@ -2076,7 +2077,7 @@ AC_SUBST(PERLMAINCC) # # Subdirectory under lib to place ImageMagick lib files @@ -23,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2007/05/20 19:44:47 steven Exp $ AC_DEFINE_UNQUOTED(MagickLibSubdir,"$MagickLibSubdir",Subdirectory of lib where ImageMagick architecture dependent files are installed) # Path to ImageMagick bin directory -@@ -2055,7 +2055,7 @@ AC_SUBST(MagickFilterModulesPath) +@@ -2134,7 +2135,7 @@ AC_SUBST(MagickFilterModulesPath) # # Path to ImageMagick document files @@ -32,7 +27,7 @@ $OpenBSD: patch-configure_ac,v 1.7 2007/05/20 19:44:47 steven Exp $ MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}" MagickDocumentPathDefine="${MagickDocumentPath}/" if test "$native_win32_build" = 'yes'; then -@@ -2066,7 +2066,7 @@ AC_SUBST(MagickDocumentPath) +@@ -2145,7 +2146,7 @@ AC_SUBST(MagickDocumentPath) # # Path to ImageMagick share files diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST index ab0eca8e7f2..867a1f3e8b3 100644 --- a/graphics/ImageMagick/pkg/PLIST +++ b/graphics/ImageMagick/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.36 2007/05/20 19:44:47 steven Exp $ +@comment $OpenBSD: PLIST,v 1.37 2007/09/19 18:46:55 sthen Exp $ !%%no_x11%% %%SHARED%% bin/Magick++-config @@ -49,6 +49,7 @@ include/magick/decorate.h include/magick/delegate.h include/magick/deprecate.h include/magick/display.h +include/magick/distort.h include/magick/draw.h include/magick/effect.h include/magick/enhance.h @@ -67,6 +68,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 @@ -83,6 +85,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 @@ -131,6 +134,7 @@ lib/ImageMagick/config/colors.xml lib/ImageMagick/config/configure.xml lib/ImageMagick/config/delegates.xml lib/ImageMagick/config/english.xml +lib/ImageMagick/config/francais.xml lib/ImageMagick/config/locale.xml lib/ImageMagick/config/type-ghostscript.xml lib/ImageMagick/config/type-solaris.xml @@ -197,7 +201,9 @@ share/doc/ImageMagick/images/logo.eps share/doc/ImageMagick/images/logo.jpg share/doc/ImageMagick/images/montage.jpg share/doc/ImageMagick/images/navy.png +share/doc/ImageMagick/images/networkredux.png share/doc/ImageMagick/images/piechart.png +share/doc/ImageMagick/images/radial-gradient.png share/doc/ImageMagick/images/reconstruct.jpg share/doc/ImageMagick/images/red-ball.png share/doc/ImageMagick/images/red-circle.png @@ -210,6 +216,7 @@ share/doc/ImageMagick/images/script.png share/doc/ImageMagick/images/smile.gif share/doc/ImageMagick/images/sponsor.jpg share/doc/ImageMagick/images/sprite.jpg +share/doc/ImageMagick/images/t-shirt.png share/doc/ImageMagick/images/travelsur.gif share/doc/ImageMagick/images/tricks.png share/doc/ImageMagick/images/wand.ico @@ -264,6 +271,7 @@ share/doc/ImageMagick/www/api.html share/doc/ImageMagick/www/api/animate.html share/doc/ImageMagick/www/api/annotate.html share/doc/ImageMagick/www/api/blob.html +share/doc/ImageMagick/www/api/cache-view.html share/doc/ImageMagick/www/api/cache.html share/doc/ImageMagick/www/api/color.html share/doc/ImageMagick/www/api/colorspace.html @@ -271,6 +279,7 @@ share/doc/ImageMagick/www/api/compare.html share/doc/ImageMagick/www/api/composite.html share/doc/ImageMagick/www/api/constitute.html share/doc/ImageMagick/www/api/decorate.html +share/doc/ImageMagick/www/api/deprecate.html share/doc/ImageMagick/www/api/display.html share/doc/ImageMagick/www/api/draw.html share/doc/ImageMagick/www/api/drawing-wand.html @@ -281,6 +290,7 @@ share/doc/ImageMagick/www/api/fx.html share/doc/ImageMagick/www/api/image.html share/doc/ImageMagick/www/api/layer.html share/doc/ImageMagick/www/api/list.html +share/doc/ImageMagick/www/api/magick-deprecate.html share/doc/ImageMagick/www/api/magick-image.html share/doc/ImageMagick/www/api/magick-property.html share/doc/ImageMagick/www/api/magick-wand.html @@ -293,6 +303,7 @@ share/doc/ImageMagick/www/api/paint.html share/doc/ImageMagick/www/api/pixel-iterator.html share/doc/ImageMagick/www/api/pixel-wand.html share/doc/ImageMagick/www/api/profile.html +share/doc/ImageMagick/www/api/property.html share/doc/ImageMagick/www/api/quantize.html share/doc/ImageMagick/www/api/registry.html share/doc/ImageMagick/www/api/resize.html @@ -315,7 +326,6 @@ share/doc/ImageMagick/www/composite.html share/doc/ImageMagick/www/conjure.html share/doc/ImageMagick/www/contact.html share/doc/ImageMagick/www/convert.html -share/doc/ImageMagick/www/cvs.html share/doc/ImageMagick/www/display.html share/doc/ImageMagick/www/download.html share/doc/ImageMagick/www/examples.html @@ -335,6 +345,7 @@ share/doc/ImageMagick/www/magick-wand.html share/doc/ImageMagick/www/magick.css share/doc/ImageMagick/www/mailing-list.html share/doc/ImageMagick/www/miff.html +share/doc/ImageMagick/www/mirrors.html share/doc/ImageMagick/www/mogrify.html share/doc/ImageMagick/www/montage.html share/doc/ImageMagick/www/motion-picture.html @@ -346,3 +357,4 @@ share/doc/ImageMagick/www/sitemap.html share/doc/ImageMagick/www/sponsors.html share/doc/ImageMagick/www/stream.html share/doc/ImageMagick/www/subversion.html +share/doc/ImageMagick/www/t-shirt.html