summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>2014-01-06 23:17:04 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>2014-01-06 23:17:04 +0000
commit7e29969dacc35ba558f9063683e24ad8341997d6 (patch)
tree65c24c6f0534be16f924674cd4d7b24e17e6c853
parent29d398ff3221bf771f137305b20f85b128d813eb (diff)
downloadfreebsd-ports-7e29969dacc35ba558f9063683e24ad8341997d6.zip
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.
-rw-r--r--graphics/ImageMagick/Makefile4
-rw-r--r--graphics/ImageMagick/pkg-plist6
2 files changed, 8 insertions, 2 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 089f15ffdbb4..c0d307684101 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -62,7 +62,7 @@ OPTIONS_DEFINE= 16BIT_PIXEL BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \
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
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 3ec21d495903..645148bb9cf7 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -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