On Mon 2012.05.21 at 17:45 -0400, Okan Demirmen wrote:
> Here's a work-in-progress long overdue update to ImageMagick.
Looking for comments/tests and ok's now.
Cheers,
Okan
Index: Makefile
===================================================================
RCS file: /home/open/anoncvs/cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.121
diff -u -p -r1.121 Makefile
--- Makefile 21 May 2012 13:29:31 -0000 1.121
+++ Makefile 21 May 2012 20:42:49 -0000
@@ -4,15 +4,14 @@ SHARED_ONLY= Yes
COMMENT= image processing tools
-VER= 6.6.6
-DASHVER= 10
+VER= 6.7.7
+DASHVER= 0
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
-REVISION= 8
-SHARED_LIBS += Magick++ 14.0 # .1.0
-SHARED_LIBS += MagickCore 2.0 # .1.0
-SHARED_LIBS += MagickWand 2.0 # .1.0
+SHARED_LIBS += Magick++ 15.0 # .1.0
+SHARED_LIBS += MagickCore 3.0 # .1.0
+SHARED_LIBS += MagickWand 3.0 # .1.0
CATEGORIES= graphics
@@ -34,7 +33,7 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB = c bz2>=10 djvulibre fftw3 jasper>=1 jbig>=1.2 jpeg \
lcms2 lzma ltdl m perl png>=4 pthread stdc++ \
tiff>=36 z ICE SM X11 Xext Xt expat fontconfig \
- freetype wmf-0.2 wmflite-0.2>=7 xcb xml2>=9
+ freetype wmflite-0.2>=7 xcb xml2>=9
MODULES = converters/libiconv
@@ -70,7 +69,7 @@ CONFIGURE_ARGS+= --with-quantum-depth=16
--without-lqr \
--without-modules \
--without-openexr \
- --with-perl=/usr/bin/perl \
+ --with-perl \
--without-rsvg \
--with-ltdl-include=${LOCALBASE}/include \
--with-ltdl-lib=${LOCALBASE}/lib \
@@ -82,11 +81,12 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE
ac_cv_path_LaunchDelegate=no
post-install:
- @perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
- ${PREFIX}/bin/Magick-config
-.for f in Magick++ MagickCore MagickWand
- @perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
- ${PREFIX}/lib/lib${f}.la
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ImageMagick
+.for i in coder.xml colors.xml delegates.xml log.xml magic.xml \
+ mime.xml policy.xml quantization-table.xml sRGB.icc \
+ thresholds.xml type-dejavu.xml type-ghostscript.xml \
+ type-windows.xml type.xml
+ ${INSTALL_DATA} ${WRKSRC}/config/$i ${PREFIX}/share/examples/ImageMagick
.endfor
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/open/anoncvs/cvs/ports/graphics/ImageMagick/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo 6 Jul 2011 22:43:00 -0000 1.18
+++ distinfo 21 May 2012 02:17:35 -0000
@@ -1,5 +1,5 @@
-MD5 (ImageMagick-6.6.6-10.tar.gz) = HurWRTdiEM/kc+vonEobiQ==
-RMD160 (ImageMagick-6.6.6-10.tar.gz) = MZUQ7mjjQuWFvZUh9eUWTdh4uZ8=
-SHA1 (ImageMagick-6.6.6-10.tar.gz) = w+IAi9OonR3xxau315sUC6M/chY=
-SHA256 (ImageMagick-6.6.6-10.tar.gz) =
bvxjtvJ/WBp5pBNVv+OaFeJAODPrg7YNmV6Z6B9rAE0=
-SIZE (ImageMagick-6.6.6-10.tar.gz) = 11319956
+MD5 (ImageMagick-6.7.7-0.tar.gz) = WKfJxpwQeXyYJUizO6KQlA==
+RMD160 (ImageMagick-6.7.7-0.tar.gz) = Amu13BaokBBGysR0ti1MtaQnLzc=
+SHA1 (ImageMagick-6.7.7-0.tar.gz) = os9CcZlw3uH/sYmcgnxGudGl7Oc=
+SHA256 (ImageMagick-6.7.7-0.tar.gz) =
Z/w+0yMv0dWwCliBTx8tC3RqOtWqj2+mPv/bM1cVZgs=
+SIZE (ImageMagick-6.7.7-0.tar.gz) = 12970380
Index: patches/patch-coders_jpeg_c
===================================================================
RCS file: patches/patch-coders_jpeg_c
diff -N patches/patch-coders_jpeg_c
--- patches/patch-coders_jpeg_c 27 Apr 2012 08:09:56 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-coders_jpeg_c,v 1.1 2012/04/27 08:09:56 jasper Exp $
-
-Security fix for CVE-2012-0260, Excessive memory use with JPEG restart markers.
-
---- coders/jpeg.c.orig Fri Apr 27 09:40:28 2012
-+++ coders/jpeg.c Fri Apr 27 09:57:14 2012
-@@ -210,6 +210,8 @@ static MagickBooleanType IsJPEG(const unsigned char *m
-
- static MagickBooleanType EmitMessage(j_common_ptr jpeg_info,int level)
- {
-+#define JPEGExcessiveWarnings 1000
-+
- char
- message[JMSG_LENGTH_MAX];
-
-@@ -224,11 +226,11 @@ static MagickBooleanType EmitMessage(j_common_ptr jpeg
- image=error_manager->image;
- if (level < 0)
- {
-- if ((jpeg_info->err->num_warnings == 0) ||
-+ if ((jpeg_info->err->num_warnings++ > JPEGExcessiveWarnings) ||
-+ (jpeg_info->err->num_warnings == 0) ||
- (jpeg_info->err->trace_level >= 3))
- ThrowBinaryException(CorruptImageWarning,(char *) message,
- image->filename);
-- jpeg_info->err->num_warnings++;
- }
- else
- if (jpeg_info->err->trace_level >= level)
Index: patches/patch-coders_png_c
===================================================================
RCS file:
/home/open/anoncvs/cvs/ports/graphics/ImageMagick/patches/patch-coders_png_c,v
retrieving revision 1.8
diff -u -p -r1.8 patch-coders_png_c
--- patches/patch-coders_png_c 6 Jul 2011 22:43:00 -0000 1.8
+++ patches/patch-coders_png_c 21 May 2012 02:41:27 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-coders_png_c,v 1.8 2011/07/06 22:43:00 kili Exp $
---- coders/png.c.orig Fri Dec 24 19:00:33 2010
-+++ coders/png.c Sat Jan 1 23:06:23 2011
-@@ -1786,7 +1786,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
+--- coders/png.c.orig Thu May 17 16:47:50 2012
++++ coders/png.c Sun May 20 20:17:39 2012
+@@ -2217,7 +2217,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
#if (PNG_LIBPNG_VER < 10400)
# if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \
Index: patches/patch-coders_tiff_c
===================================================================
RCS file: patches/patch-coders_tiff_c
diff -N patches/patch-coders_tiff_c
--- patches/patch-coders_tiff_c 27 Apr 2012 08:09:56 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-coders_tiff_c,v 1.1 2012/04/27 08:09:56 jasper Exp $
-
-Security fix for CVE-2012-1798, Copying of invalid memory when reading TIFF
EXIF IFD.
-
---- coders/tiff.c.orig Fri Apr 27 09:42:38 2012
-+++ coders/tiff.c Fri Apr 27 09:43:24 2012
-@@ -596,7 +596,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *im
- *ascii;
-
- if (TIFFGetField(tiff,exif_info[i].tag,&ascii) != 0)
-- (void) CopyMagickMemory(value,ascii,MaxTextExtent);
-+ (void) CopyMagickString(value,ascii,MaxTextExtent);
- break;
- }
- case TIFF_SHORT:
Index: patches/patch-configure
===================================================================
RCS file:
/home/open/anoncvs/cvs/ports/graphics/ImageMagick/patches/patch-configure,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure
--- patches/patch-configure 6 Jul 2011 22:43:00 -0000 1.5
+++ patches/patch-configure 21 May 2012 02:41:25 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-configure,v 1.5 2011/07/06 22:43:00 kili Exp $
---- configure.orig Fri Dec 31 15:04:17 2010
-+++ configure Thu Jan 6 14:43:30 2011
-@@ -29429,7 +29429,7 @@ fi
- #
+--- configure.orig Fri May 18 18:45:18 2012
++++ configure Sun May 20 20:39:05 2012
+@@ -32543,7 +32543,7 @@ _ACEOF
+
# Subdirectory under lib to place ImageMagick lib files
-LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
@@ -10,25 +10,16 @@ $OpenBSD: patch-configure,v 1.5 2011/07/
cat >>confdefs.h <<_ACEOF
#define LIBRARY_RELATIVE_PATH "$LIBRARY_RELATIVE_PATH"
-@@ -29533,7 +29533,7 @@ _ACEOF
+@@ -32626,7 +32626,7 @@ _ACEOF
#
# Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}"
- DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}"
- DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/"
- case "${build_os}" in
-@@ -29550,7 +29550,7 @@ _ACEOF
-
- #
- # Path to ImageMagick share files
--SHARE_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-+SHARE_RELATIVE_PATH="${PACKAGE_NAME}"
- SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}"
- DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/"
+ DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
+ DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
case "${build_os}" in
-@@ -32677,7 +32677,7 @@ MAGICK_CFLAGS=$CFLAGS
+@@ -35703,7 +35703,7 @@ MAGICK_CFLAGS=$CFLAGS
MAGICK_CXXFLAGS="$CXXFLAGS"
MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'`
MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'`
Index: patches/patch-magick_property_c
===================================================================
RCS file: patches/patch-magick_property_c
diff -N patches/patch-magick_property_c
--- patches/patch-magick_property_c 27 Apr 2012 08:09:56 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-magick_property_c,v 1.1 2012/04/27 08:09:56 jasper Exp $
-
-Chunk 1: Security fix for CVE-2012-1610, Potential EXIF Interger Overflow
-Chunk 2: Security fix for CVE-2012-0259, JPEG EXIF tag crash.
-
---- magick/property.c.orig Fri Apr 27 09:39:10 2012
-+++ magick/property.c Fri Apr 27 09:46:04 2012
-@@ -1287,6 +1287,8 @@ static MagickBooleanType GetEXIFProperty(const Image *
- break;
- components=(ssize_t) ((int) ReadPropertyLong(endian,q+4));
- number_bytes=(size_t) components*tag_bytes[format];
-+ if (number_bytes < components)
-+ break; /* prevent overflow */
- if (number_bytes <= 4)
- p=q+8;
- else
-@@ -1308,6 +1310,8 @@ static MagickBooleanType GetEXIFProperty(const Image *
- buffer[MaxTextExtent],
- *value;
-
-+ value=(char *) NULL;
-+ *buffer='\0';
- switch (format)
- {
- case EXIF_FMT_BYTE:
Index: patches/patch-magick_string_c
===================================================================
RCS file: patches/patch-magick_string_c
diff -N patches/patch-magick_string_c
--- patches/patch-magick_string_c 21 May 2012 13:29:31 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-magick_string_c,v 1.1 2012/05/21 13:29:31 okan Exp $
-
-access volation; r3970 and r3978 upstream.
-
---- magick/string.c.orig Sun May 20 15:02:02 2012
-+++ magick/string.c Sun May 20 15:02:18 2012
-@@ -223,11 +223,11 @@ MagickExport char *CloneString(char **destination,cons
- if (~length < MaxTextExtent)
- ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireString");
- *destination=(char *) ResizeQuantumMemory(*destination,length+MaxTextExtent,
-- sizeof(*destination));
-+ sizeof(**destination));
- if (*destination == (char *) NULL)
- ThrowFatalException(ResourceLimitFatalError,"UnableToAcquireString");
- if (length != 0)
-- (void) memcpy(*destination,source,length*sizeof(*destination));
-+ (void) memcpy(*destination,source,length*sizeof(**destination));
- (*destination)[length]='\0';
- return(*destination);
- }
Index: patches/patch-tests_validate-colorspace_sh
===================================================================
RCS file: patches/patch-tests_validate-colorspace_sh
diff -N patches/patch-tests_validate-colorspace_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tests_validate-colorspace_sh 21 May 2012 21:00:57 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- tests/validate-colorspace.sh.orig Mon May 21 15:00:49 2012
++++ tests/validate-colorspace.sh Mon May 21 14:57:46 2012
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization
+ # dedicated to making software imaging solutions freely available.
Index: pkg/PLIST
===================================================================
RCS file: /home/open/anoncvs/cvs/ports/graphics/ImageMagick/pkg/PLIST,v
retrieving revision 1.41
diff -u -p -r1.41 PLIST
--- pkg/PLIST 8 May 2012 15:31:58 -0000 1.41
+++ pkg/PLIST 21 May 2012 20:46:42 -0000
@@ -85,6 +85,7 @@ include/ImageMagick/magick/magick-type.h
include/ImageMagick/magick/magick.h
include/ImageMagick/magick/matrix.h
include/ImageMagick/magick/memory_.h
+include/ImageMagick/magick/method-attribute.h
include/ImageMagick/magick/methods.h
include/ImageMagick/magick/mime.h
include/ImageMagick/magick/module.h
@@ -139,6 +140,7 @@ include/ImageMagick/wand/magick-image.h
include/ImageMagick/wand/magick-property.h
include/ImageMagick/wand/magick-wand.h
include/ImageMagick/wand/magick_wand.h
+include/ImageMagick/wand/method-attribute.h
include/ImageMagick/wand/mogrify.h
include/ImageMagick/wand/montage.h
include/ImageMagick/wand/pixel-iterator.h
@@ -148,18 +150,6 @@ include/ImageMagick/wand/wand-view.h
lib/ImageMagick/
lib/ImageMagick/config/
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/policy.xml
-lib/ImageMagick/config/type-dejavu.xml
-lib/ImageMagick/config/type-ghostscript.xml
-lib/ImageMagick/config/type-windows.xml
-lib/ImageMagick/config/type.xml
-@comment lib/ImageMagick/modules-Q16/
-@comment lib/ImageMagick/modules-Q16/coders/
-@comment lib/ImageMagick/modules-Q16/filters/
lib/libMagick++.a
lib/libMagick++.la
@lib lib/libMagick++.so.${LIBMagick++_VERSION}
@@ -203,18 +193,13 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-
@man man/man1/stream.1
@man man/man3p/Image::Magick.3p
share/ImageMagick/
-share/ImageMagick/ChangeLog
-share/ImageMagick/LICENSE
-share/ImageMagick/NEWS.txt
-share/ImageMagick/config/
-share/ImageMagick/config/coder.xml
-share/ImageMagick/config/colors.xml
-share/ImageMagick/config/log.xml
-share/ImageMagick/config/magic.xml
-share/ImageMagick/config/mime.xml
-share/ImageMagick/config/sRGB.icm
-share/ImageMagick/config/thresholds.xml
+share/ImageMagick/english.xml
+share/ImageMagick/francais.xml
+share/ImageMagick/locale.xml
share/doc/ImageMagick/
+share/doc/ImageMagick/ChangeLog
+share/doc/ImageMagick/LICENSE
+share/doc/ImageMagick/NEWS.txt
share/doc/ImageMagick/images/
share/doc/ImageMagick/images/affine.png
share/doc/ImageMagick/images/arc.png
@@ -229,6 +214,7 @@ share/doc/ImageMagick/images/configure.j
share/doc/ImageMagick/images/cylinder_shaded.png
share/doc/ImageMagick/images/definitive-guide.png
share/doc/ImageMagick/images/difference.png
+share/doc/ImageMagick/images/donate.png
share/doc/ImageMagick/images/examples.jpg
share/doc/ImageMagick/images/frame.jpg
share/doc/ImageMagick/images/fuzzy-magick.png
@@ -236,11 +222,69 @@ share/doc/ImageMagick/images/gaussian-bl
share/doc/ImageMagick/images/granite.png
share/doc/ImageMagick/images/imade_art2.jpg
share/doc/ImageMagick/images/label.gif
-share/doc/ImageMagick/images/logo.eps
+share/doc/ImageMagick/images/logo-sm-flop.png
+share/doc/ImageMagick/images/logo-sm-fx.png
+share/doc/ImageMagick/images/logo-sm.png
share/doc/ImageMagick/images/logo.jpg
+share/doc/ImageMagick/images/logo.png
share/doc/ImageMagick/images/montage.jpg
share/doc/ImageMagick/images/navy.png
share/doc/ImageMagick/images/networkredux.png
+share/doc/ImageMagick/images/patterns/
+share/doc/ImageMagick/images/patterns/bricks.png
+share/doc/ImageMagick/images/patterns/checkerboard.png
+share/doc/ImageMagick/images/patterns/circles.png
+share/doc/ImageMagick/images/patterns/crosshatch.png
+share/doc/ImageMagick/images/patterns/crosshatch30.png
+share/doc/ImageMagick/images/patterns/crosshatch45.png
+share/doc/ImageMagick/images/patterns/fishscales.png
+share/doc/ImageMagick/images/patterns/gray0.png
+share/doc/ImageMagick/images/patterns/gray10.png
+share/doc/ImageMagick/images/patterns/gray100.png
+share/doc/ImageMagick/images/patterns/gray15.png
+share/doc/ImageMagick/images/patterns/gray20.png
+share/doc/ImageMagick/images/patterns/gray25.png
+share/doc/ImageMagick/images/patterns/gray30.png
+share/doc/ImageMagick/images/patterns/gray35.png
+share/doc/ImageMagick/images/patterns/gray40.png
+share/doc/ImageMagick/images/patterns/gray45.png
+share/doc/ImageMagick/images/patterns/gray5.png
+share/doc/ImageMagick/images/patterns/gray50.png
+share/doc/ImageMagick/images/patterns/gray55.png
+share/doc/ImageMagick/images/patterns/gray60.png
+share/doc/ImageMagick/images/patterns/gray65.png
+share/doc/ImageMagick/images/patterns/gray70.png
+share/doc/ImageMagick/images/patterns/gray75.png
+share/doc/ImageMagick/images/patterns/gray80.png
+share/doc/ImageMagick/images/patterns/gray85.png
+share/doc/ImageMagick/images/patterns/gray90.png
+share/doc/ImageMagick/images/patterns/gray95.png
+share/doc/ImageMagick/images/patterns/hexagons.png
+share/doc/ImageMagick/images/patterns/horizontal.png
+share/doc/ImageMagick/images/patterns/horizontal2.png
+share/doc/ImageMagick/images/patterns/horizontal3.png
+share/doc/ImageMagick/images/patterns/horizontalsaw.png
+share/doc/ImageMagick/images/patterns/hs_bdiagonal.png
+share/doc/ImageMagick/images/patterns/hs_cross.png
+share/doc/ImageMagick/images/patterns/hs_diagcross.png
+share/doc/ImageMagick/images/patterns/hs_fdiagonal.png
+share/doc/ImageMagick/images/patterns/hs_horizontal.png
+share/doc/ImageMagick/images/patterns/hs_vertical.png
+share/doc/ImageMagick/images/patterns/left30.png
+share/doc/ImageMagick/images/patterns/left45.png
+share/doc/ImageMagick/images/patterns/leftshingle.png
+share/doc/ImageMagick/images/patterns/octagons.png
+share/doc/ImageMagick/images/patterns/right30.png
+share/doc/ImageMagick/images/patterns/right45.png
+share/doc/ImageMagick/images/patterns/rightshingle.png
+share/doc/ImageMagick/images/patterns/smallfishscales.png
+share/doc/ImageMagick/images/patterns/vertical.png
+share/doc/ImageMagick/images/patterns/vertical2.png
+share/doc/ImageMagick/images/patterns/vertical3.png
+share/doc/ImageMagick/images/patterns/verticalbricks.png
+share/doc/ImageMagick/images/patterns/verticalleftshingle.png
+share/doc/ImageMagick/images/patterns/verticalrightshingle.png
+share/doc/ImageMagick/images/patterns/verticalsaw.png
share/doc/ImageMagick/images/piechart.png
share/doc/ImageMagick/images/project-support.jpg
share/doc/ImageMagick/images/radial-gradient.png
@@ -260,6 +304,7 @@ share/doc/ImageMagick/images/sprite.jpg
share/doc/ImageMagick/images/t-shirt.png
share/doc/ImageMagick/images/tricks.png
share/doc/ImageMagick/images/wand.ico
+share/doc/ImageMagick/images/wand.png
share/doc/ImageMagick/images/white-highlight.png
share/doc/ImageMagick/images/wizard.jpg
share/doc/ImageMagick/images/wizard.png
@@ -748,6 +793,7 @@ share/doc/ImageMagick/www/api/MagickCore
share/doc/ImageMagick/www/api/MagickCore/struct__BlobInfo.html
share/doc/ImageMagick/www/api/MagickCore/struct__CacheInfo.html
share/doc/ImageMagick/www/api/MagickCore/struct__CacheMethods.html
+share/doc/ImageMagick/www/api/MagickCore/struct__CacheView.html
share/doc/ImageMagick/www/api/MagickCore/struct__ChannelStatistics.html
share/doc/ImageMagick/www/api/MagickCore/struct__ChromaticityInfo.html
share/doc/ImageMagick/www/api/MagickCore/struct__Cluster.html
@@ -1044,6 +1090,7 @@ share/doc/ImageMagick/www/api/effect.htm
share/doc/ImageMagick/www/api/enhance.html
share/doc/ImageMagick/www/api/exception.html
share/doc/ImageMagick/www/api/feature.html
+share/doc/ImageMagick/www/api/fourier.html
share/doc/ImageMagick/www/api/fx.html
share/doc/ImageMagick/www/api/histogram.html
share/doc/ImageMagick/www/api/image-view.html
@@ -1116,13 +1163,14 @@ share/doc/ImageMagick/www/magick-core.ht
share/doc/ImageMagick/www/magick-vector-graphics.html
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
+share/doc/ImageMagick/www/parallel.html
share/doc/ImageMagick/www/perl-magick.html
+share/doc/ImageMagick/www/porting.html
share/doc/ImageMagick/www/quantize.html
share/doc/ImageMagick/www/resources.html
share/doc/ImageMagick/www/search.html
@@ -1132,17 +1180,24 @@ share/doc/ImageMagick/www/source/analyze
share/doc/ImageMagick/www/source/coder.xml
share/doc/ImageMagick/www/source/colors.xml
share/doc/ImageMagick/www/source/configure.xml
+share/doc/ImageMagick/www/source/contrast.c
share/doc/ImageMagick/www/source/core.c
share/doc/ImageMagick/www/source/delegates.xml
share/doc/ImageMagick/www/source/english.xml
share/doc/ImageMagick/www/source/examples.pl
+share/doc/ImageMagick/www/source/francais.xml
share/doc/ImageMagick/www/source/incantation.msl
share/doc/ImageMagick/www/source/locale.xml
share/doc/ImageMagick/www/source/log.xml
share/doc/ImageMagick/www/source/magic.xml
+share/doc/ImageMagick/www/source/mgk.c
+share/doc/ImageMagick/www/source/mime.xml
share/doc/ImageMagick/www/source/piechart.mvg
share/doc/ImageMagick/www/source/piechart.svg
+share/doc/ImageMagick/www/source/policy.xml
+share/doc/ImageMagick/www/source/thresholds.xml
share/doc/ImageMagick/www/source/type-ghostscript.xml
+share/doc/ImageMagick/www/source/type-windows.xml
share/doc/ImageMagick/www/source/type.xml
share/doc/ImageMagick/www/source/wand.c
share/doc/ImageMagick/www/sponsors.html
@@ -1150,3 +1205,33 @@ share/doc/ImageMagick/www/stream.html
share/doc/ImageMagick/www/subversion.html
share/doc/ImageMagick/www/t-shirt.html
share/doc/ImageMagick/www/wand.png
+share/examples/ImageMagick/
+@sample ${SYSCONFDIR}/ImageMagick/
+share/examples/ImageMagick/coder.xml
+@sample ${SYSCONFDIR}/ImageMagick/coder.xml
+share/examples/ImageMagick/colors.xml
+@sample ${SYSCONFDIR}/ImageMagick/colors.xml
+share/examples/ImageMagick/delegates.xml
+@sample ${SYSCONFDIR}/ImageMagick/delegates.xml
+share/examples/ImageMagick/log.xml
+@sample ${SYSCONFDIR}/ImageMagick/log.xml
+share/examples/ImageMagick/magic.xml
+@sample ${SYSCONFDIR}/ImageMagick/magic.xml
+share/examples/ImageMagick/mime.xml
+@sample ${SYSCONFDIR}/ImageMagick/mime.xml
+share/examples/ImageMagick/policy.xml
+@sample ${SYSCONFDIR}/ImageMagick/policy.xml
+share/examples/ImageMagick/quantization-table.xml
+@sample ${SYSCONFDIR}/ImageMagick/quantization-table.xml
+share/examples/ImageMagick/sRGB.icc
+@sample ${SYSCONFDIR}/ImageMagick/sRGB.icc
+share/examples/ImageMagick/thresholds.xml
+@sample ${SYSCONFDIR}/ImageMagick/thresholds.xml
+share/examples/ImageMagick/type-dejavu.xml
+@sample ${SYSCONFDIR}/ImageMagick/type-dejavu.xml
+share/examples/ImageMagick/type-ghostscript.xml
+@sample ${SYSCONFDIR}/ImageMagick/type-ghostscript.xml
+share/examples/ImageMagick/type-windows.xml
+@sample ${SYSCONFDIR}/ImageMagick/type-windows.xml
+share/examples/ImageMagick/type.xml
+@sample ${SYSCONFDIR}/ImageMagick/type.xml
