[yes, i'm replying to a private mail on a public list; it's harmless in
this case]
On Sun, Jun 05, 2011 at 11:22:16PM +0200, Landry Breuil wrote:
> As for imagemagick, why making it shared_only ? because of the
> dependency on libldtl ? (which wasn't in lib_depends, but in configure
> args ? wtf ?). the --disable-silent-rules can go away from
> configure_args.
SHARED_ONLY was a suggestion from Brad, because even the current
version of ImageMagick doesn't build on static archs. Probably
because ghostscript (which ImageMagick depends on) is SHARED_ONLY,
probably because of even more dependencies.
Below is my current diff. Naddy really wants this update (to proceed
with his png update), and as i wrote, it would be more easy to
commit this now and update to really recent ImageMagick (some
6.7.whatever) afterwards.
If this goes in, the patch to graphics/zbar from shadchin@ (posted
several months ago on ports) should go in, too.
Can I now *please* commit it? It worked for me on amd64, arm,
mips64el and powerpc for some time now.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.111
diff -u -p -r1.111 Makefile
--- Makefile 17 Nov 2010 08:05:12 -0000 1.111
+++ Makefile 6 Jul 2011 22:05:29 -0000
@@ -1,16 +1,17 @@
# $OpenBSD: Makefile,v 1.111 2010/11/17 08:05:12 espie Exp $
+SHARED_ONLY= Yes
+
COMMENT= image processing tools
-VER= 6.4.5
-DASHVER= 6
+VER= 6.6.6
+DASHVER= 10
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
-REVISION = 0
-SHARED_LIBS += Magick++ 13.0 # .1.0
-SHARED_LIBS += MagickCore 1.0 # .1.0
-SHARED_LIBS += MagickWand 1.0 # .1.0
+SHARED_LIBS += Magick++ 14.0 # .1.0
+SHARED_LIBS += MagickCore 2.0 # .1.0
+SHARED_LIBS += MagickWand 2.0 # .1.0
CATEGORIES= graphics
@@ -29,19 +30,26 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB = c jpeg m z bz2>=10 jbig>=1.2 png>=4 tiff>=36 \
- lcms>=1 jasper>=1
+WANTLIB = c bz2>=10 djvulibre fftw3 jasper>=1 jbig>=1.2 jpeg \
+ lcms>=1 lzma ltdl m perl png>=4 pthread stdc++ \
+ tiff>=36 z
LIB_DEPENDS = archivers/bzip2 \
+ archivers/xz \
+ devel/libtool,-ltdl \
+ graphics/djvulibre \
graphics/jbigkit \
graphics/png \
graphics/tiff \
graphics/lcms \
- graphics/jasper
+ graphics/jasper \
+ math/fftw3
RUN_DEPENDS= graphics/netpbm
BUILD_DEPENDS= graphics/netpbm
+ALL_TARGET= all perl-build
+
# using libltdl stuff
USE_LIBTOOL= gnu
USE_GROFF = Yes
@@ -54,7 +62,6 @@ CONFIGURE_ARGS+= --with-quantum-depth=16
--without-lqr \
--without-modules \
--without-openexr \
- --without-threads \
--with-perl=/usr/bin/perl \
--without-rsvg \
--with-ltdl-include=${LOCALBASE}/include \
@@ -63,6 +70,7 @@ CONFIGURE_ARGS+= --with-quantum-depth=16
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/libpng
-I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include" \
LDFLAGS="-L${WRKBUILD}/magick/.libs
-L${WRKBUILD}/wand/.libs -L${LOCALBASE}/lib" \
+ PTHREAD_CFLAGS="-pthread" PTHREAD_LIBS="-pthread" \
ac_cv_path_LaunchDelegate=no
FLAVORS= no_x11
@@ -77,7 +85,7 @@ CONFIGURE_ARGS += --without-x \
--without-wmf
.else
WANTLIB += ICE SM X11 Xau Xdmcp Xext Xt expat fontconfig \
- freetype iconv pthread-stubs xcb wmflite>=7 \
+ freetype iconv pthread-stubs xcb wmf wmflite>=7 \
xml2>=9
LIB_DEPENDS += graphics/libwmf \
textproc/libxml
@@ -87,8 +95,6 @@ BUILD_DEPENDS += print/ghostscript/gnu
BUILD_DEPENDS += print/transfig
CONFIGURE_ARGS += --with-wmf
.endif
-
-WRKDIST= ${WRKDIR}/${DISTNAME:S/-${DASHVER}$//}
post-install:
@perl -pi -e s,'-L${WRKBUILD}/(magick|wand)/.libs','',g \
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 29 Nov 2008 05:00:20 -0000 1.17
+++ distinfo 6 Jul 2011 22:05:29 -0000
@@ -1,5 +1,5 @@
-MD5 (ImageMagick-6.4.5-6.tar.gz) = RApCQC4VxGO6URaMiN34gw==
-RMD160 (ImageMagick-6.4.5-6.tar.gz) = uhaPWCKtB52ZdpB9BsBgtYOpxWc=
-SHA1 (ImageMagick-6.4.5-6.tar.gz) = XyDCpSK8by/3RQtruOpnvyw+7KE=
-SHA256 (ImageMagick-6.4.5-6.tar.gz) =
9J21ag6nK490FQ+G9F9WWM0C23UwcEdIGXl/Eef3GiQ=
-SIZE (ImageMagick-6.4.5-6.tar.gz) = 11194464
+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
Index: patches/patch-PerlMagick_Makefile_PL_in
===================================================================
RCS file: patches/patch-PerlMagick_Makefile_PL_in
diff -N patches/patch-PerlMagick_Makefile_PL_in
--- patches/patch-PerlMagick_Makefile_PL_in 20 Nov 2008 13:29:56 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-PerlMagick_Makefile_PL_in,v 1.1 2008/11/20 13:29:56 okan Exp $
---- PerlMagick/Makefile.PL.in.orig Sat Aug 16 21:01:11 2008
-+++ PerlMagick/Makefile.PL.in Mon Nov 3 12:26:52 2008
-@@ -77,7 +77,7 @@ WriteMakefile
- 'INSTALLBIN' => '@BIN_DIR@',
-
- # Library specification
-- 'LIBS' => [ '-L@MAGICKCORE_PATH@ -L../magick/.libs -lMagickCore
-L../wand/.libs -lMagickWand' ],
-+ 'LIBS' => [ '-L@MAGICKCORE_PATH@ -lMagickCore -lMagickWand' ],
-
- # Perl binary name (if a Perl binary is built)
- 'MAP_TARGET' => 'PerlMagick',
Index: patches/patch-coders_png_c
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/patches/patch-coders_png_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-coders_png_c
--- patches/patch-coders_png_c 29 Nov 2008 05:00:20 -0000 1.7
+++ patches/patch-coders_png_c 6 Jul 2011 22:05:29 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-coders_png_c,v 1.7 2008/11/29 05:00:20 okan Exp $
---- coders/png.c.orig Tue Nov 11 20:58:15 2008
-+++ coders/png.c Thu Nov 20 14:38:55 2008
-@@ -1783,7 +1783,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
- png_set_read_user_chunk_fn(ping, image, read_vpag_chunk_callback);
- #endif
+--- 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,
--#if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) &&
(PNG_LIBPNG_VER >= 10200) && defined(__i386__)
-+#if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) &&
(PNG_LIBPNG_VER >= 10200) && defined(PNG_MMX_CODE_SUPPORTED)
+ #if (PNG_LIBPNG_VER < 10400)
+ # if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \
+- (PNG_LIBPNG_VER >= 10200) && (PNG_LIBPNG_VER < 10220) && defined(__i386__)
++ (PNG_LIBPNG_VER >= 10200) && (PNG_LIBPNG_VER < 10220) &&
defined(PNG_MMX_CODE_SUPPORTED)
/* Disable thread-unsafe features of pnggccrd */
if (png_access_version_number() >= 10200)
{
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure
--- patches/patch-configure 29 Nov 2008 05:00:20 -0000 1.4
+++ patches/patch-configure 6 Jul 2011 22:05:29 -0000
@@ -1,15 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2008/11/29 05:00:20 okan Exp $
---- configure.orig Fri Nov 14 12:33:21 2008
-+++ configure Wed Nov 26 18:33:17 2008
-@@ -20808,6 +20808,7 @@ with_ltdl='no'
- if test "$libtool_build_shared_libs" != 'no'; then
- with_ltdl='yes'
- fi
-+with_ltdl='no'
-
- if test "$with_ltdl" != 'no'; then
- WITH_LTDL_TRUE=
-@@ -42154,7 +42155,7 @@ fi
+--- configure.orig Fri Dec 31 15:04:17 2010
++++ configure Thu Jan 6 14:43:30 2011
+@@ -29429,7 +29429,7 @@ fi
#
# Subdirectory under lib to place ImageMagick lib files
@@ -18,7 +10,7 @@ $OpenBSD: patch-configure,v 1.4 2008/11/
cat >>confdefs.h <<_ACEOF
#define LIBRARY_RELATIVE_PATH "$LIBRARY_RELATIVE_PATH"
-@@ -42258,7 +42259,7 @@ _ACEOF
+@@ -29533,7 +29533,7 @@ _ACEOF
#
# Path to ImageMagick documentation files
@@ -27,7 +19,7 @@ $OpenBSD: patch-configure,v 1.4 2008/11/
DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}"
DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/"
case "${build_os}" in
-@@ -42275,7 +42276,7 @@ _ACEOF
+@@ -29550,7 +29550,7 @@ _ACEOF
#
# Path to ImageMagick share files
@@ -36,3 +28,12 @@ $OpenBSD: patch-configure,v 1.4 2008/11/
SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}"
DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/"
case "${build_os}" in
+@@ -32677,7 +32677,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'`
+-MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
++MAGICK_LDFLAGS="$LDFLAGS"
+ MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL"
+
+
Index: patches/patch-magick_Magick-config_in
===================================================================
RCS file: patches/patch-magick_Magick-config_in
diff -N patches/patch-magick_Magick-config_in
--- patches/patch-magick_Magick-config_in 20 Nov 2008 13:29:56 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-magick_Magick-config_in,v 1.1 2008/11/20 13:29:56 okan Exp $
---- magick/Magick-config.in.orig Wed Nov 5 11:50:55 2008
-+++ magick/Magick-config.in Wed Nov 5 11:51:15 2008
-@@ -52,7 +52,7 @@ while test $# -gt 0; do
- echo '@MAGICK_LDFLAGS@'
- ;;
- --libs)
-- echo "-L${libdir} -lMagickCore"
-+ echo "-L${libdir} -lMagickCore -lMagickWand"
- ;;
- *)
- echo "${usage}" 1>&2
Index: patches/patch-wand_MagickWand_pc_in
===================================================================
RCS file: patches/patch-wand_MagickWand_pc_in
diff -N patches/patch-wand_MagickWand_pc_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-wand_MagickWand_pc_in 6 Jul 2011 22:05:29 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- wand/MagickWand.pc.in.orig Sat Sep 5 23:47:34 2009
++++ wand/MagickWand.pc.in Thu Jan 6 19:56:45 2011
+@@ -7,5 +7,5 @@ Name: MagickWand
+ Version: @PACKAGE_VERSION@
+ Description: MagickWand - C API for ImageMagick
+ Requires: ImageMagick
+-Libs: -L${libdir} -lMagickWand -lMagickCore
+-Cflags: -I${includedir} @MAGICK_PCFLAGS@
++Libs: -L${libdir} -lMagickWand -lMagickCore -pthread
++Cflags: -I${includedir} @MAGICK_PCFLAGS@ -pthread
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared 20 Nov 2008 13:29:56 -0000 1.14
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.14 2008/11/20 13:29:56 okan Exp $
-@lib lib/libMagick++.so.${LIBMagick++_VERSION}
-@lib lib/libMagickCore.so.${LIBMagickCore_VERSION}
-@lib lib/libMagickWand.so.${LIBMagickWand_VERSION}
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Image/Magick/Magick.so
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/pkg/PLIST,v
retrieving revision 1.39
diff -u -p -r1.39 PLIST
--- pkg/PLIST 20 Nov 2008 13:29:56 -0000 1.39
+++ pkg/PLIST 6 Jul 2011 22:05:29 -0000
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.39 2008/11/20 13:29:56 okan Exp $
@conflict p5-PerlMagick-*
!%%no_x11%%
-%%SHARED%%
bin/Magick++-config
bin/Magick-config
bin/MagickCore-config
@@ -34,10 +33,12 @@ include/ImageMagick/magick/
include/ImageMagick/magick/ImageMagick.h
include/ImageMagick/magick/MagickCore.h
include/ImageMagick/magick/PreRvIcccm.h
+include/ImageMagick/magick/accelerate.h
include/ImageMagick/magick/animate.h
include/ImageMagick/magick/annotate.h
include/ImageMagick/magick/api.h
include/ImageMagick/magick/artifact.h
+include/ImageMagick/magick/attribute.h
include/ImageMagick/magick/blob.h
include/ImageMagick/magick/cache-view.h
include/ImageMagick/magick/cache.h
@@ -45,6 +46,7 @@ include/ImageMagick/magick/cipher.h
include/ImageMagick/magick/client.h
include/ImageMagick/magick/coder.h
include/ImageMagick/magick/color.h
+include/ImageMagick/magick/colormap.h
include/ImageMagick/magick/colorspace.h
include/ImageMagick/magick/compare.h
include/ImageMagick/magick/composite.h
@@ -60,11 +62,15 @@ include/ImageMagick/magick/draw.h
include/ImageMagick/magick/effect.h
include/ImageMagick/magick/enhance.h
include/ImageMagick/magick/exception.h
+include/ImageMagick/magick/feature.h
+include/ImageMagick/magick/fourier.h
include/ImageMagick/magick/fx.h
include/ImageMagick/magick/gem.h
include/ImageMagick/magick/geometry.h
include/ImageMagick/magick/hashmap.h
+include/ImageMagick/magick/histogram.h
include/ImageMagick/magick/identify.h
+include/ImageMagick/magick/image-view.h
include/ImageMagick/magick/image.h
include/ImageMagick/magick/layer.h
include/ImageMagick/magick/list.h
@@ -81,9 +87,11 @@ include/ImageMagick/magick/mime.h
include/ImageMagick/magick/module.h
include/ImageMagick/magick/monitor.h
include/ImageMagick/magick/montage.h
+include/ImageMagick/magick/morphology.h
include/ImageMagick/magick/option.h
include/ImageMagick/magick/paint.h
include/ImageMagick/magick/pixel.h
+include/ImageMagick/magick/policy.h
include/ImageMagick/magick/prepress.h
include/ImageMagick/magick/profile.h
include/ImageMagick/magick/property.h
@@ -131,9 +139,9 @@ include/ImageMagick/wand/magick_wand.h
include/ImageMagick/wand/mogrify.h
include/ImageMagick/wand/montage.h
include/ImageMagick/wand/pixel-iterator.h
-include/ImageMagick/wand/pixel-view.h
include/ImageMagick/wand/pixel-wand.h
include/ImageMagick/wand/stream.h
+include/ImageMagick/wand/wand-view.h
lib/ImageMagick/
lib/ImageMagick/config/
lib/ImageMagick/config/configure.xml
@@ -141,8 +149,9 @@ 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-solaris.xml
lib/ImageMagick/config/type-windows.xml
lib/ImageMagick/config/type.xml
@comment lib/ImageMagick/modules-Q16/
@@ -150,11 +159,13 @@ lib/ImageMagick/config/type.xml
@comment lib/ImageMagick/modules-Q16/filters/
lib/libMagick++.a
lib/libMagick++.la
+@lib lib/libMagick++.so.${LIBMagick++_VERSION}
lib/libMagickCore.a
lib/libMagickCore.la
+@lib lib/libMagickCore.so.${LIBMagickCore_VERSION}
lib/libMagickWand.a
lib/libMagickWand.la
-lib/pkgconfig/
+@lib lib/libMagickWand.so.${LIBMagickWand_VERSION}
lib/pkgconfig/ImageMagick++.pc
lib/pkgconfig/ImageMagick.pc
lib/pkgconfig/Magick++.pc
@@ -168,6 +179,7 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Image/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Image/Magick/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Image/Magick/Magick.bs
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Image/Magick/Magick.so
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/Image/Magick/autosplit.ix
@man man/man1/ImageMagick.1
@man man/man1/Magick++-config.1
@@ -198,6 +210,7 @@ share/ImageMagick/config/sRGB.icm
share/ImageMagick/config/thresholds.xml
share/doc/ImageMagick/
share/doc/ImageMagick/images/
+share/doc/ImageMagick/images/affine.png
share/doc/ImageMagick/images/arc.png
share/doc/ImageMagick/images/background.jpg
share/doc/ImageMagick/images/black.png
@@ -205,20 +218,17 @@ share/doc/ImageMagick/images/bluebells_c
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/business+directory.gif
share/doc/ImageMagick/images/button.gif
-share/doc/ImageMagick/images/button_kmvu.jpg
share/doc/ImageMagick/images/configure.jpg
+share/doc/ImageMagick/images/cylinder_shaded.png
share/doc/ImageMagick/images/definitive-guide.png
share/doc/ImageMagick/images/difference.png
-share/doc/ImageMagick/images/dogwaffle.jpg
share/doc/ImageMagick/images/examples.jpg
share/doc/ImageMagick/images/frame.jpg
share/doc/ImageMagick/images/fuzzy-magick.png
share/doc/ImageMagick/images/gaussian-blur.png
share/doc/ImageMagick/images/granite.png
share/doc/ImageMagick/images/imade_art2.jpg
-share/doc/ImageMagick/images/ivedc.png
share/doc/ImageMagick/images/label.gif
share/doc/ImageMagick/images/logo.eps
share/doc/ImageMagick/images/logo.jpg
@@ -236,15 +246,17 @@ share/doc/ImageMagick/images/rose-over.p
share/doc/ImageMagick/images/rose-sigmoidal.png
share/doc/ImageMagick/images/rose.jpg
share/doc/ImageMagick/images/rose.png
+share/doc/ImageMagick/images/rose.pnm
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
share/doc/ImageMagick/images/white-highlight.png
+share/doc/ImageMagick/images/wizard.jpg
+share/doc/ImageMagick/images/wizard.png
share/doc/ImageMagick/index.html
share/doc/ImageMagick/www/
share/doc/ImageMagick/www/ImageMagickObject.html
@@ -279,6 +291,7 @@ share/doc/ImageMagick/www/Magick++/READM
share/doc/ImageMagick/www/Magick++/STL.html
share/doc/ImageMagick/www/Magick++/TypeMetric.html
share/doc/ImageMagick/www/Magick++/index.html
+share/doc/ImageMagick/www/Magick++/magick.css
share/doc/ImageMagick/www/Magick++/montage-sample-framed.jpg
share/doc/ImageMagick/www/Magick++/right_triangle.png
share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-framed.fig
@@ -1004,11 +1017,13 @@ share/doc/ImageMagick/www/api/MagickWand
share/doc/ImageMagick/www/api/MagickWand/wandtest_8c.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-view.html
share/doc/ImageMagick/www/api/cache.html
share/doc/ImageMagick/www/api/cipher.html
share/doc/ImageMagick/www/api/color.html
+share/doc/ImageMagick/www/api/colormap.html
share/doc/ImageMagick/www/api/colorspace.html
share/doc/ImageMagick/www/api/compare.html
share/doc/ImageMagick/www/api/composite.html
@@ -1022,7 +1037,10 @@ share/doc/ImageMagick/www/api/drawing-wa
share/doc/ImageMagick/www/api/effect.html
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/fx.html
+share/doc/ImageMagick/www/api/histogram.html
+share/doc/ImageMagick/www/api/image-view.html
share/doc/ImageMagick/www/api/image.html
share/doc/ImageMagick/www/api/layer.html
share/doc/ImageMagick/www/api/list.html
@@ -1033,8 +1051,10 @@ share/doc/ImageMagick/www/api/magick-wan
share/doc/ImageMagick/www/api/magick.html
share/doc/ImageMagick/www/api/memory.html
share/doc/ImageMagick/www/api/module.html
+share/doc/ImageMagick/www/api/mogrify.html
share/doc/ImageMagick/www/api/monitor.html
share/doc/ImageMagick/www/api/montage.html
+share/doc/ImageMagick/www/api/morphology.html
share/doc/ImageMagick/www/api/paint.html
share/doc/ImageMagick/www/api/pixel-iterator.html
share/doc/ImageMagick/www/api/pixel-view.html
@@ -1048,9 +1068,11 @@ share/doc/ImageMagick/www/api/resource.h
share/doc/ImageMagick/www/api/segment.html
share/doc/ImageMagick/www/api/shear.html
share/doc/ImageMagick/www/api/signature.html
+share/doc/ImageMagick/www/api/statistic.html
share/doc/ImageMagick/www/api/stream.html
share/doc/ImageMagick/www/api/transform.html
share/doc/ImageMagick/www/api/version.html
+share/doc/ImageMagick/www/api/wand-view.html
share/doc/ImageMagick/www/architecture.html
share/doc/ImageMagick/www/binary-releases.html
share/doc/ImageMagick/www/changelog.html
@@ -1060,6 +1082,7 @@ share/doc/ImageMagick/www/command-line-o
share/doc/ImageMagick/www/command-line-processing.html
share/doc/ImageMagick/www/command-line-tools.html
share/doc/ImageMagick/www/compare.html
+share/doc/ImageMagick/www/compose.html
share/doc/ImageMagick/www/composite.html
share/doc/ImageMagick/www/conjure.html
share/doc/ImageMagick/www/contact.html
@@ -1068,6 +1091,9 @@ share/doc/ImageMagick/www/display.html
share/doc/ImageMagick/www/download.html
share/doc/ImageMagick/www/escape.html
share/doc/ImageMagick/www/examples.html
+share/doc/ImageMagick/www/exception.html
+share/doc/ImageMagick/www/export.html
+share/doc/ImageMagick/www/favicon.ico
share/doc/ImageMagick/www/formats.html
share/doc/ImageMagick/www/fx.html
share/doc/ImageMagick/www/high-dynamic-range.html
@@ -1079,6 +1105,7 @@ share/doc/ImageMagick/www/install-source
share/doc/ImageMagick/www/jp2.html
share/doc/ImageMagick/www/license.html
share/doc/ImageMagick/www/links.html
+share/doc/ImageMagick/www/magick++.html
share/doc/ImageMagick/www/magick-core.html
share/doc/ImageMagick/www/magick-vector-graphics.html
share/doc/ImageMagick/www/magick-wand.html
@@ -1094,7 +1121,26 @@ share/doc/ImageMagick/www/quantize.html
share/doc/ImageMagick/www/resources.html
share/doc/ImageMagick/www/search.html
share/doc/ImageMagick/www/sitemap.html
+share/doc/ImageMagick/www/source/
+share/doc/ImageMagick/www/source/analyze.c
+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/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/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/piechart.mvg
+share/doc/ImageMagick/www/source/piechart.svg
+share/doc/ImageMagick/www/source/type-ghostscript.xml
+share/doc/ImageMagick/www/source/type.xml
+share/doc/ImageMagick/www/source/wand.c
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
+share/doc/ImageMagick/www/wand.png
