head 1.30; access; symbols pkgsrc-2013Q2:1.30.0.8 pkgsrc-2013Q2-base:1.30 pkgsrc-2012Q4:1.30.0.6 pkgsrc-2012Q4-base:1.30 pkgsrc-2011Q4:1.30.0.4 pkgsrc-2011Q4-base:1.30 pkgsrc-2011Q2:1.30.0.2 pkgsrc-2011Q2-base:1.30 pkgsrc-2009Q4:1.28.0.18 pkgsrc-2009Q4-base:1.28 pkgsrc-2008Q4:1.28.0.16 pkgsrc-2008Q4-base:1.28 pkgsrc-2008Q3:1.28.0.14 pkgsrc-2008Q3-base:1.28 cube-native-xorg:1.28.0.12 cube-native-xorg-base:1.28 pkgsrc-2008Q2:1.28.0.10 pkgsrc-2008Q2-base:1.28 pkgsrc-2008Q1:1.28.0.8 pkgsrc-2008Q1-base:1.28 pkgsrc-2007Q4:1.28.0.6 pkgsrc-2007Q4-base:1.28 pkgsrc-2007Q3:1.28.0.4 pkgsrc-2007Q3-base:1.28 pkgsrc-2007Q2:1.28.0.2 pkgsrc-2007Q2-base:1.28 pkgsrc-2007Q1:1.27.0.2 pkgsrc-2007Q1-base:1.27 pkgsrc-2006Q4:1.25.0.2 pkgsrc-2006Q4-base:1.25 pkgsrc-2006Q3:1.23.0.2 pkgsrc-2006Q3-base:1.23 pkgsrc-2006Q2:1.21.0.2 pkgsrc-2006Q2-base:1.21 pkgsrc-2006Q1:1.17.0.2 pkgsrc-2006Q1-base:1.17 pkgsrc-2005Q4:1.15.0.18 pkgsrc-2005Q4-base:1.15 pkgsrc-2005Q3:1.15.0.16 pkgsrc-2005Q3-base:1.15 pkgsrc-2005Q2:1.15.0.14 pkgsrc-2005Q2-base:1.15 pkgsrc-2005Q1:1.15.0.12 pkgsrc-2005Q1-base:1.15 pkgsrc-2004Q4:1.15.0.10 pkgsrc-2004Q4-base:1.15 pkgsrc-2004Q3:1.15.0.8 pkgsrc-2004Q3-base:1.15 pkgsrc-2004Q2:1.15.0.6 pkgsrc-2004Q2-base:1.15 pkgsrc-2004Q1:1.15.0.4 pkgsrc-2004Q1-base:1.15 pkgsrc-2003Q4:1.15.0.2 pkgsrc-2003Q4-base:1.15 netbsd-1-6:1.12.0.8 netbsd-1-6-RELEASE-base:1.12 pkgviews:1.12.0.4 pkgviews-base:1.12 buildlink2:1.12.0.2 buildlink2-base:1.13 netbsd-1-5-PATCH003:1.12 netbsd-1-5-PATCH001:1.10 netbsd-1-5-RELEASE:1.8 netbsd-1-4-PATCH003:1.8 netbsd-1-3-PATCH003:1.5 netbsd-1-3-PATCH002:1.4; locks; strict; comment @# @; 1.30 date 2010.09.16.21.03.50; author drochner; state dead; branches; next 1.29; 1.29 date 2010.08.08.21.07.24; author wiz; state Exp; branches; next 1.28; 1.28 date 2007.06.16.21.58.11; author heinz; state dead; branches; next 1.27; 1.27 date 2007.02.15.08.05.52; author adam; state Exp; branches; next 1.26; 1.26 date 2007.02.06.14.52.47; author adam; state Exp; branches; next 1.25; 1.25 date 2006.12.09.10.57.49; author adam; state Exp; branches; next 1.24; 1.24 date 2006.10.22.21.03.15; author adam; state Exp; branches; next 1.23; 1.23 date 2006.09.06.20.15.57; author adam; state Exp; branches 1.23.2.1; next 1.22; 1.22 date 2006.07.17.16.01.36; author adam; state Exp; branches; next 1.21; 1.21 date 2006.06.12.09.13.27; author adam; state Exp; branches 1.21.2.1; next 1.20; 1.20 date 2006.05.22.11.30.20; author adam; state Exp; branches; next 1.19; 1.19 date 2006.05.08.11.39.07; author adam; state Exp; branches; next 1.18; 1.18 date 2006.04.30.17.55.12; author adam; state Exp; branches; next 1.17; 1.17 date 2006.03.05.21.25.49; author adam; state Exp; branches; next 1.16; 1.16 date 2006.01.28.02.36.55; author salo; state Exp; branches; next 1.15; 1.15 date 2002.11.13.19.17.20; author wiz; state dead; branches 1.15.18.1; next 1.14; 1.14 date 2002.11.13.13.44.43; author wiz; state Exp; branches; next 1.13; 1.13 date 2002.08.22.08.06.13; author tron; state dead; branches; next 1.12; 1.12 date 2002.02.10.12.51.00; author abs; state Exp; branches 1.12.2.1; next 1.11; 1.11 date 2001.09.17.15.17.32; author tron; state Exp; branches; next 1.10; 1.10 date 2001.01.30.13.18.52; author wiz; state Exp; branches; next 1.9; 1.9 date 2001.01.29.19.03.24; author tron; state dead; branches; next 1.8; 1.8 date 2000.08.10.08.57.23; author tron; state Exp; branches; next 1.7; 1.7 date 2000.03.21.22.19.44; author tron; state Exp; branches; next 1.6; 1.6 date 99.04.25.18.46.30; author tv; state dead; branches; next 1.5; 1.5 date 98.08.07.10.40.46; author agc; state Exp; branches; next 1.4; 1.4 date 98.03.19.09.23.08; author tron; state Exp; branches; next 1.3; 1.3 date 98.02.25.17.34.49; author tron; state Exp; branches; next 1.2; 1.2 date 98.02.05.01.34.42; author tron; state Exp; branches; next 1.1; 1.1 date 98.01.27.13.51.15; author agc; state Exp; branches; next ; 1.23.2.1 date 2006.12.11.11.49.04; author ghen; state Exp; branches; next ; 1.21.2.1 date 2006.08.17.07.04.36; author ghen; state Exp; branches; next ; 1.15.18.1 date 2006.01.28.23.39.05; author seb; state Exp; branches; next ; 1.12.2.1 date 2002.08.22.11.11.18; author jlam; state dead; branches; next ; desc @@ 1.30 log @update to 6.6.4.1 many improvements and fixes - see the changelog @ text @$NetBSD: patch-ab,v 1.29 2010/08/08 21:07:24 wiz Exp $ Fix whitespace issues -- gmake-3.82 expects tabs. --- Makefile.in.orig 2010-04-23 18:29:22.000000000 +0000 +++ Makefile.in @@@@ -11119,21 +11119,21 @@@@ check-local: $(PERLMAGICK_CHECK_LOCAL_TA # drd: valgrind's newer thread error detector drd: - $(MAKE) MEMCHECK='valgrind --tool=drd --check-stack-var=yes --var-info=yes \ + $(MAKE) MEMCHECK='valgrind --tool=drd --check-stack-var=yes --var-info=yes \ --quiet $(VALGRIND_EXTRA_OPTS)' check # helgrind: valgrind's older thread error detector helgrind: - $(MAKE) MEMCHECK='valgrind --tool=helgrind --quiet $(VALGRIND_EXTRA_OPTS)' check + $(MAKE) MEMCHECK='valgrind --tool=helgrind --quiet $(VALGRIND_EXTRA_OPTS)' check # memcheck: valgrind's memory access checker memcheck: - $(MAKE) MEMCHECK='valgrind --tool=memcheck --leak-check=full --read-var-info=yes \ + $(MAKE) MEMCHECK='valgrind --tool=memcheck --leak-check=full --read-var-info=yes \ --track-origins=yes --num-callers=12 --quiet $(VALGRIND_EXTRA_OPTS)' check # ptrcheck: valgrind's experimental pointer checking tool. ptrcheck: - $(MAKE) MEMCHECK='valgrind --tool=exp-ptrcheck --quiet $(VALGRIND_EXTRA_OPTS)' check + $(MAKE) MEMCHECK='valgrind --tool=exp-ptrcheck --quiet $(VALGRIND_EXTRA_OPTS)' check dist-hook: ( \ builddir=`pwd` ; \ @ 1.29 log @Fix whitespace problem in Makefile. @ text @d1 1 a1 1 $NetBSD$ @ 1.28 log @Updated to version 6.3.4.9 (approved by adam@@). Pkgsrc changes: - http://www.imagemagick.org/ is the HOMEPAGE now. - The package supports installation to DESTDIR. - Removed patch-ab because it was unclear why we would not want to have Magick++-config.1. Changes since version 6.3.3.6: ============================== 2007-06-11 6.3.4-9 Cristy * Converting a jpg to pdf is creating an empty pdf object (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=8954). * Respect the '-set type:hinting off option' (bug report from Richard Jones). * WritePSDImage vulnerable to exploitable heap corruption (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=8967). 2007-06-09 6.3.4-8 Cristy * SetMagickRegistry() post-increment the value 'id' (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=8944). 2007-06-02 6.3.4-6 Cristy * Read/write 10 & 12-bit packed DPX images. * Reduce stack requirements for messaging system. * Small memory leak for raw profiles in the PNG coder. 2007-06-01 6.3.4-5 Glenn * Added GIF, JPEG, and PNG interlace types. For backward compatibility, you can continue to use "-interlace Plane" to request these. 2007-04-30 6.3.4-0 Anthony * Fixed minor bug in the 'curl' for Polaroid of very non-square images. 2007-06-01 6.3.4-5 Cristy * Set min-is-white for Group4-compressed PDF. * Add PaintFloodfillImage() method. 2007-05-30 6.3.4-4 Cristy * Add MEPP metric to compare program. Returns the mean error per pixel along with the normalize mean and maximum error. * Attach an XMP profile to an image (e.g. convert input.tif -profile xmp:metadata.xmp output.tif). 2007-05-22 6.3.4-3 Cristy * Fixed mogrify conversions with -format and -path (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=9127). 2007-05-15 6.3.4-2 Cristy * SVG style element was not always parsed properly. * Do not dither when the number of unique colors is already less than the maximum. * Return normalized PAE metric (compare utility). 2007-05-03 6.3.4-1 Cristy * Add support for PFM images. * Check for corrupt EXIF image profiles. * Writing JPEG YCbCr TIFF images no longer faults (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=8896). 2007-04-30 6.3.4-0 Anthony * Fixed minor bug for crop missed images and 'background' GIF disposal. 2007-04-28 6.3.4-0 Glenn * Added profile support to the GIF decoder/encoder. They are stored as GIF Application Extensions. Known extensions include existing ICCRGB1 (for ICC profiles) and new MGKIPTC0 and MGK8BIM0 (for IPTC and 8BIM profiles). Unknown extensions found in GIF files are read as gifappNNN. 2007-04-28 6.3.4-0 Anthony * Invert Opacity change for user defined ordered dither threshold maps, so that 'off' map is transparent, and 'on' is opaque. 2007-04-24 6.3.4-0 Anthony * Added an initial Coalesce Images, and a final +map local colortable optimization to the -layers Optimize method, for a simple to use GIF optimization operation. (more work to come) 2007-04-22 6.3.4-0 Cristy * Properly set the virtual canvas of a multi-frame GIF image sequence. * Add AcquireOneVirtualPixel() method. * Set Log colorspace properly when writing DPX images. * Add -tile-offset option. * Add support for the EXR image format. * Improve support for DPX images. * Add --enable-hdri option to the configure script. * Add support for high dynamic-range images (HDRI). 2007-04-20 6.3.3-9 Peter Hull * Improve support for writing multiple image icons. 2007-04-18 6.3.3-9 Anthony * Separated -layers Optimize from -layers OptimizeFrame to allow the former expansion into a general (multiple method) optimizer of GIF animations * merged -layers OptimizeTransparency into -layers Optimize method 2007-04-12 6.3.3-8 Chris Madison * Fix fault whem comparing a colormapped image with a non-colormapped one. * Fix race condition when spawning delegate programs. * TIFF JPEG now respects the -quality comptression setting. * The -fx option now properly groks the logical and operator. * DPX tilestamp property should be timestamp. 2007-04-13 6.3.3-7 Anthony * Added GravityAdjustGeometry() to "geometry.c" to adjust geometry settings according to given gravity and canvas area it applies to. This is for code simplification thoughout MagickCore. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.27 2007/02/15 08:05:52 adam Exp $ d3 3 a5 1 --- Makefile.in.orig 2007-02-10 21:49:52.000000000 +0100 d7 7 a13 3 @@@@ -3629,8 +3629,6 @@@@ WAND_CLEANFILES = \ @@WITH_MAGICK_PLUS_PLUS_TRUE@@MAGICKPP_SCRPTS = \ @@WITH_MAGICK_PLUS_PLUS_TRUE@@ Magick++/bin/Magick++-config d15 4 a18 2 -@@WITH_MAGICK_PLUS_PLUS_TRUE@@MAGICKPP_MANS = \ -@@WITH_MAGICK_PLUS_PLUS_TRUE@@ Magick++/bin/Magick++-config.1 d20 5 a24 17 @@WITH_MAGICK_PLUS_PLUS_TRUE@@MAGICKPP_PKGCONFIG = \ @@WITH_MAGICK_PLUS_PLUS_TRUE@@ Magick++/lib/ImageMagick++.pc @@@@ -3680,7 +3678,6 @@@@ WAND_CLEANFILES = \ @@WITH_MAGICK_PLUS_PLUS_TRUE@@ Magick++/INSTALL \ @@WITH_MAGICK_PLUS_PLUS_TRUE@@ Magick++/NEWS \ @@WITH_MAGICK_PLUS_PLUS_TRUE@@ Magick++/README \ -@@WITH_MAGICK_PLUS_PLUS_TRUE@@ Magick++/bin/Magick++-config.1 \ @@WITH_MAGICK_PLUS_PLUS_TRUE@@ Magick++/bin/Magick++-config.in \ @@WITH_MAGICK_PLUS_PLUS_TRUE@@ Magick++/lib/ImageMagick++.pc.in \ @@WITH_MAGICK_PLUS_PLUS_TRUE@@ Magick++/demo/model.miff \ @@@@ -4932,7 +4929,6 @@@@ pkgconfig_DATA = \ # Manual pages to install man_MANS = \ $(MAGICK_MANS) \ - $(MAGICKPP_MANS) \ $(UTILITIES_MANS) \ $(WAND_MANS) d26 7 @ 1.27 log @Changes 6.3.2.4: * Bug fixes and improvements @ text @d1 1 a1 1 $NetBSD$ @ 1.26 log @Changes 6.3.2.3: * Added thumbnail format to write EXIF thumbnails. * Move EXIF properties to the EXIF namespace (e.g. exif:XResolution). * Add interpolate and background options to PerlMagick's AffineTransform(). * Revert to Postscript rendering if Freetype delegate library is not available. @ text @d3 1 a3 1 --- Makefile.in.orig 2007-02-05 22:13:28.000000000 +0100 d5 1 a5 1 @@@@ -3627,8 +3627,6 @@@@ WAND_CLEANFILES = \ d14 1 a14 1 @@@@ -3678,7 +3676,6 @@@@ WAND_CLEANFILES = \ d22 1 a22 1 @@@@ -4930,7 +4927,6 @@@@ pkgconfig_DATA = \ @ 1.25 log @Changes 6.3.1.0: * Bug fixes @ text @d3 1 a3 1 --- Makefile.in.orig 2006-11-27 02:54:57.000000000 +0100 d5 1 a5 1 @@@@ -3579,8 +3579,6 @@@@ WAND_CLEANFILES = \ d14 1 a14 1 @@@@ -3630,7 +3628,6 @@@@ WAND_CLEANFILES = \ d22 1 a22 1 @@@@ -4882,7 +4879,6 @@@@ pkgconfig_DATA = \ @ 1.24 log @Changes 6.3.0-0: * Destroy MagickCore API environment when END{} is called in PerlMagick * Support -fx conditionals (e.g. x ? y : z), assignment (e.g. zz=3.1), and statement separators (e.g. zz=2.1; zz). * Add new pixel: attribute (e.g. -format '%[pixel:s]'). * Add support for Supplementary Plane Unicode characters Changes 6.2.9-8: * The plasma: coder is once again opaque. * Bogus relinquish in rare circustances produced incorrect resource utilization statistics. Changes 6.2.9-7: * Add CMYK support to the PAM image format. * Do not write PDF soft mask if image is PaletteMatteType. * Patches from Sven Koehler to improve PerlMagick's build script. Changes 6.2.9-7: * Add additional ordered-dithering options. Changes 6.2.9-6: * Ensure cache_resources in magick/cache.c is a valid splay-tree before we add/remove nodes to/from it. * Automatically threshold the alpha channel at 50% when color reducing an image. * Make ParseMagickOptions() more robust to handle ordered dither options. @ text @d3 1 a3 1 --- Makefile.in.orig 2006-10-14 21:21:05.000000000 +0200 d5 1 a5 1 @@@@ -3291,8 +3291,6 @@@@ WAND_CLEANFILES = \ d14 1 a14 1 @@@@ -3342,7 +3340,6 @@@@ WAND_CLEANFILES = \ d22 1 a22 1 @@@@ -4603,7 +4600,6 @@@@ pkgconfig_DATA = \ @ 1.23 log @Changes 6.2.9-3: * Add -clip-mask option to clip as defined by an image mask. Changes 6.2.9-2: * Add >>, <<, >=, and <= operators to -fx. @ text @d3 1 a3 1 --- Makefile.in.orig 2006-09-01 16:08:16.000000000 +0200 d5 1 a5 1 @@@@ -3285,8 +3285,6 @@@@ WAND_CLEANFILES = \ d14 1 a14 1 @@@@ -3336,7 +3334,6 @@@@ WAND_CLEANFILES = \ d22 1 a22 1 @@@@ -4610,7 +4607,6 @@@@ pkgconfig_DATA = \ @ 1.23.2.1 log @Pullup ticket 1951 - requested by salo security update for ImageMagick - pkgsrc/graphics/ImageMagick/Makefile 1.146,1.148 - pkgsrc/graphics/ImageMagick/Makefile.common 1.65-1.66 - pkgsrc/graphics/ImageMagick/PLIST 1.51-1.52 - pkgsrc/graphics/ImageMagick/distinfo 1.78-1.81 - pkgsrc/graphics/ImageMagick/patches/patch-aa 1.38-1.40 - pkgsrc/graphics/ImageMagick/patches/patch-ab 1.24-1.25 Module Name: pkgsrc Committed By: rillig Date: Tue Oct 10 19:43:32 UTC 2006 Modified Files: pkgsrc/graphics/ImageMagick: distinfo pkgsrc/graphics/ImageMagick/patches: patch-aa Log Message: Fixed "test ==". --- Module Name: pkgsrc Committed By: adam Date: Sun Oct 22 21:03:15 UTC 2006 Modified Files: pkgsrc/graphics/ImageMagick: Makefile.common PLIST distinfo pkgsrc/graphics/ImageMagick/patches: patch-aa patch-ab Log Message: Changes 6.3.0-0: * Destroy MagickCore API environment when END{} is called in PerlMagick * Support -fx conditionals (e.g. x ? y : z), assignment (e.g. zz=3.1), and statement separators (e.g. zz=2.1; zz). * Add new pixel: attribute (e.g. -format '%[pixel:s]'). * Add support for Supplementary Plane Unicode characters Changes 6.2.9-8: * The plasma: coder is once again opaque. * Bogus relinquish in rare circustances produced incorrect resource utilization statistics. Changes 6.2.9-7: * Add CMYK support to the PAM image format. * Do not write PDF soft mask if image is PaletteMatteType. * Patches from Sven Koehler to improve PerlMagick's build script. Changes 6.2.9-7: * Add additional ordered-dithering options. Changes 6.2.9-6: * Ensure cache_resources in magick/cache.c is a valid splay-tree before we add/remove nodes to/from it. * Automatically threshold the alpha channel at 50% when color reducing an image. * Make ParseMagickOptions() more robust to handle ordered dither options. --- Module Name: pkgsrc Committed By: joerg Date: Thu Nov 30 22:55:31 UTC 2006 Modified Files: pkgsrc/graphics/ImageMagick: Makefile distinfo Added Files: pkgsrc/graphics/ImageMagick/patches: patch-ac Log Message: Remove comma at end of enum in magick/options.h, making it parseable by C++ compilers. Bump revision. --- Module Name: pkgsrc Committed By: adam Date: Sat Dec 9 10:57:50 UTC 2006 Modified Files: pkgsrc/graphics/ImageMagick: Makefile Makefile.common PLIST distinfo pkgsrc/graphics/ImageMagick/patches: patch-aa patch-ab Removed Files: pkgsrc/graphics/ImageMagick/patches: patch-ac Log Message: Changes 6.3.1.0: * Bug fixes @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.23 2006/09/06 20:15:57 adam Exp $ d3 1 a3 1 --- Makefile.in.orig 2006-11-27 02:54:57.000000000 +0100 d5 1 a5 1 @@@@ -3579,8 +3579,6 @@@@ WAND_CLEANFILES = \ d14 1 a14 1 @@@@ -3630,7 +3628,6 @@@@ WAND_CLEANFILES = \ d22 1 a22 1 @@@@ -4882,7 +4879,6 @@@@ pkgconfig_DATA = \ @ 1.22 log @Changes 6.2.8-4: * Add IsImageSimiliar() method to MagickCore API. * Improve color reduction algorithm for images with transparency. Changes 6.2.8-3: * The -page A4 option no longer returns a width/height of 0. * GetMagickModulePath() at line 803 in magick/module.c the variable 'home' is not freed before returning. * Magick::throwException should not call MagickLib::GetException(). Changes 6.2.8-2: * The DPX orientation header elements are 8 not 16. * Fix the ImageMagick web pages so they render properly. Changes 6.2.8-1: * Fix off-by-one error in DrawAffineImage(). * Set the offset to layer 2 of XCF images. * Set proper precendence so -fx 'p{u[1]*w,u[2]*h}' parses properly (bug @ text @d3 1 a3 1 --- Makefile.in.orig 2006-07-13 04:29:46.000000000 +0200 d5 1 a5 1 @@@@ -3281,8 +3281,6 @@@@ WAND_CLEANFILES = \ d14 1 a14 1 @@@@ -3332,7 +3330,6 @@@@ WAND_CLEANFILES = \ d22 1 a22 1 @@@@ -4606,7 +4603,6 @@@@ pkgconfig_DATA = \ @ 1.21 log @Changes 6.2.8.0: * Bug fixes and improvements @ text @d3 1 a3 1 --- Makefile.in.orig 2006-06-05 04:08:39.000000000 +0200 d5 1 a5 1 @@@@ -3268,8 +3268,6 @@@@ WAND_CLEANFILES = \ d14 1 a14 1 @@@@ -3319,7 +3317,6 @@@@ WAND_CLEANFILES = \ d22 1 a22 1 @@@@ -4587,7 +4584,6 @@@@ pkgconfig_DATA = \ @ 1.21.2.1 log @Pullup ticket 1791 - requested by salo security update for ImageMagick Revisions pulled up: - pkgsrc/graphics/ImageMagick/Makefile.common 1.58-1.60, 1.62 - pkgsrc/graphics/ImageMagick/PLIST 1.49 - pkgsrc/graphics/ImageMagick/distinfo 1.70-1.72, 1.75 - pkgsrc/graphics/ImageMagick/patches/patch-aa 1.37 - pkgsrc/graphics/ImageMagick/patches/patch-ab 1.22 Module Name: pkgsrc Committed By: adam Date: Mon Jul 17 16:01:36 UTC 2006 Modified Files: pkgsrc/graphics/ImageMagick: Makefile.common PLIST distinfo pkgsrc/graphics/ImageMagick/patches: patch-aa patch-ab Log Message: Changes 6.2.8-4: * Add IsImageSimiliar() method to MagickCore API. * Improve color reduction algorithm for images with transparency. Changes 6.2.8-3: * The -page A4 option no longer returns a width/height of 0. * GetMagickModulePath() at line 803 in magick/module.c the variable 'home' is not freed before returning. * Magick::throwException should not call MagickLib::GetException(). Changes 6.2.8-2: * The DPX orientation header elements are 8 not 16. * Fix the ImageMagick web pages so they render properly. Changes 6.2.8-1: * Fix off-by-one error in DrawAffineImage(). * Set the offset to layer 2 of XCF images. * Set proper precendence so -fx 'p{u[1]*w,u[2]*h}' parses properly (bug Module Name: pkgsrc Committed By: adam Date: Mon Jul 31 14:55:36 UTC 2006 Modified Files: pkgsrc/graphics/ImageMagick: Makefile.common distinfo Log Message: Changes 6.2.8.7: * Bug fixes Module Name: pkgsrc Committed By: perry Date: Mon Aug 7 01:08:05 UTC 2006 Modified Files: pkgsrc/graphics/ImageMagick: Makefile.common distinfo Log Message: Update to 6.2.8-8 -- -7 is no longer available on most ImageMagick mirrors. The ChangeLog between -7 and -8 says: * Add -unique-colors to discard all but one of any pixel color. * The montage program properly parses the -channel option. * Make -colors work consistently as an image operator. * Some DPX images do not contain a television header. * Restore ability to read 10-bit grayscale Cineon images. * Improve handling of corrupt GIF images. Module Name: pkgsrc Committed By: abs Date: Tue Aug 15 12:20:12 UTC 2006 Modified Files: pkgsrc/graphics/ImageMagick: Makefile Makefile.common distinfo Log Message: Update graphics/ImageMagick from 6.2.8.8 to 6.2.9.0 * Add -adaptive-resize option. * Permit x100 as a geometry in Magick++. * Respect width/height for image MVG element. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.22 2006/07/17 16:01:36 adam Exp $ d3 1 a3 1 --- Makefile.in.orig 2006-07-13 04:29:46.000000000 +0200 d5 1 a5 1 @@@@ -3281,8 +3281,6 @@@@ WAND_CLEANFILES = \ d14 1 a14 1 @@@@ -3332,7 +3330,6 @@@@ WAND_CLEANFILES = \ d22 1 a22 1 @@@@ -4606,7 +4603,6 @@@@ pkgconfig_DATA = \ @ 1.20 log @Changes 6.2.7.7: * Don't fault when processing bad TIFF profiles (4 characters or less). * Masks are now read properly for 16-bit DIB's. * The pixel cache file descriptor limit code failed because the pixel cache timestamp was not always being set properly. * Fixed a small memory leak in IsGrayImage(). * Fixed Cineon writing bug for very long filenames in 6.2.7 (reference http://redux.imagemagick.org/discussion-server/viewtopic.php?t=6590) * Begin the long journey of enhancing the conjure utility to support all options that are supported by the convert utility and PerlMagick (e.g. border, guassian-blur, etc.). @ text @d3 1 a3 1 --- Makefile.in.orig 2006-05-21 04:25:57.000000000 +0200 d5 1 a5 1 @@@@ -3267,8 +3267,6 @@@@ WAND_CLEANFILES = \ d14 1 a14 1 @@@@ -3318,7 +3316,6 @@@@ WAND_CLEANFILES = \ d22 1 a22 1 @@@@ -4586,7 +4583,6 @@@@ pkgconfig_DATA = \ @ 1.19 log @Changes 6.2.7.3: * Add -adaptive-sharpen to the convert and mogrify programs. Changes 6.2.7.2: * Generate proper image filenames when filename has more than one embedded period (e.g. image.gif.eps becomes image.gif-0.eps, image.gif-1.eps, etc.). * CompositeImage() is now thread-safe. @ text @d3 1 a3 1 --- Makefile.in.orig 2006-05-07 17:10:38.000000000 +0200 d5 1 a5 1 @@@@ -3263,8 +3263,6 @@@@ WAND_CLEANFILES = \ d14 1 a14 1 @@@@ -3314,7 +3312,6 @@@@ WAND_CLEANFILES = \ d22 1 a22 1 @@@@ -4582,7 +4579,6 @@@@ pkgconfig_DATA = \ @ 1.18 log @Changes 6.2.7.1: * Bug fixes and improvements (see ChangeLog for details) @ text @d3 1 a3 1 --- Makefile.in.orig 2006-04-24 03:19:49.000000000 +0200 d5 1 a5 1 @@@@ -3264,8 +3264,6 @@@@ WAND_CLEANFILES = \ d14 1 a14 1 @@@@ -3315,7 +3313,6 @@@@ WAND_CLEANFILES = \ d22 1 a22 1 @@@@ -4583,7 +4580,6 @@@@ pkgconfig_DATA = \ @ 1.17 log @Changes 6.2.6.3: * The command line utilities properly returns a non-zero status when an exception is thrown. Changes 6.2.6.2 * Fix a memory leak in each of CompositeImageCommand() and CompositeImage() * Add new options -layers compare-any, -layers compare-clear, -layers compare-overlay, and -layers optimize. * Draw last dash in a dashed polyline. * Add %D to -format to return the image disposal method. * ncorrect handling of file:// URIs causes data loss (patch from Daniel Kobras). * Set default BMP resolution units to PixelsPerCentimeter (problem report from digipete@@shaw...). @ text @d3 1 a3 1 --- Makefile.in.orig 2006-03-05 22:13:13.000000000 +0100 d5 1 a5 1 @@@@ -3247,8 +3247,6 @@@@ WAND_CLEANFILES = \ d14 1 a14 1 @@@@ -3298,7 +3296,6 @@@@ WAND_CLEANFILES = \ d22 1 a22 1 @@@@ -4566,7 +4563,6 @@@@ pkgconfig_DATA = \ @ 1.16 log @Security fixes for CVE-2006-0082 and Debian bug #345595: "Format string vulnerabilities in ImageMagick allow user-complicit attackers to cause a denial of service (crash) and possibly execute arbitrary code via a numeric format string specifier such as %d in the file name, a variant of CVE-2005-0397, and as demonstrated using the convert program." Patches from Debian. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-0082 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345876 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345595 @ text @d3 27 a29 13 Security fix for CVE-2006-0082, from Debian. --- wand/animate.c.orig 2006-01-13 05:49:46.000000000 +0100 +++ wand/animate.c 2006-01-28 02:24:20.000000000 +0100 @@@@ -410,7 +410,7 @@@@ /* Form filename for multi-part images. */ - (void) FormatMagickString(filename,MaxTextExtent, + (void) FormatMagickStringNumeric(filename,MaxTextExtent, image_info->filename,scene); if (LocaleCompare(filename,image_info->filename) == 0) (void) FormatMagickString(filename,MaxTextExtent,"%s[%lu]", @ 1.15 log @According to the ImageMagick developers, it is uncommon for any two libMagick.so libraries to be API compatible, and they don't want to handle proper ELF versioning, but have the "real" version number in the library. To spare us the pkgsrc maintenance nightmare, follow their example. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.14 2002/11/13 13:44:43 wiz Exp $ d3 13 a15 11 --- Magick++/lib/Makefile.in.orig Thu Oct 17 04:38:16 2002 +++ Magick++/lib/Makefile.in @@@@ -337,7 +337,7 @@@@ libMagick___la_SOURCES = \ # Add -no-undefined once Cygwin supports throwing C++ exceptions from DLLs. libMagick___la_LDFLAGS = \ - -release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION) + -version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION) libMagick___la_LIBADD = ../../magick/libMagick.la @ 1.15.18.1 log @Pullup ticket 1070 - requested by Lubomir Sedlacik sync graphics/ImageMagick with HEAD including security fixes Revisions pulled up: - pkgsrc/graphics/ImageMagick/Makefile 1.137 - pkgsrc/graphics/ImageMagick/Makefile.common 1.46 - pkgsrc/graphics/ImageMagick/PLIST 1.44 - pkgsrc/graphics/ImageMagick/buildlink3.mk 1.11 - pkgsrc/graphics/ImageMagick/distinfo 1.57, 1.58 - pkgsrc/graphics/ImageMagick/options.mk 1.4 - pkgsrc/graphics/ImageMagick/patches/patch-aa 1.33 - pkgsrc/graphics/ImageMagick/patches/patch-ab 1.16 - pkgsrc/graphics/ImageMagick/patches/patch-ac 1.12 - pkgsrc/graphics/ImageMagick/patches/patch-ad 1.9 - pkgsrc/graphics/ImageMagick/patches/patch-ae 1.6 - pkgsrc/graphics/ImageMagick/patches/patch-af 1.6 - pkgsrc/graphics/ImageMagick/patches/patch-ag 1.4 - pkgsrc/graphics/ImageMagick/patches/patch-ah 1.3 Module Name: pkgsrc Committed By: adam Date: Thu Jan 26 20:38:19 UTC 2006 Modified Files: pkgsrc/graphics/ImageMagick: Makefile Makefile.common PLIST buildlink3.mk distinfo options.mk pkgsrc/graphics/ImageMagick/patches: patch-aa Log Message: Changes 6.2.6.0: * Bug fixes --- Module Name: pkgsrc Committed By: salo Date: Sat Jan 28 02:36:55 UTC 2006 Modified Files: pkgsrc/graphics/ImageMagick: Makefile distinfo Added Files: pkgsrc/graphics/ImageMagick/patches: patch-ab patch-ac patch-ad patch-ae patch-af patch-ag patch-ah Log Message: Security fixes for CVE-2006-0082 and Debian bug #345595: "Format string vulnerabilities in ImageMagick allow user-complicit attackers to cause a denial of service (crash) and possibly execute arbitrary code via a numeric format string specifier such as %d in the file name, a variant of CVE-2005-0397, and as demonstrated using the convert program." Patches from Debian. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-0082 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345876 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=345595 @ text @d1 1 a1 1 $NetBSD$ d3 11 a13 13 Security fix for CVE-2006-0082, from Debian. --- wand/animate.c.orig 2006-01-13 05:49:46.000000000 +0100 +++ wand/animate.c 2006-01-28 02:24:20.000000000 +0100 @@@@ -410,7 +410,7 @@@@ /* Form filename for multi-part images. */ - (void) FormatMagickString(filename,MaxTextExtent, + (void) FormatMagickStringNumeric(filename,MaxTextExtent, image_info->filename,scene); if (LocaleCompare(filename,image_info->filename) == 0) (void) FormatMagickString(filename,MaxTextExtent,"%s[%lu]", @ 1.14 log @Update to 5.5.1-6. Changes: * Verify sanity of sysconf(_SC_PAGE_SIZE) and sysconf(_SC_PHYS_PAGES) before using their values. * Corrected bug in image geometry height calculation. * PingBlob() improperly set the length memory of BlobInfo to zero. * Fixed Ping() memory leak in PerlMagick. * Fixed -map problem in convert/mogrify utilities. * -border with a single value now produces correct results (e.g. -border 10). * Set locale type LC_NUMERIC to "C". * Bug fix for PS2 encoder. * Added PS-Adobe preamble to PS3 encoder. * Use ImageMagick release number to allow multiple ImageMagick releases to co-exist without interference on the same machine. * Decided that DrawGet functions should return by value. * Added detailed logging to BMP, PNG, and JPEG codecs, including JPEG quality estimate. * Added draw.h "DrawGet" equivalents to most of the "DrawSet" functions. * Added an array size argument to DrawSetDashPattern and got rid of the zero-termination garbage. o Remove 'Set' from the names of draw.h functions which update the current affine transformation array (e.g. DrawSetRotate becomes DrawRotate). * Under Windows, a DllMain function which automatically initializes ImageMagick (when ImageMagick is built using DLLs) may be added by defining ProvideDllMain in magick_config.h * Added resource consumption methods, see magick/resource.c. * Replaced underscores in commandline options with hyphens. For backward compatibility, underscores will continue to be recognized. * Added -blue-primary, -green-primary, -red-primary, -white-point options. * Added BMP2 and BMP3 output formats. * Changed chromaticity primary.z from 1.0 to 1.0-(primary.x+primary.y) in the PNG and PCD codecs. * Added 'exception' parameter to the ImageMagick progress monitor API. * Added enumerated types for the dispose member of the Image structure. * Added -version option to commandline utilities. * The xcf decoder would sometimes create artifacts when reading RLE-encoded grayscale images, due to the green and blue samples not being defined. * Added logging capabilities to the CORE API. This facility is useful for debugging. Added "events" parameter to the -debug commandline option. * AcquireImagePixels() did not always return the same pixel values for virtual pixels when the cache was stored on disk (very rare). * new -virtual-pixel command line option. * new PerlMagick virtual-pixel image attribute. @ text @d1 1 a1 1 $NetBSD$ @ 1.13 log @Update "ImageMagick" and "p5-PerlMagick" packages to version 5.4.8.2. Many bugs were fixed since the release of version 5.3.9 and lots of new features like 32-Bit QuantumDepth support added. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.12 2002/02/10 12:51:00 abs Exp $ d3 3 a5 4 --- configure.in.orig Wed Sep 12 17:39:19 2001 +++ configure.in @@@@ -423,9 +423,6 @@@@ eval "eval MAN_DIR=$mandir" d7 4 a11 5 -LDFLAGS="$LDFLAGS -L$LIB_DIR" -CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR" - # Extend includedir to include magick subdirectory offset includedir="$includedir/magick" d13 1 @ 1.12 log @Switch a 'long' to int32_t to work correctly on BE-LP64 platforms. Mark NOT_FOR_PLATFORM = NetBSD-*-sparc64 as c++ still broken @ text @d1 1 a1 1 $NetBSD$ @ 1.12.2.1 log @Merge changes from pkgsrc-current into the buildlink2 branch for the packages that have buildlink2.mk files. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.12 2002/02/10 12:51:00 abs Exp $ @ 1.11 log @Update "ImageMagick" and "p5-PerlMagick" packages to version 5.3.9. A complete list of changes is not available unfortunately. Recent changes are: - Text drawing now handles UTF8-encoding. - Off-by-one GetImagePixels() fix in draw.c - PingImage() now reports attributes for all images an image sequence. - magick/image.h: Rename QuantumLeap define to QuantumDepth. QuantumDepth is set to the values 8 or 16, depend configuration option. - Updated PerlMagick signatures to signature algorithm. - ImageMagick defaults to 16-bit quantum. Set QuantumMagick for 8-bit. - Changed image->blob from BlobInfo to BlobInfo- so the Image structure size is not dependent on the large-file defines. - Added -background to convert prog - DispatchImage() now properly handles grayscale images. @ text @d3 11 a13 8 --- magick/magick.h.orig Wed Aug 15 04:20:26 2001 +++ magick/magick.h Mon Sep 17 16:39:59 2001 @@@@ -11,8 +11,6 @@@@ /* System include declarations. */ -#define _XOPEN_SOURCE 500 -#define _POSIX_C_SOURCE 199506L a14 2 #define _MAGICK_CONFIG_H #if !defined(vms) && !defined(macintosh) @ 1.10 log @Make it partially compile on 1.4.2, whose unistd.h doesn't seem to like this combination of _XOPEN_SOURCE and _POSIX_C_SOURCE. @ text @d3 2 a4 2 --- magick/magick.h.orig Wed Jan 24 16:12:55 2001 +++ magick/magick.h Tue Jan 30 13:53:37 2001 d12 2 a13 2 #include #include @ 1.9 log @Update "ImageMagick" package to version 5.2.8. Changes since version 5.2.2: - URL's are now understood on Win32 (thanks to libXML and William Radcliffe). - ImageMagick defaults to 16-bit per pixel component now. - Support added for ART images (contributed by Jaroslav Fojtik). - Added -pause to the animate program. You can now specify a minimum/maximum delay for an image sequence. - Added %c to -format to get the image comment (patch provided by Frank Mattern). - Over compositing is now the Porter-Duff algorithm (inspired by William Radcliffe and Alvy Ray Smith). - You can write SVG output if the input is SVG, MVG, or WMF. - ImageMagick now can accept AFM, PFB, and PFM fonts. - The linewidth parameter is deprecated in PerlMagick. Use stroke_width instead. - Digital Applications contributed text stroking code. - You can now specify Truetype fonts directly. No @@ prefix is required (e.g. convert -font Arial.ttf ...) - Digital Applications contributed line cap and dash pattern rendering code. - Added the Multiple composite operator for the creation of drop-shadows (patch provided by John Harper). - Support added for CUT images (contributed by Jaroslav Fojtik). - Bill Radcliffe contributed fast polygoni rendering code. Parts of the rendering algorithm were inspired by libart. - Support added for BMP images with a 'BA' chunk (contributed by Jaroslav Fojtik). @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.8 2000/08/10 08:57:23 tron Exp $ d3 3 a5 3 --- magick/magick.h.orig Tue Aug 1 01:32:36 2000 +++ magick/magick.h Mon Aug 7 16:48:20 2000 @@@@ -7,10 +7,12 @@@@ d9 2 a10 6 +#ifndef __NetBSD__ #define __EXTENSIONS__ 1 #define _POSIX_C_SOURCE 199506L #define _XOPEN_SOURCE 500 #define _XOPEN_SOURCE_EXTENDED 1 +#endif @ 1.8 log @Update "ImageMagick" package to version 5.2.2. Changes in version 5.2.2: - Support added for the Word Perfect Graphics (WPG) file format (contributed by Jaroslav Fojtik). - The pixel 'matte' field is changed to indicate the degree of pixel transparency rather than the degree of opacity. This makes the pixels compatable with most popular video cards, and many in-memory image formats. When the pixel quantum size is eight bits, the colormap is restricted to 256 colors, but supports up to 65535 colors when the quantum size is sixteen bits (when QuantumLeap is defined at compilation time). - ImageMagick is more memory efficient (by 18%) when the quantum size is eight bits, and the image is colormapped. - ImageMagick is (finally) believed to be thread safe under Windows, since it uses the Windows synchronization APIs to lock shared data. - Under Unix and Windows, dynamically-loaded format coder modules are supported. There are currently 72 loadable modules. Support for loadable modules allows the user to add or remove formats from ImageMagick by simply adding or removing a file. New modules are automatically detected so users may add their own modules. This support is proven to work for Sun Solaris, Linux, and SGI IRIX. Please let us know about other operating systems they work on. Building a modular ImageMagick is enabled by specifing the configure options --enable-shared --with-modules. - ImageMagick now has a set of modules for streaming. Here pixels are passed to the application as they are available and deleted after use ensuring a small memory footprint. This is useful for multi-media applications such as MPEG. - Image format identification (based on the file header) is now configured via an external text file. This allows the user to add automatic file identification for new formats added via a coder module, or via a delegate (external program). - XML files conforming to the W3C SVG DTD are now rendered directly by ImageMagick. The support is incomplete but still useful. - The Pilot Image Format (PDB) is now supported. - The drawing primitives have been extended to support drawing bezier curves, rounded rectangles, and arcs. There is now support for drawing compound objects (a sequence of objects) using drawing paths. The concept of a drawing pen has been split into stroke (for the outline) and fill (for the objects internal color). If fill is not defined, then only the object outline is drawn. This substantial change results in the existing drawing commands for filled objects (fillEllipse, fillRectangle, fillCircle, and fillPolygon) being deprecated. - A cache file format is now supported which is a snapshot of an image's pixel cache as it appears on disk. Images stored in this format (large) may be loaded instantly by ImageMagick since decoding is not required. In order to write this format , the argument -cache 0 must be supplied (e.g. convert -cache 0 file.jpg file.cache). - The build environment for Windows NT is entirely re-done. There is now a configure program which generates a set of Visual C++ project files which satisfy a set of reqirements (e.g. DLL, multi-thread, X11). These project files are then used to build ImageMagick. - The C API is significantly modified in order to provide thread-safe operation via function re-entrancy. ImageMagick is believed to be thread-safe when used with POSIX threads. It is not yet completely thread safe under Windows or the Mac. Errors (of type ExceptionInfo) are now reported by a function argument, or via a member of the current image. - The GaussianBlurImage() function (contributed by runger@@cs.mcgill.ca) supports Gaussian bluring an image. - Functions (OpenCacheView(), CloseCacheView(), GetCacheView(), SetCacheView(), and SyncCacheView()) are provided in order to support manipulating multiple pixel views. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Update "ImageMagick" package to version 5.1.1. Changes since version 4.2.9: - ImageMagick has a new logo (contributed by Ofer Tenenbaum). - Requests for all or part of a pixel row, or multiple complete pixel rows, are mapped directly to the underlying image in memory, or memory mapped from a disk file, avoiding performance-robbing pixel copying. Requested rectangular regions which are narrower than the image width must still be copied to a scratch space. - Support for WBMP, Wireless Bitmap (level 0) images (contributed by Milan Votava) - Image sizes are limited by physical memory plus available disk space on the machine, or the file addressing limits of the operating system, whichever comes first. This means that if you can figure out how to build a big enough machine (and have plenty of time) terabyte images can be processed. - An image cache subsystem and API are provided to map portions (as small as one pixel or as large as the entire image) of images into memory and to save any updates. - Memory mapping is used to access files. This is the most efficient access mechanism available. - DirectColor pixels are now stored in an efficient 32-bit structure (or 64-bit when QuantumLeap is enabled). - PseudoColor indices are now stored separately from the DirectColor pixels (PseudoColor and DirectColor representations are still available simultaneously). - In-memory run-length encoding is eliminated. - Compressed images are decompressed and compressed incrementally in order to limit memory consumption. - Lots of minor C API fixes and improvements. - Cache threshold setting for setting the boundary between use of RAM or RAM + disk when processing an image: - Use the --enable-cache option (e.g. --enable-cache=160) to set the compiled-in default when running the configure script. - Use -cache for ImageMagick utilities - Set the cache_threshold attribute in PerlMagick - Set the cacheThreshold attribute in Magick++ - The identify utility now displays precise read-time values. - The Win32 build environment (now called "VisualMagick") is completely re-done and supports building both multi-thread DLL as well as static libraries. @ text @d3 7 a9 5 --- magick/magick.h.orig Fri Feb 4 18:14:06 2000 +++ magick/magick.h Tue Mar 21 22:38:42 2000 @@@@ -5,9 +5,11 @@@@ #define _MAGICK_H a10 1 +#ifndef __NetBSD__ d16 2 a17 2 /* System include declarations. @ 1.6 log @Do the following to make this ELF and 1.3 friendly: - use the autoconf configure script to configure and build (we were already running configure but using Imake to build!?) - make use of pkglibtool (package already has full libtool support) (Note that now that we use Autoconf, this installs in ${LOCALBASE} without the need for a tool such as xpkgwedge. The configure script automatically detects all the stuff for which we had used patches in the Imakefiles.) Also use --without-... to disable optional components for which we have no explicit dependencies, which can be reenabled by the user in pkgsrc, so that the built binaries do not have "hidden" dependencies. Closes PR pkg/7463. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.5 1998/08/07 10:40:46 agc Exp $ d3 14 a16 42 --- Imakefile.orig Tue Feb 24 21:03:43 1998 +++ Imakefile Thu Mar 19 09:46:13 1998 @@@@ -76,28 +76,28 @@@@ NormalProgramTarget(display,display.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm) NormalLintTarget($(LINTSRCS)) InstallProgram(display,$(LOCALDIR)) -InstallMultipleMan(display.1,$(LOCALMAN1)) +InstallMultipleManSuffix(display,$(LOCALMAN1),1) NormalProgramTarget(montage,montage.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm) InstallProgram(montage,$(LOCALDIR)) -InstallMultipleMan(montage.1,$(LOCALMAN1)) +InstallMultipleManSuffix(montage,$(LOCALMAN1),1) NormalProgramTarget(import,import.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm) InstallProgram(import,$(LOCALDIR)) -InstallMultipleMan(import.1,$(LOCALMAN1)) +InstallMultipleManSuffix(import,$(LOCALMAN1),1) NormalProgramTarget(animate,animate.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm) InstallProgram(animate,$(LOCALDIR)) -InstallMultipleMan(animate.1,$(LOCALMAN1)) +InstallMultipleManSuffix(animate,$(LOCALMAN1),1) NormalProgramTarget(convert,convert.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm) InstallProgram(convert,$(LOCALDIR)) -InstallMultipleMan(convert.1,$(LOCALMAN1)) +InstallMultipleManSuffix(convert,$(LOCALMAN1),1) NormalProgramTarget(identify,identify.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm) InstallProgram(identify,$(LOCALDIR)) -InstallMultipleMan(identify.1,$(LOCALMAN1)) +InstallMultipleManSuffix(identify,$(LOCALMAN1),1) NormalProgramTarget(mogrify,mogrify.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm) InstallProgram(mogrify,$(LOCALDIR)) -InstallMultipleMan(mogrify.1,$(LOCALMAN1)) +InstallMultipleManSuffix(mogrify,$(LOCALMAN1),1) NormalProgramTarget(combine,combine.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm) InstallProgram(combine,$(LOCALDIR)) -InstallMultipleMan(combine.1,$(LOCALMAN1)) -InstallMultipleMan(ImageMagick.1,$(LOCALMAN1)) -InstallMultipleMan(miff.4,$(LOCALMAN4)) -InstallMultipleMan(quantize.5,$(LOCALMAN5)) +InstallMultipleManSuffix(combine,$(LOCALMAN1),1) +InstallMultipleManSuffix(ImageMagick,$(LOCALMAN1),1) +InstallMultipleManSuffix(miff,$(LOCALMAN4),4) +InstallMultipleManSuffix(quantize,$(LOCALMAN5),5) @ 1.5 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update to ImageMagick 4.0.3. @ text @d1 2 @ 1.3 log @Manual page creation only picked the correct filenames with my outdated "NetBSD.cf". It now works fine with the one from NetBSD's X11 sources. @ text @d1 2 a2 11 --- Imakefile.orig Sun Feb 1 07:41:50 1998 +++ Imakefile Thu Feb 5 02:12:14 1998 @@@@ -61,7 +61,7 @@@@ combine xtp #endif -SUBDIRS = magick +SUBDIRS = magick xtp AllTarget($(PROGRAMS)) DependTarget() d7 1 a7 1 -InstallMultipleMan(display.1,$(LOCALMAN)) d11 1 a11 1 -InstallMultipleMan(montage.1,$(LOCALMAN)) d15 1 a15 1 -InstallMultipleMan(import.1,$(LOCALMAN)) d19 1 a19 1 -InstallMultipleMan(animate.1,$(LOCALMAN)) d23 1 a23 1 -InstallMultipleMan(convert.1,$(LOCALMAN)) d27 1 a27 1 -InstallMultipleMan(identify.1,$(LOCALMAN)) d31 1 a31 1 -InstallMultipleMan(mogrify.1,$(LOCALMAN)) d35 4 a38 4 -InstallMultipleMan(combine.1,$(LOCALMAN)) -InstallMultipleMan(ImageMagick.1,$(LOCALMAN)) -InstallMultipleMan(miff.4,$(LOCALMAN)) -InstallMultipleMan(quantize.5,$(LOCALMAN)) @ 1.2 log @Fix broken "Imakefile" patches which caused "eqn" to process the the binaries files. @ text @d17 1 a17 1 +InstallMultipleMan(display.1,$(LOCALMAN1)) d21 1 a21 1 +InstallMultipleMan(montage.1,$(LOCALMAN1)) d25 1 a25 1 +InstallMultipleMan(import.1,$(LOCALMAN1)) d29 1 a29 1 +InstallMultipleMan(animate.1,$(LOCALMAN1)) d33 1 a33 1 +InstallMultipleMan(convert.1,$(LOCALMAN1)) d37 1 a37 1 +InstallMultipleMan(identify.1,$(LOCALMAN1)) d41 1 a41 1 +InstallMultipleMan(mogrify.1,$(LOCALMAN1)) d48 4 a51 4 +InstallMultipleMan(combine.1,$(LOCALMAN1)) +InstallMultipleMan(ImageMagick.1,$(LOCALMAN1)) +InstallMultipleMan(miff.4,$(LOCALMAN4)) +InstallMultipleMan(quantize.5,$(LOCALMAN5)) @ 1.1 log @Upgrade to version 4.0 of ImageMagick (from Hitoshi Osada osada@@meme.hokudai.ac.jp, thatrack@@da2.so-net.or.jp). Fixes PR pkg/4890. @ text @d1 12 a12 3 --- Imakefile~ Sun Jan 4 05:24:10 1998 +++ Imakefile Sat Jan 24 19:17:11 1998 @@@@ -68,28 +68,28 @@@@ d17 1 a17 1 +InstallMultipleMan(display,$(LOCALMAN1)) d21 1 a21 1 +InstallMultipleMan(montage,$(LOCALMAN1)) d25 1 a25 1 +InstallMultipleMan(import,$(LOCALMAN1)) d29 1 a29 1 +InstallMultipleMan(animate,$(LOCALMAN1)) d33 1 a33 1 +InstallMultipleMan(convert,$(LOCALMAN1)) d37 1 a37 1 +InstallMultipleMan(identify,$(LOCALMAN1)) d41 1 a41 1 +InstallMultipleMan(mogrify,$(LOCALMAN1)) d48 4 a51 4 +InstallMultipleMan(combine,$(LOCALMAN1)) +InstallMultipleMan(ImageMagick,$(LOCALMAN1)) +InstallMultipleMan(miff,$(LOCALMAN4)) +InstallMultipleMan(quantize,$(LOCALMAN5)) @