- Fix detection of fontconfig and add knob to enable/disable

- Fix detection of librsvg and add knob to enable/disable
- Fix leftovers when set many combinations of WITH/WITHOUT
- Respect CFLAGS/LDFLAGS
- Bump PORTREVISION since have default features that now are detected property

Pointy hat to:	me
Approved by:	maintainer timeout (on past commit)
Tested by:	many and me on all day

3 files changed, 95 insertions, 47 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index fbb4767ef7fe..d503077673ee 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ImageMagick
 DISTVERSION=	6.2.7-7
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.imagemagick.org/pub/ImageMagick/ \
 		ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \
@@ -30,14 +31,15 @@ USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libltdl:15
+USE_AUTOTOOLS=	libtool:15 libltdl:15
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
 
 MAN1=		ImageMagick.1 Magick++-config.1 Magick-config.1 Wand-config.1 \
-		compare.1 composite.1 convert.1 identify.1 mogrify.1 montage.1
+		animate.1 conjure.1 compare.1 composite.1 convert.1 display.1 \
+		identify.1 import.1 mogrify.1 montage.1
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
@@ -90,20 +92,26 @@ PLIST_SUB+=		MODULES='@comment '
 
 .if !defined(WITHOUT_IMAGEMAGICK_JPEG)
 LIB_DEPENDS+=		jpeg.9:${PORTSDIR}/graphics/jpeg
+PLIST_SUB+=		JPEG=""
 .else
 CONFIGURE_ARGS+=	--without-jpeg
+PLIST_SUB+=		JPEG="@comment "
 .endif
 
 .if !defined(WITHOUT_IMAGEMAGICK_PNG)
 LIB_DEPENDS+=		png.5:${PORTSDIR}/graphics/png
+PLIST_SUB+=		PNG=""
 .else
 CONFIGURE_ARGS+=	--without-png
+PLIST_SUB+=		PNG="@comment "
 .endif
 
 .if !defined(WITHOUT_IMAGEMAGICK_TIFF)
 LIB_DEPENDS+=		tiff.4:${PORTSDIR}/graphics/tiff
+PLIST_SUB+=		TIFF=""
 .else
 CONFIGURE_ARGS+=	--without-tiff
+PLIST_SUB+=		TIFF="@comment "
 .endif
 
 # Produce BZip compressed MIFF images
@@ -115,20 +123,27 @@ CONFIGURE_ARGS+=	--without-bzlib
 .if !defined(WITHOUT_IMAGEMAGICK_FPX)
 LIB_DEPENDS+=		fpx.1:${PORTSDIR}/graphics/libfpx
 CONFIGURE_ARGS+=	--with-fpx
+PLIST_SUB+=		FPX=""
+.else
+PLIST_SUB+=		FPX="@comment "
 .endif
 
 # JBIG images (lossless compression for bi-level images)
 .if !defined(WITHOUT_IMAGEMAGICK_JBIG)
 LIB_DEPENDS+=		jbig.1:${PORTSDIR}/graphics/jbigkit
+PLIST_SUB+=		JBIG=""
 .else
 CONFIGURE_ARGS+=	--without-jbig
+PLIST_SUB+=		JBIG="@comment "
 .endif
 
 # JPEG2000 images (wavelet-based lossy compression)
 .if !defined(WITHOUT_IMAGEMAGICK_JPEG2000)
-LIB_DEPENDS+=	jasper.4:${PORTSDIR}/graphics/jasper
+LIB_DEPENDS+=		jasper.4:${PORTSDIR}/graphics/jasper
+PLIST_SUB+=		JPEG2000=""
 .else
 CONFIGURE_ARGS+=	--without-jp2
+PLIST_SUB+=		JPEG2000="@comment "
 .endif
 
 # GraphViz dot graphs
@@ -136,8 +151,7 @@ CONFIGURE_ARGS+=	--without-jp2
 BUILD_DEPENDS+=		dot:${PORTSDIR}/graphics/graphviz
 RUN_DEPENDS+=		dot:${PORTSDIR}/graphics/graphviz
 .else
-CONFIGURE_ARGS+=	--without-dot
-CONFIGURE_ARGS+=	--without-gvc
+CONFIGURE_ARGS+=	--without-dot --without-gvc
 .endif
 
 # LCMS (Little CMS) color management
@@ -147,13 +161,23 @@ LIB_DEPENDS+=		lcms.1:${PORTSDIR}/graphics/lcms
 CONFIGURE_ARGS+=	--without-lcms
 .endif
 
-# TTF (TrueType Font) support
+# Freetype (TrueType Font) support
 .if !defined(WITHOUT_IMAGEMAGICK_TTF)
-BUILD_DEPENDS+=		freetype-config:${PORTSDIR}/print/freetype2	# XXX
 LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2
 USE_GHOSTSCRIPT=	yes
+CONFIGURE_ARGS+=	--with-freetype
+.else
+CONFIGURE_ARGS+=	--without-freetype
+.endif
+
+# Fontconfig support
+.if !defined(WITHOUT_IMAGEMAGICK_FONTCONFIG)
+LIB_DEPENDS+=		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+CONFIGURE_ARGS+=	--with-fontconfig
+CONFIGURE_ENV+=		FONTCONFIG_CFLAGS="-I${X11BASE}/include" \
+			FONTCONFIG_LIBS="-L${X11BASE}/lib"
 .else
-CONFIGURE_ARGS+=	--without-ttf
+CONFIGURE_ARGS+=	--without-fontconfig
 .endif
 
 # WMF (Windows Meta File) images
@@ -175,12 +199,18 @@ CONFIGURE_ARGS+=	--without-wmf
 # SVG (Scalable Vector Graphics) images and MSL (Magick Scripting Language)
 # both require XML
 .if !defined(WITHOUT_IMAGEMAGICK_SVG) || !defined(WITHOUT_IMAGEMAGICK_MSL)
-LIB_DEPENDS+=		xml2.5:${PORTSDIR}/textproc/libxml2
-MAN1+=			conjure.1
-PLIST_SUB+=		WITH_CONJURE=''
+USE_GNOME+=		libxml2
+CONFIGURE_ARGS+=	--with-xml
 .else
 CONFIGURE_ARGS+=	--without-xml
-PLIST_SUB+=		WITH_CONJURE='@comment '
+.endif
+.if !defined(WITHOUT_IMAGEMAGICK_SVG)
+LIB_DEPENDS+=		rsvg-2.2:${PORTSDIR}/graphics/librsvg2
+CONFIGURE_ARGS+=	--with-rsvg
+CONFIGURE_ENV+=		RSVG_CFLAGS="-I${X11BASE}/include/librsvg-2" \
+			RSVG_LIBS="-L${X11BASE}/lib"
+.else
+CONFIGURE_ARGS+=	--without-rsvg
 .endif
 
 # DPS (Display PostScript) support
@@ -206,7 +236,6 @@ PLIST_SUB+=		X11='@comment '
 CONFLICTS+=		display
 CONFIGURE_ARGS+=	--with-x
 USE_XLIB=		yes
-MAN1+=			animate.1 display.1 import.1
 PLIST_SUB+=		X11=''
 .if !defined(WITHOUT_IMAGEMAGICK_MPEG2)
 RUN_DEPENDS+=		mpeg2encode:${PORTSDIR}/multimedia/mpeg2codec
@@ -248,6 +277,11 @@ post-patch:
 # deprecated gvCleanup
 	@${REINPLACE_CMD} -e "s|gvCleanup|gvFreeContext|g" \
 		${WRKSRC}/coders/dot.c
+# Respect Make flags
+	@${REINPLACE_CMD} -E -e "s|^CPPFLAGS =|CPPFLAGS ?=|g" \
+		-e "s|^CXXFLAGS =|CXXFLAGS ?=|g" -e "s|^CFLAGS =|CFLAGS ?=|g" \
+		-e "s|^CC =|CC ?=|g" -e "s|^CPP =|CPP ?=|g" -e "s|^CXX =|CXX ?=|g" \
+		-e "s|^LDFLAGS =|LDFLAGS ?=|g" ${WRKSRC}/Makefile.in
 
 post-install:
 .if defined(WITHOUT_IMAGEMAGICK_16BIT_PIXEL)
diff --git a/graphics/ImageMagick/files/patch-Makefile.in b/graphics/ImageMagick/files/patch-Makefile.in
index b882376059bc..e73ee9b34336 100644
--- a/graphics/ImageMagick/files/patch-Makefile.in
+++ b/graphics/ImageMagick/files/patch-Makefile.in
@@ -1,6 +1,20 @@
---- Makefile.in.orig	Sat Mar  5 01:08:24 2005
-+++ Makefile.in	Thu Apr  7 23:38:41 2005
-@@ -9336,7 +9340,7 @@
+--- Makefile.in.orig	Sat May 20 23:25:57 2006
++++ Makefile.in	Thu May 25 17:21:09 2006
+@@ -8643,11 +8643,11 @@
+ @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagick_la-sun.lo `test -f 'coders/sun.c' || echo '$(srcdir)/'`coders/sun.c
+ 
+ coders/magick_libMagick_la-svg.lo: coders/svg.c
+-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagick_la-svg.lo -MD -MP -MF "coders/$(DEPDIR)/magick_libMagick_la-svg.Tpo" -c -o coders/magick_libMagick_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c; \
++@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(coders_svg_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagick_la-svg.lo -MD -MP -MF "coders/$(DEPDIR)/magick_libMagick_la-svg.Tpo" -c -o coders/magick_libMagick_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c; \
+ @am__fastdepCC_TRUE@	then mv -f "coders/$(DEPDIR)/magick_libMagick_la-svg.Tpo" "coders/$(DEPDIR)/magick_libMagick_la-svg.Plo"; else rm -f "coders/$(DEPDIR)/magick_libMagick_la-svg.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='coders/svg.c' object='coders/magick_libMagick_la-svg.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagick_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c
++@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(coders_svg_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagick_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c
+ 
+ coders/magick_libMagick_la-tga.lo: coders/tga.c
+ @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagick_la-tga.lo -MD -MP -MF "coders/$(DEPDIR)/magick_libMagick_la-tga.Tpo" -c -o coders/magick_libMagick_la-tga.lo `test -f 'coders/tga.c' || echo '$(srcdir)/'`coders/tga.c; \
+@@ -9722,7 +9722,7 @@
  
  @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
  @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index c80851107e02..b7a5a92f0cef 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -1,14 +1,14 @@
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
-%%X11%%bin/animate
+bin/animate
 bin/compare
 bin/composite
-%%WITH_CONJURE%%bin/conjure
+bin/conjure
 bin/convert
-%%X11%%bin/display
+bin/display
 bin/identify
-%%X11%%bin/import
+bin/import
 bin/mogrify
 bin/montage
 include/Magick++.h
@@ -172,18 +172,18 @@ lib/ImageMagick/modules-%%QBIT%%/coders/.keep
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/dpx.a
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/dpx.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/dpx.so
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/ept.a
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/ept.la
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/ept.so
+%%TIFF%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/ept.a
+%%TIFF%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/ept.la
+%%TIFF%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/ept.so
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fax.a
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fax.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fax.so
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fits.a
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fits.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fits.so
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fpx.a
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fpx.la
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fpx.so
+%%FPX%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fpx.a
+%%FPX%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fpx.la
+%%FPX%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fpx.so
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/gif.a
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/gif.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/gif.so
@@ -205,15 +205,15 @@ lib/ImageMagick/modules-%%QBIT%%/coders/.keep
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/info.a
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/info.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/info.so
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jbig.a
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jbig.la
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jbig.so
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jp2.a
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jp2.la
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jp2.so
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jpeg.a
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jpeg.la
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jpeg.so
+%%JBIG%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jbig.a
+%%JBIG%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jbig.la
+%%JBIG%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jbig.so
+%%JPEG2000%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jp2.a
+%%JPEG2000%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jp2.la
+%%JPEG2000%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jp2.so
+%%JPEG%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jpeg.a
+%%JPEG%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jpeg.la
+%%JPEG%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/jpeg.so
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/label.a
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/label.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/label.so
@@ -292,9 +292,9 @@ lib/ImageMagick/modules-%%QBIT%%/coders/.keep
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/plasma.a
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/plasma.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/plasma.so
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/png.a
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/png.la
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/png.so
+%%PNG%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/png.a
+%%PNG%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/png.la
+%%PNG%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/png.so
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/pnm.a
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/pnm.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/pnm.so
@@ -352,9 +352,9 @@ lib/ImageMagick/modules-%%QBIT%%/coders/.keep
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/tga.a
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/tga.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/tga.so
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/tiff.a
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/tiff.la
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/tiff.so
+%%TIFF%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/tiff.a
+%%TIFF%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/tiff.la
+%%TIFF%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/tiff.so
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/tile.a
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/tile.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/tile.so
@@ -394,9 +394,9 @@ lib/ImageMagick/modules-%%QBIT%%/coders/.keep
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/wpg.a
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/wpg.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/wpg.so
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/x.a
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/x.la
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/x.so
+%%X11%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/x.a
+%%X11%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/x.la
+%%X11%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/x.so
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xbm.a
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xbm.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xbm.so
@@ -409,9 +409,9 @@ lib/ImageMagick/modules-%%QBIT%%/coders/.keep
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xpm.a
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xpm.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xpm.so
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xwd.a
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xwd.la
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xwd.so
+%%X11%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xwd.a
+%%X11%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xwd.la
+%%X11%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xwd.so
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/ycbcr.a
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/ycbcr.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/ycbcr.so