Made ``--with-modules'' an optional argument triggered by WITH_MODULES

knob.  IMO, this  should  be removed  at all.  It  seems, the  "modules"
provide solution to  a problem that does not exist.  And provide poorly.
First, every  module is  really a  shell script  (.la), which  loads the
namesake shared object  (.so). Second -- they don't work.  At least, not
on FreeBSD. I wish someone did
	cd work/ImageMagick-<version>/PerlMagick/demo
	make
before enabling them for the rest of us...

2 files changed, 171 insertions, 164 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 3c2af59ed56f..fbd9c7ed003f 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -49,9 +49,16 @@ LIBTOOLFLAGS=	# empty
 USE_AUTOCONF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-shared --with-modules \
+CONFIGURE_ARGS=	--enable-shared \
 		--with-perl=${PERL5}
 
+.ifdef WITH_MODULES
+CONFIGURE_ARGS+=--with-modules
+PLIST_SUB+=	MODULES=''
+.else
+PLIST_SUB+=	MODULES='@comment '
+.endif
+
 .ifdef NO_X
 CONFIGURE_ARGS+=--without-x
 PLIST_SUB+=	X11='@comment '
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 4b190de77c91..e2cfa268ab3e 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -49,167 +49,167 @@ include/magick/version.h
 include/magick/widget.h
 include/magick/xwindows.h
 lib/ImageMagick/delegates.mgk
-lib/ImageMagick/modules/coders/8bim.la
-lib/ImageMagick/modules/coders/8bim.so
-lib/ImageMagick/modules/coders/art.la
-lib/ImageMagick/modules/coders/art.so
-lib/ImageMagick/modules/coders/avi.la
-lib/ImageMagick/modules/coders/avi.so
-lib/ImageMagick/modules/coders/avs.la
-lib/ImageMagick/modules/coders/avs.so
-lib/ImageMagick/modules/coders/bmp.la
-lib/ImageMagick/modules/coders/bmp.so
-lib/ImageMagick/modules/coders/cmyk.la
-lib/ImageMagick/modules/coders/cmyk.so
-lib/ImageMagick/modules/coders/cut.la
-lib/ImageMagick/modules/coders/cut.so
-lib/ImageMagick/modules/coders/dcm.la
-lib/ImageMagick/modules/coders/dcm.so
-lib/ImageMagick/modules/coders/dps.la
-lib/ImageMagick/modules/coders/dps.so
-lib/ImageMagick/modules/coders/ept.la
-lib/ImageMagick/modules/coders/ept.so
-lib/ImageMagick/modules/coders/fax.la
-lib/ImageMagick/modules/coders/fax.so
-lib/ImageMagick/modules/coders/fits.la
-lib/ImageMagick/modules/coders/fits.so
-lib/ImageMagick/modules/coders/fpx.la
-lib/ImageMagick/modules/coders/fpx.so
-lib/ImageMagick/modules/coders/gif.la
-lib/ImageMagick/modules/coders/gif.so
-lib/ImageMagick/modules/coders/gradient.la
-lib/ImageMagick/modules/coders/gradient.so
-lib/ImageMagick/modules/coders/gray.la
-lib/ImageMagick/modules/coders/gray.so
-lib/ImageMagick/modules/coders/hdf.la
-lib/ImageMagick/modules/coders/hdf.so
-lib/ImageMagick/modules/coders/histogram.la
-lib/ImageMagick/modules/coders/histogram.so
-lib/ImageMagick/modules/coders/html.la
-lib/ImageMagick/modules/coders/html.so
-lib/ImageMagick/modules/coders/icm.la
-lib/ImageMagick/modules/coders/icm.so
-lib/ImageMagick/modules/coders/icon.la
-lib/ImageMagick/modules/coders/icon.so
-lib/ImageMagick/modules/coders/iptc.la
-lib/ImageMagick/modules/coders/iptc.so
-lib/ImageMagick/modules/coders/jbig.la
-lib/ImageMagick/modules/coders/jbig.so
-lib/ImageMagick/modules/coders/jpeg.la
-lib/ImageMagick/modules/coders/jpeg.so
-lib/ImageMagick/modules/coders/label.la
-lib/ImageMagick/modules/coders/label.so
-lib/ImageMagick/modules/coders/logo.la
-lib/ImageMagick/modules/coders/logo.so
-lib/ImageMagick/modules/coders/map.la
-lib/ImageMagick/modules/coders/map.so
-lib/ImageMagick/modules/coders/matte.la
-lib/ImageMagick/modules/coders/matte.so
-lib/ImageMagick/modules/coders/miff.la
-lib/ImageMagick/modules/coders/miff.so
-lib/ImageMagick/modules/coders/modules.mgk
-lib/ImageMagick/modules/coders/mono.la
-lib/ImageMagick/modules/coders/mono.so
-lib/ImageMagick/modules/coders/mpc.la
-lib/ImageMagick/modules/coders/mpc.so
-lib/ImageMagick/modules/coders/mtv.la
-lib/ImageMagick/modules/coders/mtv.so
-lib/ImageMagick/modules/coders/mvg.la
-lib/ImageMagick/modules/coders/mvg.so
-lib/ImageMagick/modules/coders/null.la
-lib/ImageMagick/modules/coders/null.so
-lib/ImageMagick/modules/coders/pcd.la
-lib/ImageMagick/modules/coders/pcd.so
-lib/ImageMagick/modules/coders/pcl.la
-lib/ImageMagick/modules/coders/pcl.so
-lib/ImageMagick/modules/coders/pcx.la
-lib/ImageMagick/modules/coders/pcx.so
-lib/ImageMagick/modules/coders/pdb.la
-lib/ImageMagick/modules/coders/pdb.so
-lib/ImageMagick/modules/coders/pdf.la
-lib/ImageMagick/modules/coders/pdf.so
-lib/ImageMagick/modules/coders/pict.la
-lib/ImageMagick/modules/coders/pict.so
-lib/ImageMagick/modules/coders/pix.la
-lib/ImageMagick/modules/coders/pix.so
-lib/ImageMagick/modules/coders/plasma.la
-lib/ImageMagick/modules/coders/plasma.so
-lib/ImageMagick/modules/coders/png.la
-lib/ImageMagick/modules/coders/png.so
-lib/ImageMagick/modules/coders/pnm.la
-lib/ImageMagick/modules/coders/pnm.so
-lib/ImageMagick/modules/coders/preview.la
-lib/ImageMagick/modules/coders/preview.so
-lib/ImageMagick/modules/coders/ps.la
-lib/ImageMagick/modules/coders/ps.so
-lib/ImageMagick/modules/coders/ps2.la
-lib/ImageMagick/modules/coders/ps2.so
-lib/ImageMagick/modules/coders/ps3.la
-lib/ImageMagick/modules/coders/ps3.so
-lib/ImageMagick/modules/coders/psd.la
-lib/ImageMagick/modules/coders/psd.so
-lib/ImageMagick/modules/coders/pwp.la
-lib/ImageMagick/modules/coders/pwp.so
-lib/ImageMagick/modules/coders/rgb.la
-lib/ImageMagick/modules/coders/rgb.so
-lib/ImageMagick/modules/coders/rla.la
-lib/ImageMagick/modules/coders/rla.so
-lib/ImageMagick/modules/coders/rle.la
-lib/ImageMagick/modules/coders/rle.so
-lib/ImageMagick/modules/coders/sct.la
-lib/ImageMagick/modules/coders/sct.so
-lib/ImageMagick/modules/coders/sfw.la
-lib/ImageMagick/modules/coders/sfw.so
-lib/ImageMagick/modules/coders/sgi.la
-lib/ImageMagick/modules/coders/sgi.so
-lib/ImageMagick/modules/coders/stegano.la
-lib/ImageMagick/modules/coders/stegano.so
-lib/ImageMagick/modules/coders/sun.la
-lib/ImageMagick/modules/coders/sun.so
-lib/ImageMagick/modules/coders/svg.la
-lib/ImageMagick/modules/coders/svg.so
-lib/ImageMagick/modules/coders/tga.la
-lib/ImageMagick/modules/coders/tga.so
-lib/ImageMagick/modules/coders/tiff.la
-lib/ImageMagick/modules/coders/tiff.so
-lib/ImageMagick/modules/coders/tile.la
-lib/ImageMagick/modules/coders/tile.so
-lib/ImageMagick/modules/coders/tim.la
-lib/ImageMagick/modules/coders/tim.so
-lib/ImageMagick/modules/coders/ttf.la
-lib/ImageMagick/modules/coders/ttf.so
-lib/ImageMagick/modules/coders/txt.la
-lib/ImageMagick/modules/coders/txt.so
-lib/ImageMagick/modules/coders/uil.la
-lib/ImageMagick/modules/coders/uil.so
-lib/ImageMagick/modules/coders/url.la
-lib/ImageMagick/modules/coders/url.so
-lib/ImageMagick/modules/coders/uyvy.la
-lib/ImageMagick/modules/coders/uyvy.so
-lib/ImageMagick/modules/coders/vicar.la
-lib/ImageMagick/modules/coders/vicar.so
-lib/ImageMagick/modules/coders/vid.la
-lib/ImageMagick/modules/coders/vid.so
-lib/ImageMagick/modules/coders/viff.la
-lib/ImageMagick/modules/coders/viff.so
-lib/ImageMagick/modules/coders/wbmp.la
-lib/ImageMagick/modules/coders/wbmp.so
-lib/ImageMagick/modules/coders/wmf.la
-lib/ImageMagick/modules/coders/wmf.so
-lib/ImageMagick/modules/coders/wpg.la
-lib/ImageMagick/modules/coders/wpg.so
-lib/ImageMagick/modules/coders/x.la
-lib/ImageMagick/modules/coders/x.so
-lib/ImageMagick/modules/coders/xbm.la
-lib/ImageMagick/modules/coders/xbm.so
-lib/ImageMagick/modules/coders/xc.la
-lib/ImageMagick/modules/coders/xc.so
-lib/ImageMagick/modules/coders/xpm.la
-lib/ImageMagick/modules/coders/xpm.so
-lib/ImageMagick/modules/coders/xwd.la
-lib/ImageMagick/modules/coders/xwd.so
-lib/ImageMagick/modules/coders/yuv.la
-lib/ImageMagick/modules/coders/yuv.so
+%%MODULES%%lib/ImageMagick/modules/coders/8bim.la
+%%MODULES%%lib/ImageMagick/modules/coders/8bim.so
+%%MODULES%%lib/ImageMagick/modules/coders/art.la
+%%MODULES%%lib/ImageMagick/modules/coders/art.so
+%%MODULES%%lib/ImageMagick/modules/coders/avi.la
+%%MODULES%%lib/ImageMagick/modules/coders/avi.so
+%%MODULES%%lib/ImageMagick/modules/coders/avs.la
+%%MODULES%%lib/ImageMagick/modules/coders/avs.so
+%%MODULES%%lib/ImageMagick/modules/coders/bmp.la
+%%MODULES%%lib/ImageMagick/modules/coders/bmp.so
+%%MODULES%%lib/ImageMagick/modules/coders/cmyk.la
+%%MODULES%%lib/ImageMagick/modules/coders/cmyk.so
+%%MODULES%%lib/ImageMagick/modules/coders/cut.la
+%%MODULES%%lib/ImageMagick/modules/coders/cut.so
+%%MODULES%%lib/ImageMagick/modules/coders/dcm.la
+%%MODULES%%lib/ImageMagick/modules/coders/dcm.so
+%%MODULES%%lib/ImageMagick/modules/coders/dps.la
+%%MODULES%%lib/ImageMagick/modules/coders/dps.so
+%%MODULES%%lib/ImageMagick/modules/coders/ept.la
+%%MODULES%%lib/ImageMagick/modules/coders/ept.so
+%%MODULES%%lib/ImageMagick/modules/coders/fax.la
+%%MODULES%%lib/ImageMagick/modules/coders/fax.so
+%%MODULES%%lib/ImageMagick/modules/coders/fits.la
+%%MODULES%%lib/ImageMagick/modules/coders/fits.so
+%%MODULES%%lib/ImageMagick/modules/coders/fpx.la
+%%MODULES%%lib/ImageMagick/modules/coders/fpx.so
+%%MODULES%%lib/ImageMagick/modules/coders/gif.la
+%%MODULES%%lib/ImageMagick/modules/coders/gif.so
+%%MODULES%%lib/ImageMagick/modules/coders/gradient.la
+%%MODULES%%lib/ImageMagick/modules/coders/gradient.so
+%%MODULES%%lib/ImageMagick/modules/coders/gray.la
+%%MODULES%%lib/ImageMagick/modules/coders/gray.so
+%%MODULES%%lib/ImageMagick/modules/coders/hdf.la
+%%MODULES%%lib/ImageMagick/modules/coders/hdf.so
+%%MODULES%%lib/ImageMagick/modules/coders/histogram.la
+%%MODULES%%lib/ImageMagick/modules/coders/histogram.so
+%%MODULES%%lib/ImageMagick/modules/coders/html.la
+%%MODULES%%lib/ImageMagick/modules/coders/html.so
+%%MODULES%%lib/ImageMagick/modules/coders/icm.la
+%%MODULES%%lib/ImageMagick/modules/coders/icm.so
+%%MODULES%%lib/ImageMagick/modules/coders/icon.la
+%%MODULES%%lib/ImageMagick/modules/coders/icon.so
+%%MODULES%%lib/ImageMagick/modules/coders/iptc.la
+%%MODULES%%lib/ImageMagick/modules/coders/iptc.so
+%%MODULES%%lib/ImageMagick/modules/coders/jbig.la
+%%MODULES%%lib/ImageMagick/modules/coders/jbig.so
+%%MODULES%%lib/ImageMagick/modules/coders/jpeg.la
+%%MODULES%%lib/ImageMagick/modules/coders/jpeg.so
+%%MODULES%%lib/ImageMagick/modules/coders/label.la
+%%MODULES%%lib/ImageMagick/modules/coders/label.so
+%%MODULES%%lib/ImageMagick/modules/coders/logo.la
+%%MODULES%%lib/ImageMagick/modules/coders/logo.so
+%%MODULES%%lib/ImageMagick/modules/coders/map.la
+%%MODULES%%lib/ImageMagick/modules/coders/map.so
+%%MODULES%%lib/ImageMagick/modules/coders/matte.la
+%%MODULES%%lib/ImageMagick/modules/coders/matte.so
+%%MODULES%%lib/ImageMagick/modules/coders/miff.la
+%%MODULES%%lib/ImageMagick/modules/coders/miff.so
+%%MODULES%%lib/ImageMagick/modules/coders/modules.mgk
+%%MODULES%%lib/ImageMagick/modules/coders/mono.la
+%%MODULES%%lib/ImageMagick/modules/coders/mono.so
+%%MODULES%%lib/ImageMagick/modules/coders/mpc.la
+%%MODULES%%lib/ImageMagick/modules/coders/mpc.so
+%%MODULES%%lib/ImageMagick/modules/coders/mtv.la
+%%MODULES%%lib/ImageMagick/modules/coders/mtv.so
+%%MODULES%%lib/ImageMagick/modules/coders/mvg.la
+%%MODULES%%lib/ImageMagick/modules/coders/mvg.so
+%%MODULES%%lib/ImageMagick/modules/coders/null.la
+%%MODULES%%lib/ImageMagick/modules/coders/null.so
+%%MODULES%%lib/ImageMagick/modules/coders/pcd.la
+%%MODULES%%lib/ImageMagick/modules/coders/pcd.so
+%%MODULES%%lib/ImageMagick/modules/coders/pcl.la
+%%MODULES%%lib/ImageMagick/modules/coders/pcl.so
+%%MODULES%%lib/ImageMagick/modules/coders/pcx.la
+%%MODULES%%lib/ImageMagick/modules/coders/pcx.so
+%%MODULES%%lib/ImageMagick/modules/coders/pdb.la
+%%MODULES%%lib/ImageMagick/modules/coders/pdb.so
+%%MODULES%%lib/ImageMagick/modules/coders/pdf.la
+%%MODULES%%lib/ImageMagick/modules/coders/pdf.so
+%%MODULES%%lib/ImageMagick/modules/coders/pict.la
+%%MODULES%%lib/ImageMagick/modules/coders/pict.so
+%%MODULES%%lib/ImageMagick/modules/coders/pix.la
+%%MODULES%%lib/ImageMagick/modules/coders/pix.so
+%%MODULES%%lib/ImageMagick/modules/coders/plasma.la
+%%MODULES%%lib/ImageMagick/modules/coders/plasma.so
+%%MODULES%%lib/ImageMagick/modules/coders/png.la
+%%MODULES%%lib/ImageMagick/modules/coders/png.so
+%%MODULES%%lib/ImageMagick/modules/coders/pnm.la
+%%MODULES%%lib/ImageMagick/modules/coders/pnm.so
+%%MODULES%%lib/ImageMagick/modules/coders/preview.la
+%%MODULES%%lib/ImageMagick/modules/coders/preview.so
+%%MODULES%%lib/ImageMagick/modules/coders/ps.la
+%%MODULES%%lib/ImageMagick/modules/coders/ps.so
+%%MODULES%%lib/ImageMagick/modules/coders/ps2.la
+%%MODULES%%lib/ImageMagick/modules/coders/ps2.so
+%%MODULES%%lib/ImageMagick/modules/coders/ps3.la
+%%MODULES%%lib/ImageMagick/modules/coders/ps3.so
+%%MODULES%%lib/ImageMagick/modules/coders/psd.la
+%%MODULES%%lib/ImageMagick/modules/coders/psd.so
+%%MODULES%%lib/ImageMagick/modules/coders/pwp.la
+%%MODULES%%lib/ImageMagick/modules/coders/pwp.so
+%%MODULES%%lib/ImageMagick/modules/coders/rgb.la
+%%MODULES%%lib/ImageMagick/modules/coders/rgb.so
+%%MODULES%%lib/ImageMagick/modules/coders/rla.la
+%%MODULES%%lib/ImageMagick/modules/coders/rla.so
+%%MODULES%%lib/ImageMagick/modules/coders/rle.la
+%%MODULES%%lib/ImageMagick/modules/coders/rle.so
+%%MODULES%%lib/ImageMagick/modules/coders/sct.la
+%%MODULES%%lib/ImageMagick/modules/coders/sct.so
+%%MODULES%%lib/ImageMagick/modules/coders/sfw.la
+%%MODULES%%lib/ImageMagick/modules/coders/sfw.so
+%%MODULES%%lib/ImageMagick/modules/coders/sgi.la
+%%MODULES%%lib/ImageMagick/modules/coders/sgi.so
+%%MODULES%%lib/ImageMagick/modules/coders/stegano.la
+%%MODULES%%lib/ImageMagick/modules/coders/stegano.so
+%%MODULES%%lib/ImageMagick/modules/coders/sun.la
+%%MODULES%%lib/ImageMagick/modules/coders/sun.so
+%%MODULES%%lib/ImageMagick/modules/coders/svg.la
+%%MODULES%%lib/ImageMagick/modules/coders/svg.so
+%%MODULES%%lib/ImageMagick/modules/coders/tga.la
+%%MODULES%%lib/ImageMagick/modules/coders/tga.so
+%%MODULES%%lib/ImageMagick/modules/coders/tiff.la
+%%MODULES%%lib/ImageMagick/modules/coders/tiff.so
+%%MODULES%%lib/ImageMagick/modules/coders/tile.la
+%%MODULES%%lib/ImageMagick/modules/coders/tile.so
+%%MODULES%%lib/ImageMagick/modules/coders/tim.la
+%%MODULES%%lib/ImageMagick/modules/coders/tim.so
+%%MODULES%%lib/ImageMagick/modules/coders/ttf.la
+%%MODULES%%lib/ImageMagick/modules/coders/ttf.so
+%%MODULES%%lib/ImageMagick/modules/coders/txt.la
+%%MODULES%%lib/ImageMagick/modules/coders/txt.so
+%%MODULES%%lib/ImageMagick/modules/coders/uil.la
+%%MODULES%%lib/ImageMagick/modules/coders/uil.so
+%%MODULES%%lib/ImageMagick/modules/coders/url.la
+%%MODULES%%lib/ImageMagick/modules/coders/url.so
+%%MODULES%%lib/ImageMagick/modules/coders/uyvy.la
+%%MODULES%%lib/ImageMagick/modules/coders/uyvy.so
+%%MODULES%%lib/ImageMagick/modules/coders/vicar.la
+%%MODULES%%lib/ImageMagick/modules/coders/vicar.so
+%%MODULES%%lib/ImageMagick/modules/coders/vid.la
+%%MODULES%%lib/ImageMagick/modules/coders/vid.so
+%%MODULES%%lib/ImageMagick/modules/coders/viff.la
+%%MODULES%%lib/ImageMagick/modules/coders/viff.so
+%%MODULES%%lib/ImageMagick/modules/coders/wbmp.la
+%%MODULES%%lib/ImageMagick/modules/coders/wbmp.so
+%%MODULES%%lib/ImageMagick/modules/coders/wmf.la
+%%MODULES%%lib/ImageMagick/modules/coders/wmf.so
+%%MODULES%%lib/ImageMagick/modules/coders/wpg.la
+%%MODULES%%lib/ImageMagick/modules/coders/wpg.so
+%%MODULES%%lib/ImageMagick/modules/coders/x.la
+%%MODULES%%lib/ImageMagick/modules/coders/x.so
+%%MODULES%%lib/ImageMagick/modules/coders/xbm.la
+%%MODULES%%lib/ImageMagick/modules/coders/xbm.so
+%%MODULES%%lib/ImageMagick/modules/coders/xc.la
+%%MODULES%%lib/ImageMagick/modules/coders/xc.so
+%%MODULES%%lib/ImageMagick/modules/coders/xpm.la
+%%MODULES%%lib/ImageMagick/modules/coders/xpm.so
+%%MODULES%%lib/ImageMagick/modules/coders/xwd.la
+%%MODULES%%lib/ImageMagick/modules/coders/xwd.so
+%%MODULES%%lib/ImageMagick/modules/coders/yuv.la
+%%MODULES%%lib/ImageMagick/modules/coders/yuv.so
 lib/libMagick++.a
 lib/libMagick++.la
 lib/libMagick++.so
@@ -325,8 +325,8 @@ share/ImageMagick/www/tools.html
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image/Magick
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Image
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Image
-@dirrm lib/ImageMagick/modules/coders
-@dirrm lib/ImageMagick/modules
+%%MODULES%%@dirrm lib/ImageMagick/modules/coders
+%%MODULES%%@dirrm lib/ImageMagick/modules
 @dirrm lib/ImageMagick
 @dirrm include/magick
 @dirrm include/Magick++