no regressions on amd64. please test/comment.
Index: ImageMagick/Makefile
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.95
diff -u -r1.95 Makefile
--- ImageMagick/Makefile 2007/04/09 20:47:27 1.95
+++ ImageMagick/Makefile 2007/05/16 14:13:29
@@ -2,10 +2,10 @@
COMMENT= "image processing tools"
-VER= 6.3.2
+VER= 6.3.4
DASHVER= 1
DISTNAME= ImageMagick-${VER}-${DASHVER}
-PKGNAME= ImageMagick-${VER}.${DASHVER}p0
+PKGNAME= ImageMagick-${VER}.${DASHVER}
SHARED_LIBS= Magick++ 12.0 \
Magick 12.0 \
Wand 12.0
Index: ImageMagick/distinfo
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- ImageMagick/distinfo 2007/04/05 16:19:55 1.12
+++ ImageMagick/distinfo 2007/05/16 14:13:29
@@ -1,5 +1,5 @@
-MD5 (ImageMagick-6.3.2-1.tar.gz) = 4dWBecxfOXIcSu8KQhB3ZQ==
-RMD160 (ImageMagick-6.3.2-1.tar.gz) = JoNHllPz1hpls1FZ5ubw/nhnu20=
-SHA1 (ImageMagick-6.3.2-1.tar.gz) = RlTKbIGWrPUMPd9/FII48cUUqn4=
-SHA256 (ImageMagick-6.3.2-1.tar.gz) =
sLkObgPXUhMmSqIztsqrqFcyR2aMAG4ZXpoYZNBayq4=
-SIZE (ImageMagick-6.3.2-1.tar.gz) = 6653067
+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
Index: ImageMagick/patches/patch-coders_png_c
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/patches/patch-coders_png_c,v
retrieving revision 1.3
diff -u -r1.3 patch-coders_png_c
--- ImageMagick/patches/patch-coders_png_c 2007/04/08 15:22:50 1.3
+++ ImageMagick/patches/patch-coders_png_c 2007/05/16 14:13:29
@@ -1,7 +1,7 @@
$OpenBSD: patch-coders_png_c,v 1.3 2007/04/08 15:22:50 steven Exp $
---- coders/png.c.orig Sun Apr 8 09:39:25 2007
-+++ coders/png.c Sun Apr 8 09:40:09 2007
-@@ -1756,7 +1756,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
+--- 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,
png_set_read_user_chunk_fn(ping, image, read_vpag_chunk_callback);
#endif
Index: ImageMagick/patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/patches/patch-configure_ac,v
retrieving revision 1.6
diff -u -r1.6 patch-configure_ac
--- ImageMagick/patches/patch-configure_ac 2007/04/08 15:22:50 1.6
+++ ImageMagick/patches/patch-configure_ac 2007/05/16 14:13:29
@@ -1,20 +1,20 @@
$OpenBSD: patch-configure_ac,v 1.6 2007/04/08 15:22:50 steven Exp $
---- configure.ac.orig Wed Jan 17 17:30:47 2007
-+++ configure.ac Sun Apr 8 09:39:04 2007
-@@ -373,9 +373,9 @@ AM_CONDITIONAL(WITH_MODULES, test "$with_modules" != '
+--- 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'
+- with_ltdl='yes'
-fi
+#if test "$libtool_build_shared_libs" != 'no' ; then
-+# with_ltdl='yes'
++# with_ltdl='yes'
+#fi
AM_CONDITIONAL(WITH_LTDL, test "$with_ltdl" != 'no')
if test "$with_ltdl" != 'no' ; then
-@@ -2053,7 +2053,7 @@ AC_SUBST(PERLMAINCC)
+@@ -1997,7 +1997,7 @@ AC_SUBST(PERLMAINCC)
#
# Subdirectory under lib to place ImageMagick lib files
@@ -23,7 +23,7 @@
AC_DEFINE_UNQUOTED(MagickLibSubdir,"$MagickLibSubdir",Subdirectory of lib
where ImageMagick architecture dependent files are installed)
# Path to ImageMagick bin directory
-@@ -2116,7 +2116,7 @@ AC_SUBST(MagickFilterModulesPath)
+@@ -2055,7 +2055,7 @@ AC_SUBST(MagickFilterModulesPath)
#
# Path to ImageMagick document files
@@ -31,8 +31,8 @@
+MagickDocumentSubdir="${PACKAGE_NAME}"
MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}"
MagickDocumentPathDefine="${MagickDocumentPath}/"
- if test "$native_win32_build" = 'yes'
-@@ -2128,7 +2128,7 @@ AC_SUBST(MagickDocumentPath)
+ if test "$native_win32_build" = 'yes'; then
+@@ -2066,7 +2066,7 @@ AC_SUBST(MagickDocumentPath)
#
# Path to ImageMagick share files
@@ -40,4 +40,4 @@
+MagickShareSubdir="${PACKAGE_NAME}"
MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
MagickSharePathDefine="${MagickSharePath}/"
- if test "$native_win32_build" = 'yes'
+ if test "$native_win32_build" = 'yes'; then
Index: ImageMagick/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/pkg/PLIST,v
retrieving revision 1.35
diff -u -r1.35 PLIST
--- ImageMagick/pkg/PLIST 2007/01/31 14:34:58 1.35
+++ ImageMagick/pkg/PLIST 2007/05/16 14:13:29
@@ -33,7 +33,6 @@
include/magick/animate.h
include/magick/annotate.h
include/magick/api.h
-include/magick/attribute.h
include/magick/blob.h
include/magick/cache-view.h
include/magick/cache.h
@@ -111,6 +110,7 @@
include/wand/composite.h
include/wand/conjure.h
include/wand/convert.h
+include/wand/deprecate.h
include/wand/display.h
include/wand/drawing-wand.h
include/wand/identify.h
@@ -177,6 +177,10 @@
share/doc/ImageMagick/images/arc.png
share/doc/ImageMagick/images/background.jpg
share/doc/ImageMagick/images/black.png
+share/doc/ImageMagick/images/bluebells_clipped.jpg
+share/doc/ImageMagick/images/bluebells_darker.jpg
+share/doc/ImageMagick/images/bluebells_lin.jpg
+share/doc/ImageMagick/images/bluebells_log.jpg
share/doc/ImageMagick/images/button.gif
share/doc/ImageMagick/images/configure.jpg
share/doc/ImageMagick/images/definitive-guide.png
@@ -259,7 +263,6 @@
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/attribute.html
share/doc/ImageMagick/www/api/blob.html
share/doc/ImageMagick/www/api/cache.html
share/doc/ImageMagick/www/api/color.html
@@ -279,7 +282,7 @@
share/doc/ImageMagick/www/api/layer.html
share/doc/ImageMagick/www/api/list.html
share/doc/ImageMagick/www/api/magick-image.html
-share/doc/ImageMagick/www/api/magick-property.php
+share/doc/ImageMagick/www/api/magick-property.html
share/doc/ImageMagick/www/api/magick-wand.html
share/doc/ImageMagick/www/api/magick.html
share/doc/ImageMagick/www/api/memory.html
@@ -318,6 +321,7 @@
share/doc/ImageMagick/www/examples.html
share/doc/ImageMagick/www/formats.html
share/doc/ImageMagick/www/fx.html
+share/doc/ImageMagick/www/high-dynamic-range.html
share/doc/ImageMagick/www/history.html
share/doc/ImageMagick/www/identify.html
share/doc/ImageMagick/www/import.html
@@ -333,6 +337,7 @@
share/doc/ImageMagick/www/miff.html
share/doc/ImageMagick/www/mogrify.html
share/doc/ImageMagick/www/montage.html
+share/doc/ImageMagick/www/motion-picture.html
share/doc/ImageMagick/www/perl-magick.html
share/doc/ImageMagick/www/quantize.html
share/doc/ImageMagick/www/resources.html
Index: p5-PerlMagick/Makefile
===================================================================
RCS file: /cvs/ports/graphics/p5-PerlMagick/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- p5-PerlMagick/Makefile 2007/01/31 14:34:58 1.16
+++ p5-PerlMagick/Makefile 2007/05/16 14:13:29
@@ -4,7 +4,7 @@
COMMENT= "object-oriented Perl interface to ImageMagick"
-VER= 6.3.2
+VER= 6.3.4
DASHVER= 1
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= p5-PerlMagick-${VER}.${DASHVER}
Index: p5-PerlMagick/distinfo
===================================================================
RCS file: /cvs/ports/graphics/p5-PerlMagick/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- p5-PerlMagick/distinfo 2007/04/05 16:19:57 1.12
+++ p5-PerlMagick/distinfo 2007/05/16 14:13:29
@@ -1,5 +1,5 @@
-MD5 (ImageMagick-6.3.2-1.tar.gz) = 4dWBecxfOXIcSu8KQhB3ZQ==
-RMD160 (ImageMagick-6.3.2-1.tar.gz) = JoNHllPz1hpls1FZ5ubw/nhnu20=
-SHA1 (ImageMagick-6.3.2-1.tar.gz) = RlTKbIGWrPUMPd9/FII48cUUqn4=
-SHA256 (ImageMagick-6.3.2-1.tar.gz) =
sLkObgPXUhMmSqIztsqrqFcyR2aMAG4ZXpoYZNBayq4=
-SIZE (ImageMagick-6.3.2-1.tar.gz) = 6653067
+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
Index: p5-PerlMagick/patches/patch-PerlMagick_Makefile_PL
===================================================================
RCS file:
/cvs/ports/graphics/p5-PerlMagick/patches/patch-PerlMagick_Makefile_PL,v
retrieving revision 1.9
diff -u -r1.9 patch-PerlMagick_Makefile_PL
--- p5-PerlMagick/patches/patch-PerlMagick_Makefile_PL 2007/01/31 14:34:58
1.9
+++ p5-PerlMagick/patches/patch-PerlMagick_Makefile_PL 2007/05/16 14:13:29
@@ -1,8 +1,8 @@
$OpenBSD: patch-PerlMagick_Makefile_PL,v 1.9 2007/01/31 14:34:58 bernd Exp $
---- PerlMagick/Makefile.PL.orig Fri Jan 19 16:59:33 2007
-+++ PerlMagick/Makefile.PL Tue Jan 23 18:46:25 2007
+--- PerlMagick/Makefile.PL.orig Sat May 12 06:05:24 2007
++++ PerlMagick/Makefile.PL Wed May 16 18:07:03 2007
@@ -44,13 +44,13 @@ WriteMakefile
- 'DEFINE' => ' -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES=1 -DHAVE_CONFIG_H',
# e.g., '-DHAVE_SOMETHING'
+ 'DEFINE' => ' -D_LARGE_FILES=1 -DHAVE_CONFIG_H', # e.g.,
'-DHAVE_SOMETHING'
# Header search specfication and preprocessor flags
- 'INC' => '-I../ -I.. -I/usr/include/freetype2 -I/usr/include/libxml2',
@@ -21,7 +21,7 @@
'INSTALLBIN' => '/usr/bin',
# Library specification
-- 'LIBS' => [ '-L/usr/lib -lfreetype -llcms -ltiff -lfreetype -ljpeg
-lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lpthread -lm -lpthread' ],
+- 'LIBS' => [ '-L/usr/lib -L../magick/.libs -lMagick -L/usr/lib64
-lfreetype -llcms -ltiff -lfreetype -ljpeg -lfontconfig -lXext -lSM -lICE -lX11
-lXt -lbz2 -lz -lpthread -lm -lpthread' ],
+ 'LIBS' => [ '-L%%LOCALBASE%%/lib -lMagick -L%%X11BASE%%/lib -ljbig
-llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lXt -lSM -lICE -lX11
-lbz2 -lxml2 -lz -lm' ],
# Perl binary name (if a Perl binary is built)
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
