svn commit: r338953 - head/graphics/ImageMagick

[Andrey A. Chernov]

Author: ache
Date: Mon Jan  6 23:17:04 2014
New Revision: 338953
URL: http://svnweb.freebsd.org/changeset/ports/338953

Log:
  Add new PerlMagick files to pkg-plist.
  Move Makefile comment where it belongs.
  Return back PERL option as default one. At least basic PerlMagick
  functions works in my testing.

Modified:
  head/graphics/ImageMagick/Makefile
  head/graphics/ImageMagick/pkg-plist

Modified: head/graphics/ImageMagick/Makefile
==============================================================================
--- head/graphics/ImageMagick/Makefile	Mon Jan  6 23:15:20 2014	(r338952)
+++ head/graphics/ImageMagick/Makefile	Mon Jan  6 23:17:04 2014	(r338953)
@@ -62,7 +62,7 @@ OPTIONS_DEFINE=	16BIT_PIXEL BZIP2 DOCS D
 		OPENEXR OPENMP PANGO PDF PERL PNG SVG TESTS TIFF WEBP WMF \
 		THREADS
 OPTIONS_DEFAULT=	16BIT_PIXEL BZIP2 FFTW FONTCONFIG FPX FREETYPE \
-		JASPER JBIG JPEG LCMS2 LZMA LQR MODULES PDF PNG SVG TIFF \
+		JASPER JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG TIFF \
 		WEBP WMF THREADS
 
 16BIT_PIXEL_DESC=	16bit pixel support
@@ -133,10 +133,10 @@ CONFIGURE_ARGS+=	--enable-openmp
 CONFIGURE_ARGS+=	--disable-openmp
 .endif
 
-# Faster, but poor quality
 .if ${PORT_OPTIONS:M16BIT_PIXEL}
 PLIST_SUB+=		QBIT='Q16'
 .else
+# Faster, but poor quality
 CONFIGURE_ARGS+=	--with-quantum-depth=8
 PLIST_SUB+=		QBIT='Q8'
 .endif

Modified: head/graphics/ImageMagick/pkg-plist
==============================================================================
--- head/graphics/ImageMagick/pkg-plist	Mon Jan  6 23:15:20 2014	(r338952)
+++ head/graphics/ImageMagick/pkg-plist	Mon Jan  6 23:17:04 2014	(r338953)
@@ -427,10 +427,14 @@ libdata/pkgconfig/MagickWand.pc
 libdata/pkgconfig/Wand-6.%%QBIT%%.pc
 libdata/pkgconfig/Wand.pc
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Image/Magick.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Image/Magick/%%QBIT%%.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/.packlist
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.bs
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.so
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/autosplit.ix
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/%%QBIT%%/%%QBIT%%.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/%%QBIT%%/%%QBIT%%.so
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/%%QBIT%%/autosplit.ix
 %%DATADIR%%/english.xml
 %%DATADIR%%/francais.xml
 %%DATADIR%%/locale.xml
@@ -1449,8 +1453,10 @@ libdata/pkgconfig/Wand.pc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/%%QBIT%%
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick
 %%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Image/Magick
 %%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Image
 @dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters
 @dirrmtry lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders