diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2018-11-10 19:57:07 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2018-11-10 19:57:07 +0000 |
| commit | 289883b11b6d306dfca0bb78c7784880c0944289 (patch) | |
| tree | 0b5ef334a151c39e9372903664b7ca648b9009bb /graphics | |
| parent | Update to Wine 3.20. This includes the following changes: (diff) | |
Update ImageMagick to 6.9.10.14 [1]
* Add PKGNAMESUFFIX and rename the directory. This was done to show
that IM6 is not the "main" version. But still fully supported by upstream.
* Convert a number of options to optionhelpers.
* Add option for ISO/IEC 23008-12:2017 HEIF suport
* Add comment to pkg-descr explaining IM6's "legacy" tag.
* Add comment to the patch-config_policy.xml file why it still needed.
Please note that IM7 is not a drop in replacement due to library API and
command arguments changes. And as a result ports need to decide for themself
which version to use.
Chase these changes in all the ports that using IM6.
PR: 225102 (based on, only the version update) [1]
Submitted by: Pascal Christen <pascal.christen@hostpoint.ch>
Notes
Notes:
svn path=/head/; revision=484640
Diffstat (limited to 'graphics')
59 files changed, 275 insertions, 294 deletions
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo deleted file mode 100644 index 74d70de8092d..000000000000 --- a/graphics/ImageMagick/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1514224543 -SHA256 (ImageMagick-6.9.9-28.tar.xz) = c1df8dcdd9e8fd910b1d3fa85337beebe8eff1664ed0bf05a353a33afed2bfe1 -SIZE (ImageMagick-6.9.9-28.tar.xz) = 8826584 diff --git a/graphics/ImageMagick-nox11/Makefile b/graphics/ImageMagick6-nox11/Makefile index 62e3b72c0444..e3535fe39e7d 100644 --- a/graphics/ImageMagick-nox11/Makefile +++ b/graphics/ImageMagick6-nox11/Makefile @@ -7,6 +7,6 @@ PORTSCOUT= ignore:1 # workaround until bsd.port.mk code can grok the disabling of the X11 option WITHOUT_X11=yes -MASTERDIR= ${.CURDIR}/../ImageMagick +MASTERDIR= ${.CURDIR}/../ImageMagick6 .include "${MASTERDIR}/Makefile" diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick6/Makefile index ae644523066a..d5a2fcb56c73 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick6/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 6.9.9-28 -PORTREVISION= 2 +DISTVERSION= 6.9.10-14 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ @@ -27,6 +26,7 @@ MASTER_SITES= http://www.imagemagick.org/download/ \ ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \ ftp://ftp.is.co.za/pub/imagemagick/ \ ftp://ftp.fifi.org/pub/ImageMagick/ +PKGNAMESUFFIX= 6 MAINTAINER= kwm@FreeBSD.org COMMENT= Image processing tools (legacy version) @@ -48,7 +48,10 @@ CPE_VENDOR= imagemagick SHEBANG_FILES= www/source/examples.pl GNU_CONFIGURE= yes CONFIGURE_ENV= MAKE=${MAKE_CMD} -CONFIGURE_ARGS= --without-dps +CONFIGURE_ARGS= --without-dps \ + --without-flif \ + --without-raqm \ + --without-zstd USE_LDCONFIG= yes USE_GNOME= libxml2 @@ -59,41 +62,119 @@ SAMPLE_FILES= coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \ PLIST_SUB= PORTVERSION=${PORTVERSION:R} +OPTIONS_SUB= yes OPTIONS_DEFINE= BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \ - GRAPHVIZ GSLIB JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \ + GRAPHVIZ GSLIB HEIF JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \ OPENEXR OPENMP PANGO PDF PERL PNG SVG TESTS TIFF WEBP WMF \ THREADS X11 16BIT_PIXEL HDRI RAW OPTIONS_DEFAULT= 16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE \ JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG \ TIFF WEBP WMF THREADS X11 RAW -16BIT_PIXEL_DESC= 16bit pixel support -JPEG2000_DESC= OpenJPEG 2000 support via openjpeg DJVU_DESC= DJVU format support (needs THREADS) GSLIB_DESC= libgs (Postscript SHLIB) support -HDRI_DESC= High dynamic range images support -MODULES_DESC= Modules support -SVG_DESC= SVG vector image format support (via librsvg) TESTS_DESC= Run bundled self-tests after build #SIMD_CONFIGURE_WITH= gcc-arch CONFIGURE_ARGS+= --without-gcc-arch +16BIT_PIXEL_DESC= 16bit pixel support +16BIT_PIXEL_CONFIGURE_OFF=--with-quantum-depth=8 +16BIT_PIXEL_VARS= _QBIT=Q16 +16BIT_PIXEL_VARS_OFF= _QBIT=Q8 +PLIST_SUB+= QBIT=${_QBIT} + +# Produce BZip compressed MIFF images +BZIP2_DESC= bzip2 compressed MIFF images +BZIP2_CONFIGURE_WITH= bzlib + +FFTW_CONFIGURE_WITH= fftw +FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 + +FONTCONFIG_CONFIGURE_WITH= fontconfig +FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig + +FREETYPE_CONFIGURE_WITH= freetype +FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 + +# FPX (FlashPIX) images +FPX_CONFIGURE_WITH= fpx +FPX_LIB_DEPENDS= libfpx.so:graphics/libfpx + +GRAPHVIZ_CONFIGURE_WITH= gvc +GRAPHVIZ_LIB_DEPENDS= libgvc.so:graphics/graphviz +GRAPHVIZ_CFLAGS= -I${LOCALBASE}/include/graphviz +GRAPHVIZ_LDFLAGS= -L${LOCALBASE}/lib/graphviz + +HEIF_DESC= ISO/IEC 23008-12:2017 HEIF file format support +HEIF_CONFIGURE_WITH= heic +HEIF_LIB_DEPENDS= libheif.so:graphics/libheif + +HDRI_DESC= High dynamic range images support +HDRI_CONFIGURE_ENABLE= hdri +HDRI_VARS= _HDRI=HDRI +HDRI_VARS_OFF= _HDRI="" +PLIST_SUB+= HDRI=${_HDRI} + +# JBIG images (lossless compression for bi-level images) +JBIG_CONFIGURE_WITH= jbig +JBIG_LIB_DEPENDS= libjbig.so:graphics/jbigkit + +JPEG_CONFIGURE_WITH= jpeg +JPEG_USES= jpeg + +# JPEG2000 images (wavelet-based lossy compression) +JPEG2000_DESC= OpenJPEG 2000 support via openjpeg +JPEG2000_CONFIGURE_WITH=openjp2 +JPEG2000_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg + +LCMS2_CONFIGURE_WITH= lcms +LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 + +LQR_CONFIGURE_WITH= lqr +LQR_LIB_DEPENDS= liblqr-1.so:graphics/liblqr-1 +LQR_USE= gnome=glib20 + +LZMA_CONFIGURE_WITH= lzma + +# Loadable coders, smaller executable, but PerlMagick not really works +# ('make test' there works) +MODULES_DESC= Modules support +MODULES_CONFIGURE_WITH= modules + +PANGO_CONFIGURE_WITH= pango +PANGO_USE= gnome=pango +PANGO_IMPLIES= X11 + +PNG_CONFIGURE_WITH= png +PNG_LIB_DEPENDS= libpng.so:graphics/png + # libraw is by default liked to lcms2, whichs also ends up in IM regardless # of the IM LCMS option. +RAW_DESC= RAW format support (implies the lcms2 option) RAW_CONFIGURE_WITH= raw -RAW_LIB_DEPENDS= libraw_r.so:graphics/libraw \ - liblcms2.so:graphics/lcms2 +RAW_LIB_DEPENDS= libraw_r.so:graphics/libraw +RAW_IMPLIES= LCMS2 -.include <bsd.port.options.mk> +SVG_DESC= SVG vector image format support (via librsvg, implies the x11 option) +SVG_CONFIGURE_WITH= rsvg +SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 +SVG_USE= gnome=cairo,gdkpixbuf2 +SVG_IMPLIES= X11 -.if ${PORT_OPTIONS:MHDRI} -CONFIGURE_ARGS+= --enable-hdri -_HDRI=HDRI -.else -CONFIGURE_ARGS+= --disable-hdri -_HDRI="" -.endif -PLIST_SUB+= HDRI=${_HDRI} +TIFF_CONFIGURE_WITH= tiff +TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff + +WEBP_CONFIGURE_WITH= webp +WEBP_LIB_DEPENDS= libwebp.so:graphics/webp + +X11_CONFIGURE_WITH= x +X11_USE= xorg=ice,sm,x11,xext,xt +X11_VARS= CONFLICTS_INSTALL+="ImageMagick-nox11-6* ImageMagick6-nox11-6*" \ + CONFLICTS+=display-[0-9]* +X11_VARS_OFF= CONFLICTS_INSTALL+="ImageMagick-6* ImageMagick6-6*" \ + PKGNAMESUFFIX=6-nox11 + +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MTHREADS} _IMAGEMAGICK_THREADS=yes @@ -152,29 +233,10 @@ USES+= compiler:openmp CONFIGURE_ARGS+= --disable-openmp .endif -.if ${PORT_OPTIONS:M16BIT_PIXEL} -_QBIT=Q16 -.else -# Faster, but poor quality -CONFIGURE_ARGS+= --with-quantum-depth=8 -_QBIT=Q8 -.endif -PLIST_SUB+= QBIT=${_QBIT} - .if defined(WITH_WINDOWS_FONT_DIR) CONFIGURE_ARGS+= --with-windows-font-dir=${WITH_WINDOWS_FONT_DIR} .endif -# Loadable coders, smaller executable, but PerlMagick not really works -# ('make test' there works) -.if ${PORT_OPTIONS:MMODULES} -CONFIGURE_ARGS+= --with-modules -PLIST_SUB+= MODULES='' -.else -CONFIGURE_ARGS+= --without-modules -PLIST_SUB+= MODULES='@comment ' -.endif - .if ${PORT_OPTIONS:MOPENEXR} . if ${_IMAGEMAGICK_THREADS} == "no" IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG} @@ -199,30 +261,6 @@ CONFIGURE_ARGS+= --without-djvu PLIST_SUB+= DJVU="@comment " .endif -.if ${PORT_OPTIONS:MJPEG} -USES+= jpeg -PLIST_SUB+= JPEG="" -.else -CONFIGURE_ARGS+= --without-jpeg -PLIST_SUB+= JPEG="@comment " -.endif - -.if ${PORT_OPTIONS:MPNG} -LIB_DEPENDS+= libpng.so:graphics/png -PLIST_SUB+= PNG="" -.else -CONFIGURE_ARGS+= --without-png -PLIST_SUB+= PNG="@comment " -.endif - -.if ${PORT_OPTIONS:MTIFF} -LIB_DEPENDS+= libtiff.so:graphics/tiff -PLIST_SUB+= TIFF="" -.else -CONFIGURE_ARGS+= --without-tiff -PLIST_SUB+= TIFF="@comment " -.endif - .if ${PORT_OPTIONS:MGSLIB} CONFIGURE_ARGS+= --with-gslib . if ${PORT_OPTIONS:MX11} @@ -234,102 +272,6 @@ USES+= ghostscript CONFIGURE_ARGS+= --without-gslib .endif -.if ${PORT_OPTIONS:MLQR} -CONFIGURE_ARGS+= --with-lqr -LIB_DEPENDS+= liblqr-1.so:graphics/liblqr-1 -USE_GNOME+= glib20 -.else -CONFIGURE_ARGS+= --without-lqr -.endif - -.if ${PORT_OPTIONS:MFFTW} -CONFIGURE_ARGS+= --with-fftw -LIB_DEPENDS+= libfftw3.so:math/fftw3 -.else -CONFIGURE_ARGS+= --without-fftw -.endif - -# Produce BZip compressed MIFF images -.if empty(PORT_OPTIONS:MBZIP2) -CONFIGURE_ARGS+= --without-bzlib -.endif - -# FPX (FlashPIX) images -.if ${PORT_OPTIONS:MFPX} -LIB_DEPENDS+= libfpx.so:graphics/libfpx -CONFIGURE_ARGS+= --with-fpx -PLIST_SUB+= FPX="" -.else -CONFIGURE_ARGS+= --without-fpx -PLIST_SUB+= FPX="@comment " -.endif - -# JBIG images (lossless compression for bi-level images) -.if ${PORT_OPTIONS:MJBIG} -LIB_DEPENDS+= libjbig.so:graphics/jbigkit -PLIST_SUB+= JBIG="" -.else -CONFIGURE_ARGS+= --without-jbig -PLIST_SUB+= JBIG="@comment " -.endif - -# JPEG2000 images (wavelet-based lossy compression) -.if ${PORT_OPTIONS:MJPEG2000} -LIB_DEPENDS+= libopenjp2.so:graphics/openjpeg -PLIST_SUB+= JPEG2000="" -.else -CONFIGURE_ARGS+= --without-openjp2 -PLIST_SUB+= JPEG2000="@comment " -.endif - -# GraphViz dot graphs -.if ${PORT_OPTIONS:MGRAPHVIZ} -LIB_DEPENDS+= libgvc.so:graphics/graphviz -CFLAGS+= -I${LOCALBASE}/include/graphviz -LDFLAGS+= -L${LOCALBASE}/lib/graphviz -.else -CONFIGURE_ARGS+= --without-gvc -.endif - -# LZMA support -# needs manula override for base system... -.if ! ${PORT_OPTIONS:MLZMA} -CONFIGURE_ARGS+= --without-lzma -.endif - -# LCMS (Little CMS) color management version 2 and 1 (mutually exclusive) -.if ${PORT_OPTIONS:MLCMS2} -LIB_DEPENDS+= liblcms2.so:graphics/lcms2 -.else -CONFIGURE_ARGS+= --without-lcms -.endif - -# Freetype (TrueType Font) support -.if ${PORT_OPTIONS:MFREETYPE} -LIB_DEPENDS+= libfreetype.so:print/freetype2 -CONFIGURE_ARGS+= --with-freetype -.else -CONFIGURE_ARGS+= --without-freetype -.endif - -# Webp support -.if ${PORT_OPTIONS:MWEBP} -LIB_DEPENDS+= libwebp.so:graphics/webp -CONFIGURE_ARGS+= --with-webp -PLIST_SUB+= WEBP="" -.else -CONFIGURE_ARGS+= --without-webp -PLIST_SUB+= WEBP="@comment " -.endif - -# Fontconfig support -.if ${PORT_OPTIONS:MFONTCONFIG} -LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig -CONFIGURE_ARGS+= --with-fontconfig -.else -CONFIGURE_ARGS+= --without-fontconfig -.endif - # WMF (Windows Meta File) images .if ${PORT_OPTIONS:MWMF} . if ${PORT_OPTIONS:MX11} @@ -344,24 +286,6 @@ CONFIGURE_ARGS+= --without-wmf PLIST_SUB+= WMF="@comment " .endif -# SVG (Scalable Vector Graphics) requires both libxml2 and X11 -.if ${PORT_OPTIONS:MSVG} && ${PORT_OPTIONS:MX11} -LIB_DEPENDS+= librsvg-2.so:graphics/librsvg2 -USE_GNOME+= cairo gdkpixbuf2 -CONFIGURE_ARGS+= --with-rsvg -.else -CONFIGURE_ARGS+= --without-rsvg -.endif - -# Pango support -.if ${PORT_OPTIONS:MPANGO} && ${PORT_OPTIONS:MX11} -USE_GNOME+= pango -PLIST_SUB+= PANGO="" -.else -CONFIGURE_ARGS+= --without-pango -PLIST_SUB+= PANGO="@comment " -.endif - # PDF (Adobe Portable Document Format) support .if ${PORT_OPTIONS:MPDF} . if ${PORT_OPTIONS:MX11} @@ -371,19 +295,6 @@ USES+= ghostscript . endif .endif -.if ! ${PORT_OPTIONS:MX11} -CONFIGURE_ARGS+= --without-x -CONFLICTS_INSTALL+= ImageMagick-6* -PLIST_SUB+= X11='@comment ' -PKGNAMESUFFIX= -nox11 -.else -CONFLICTS_INSTALL+= ImageMagick-nox11-6* -CONFLICTS+= display-[0-9]* -CONFIGURE_ARGS+= --with-x -USE_XORG= sm ice x11 xext xt -PLIST_SUB+= X11='' -.endif - .if ${PORT_OPTIONS:MDOCS} INSTALL_TARGET= install-strip install-docDATA install-data-html .else diff --git a/graphics/ImageMagick6/distinfo b/graphics/ImageMagick6/distinfo new file mode 100644 index 000000000000..b0aff23dcfdb --- /dev/null +++ b/graphics/ImageMagick6/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1541454920 +SHA256 (ImageMagick-6.9.10-14.tar.xz) = d123d4ad4e5bf72c51a6f528a2dbbbd4bf4249f25b36045017c9c634db968e6d +SIZE (ImageMagick-6.9.10-14.tar.xz) = 8931552 diff --git a/graphics/ImageMagick/files/patch-config_policy.xml b/graphics/ImageMagick6/files/patch-config_policy.xml index f7af1e22efcb..7fb5b59e3707 100644 --- a/graphics/ImageMagick/files/patch-config_policy.xml +++ b/graphics/ImageMagick6/files/patch-config_policy.xml @@ -1,3 +1,5 @@ +Upstream doesn't disable these by default. + --- config/policy.xml.orig 2017-09-23 12:22:04 UTC +++ config/policy.xml @@ -64,6 +64,11 @@ diff --git a/graphics/ImageMagick/pkg-descr b/graphics/ImageMagick6/pkg-descr index fdcf12cb69ff..30a6719b0608 100644 --- a/graphics/ImageMagick/pkg-descr +++ b/graphics/ImageMagick6/pkg-descr @@ -11,4 +11,10 @@ extremely useful for image manipulation. The optional "display" utility conflicts with the utility of the same name from the misc/display port/package. +While ImageMagick 6 is labeled by upstream as "legacy", this means that +it will only receive bug fixes. New features will only be added in +ImageMagick 7. + +There is currently no plan of stopping support for ImageMagick 6 upstream. + WWW: http://www.ImageMagick.org/ diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick6/pkg-plist index edc2ffa9173f..8b148464b578 100644 --- a/graphics/ImageMagick/pkg-plist +++ b/graphics/ImageMagick6/pkg-plist @@ -126,6 +126,7 @@ include/ImageMagick-6/magick/semaphore.h include/ImageMagick-6/magick/shear.h include/ImageMagick-6/magick/signature.h include/ImageMagick-6/magick/splay-tree.h +include/ImageMagick-6/magick/static.h include/ImageMagick-6/magick/statistic.h include/ImageMagick-6/magick/stream.h include/ImageMagick-6/magick/string_.h @@ -208,8 +209,6 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml %%TIFF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/ept.so %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fax.la %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fax.so -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fd.la -%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fd.so %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fits.la %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fits.so %%FPX%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fpx.la @@ -224,6 +223,8 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/hald.so %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/hdr.la %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/hdr.so +%%HEIF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/heic.la +%%HEIF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/heic.so %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/histogram.la %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/histogram.so %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/hrz.la @@ -422,13 +423,13 @@ lib/libMagick++-6.so.8.0.0 lib/libMagickCore-6.a lib/libMagickCore-6.la lib/libMagickCore-6.so -lib/libMagickCore-6.so.5 -lib/libMagickCore-6.so.5.0.0 +lib/libMagickCore-6.so.6 +lib/libMagickCore-6.so.6.0.0 lib/libMagickWand-6.a lib/libMagickWand-6.la lib/libMagickWand-6.so -lib/libMagickWand-6.so.5 -lib/libMagickWand-6.so.5.0.0 +lib/libMagickWand-6.so.6 +lib/libMagickWand-6.so.6.0.0 %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick.pm %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick/%%QBIT%%%%HDRI%%.pm %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/%%QBIT%%%%HDRI%%.so @@ -1339,65 +1340,115 @@ man/man1/stream.1.gz %%PORTDOCS%%%%DOCSDIR%%-6/www/api/MagickWand/wand_8h.html %%PORTDOCS%%%%DOCSDIR%%-6/www/api/MagickWand/wandtest_8c.html %%PORTDOCS%%%%DOCSDIR%%-6/www/api/animate.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/animate.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/annotate.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/annotate.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/attribute.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/attribute.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/blob.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/blob.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/cache-view.html %%PORTDOCS%%%%DOCSDIR%%-6/www/api/cache.html %%PORTDOCS%%%%DOCSDIR%%-6/www/api/channel.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/channel.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/cipher.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/cipher.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/color.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/color.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/colormap.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/colormap.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/colorspace.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/colorspace.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/compare.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/compare.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/composite.html %%PORTDOCS%%%%DOCSDIR%%-6/www/api/constitute.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/constitute.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/decorate.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/decorate.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/deprecate.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/deprecate.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/display.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/display.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/distort.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/distort.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/draw.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/draw.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/drawing-wand.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/drawing-wand.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/effect.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/effect.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/enhance.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/enhance.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/exception.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/exception.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/feature.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/feature.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/fourier.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/fourier.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/fx.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/fx.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/histogram.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/histogram.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/image-view.html %%PORTDOCS%%%%DOCSDIR%%-6/www/api/image.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/image.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/layer.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/layer.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/list.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/list.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/magick++-classes.html %%PORTDOCS%%%%DOCSDIR%%-6/www/api/magick-deprecate.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/magick-deprecate.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/magick-image.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/magick-image.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/magick-property.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/magick-property.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/magick-wand.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/magick-wand.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/magick.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/magick.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/memory.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/memory.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/mime.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/mime.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/module.html %%PORTDOCS%%%%DOCSDIR%%-6/www/api/mogrify.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/mogrify.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/monitor.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/monitor.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/montage.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/montage.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/morphology.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/morphology.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/paint.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/paint.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/pixel-iterator.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/pixel-iterator.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/pixel-wand.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/pixel-wand.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/profile.html %%PORTDOCS%%%%DOCSDIR%%-6/www/api/property.html %%PORTDOCS%%%%DOCSDIR%%-6/www/api/quantize.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/quantize.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/registry.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/registry.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/resize.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/resize.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/resource.html %%PORTDOCS%%%%DOCSDIR%%-6/www/api/segment.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/segment.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/shear.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/shear.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/signature.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/signature.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/statistic.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/statistic.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/stream.html %%PORTDOCS%%%%DOCSDIR%%-6/www/api/transform.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/transform.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/version.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/api/version.php %%PORTDOCS%%%%DOCSDIR%%-6/www/api/wand-view.html %%PORTDOCS%%%%DOCSDIR%%-6/www/architecture.html %%PORTDOCS%%%%DOCSDIR%%-6/www/assets/magick.css diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index 394bd3adee7e..2bc3ae156947 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -36,7 +36,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libltdl.so:devel/libltdl -CONFLICTS_INSTALL= ImageMagick ImageMagick-nox11 # bin/Magick++-config +# bin/Magick++-config +CONFLICTS_INSTALL= ImageMagick ImageMagick-nox11 ImageMagick6 ImageMagick6-nox11 # This port uses .la files, keep libtool:keepla! (magick/module.c) USES= cpe gettext-runtime gmake gnome libtool:keepla \ diff --git a/graphics/Makefile b/graphics/Makefile index 1c64490224ac..d1894a7d6215 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -9,8 +9,8 @@ SUBDIR += GraphicsMagick SUBDIR += Hermes SUBDIR += IPA - SUBDIR += ImageMagick - SUBDIR += ImageMagick-nox11 + SUBDIR += ImageMagick6 + SUBDIR += ImageMagick6-nox11 SUBDIR += ImageMagick7 SUBDIR += ImageMagick7-nox11 SUBDIR += O2-tools diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile index 1a3727886c1f..8b4db5c47578 100644 --- a/graphics/autotrace/Makefile +++ b/graphics/autotrace/Makefile @@ -3,7 +3,7 @@ PORTNAME= autotrace PORTVERSION= 0.31.1 -PORTREVISION= 31 +PORTREVISION= 32 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/AutoTrace/${PORTVERSION} @@ -28,7 +28,7 @@ OPTIONS_DEFAULT=IMAGEMAGICK PSTOEDIT MING_DESC= Enable swf interface PSTOEDIT_DESC= Convert postscript to other formats -IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick +IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 IMAGEMAGICK_CONFIGURE_OFF= --without-magick MING_LIB_DEPENDS= libming.so:graphics/ming diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile index 21b1c7249c4a..315867357d76 100644 --- a/graphics/aview/Makefile +++ b/graphics/aview/Makefile @@ -3,7 +3,7 @@ PORTNAME= aview DISTVERSION= 1.3.0rc1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SF/aa-project/${PORTNAME}/${DISTVERSION} @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Graphics viewer for viewing netpbm format on console or X using aalib RUN_DEPENDS= anytopnm:graphics/netpbm \ - convert:graphics/ImageMagick + convert:graphics/ImageMagick6 LIB_DEPENDS= libaa.so:graphics/aalib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} diff --git a/graphics/converseen/Makefile b/graphics/converseen/Makefile index 27554c68bb54..ecbd56a0eda5 100644 --- a/graphics/converseen/Makefile +++ b/graphics/converseen/Makefile @@ -3,6 +3,7 @@ PORTNAME= converseen DISTVERSIONPREFIX= v DISTVERSION= 0.9.7 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= fernape@FreeBSD.org @@ -11,7 +12,7 @@ COMMENT= Easy to use graphics conversion utility LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick +LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 USES= cmake:outsource compiler:c++11-lang qt:5 tar:bzip2 USE_QT= core gui network widgets \ diff --git a/graphics/cuneiform/Makefile b/graphics/cuneiform/Makefile index 995fa23efd81..a02ab92a3ea6 100644 --- a/graphics/cuneiform/Makefile +++ b/graphics/cuneiform/Makefile @@ -3,7 +3,7 @@ PORTNAME= cuneiform PORTVERSION= 1.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://launchpadlibrarian.net/69906918/ DISTNAME= ${PORTNAME}-linux-${PORTVERSION} @@ -24,7 +24,7 @@ USE_LDCONFIG= yes OPTIONS_DEFINE= IMAGEMAGICK -IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick +IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 IMAGEMAGICK_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_ImageMagick post-patch: diff --git a/graphics/curator/Makefile b/graphics/curator/Makefile index 4ece00e60ee7..67d3a59581c6 100644 --- a/graphics/curator/Makefile +++ b/graphics/curator/Makefile @@ -3,7 +3,7 @@ PORTNAME= curator PORTVERSION= 2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics www python MASTER_SITES= SF @@ -15,7 +15,7 @@ USE_PYTHON= distutils autoplist concurrent optsuffix PLIST_FILES= man/man1/curator.1.gz -RUN_DEPENDS= convert:graphics/ImageMagick +RUN_DEPENDS= convert:graphics/ImageMagick6 post-install: ${INSTALL_MAN} ${FILESDIR}/curator.1 ${STAGEDIR}${PREFIX}/man/man1/curator.1 diff --git a/graphics/cuttlefish/Makefile b/graphics/cuttlefish/Makefile index 12f442ee0e4a..986ad8a36840 100644 --- a/graphics/cuttlefish/Makefile +++ b/graphics/cuttlefish/Makefile @@ -3,7 +3,7 @@ PORTNAME= cuttlefish PORTVERSION= 1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics geography MASTER_SITES= http://www.caida.org/tools/visualization/cuttlefish/code/ @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Plots diurnal and geographical patterns of supplied data RUN_DEPENDS+= p5-GD>=0:graphics/p5-GD \ - convert:graphics/ImageMagick \ + convert:graphics/ImageMagick6 \ gifsicle:graphics/gifsicle USES= perl5 shebangfix diff --git a/graphics/danpei/Makefile b/graphics/danpei/Makefile index 8be224475fca..1f85395da7ac 100644 --- a/graphics/danpei/Makefile +++ b/graphics/danpei/Makefile @@ -3,7 +3,7 @@ PORTNAME= danpei PORTVERSION= 2.9.7 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= graphics MASTER_SITES= SF @@ -20,7 +20,7 @@ LIB_DEPENDS= libpng.so:graphics/png OPTIONS_DEFINE= IMAGEMAGICK OPTIONS_DEFAULT=IMAGEMAGICK -IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick +IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick6 USES= gettext USE_GNOME= gtk12 gdkpixbuf diff --git a/graphics/dcraw-m/Makefile b/graphics/dcraw-m/Makefile index ac9bbc12c021..a3aae241e660 100644 --- a/graphics/dcraw-m/Makefile +++ b/graphics/dcraw-m/Makefile @@ -3,7 +3,7 @@ PORTNAME= dcraw-m PORTVERSION= 9.22 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MAINTAINER= waitman@waitman.net @@ -13,7 +13,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libjasper.so:graphics/jasper \ liblcms2.so:graphics/lcms2 \ - libMagickWand-6.so:graphics/ImageMagick + libMagickWand-6.so:graphics/ImageMagick6 USE_GITHUB= yes GH_ACCOUNT= waitman diff --git a/graphics/dmtx-utils/Makefile b/graphics/dmtx-utils/Makefile index 43a536e33316..41c64a170b91 100644 --- a/graphics/dmtx-utils/Makefile +++ b/graphics/dmtx-utils/Makefile @@ -3,7 +3,7 @@ PORTNAME= dmtx-utils PORTVERSION= 0.7.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/libdmtx/libdmtx/${PORTVERSION} @@ -13,8 +13,8 @@ COMMENT= Software for reading and writing Data Matrix barcodes LICENSE= LGPL21+ LIB_DEPENDS= libdmtx.so:graphics/libdmtx \ - libMagickWand-6.so:graphics/ImageMagick \ - libMagickCore-6.so:graphics/ImageMagick + libMagickWand-6.so:graphics/ImageMagick6 \ + libMagickCore-6.so:graphics/ImageMagick6 USES= localbase tar:bzip2 pkgconfig GNU_CONFIGURE= yes diff --git a/graphics/embree/Makefile b/graphics/embree/Makefile index 180120787ead..00b56a8b7a1e 100644 --- a/graphics/embree/Makefile +++ b/graphics/embree/Makefile @@ -32,7 +32,7 @@ OPTIONS_DEFAULT= ISPC OPTIONS_SUB= yes IMAGEMAGICK_DESC= BMP, GIF, PNG, TGA, TIFF image formats support -IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick +IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 IMAGEMAGICK_CMAKE_ON= -DEMBREE_TUTORIALS_IMAGE_MAGICK:BOOL=ON ISPC_DESC= ISPC applications support diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile index 97fdd09696fd..2b06ee482377 100644 --- a/graphics/fpc-imagemagick/Makefile +++ b/graphics/fpc-imagemagick/Makefile @@ -1,6 +1,8 @@ # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ +PORTREVISION= 1 + CATEGORIES= graphics lang PKGNAMESUFFIX= -imagemagick @@ -16,6 +18,6 @@ OPTIONS_DEFINE= IMAGEMAGICK IMAGEMAGICK_DESC= Install ImageMagick image proccesing tool OPTIONS_DEFAULT= IMAGEMAGICK -IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick +IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 .include "${MASTERDIR}/Makefile" diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile index 76be15810ab6..8ffbf5d026c2 100644 --- a/graphics/gimp-gmic-plugin/Makefile +++ b/graphics/gimp-gmic-plugin/Makefile @@ -2,7 +2,7 @@ PORTNAME= gmic PORTVERSION= 1.6.9 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= graphics MASTER_SITES= http://gmic.eu/files/source/ PKGNAMEPREFIX= gimp- @@ -15,7 +15,7 @@ COMMENT= GREYC's Magic Image Converter LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick \ libIlmImf.so:graphics/openexr \ libopencv_video.so:graphics/opencv \ - libMagick++-6.so:graphics/ImageMagick \ + libMagick++-6.so:graphics/ImageMagick6 \ libavcodec.so:multimedia/ffmpeg \ libfftw3.so:math/fftw3 \ libgimp-2.0.so:graphics/gimp-app \ diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile index f12ae4165491..af0bb4b1b72c 100644 --- a/graphics/gscan2pdf/Makefile +++ b/graphics/gscan2pdf/Makefile @@ -3,6 +3,7 @@ PORTNAME= gscan2pdf PORTVERSION= 2.1.7 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF @@ -16,7 +17,7 @@ BUILD_DEPENDS= p5-Config-General>=2.40:devel/p5-Config-General \ p5-Locale-gettext>=1.05:devel/p5-Locale-gettext \ p5-Log-Log4perl>0:devel/p5-Log-Log4perl \ p5-Readonly>0:devel/p5-Readonly \ - ImageMagick>0:graphics/ImageMagick \ + ImageMagick6>0:graphics/ImageMagick6 \ p5-Image-Sane>=0.14:graphics/p5-Image-Sane \ p5-Set-IntSpan>=1.10:math/p5-Set-IntSpan \ p5-List-MoreUtils>0:lang/p5-List-MoreUtils \ @@ -32,7 +33,7 @@ RUN_DEPENDS:= p5-Proc-ProcessTable>0:devel/p5-Proc-ProcessTable \ scanimage:graphics/sane-backends \ scanadf:graphics/sane-frontends \ unpaper:graphics/unpaper \ - ImageMagick>0:graphics/ImageMagick \ + ImageMagick6>0:graphics/ImageMagick6 \ p5-HTML-Parser>0:www/p5-HTML-Parser \ p5-Filesys-Df>0.92:sysutils/p5-Filesys-Df \ p5-Data-UUID>=1.220:devel/p5-Data-UUID \ diff --git a/graphics/hdr_tools/Makefile b/graphics/hdr_tools/Makefile index 68403550ece5..78bd2360f71d 100644 --- a/graphics/hdr_tools/Makefile +++ b/graphics/hdr_tools/Makefile @@ -3,7 +3,7 @@ PORTNAME= hdr_tools PORTVERSION= 0.0.2010.11.23 # unspecified by the author, so use the date -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://ttic.uchicago.edu/~cotter/projects/hdr_tools/archives/ \ http://freebsd.nsu.ru/distfiles/ @@ -17,7 +17,7 @@ LICENSE= GPLv3 LIB_DEPENDS= libpopt.so:devel/popt \ libtiff.so:graphics/tiff \ libIlmImf.so:graphics/openexr \ - libMagick++-6.so:graphics/ImageMagick + libMagick++-6.so:graphics/ImageMagick6 USES= compiler:features gmake pkgconfig tar:tgz NO_WRKSUBDIR= yes diff --git a/graphics/imageindex/Makefile b/graphics/imageindex/Makefile index 787d6d2ac962..84cafc300407 100644 --- a/graphics/imageindex/Makefile +++ b/graphics/imageindex/Makefile @@ -3,7 +3,7 @@ PORTNAME= imageindex PORTVERSION= 2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.edwinh.org/imageindex/release/ \ http://www.reynoldsnet.org/imageindex/release/ @@ -11,7 +11,7 @@ MASTER_SITES= http://www.edwinh.org/imageindex/release/ \ MAINTAINER= johnjen@reynoldsnet.org COMMENT= Digital photo gallery tool -RUN_DEPENDS= convert:graphics/ImageMagick \ +RUN_DEPENDS= convert:graphics/ImageMagick6 \ mplayer:multimedia/mplayer \ p5-Image-Info>=0:graphics/p5-Image-Info diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 99ab35dafa9f..1975b70c2b2a 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -3,7 +3,7 @@ PORTNAME= inkscape PORTVERSION= 0.92.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics gnome MASTER_SITES= https://inkscape.org/en/gallery/item/12187/ @@ -28,7 +28,7 @@ LIB_DEPENDS= libpopt.so:devel/popt \ libfreetype.so:print/freetype2 \ libpotrace.so:graphics/libpotrace \ libpng.so:graphics/png \ - libMagick++-6.so:graphics/ImageMagick + libMagick++-6.so:graphics/ImageMagick6 USES= compiler:c++11-lib cmake cpe desktop-file-utils gnome \ iconv:wchar_t jpeg pathfix pkgconfig python:2.7,build \ diff --git a/graphics/instant-meshes/Makefile b/graphics/instant-meshes/Makefile index ad47bbe3cbab..8748b87a4729 100644 --- a/graphics/instant-meshes/Makefile +++ b/graphics/instant-meshes/Makefile @@ -12,7 +12,7 @@ COMMENT= Interactive field-aligned mesh generator LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= convert:graphics/ImageMagick +BUILD_DEPENDS= convert:graphics/ImageMagick6 LIB_DEPENDS= libglfw.so:graphics/glfw \ libtbb.so:devel/tbb RUN_DEPENDS= zenity:x11/zenity diff --git a/graphics/kipi-plugin-videoslideshow/Makefile b/graphics/kipi-plugin-videoslideshow/Makefile index a6b116124ed7..b81a7253b884 100644 --- a/graphics/kipi-plugin-videoslideshow/Makefile +++ b/graphics/kipi-plugin-videoslideshow/Makefile @@ -2,13 +2,13 @@ PORTNAME= kipi-plugin-${KIPI_PLUGIN} PORTVERSION= ${DIGIKAM_VER} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics kde MAINTAINER= kde@FreeBSD.org COMMENT= ${${KIPI_PLUGIN}_DESC} -LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick \ +LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6 \ libQtGLib-2.0.so:multimedia/gstreamer1-qt@qt4 KIPI_PLUGIN= videoslideshow diff --git a/graphics/l2p/Makefile b/graphics/l2p/Makefile index 676881636540..60566653b707 100644 --- a/graphics/l2p/Makefile +++ b/graphics/l2p/Makefile @@ -2,7 +2,7 @@ PORTNAME= l2p PORTVERSION= 1.1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics print perl5 MASTER_SITES= http://static.redsymbol.net/software/l2p/dist/ \ http://nivit.altervista.org/FreeBSD/ports/distfiles/ @@ -10,7 +10,7 @@ MASTER_SITES= http://static.redsymbol.net/software/l2p/dist/ \ MAINTAINER= nivit@FreeBSD.org COMMENT= Create PNG images from LaTeX math expressions -RUN_DEPENDS= convert:graphics/ImageMagick +RUN_DEPENDS= convert:graphics/ImageMagick6 NO_BUILD= yes diff --git a/graphics/libboard/Makefile b/graphics/libboard/Makefile index 9032727c42c9..51b83a299028 100644 --- a/graphics/libboard/Makefile +++ b/graphics/libboard/Makefile @@ -3,7 +3,7 @@ PORTNAME= libboard DISTVERSION= 0.9.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MAINTAINER= thierry@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Vector graphics C++ library LICENSE= LGPL3 -LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick +LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 USES= cmake compiler:c++11-lang localbase diff --git a/graphics/libdmtx/Makefile b/graphics/libdmtx/Makefile index afa1cb482d9b..6a1fcea48c69 100644 --- a/graphics/libdmtx/Makefile +++ b/graphics/libdmtx/Makefile @@ -3,7 +3,7 @@ PORTNAME= libdmtx PORTVERSION= 0.7.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MASTER_SITES= SF @@ -13,7 +13,7 @@ COMMENT= Library for reading and writing Data Matrix barcodes LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick +LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 USES= tar:bzip2 libtool GNU_CONFIGURE= yes diff --git a/graphics/npretty/Makefile b/graphics/npretty/Makefile index e27eebf1ea9f..f7d0f8f32a0b 100644 --- a/graphics/npretty/Makefile +++ b/graphics/npretty/Makefile @@ -4,7 +4,7 @@ PORTNAME= npretty DISTVERSIONPREFIX= n DISTVERSION= 0.9.3-1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= peter@pean.org @@ -14,7 +14,7 @@ LICENSE= GPLv2 RUN_DEPENDS= p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool \ p5-forks>=0:devel/p5-forks -LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick +LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6 USE_GITHUB= yes GH_ACCOUNT= gammy diff --git a/graphics/ocre/Makefile b/graphics/ocre/Makefile index a995d10413a8..da451033c500 100644 --- a/graphics/ocre/Makefile +++ b/graphics/ocre/Makefile @@ -3,6 +3,7 @@ PORTNAME= ocre PORTVERSION= 0.043 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://lem.eui.upm.es/pub/ocre/ DISTNAME= ${PORTNAME}_v${PORTVERSION:S/./_/} @@ -13,7 +14,7 @@ COMMENT= Simple optical character recognition solution LICENSE= GPLv3 LIB_DEPENDS= libaspell.so:textproc/aspell -RUN_DEPENDS= display:graphics/ImageMagick \ +RUN_DEPENDS= display:graphics/ImageMagick6 \ gnuplot:math/gnuplot \ ispell:textproc/aspell-ispell diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile index 9a3a70719e11..c6f330c35a8e 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -3,7 +3,7 @@ PORTNAME= opendx PORTVERSION= 4.4.4 -PORTREVISION= 26 +PORTREVISION= 27 CATEGORIES= graphics math java MASTER_SITES= http://www.sfr-fresh.com/unix/misc/ DISTNAME= dx-${PORTVERSION} @@ -16,7 +16,7 @@ LICENSE_NAME= IBM PUBLIC LICENSE - Open Visualization Data Explorer VERSION 1.0 LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick \ +LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 \ libtiff.so:graphics/tiff \ libcdf.so:science/cdf \ libXp.so:x11/libXp diff --git a/graphics/openfx-arena/Makefile b/graphics/openfx-arena/Makefile index e0f9104ea33f..2b9827e69cf0 100644 --- a/graphics/openfx-arena/Makefile +++ b/graphics/openfx-arena/Makefile @@ -3,7 +3,7 @@ PORTNAME= openfx-arena PORTVERSION= 2.3.14 DISTVERSIONPREFIX= Natron- -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= olivier@FreeBSD.org @@ -19,7 +19,7 @@ LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio \ librevenge-0.0.so:textproc/librevenge \ libpoppler-glib.so:graphics/poppler-glib \ liblcms2.so:graphics/lcms2 \ - libMagick++-6.so:graphics/ImageMagick \ + libMagick++-6.so:graphics/ImageMagick6 \ libzip.so:archivers/libzip \ libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ diff --git a/graphics/optar/Makefile b/graphics/optar/Makefile index 034e82ac58a3..be273ac5e195 100644 --- a/graphics/optar/Makefile +++ b/graphics/optar/Makefile @@ -3,6 +3,7 @@ PORTNAME= optar PORTVERSION= 2015.02.09 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://ronja.twibright.com/ DISTNAME= ${PORTNAME} @@ -15,7 +16,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png -RUN_DEPENDS= convert:graphics/ImageMagick +RUN_DEPENDS= convert:graphics/ImageMagick6 WRKSRC= ${WRKDIR}/optar_dist diff --git a/graphics/p5-CAD-Drawing/Makefile b/graphics/p5-CAD-Drawing/Makefile index 28b6cb64aabc..8dcf229187c6 100644 --- a/graphics/p5-CAD-Drawing/Makefile +++ b/graphics/p5-CAD-Drawing/Makefile @@ -3,7 +3,7 @@ PORTNAME= CAD-Drawing PORTVERSION= 0.26 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -20,7 +20,7 @@ RUN_DEPENDS= p5-CAD-Calc>=0:math/p5-CAD-Calc \ p5-Math-MatrixReal>=0:math/p5-Math-MatrixReal \ p5-Math-Vec>=0:math/p5-Math-Vec \ p5-Stream>=0:devel/p5-Stream \ - convert:graphics/ImageMagick + convert:graphics/ImageMagick6 USES= perl5 USE_PERL5= modbuild diff --git a/graphics/p5-Image-Heatmap/Makefile b/graphics/p5-Image-Heatmap/Makefile index da6c85c8a31e..fa221e8f8cc2 100644 --- a/graphics/p5-Image-Heatmap/Makefile +++ b/graphics/p5-Image-Heatmap/Makefile @@ -3,7 +3,7 @@ PORTNAME= Image-Heatmap PORTVERSION= 0.565 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -14,7 +14,7 @@ COMMENT= Convert geographic coordinates into a graphical heatmap LICENSE= ART20 GPLv1 LICENSE_COMB= dual -RUN_DEPENDS= convert:graphics/ImageMagick +RUN_DEPENDS= convert:graphics/ImageMagick6 WRKSRC= ${WRKDIR}/${PORTNAME} USES= perl5 diff --git a/graphics/p5-Image-Magick-Iterator/Makefile b/graphics/p5-Image-Magick-Iterator/Makefile index 7d00771500bc..ddfc228ac6e9 100644 --- a/graphics/p5-Image-Magick-Iterator/Makefile +++ b/graphics/p5-Image-Magick-Iterator/Makefile @@ -3,7 +3,7 @@ PORTNAME= Image-Magick-Iterator PORTVERSION= 0.01 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -12,7 +12,7 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Sequentially read Image::Magick object from a filehandle BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ImageMagick>=0:graphics/ImageMagick \ +RUN_DEPENDS= ImageMagick6>=0:graphics/ImageMagick6 \ p5-Image-PBMlib>=1.05:graphics/p5-Image-PBMlib NO_ARCH= yes diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile index 69947704b229..5cfe6551c507 100644 --- a/graphics/pecl-imagick/Makefile +++ b/graphics/pecl-imagick/Makefile @@ -3,7 +3,7 @@ PORTNAME= imagick PORTVERSION= 3.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= mm@FreeBSD.org @@ -13,8 +13,8 @@ LICENSE= PHP301 OPTIONS_DEFINE= X11 -X11_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick -X11_LIB_DEPENDS_OFF= libMagickWand-6.so:graphics/ImageMagick-nox11 +X11_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 +X11_LIB_DEPENDS_OFF= libMagickWand-6.so:graphics/ImageMagick6-nox11 USES= php:pecl pkgconfig localbase diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile index d88d31c388f7..ce3c97ace887 100644 --- a/graphics/pfstools/Makefile +++ b/graphics/pfstools/Makefile @@ -56,7 +56,7 @@ OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \ libIex.so:graphics/ilmbase IMAGEMAGICK_CMAKE_BOOL= WITH_ImageMagick -IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick +IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 NETPBM_CMAKE_BOOL= WITH_NetPBM NETPBM_LIB_DEPENDS= libnetpbm.so:graphics/netpbm diff --git a/graphics/php-magickwand/Makefile b/graphics/php-magickwand/Makefile index 32a2517dce72..317930c0895e 100644 --- a/graphics/php-magickwand/Makefile +++ b/graphics/php-magickwand/Makefile @@ -3,7 +3,7 @@ PORTNAME= magickwand PORTVERSION= 1.0.9 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= http://www.magickwand.org/download/php/ PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ DISTNAME= MagickWandForPHP-${PORTVERSION}-2 MAINTAINER= ports@FreeBSD.org COMMENT= PHP extension to manipulate images -LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick +LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 USES= php:ext pkgconfig IGNORE_WITH_PHP= 70 71 72 73 diff --git a/graphics/pqiv/Makefile b/graphics/pqiv/Makefile index 0648559d7b16..0a8cf1048615 100644 --- a/graphics/pqiv/Makefile +++ b/graphics/pqiv/Makefile @@ -54,7 +54,7 @@ SPECTRE_CONFIGURE_WITH= spectre SPECTRE_LIB_DEPENDS= libspectre.so:print/libspectre WAND_CONFIGURE_WITH= wand -WAND_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick +WAND_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 0c5c64d3577e..2621037767cd 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -3,7 +3,7 @@ PORTNAME= pstoedit PORTVERSION= 3.70 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics print MASTER_SITES= SF @@ -33,7 +33,7 @@ EMF_DESC= WMF/EMF support via libEMF EMF_LIB_DEPENDS= libEMF.so:graphics/libemf EMF_CONFIGURE_ON= --with-libemf-include=${LOCALBASE}/include/libEMF EMF_CONFIGURE_OFF= --without-emf -MAGICK_LIB_DEPENDS= libMagick++-*.so:graphics/ImageMagick +MAGICK_LIB_DEPENDS= libMagick++-*.so:graphics/ImageMagick6 MAGICK_CONFIGURE_ON= --with-magick MAGICK_CONFIGURE_OFF= --without-magick MING_DESC= Flash support via Ming diff --git a/graphics/py-sk1/Makefile b/graphics/py-sk1/Makefile index 92d6c2547052..295648933213 100644 --- a/graphics/py-sk1/Makefile +++ b/graphics/py-sk1/Makefile @@ -2,7 +2,7 @@ PORTNAME= sk1 DISTVERSION= g20171127 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,7 +13,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ - libMagickCore-6.so:graphics/ImageMagick + libMagickCore-6.so:graphics/ImageMagick6 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile index 9c1069485f10..5fbb46d00de1 100644 --- a/graphics/py-sorl-thumbnail/Makefile +++ b/graphics/py-sorl-thumbnail/Makefile @@ -33,7 +33,7 @@ DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLA DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" GRAPHICSMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/gm:graphics/GraphicsMagick -IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick +IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR} WAND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Wand>0:graphics/py-wand@${PY_FLAVOR} diff --git a/graphics/py-wand/Makefile b/graphics/py-wand/Makefile index 413909ec6aae..f7221e08176c 100644 --- a/graphics/py-wand/Makefile +++ b/graphics/py-wand/Makefile @@ -2,7 +2,7 @@ PORTNAME= Wand PORTVERSION= 0.4.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +12,7 @@ COMMENT= MagickWand Python binding LICENSE= MIT -LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick +LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 USES= python USE_PYTHON= distutils autoplist diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile index a2577464813d..6d88c24dc912 100644 --- a/graphics/raster3d/Makefile +++ b/graphics/raster3d/Makefile @@ -3,7 +3,7 @@ PORTNAME= raster3d DISTVERSION= 3.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics biology MASTER_SITES= http://skuld.bmsc.washington.edu/${PORTNAME}/ DISTNAME= Raster3D_${DISTVERSION:R}-${DISTVERSION:E} @@ -32,7 +32,7 @@ OPTIONS_DEFINE= IMAGEMAGICK DOCS EXAMPLES OPTIONS_DEFAULT=IMAGEMAGICK OPTIONS_SUB= yes -IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick +IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick6 pre-build: # generation of Makefile.incl has to be separate from 'make all', otherwise the generated Makefile.incl isn't read by 'make all' @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} linux diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile index 54e416e0bc7b..87ee7149691a 100644 --- a/graphics/reallyslick/Makefile +++ b/graphics/reallyslick/Makefile @@ -3,7 +3,7 @@ PORTNAME= reallyslick PORTVERSION= 0.9.1 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= graphics MASTER_SITES= SF/rss-glx/rss-glx/${PORTVERSION} DISTNAME= rss-glx_${PORTVERSION} @@ -11,7 +11,7 @@ DISTNAME= rss-glx_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= OpenGL screensaver collection -LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick \ +LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 \ libGLC.so:graphics/quesoglc USES= compiler gmake pathfix pkgconfig tar:bzip2 libtool diff --git a/graphics/recoverjpeg/Makefile b/graphics/recoverjpeg/Makefile index e5037361bcba..0553e55669d0 100644 --- a/graphics/recoverjpeg/Makefile +++ b/graphics/recoverjpeg/Makefile @@ -3,6 +3,7 @@ PORTNAME= recoverjpeg PORTVERSION= 2.6.3 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://rfc1149.net/download/${PORTNAME}/ \ LOCAL/ehaupt @@ -13,7 +14,7 @@ COMMENT= Recoverjpeg tries to recover JFIF (JPEG) pictures from a peripheral LICENSE= GPLv2 RUN_DEPENDS= exif:graphics/exif \ - identify:graphics/ImageMagick + identify:graphics/ImageMagick6 USES= python shebangfix GNU_CONFIGURE= yes diff --git a/graphics/renrot/Makefile b/graphics/renrot/Makefile index faf1477efd7c..6147655aad5b 100644 --- a/graphics/renrot/Makefile +++ b/graphics/renrot/Makefile @@ -23,7 +23,7 @@ PORTDOCS= AUTHORS README README.russian ChangeLog NEWS TODO OPTIONS_DEFINE= IMAGEMAGICK DOCS IMAGEMAGICK_DESC= Image::Magick Perl module support -IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick +IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick6 post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} diff --git a/graphics/rubygem-mini_magick/Makefile b/graphics/rubygem-mini_magick/Makefile index 30152d70ddba..47369a8caa4c 100644 --- a/graphics/rubygem-mini_magick/Makefile +++ b/graphics/rubygem-mini_magick/Makefile @@ -3,6 +3,7 @@ PORTNAME= mini_magick PORTVERSION= 4.9.2 +PORTREVISION= 1 CATEGORIES= graphics rubygems MASTER_SITES= RG @@ -16,7 +17,7 @@ OPTIONS_DEFINE= X11 OPTIONS_SINGLE= IMAGEMAGICK OPTIONS_SINGLE_IMAGEMAGICK= IMAGEMAGICK6 IMAGEMAGICK7 OPTIONS_DEFAULT=IMAGEMAGICK6 X11 -IMAGEMAGICK6_DESC= Use ImageMagick 6.x (graphics/ImageMagick) +IMAGEMAGICK6_DESC= Use ImageMagick 6.x (graphics/ImageMagick6) IMAGEMAGICK7_DESC= Use ImageMagick 7.x (graphics/ImageMagick7) USES= gem @@ -28,13 +29,13 @@ NO_ARCH= yes .if ${PORT_OPTIONS:MX11} .if ${PORT_OPTIONS:MIMAGEMAGICK6} -RUN_DEPENDS+= convert:graphics/ImageMagick +RUN_DEPENDS+= convert:graphics/ImageMagick6 .else RUN_DEPENDS+= convert:graphics/ImageMagick7 .endif .else .if ${PORT_OPTIONS:MIMAGEMAGICK6} -RUN_DEPENDS+= convert:graphics/ImageMagick-nox11 +RUN_DEPENDS+= convert:graphics/ImageMagick6-nox11 .else RUN_DEPENDS+= convert:graphics/ImageMagick7-nox11 .endif diff --git a/graphics/rubygem-rmagick/Makefile b/graphics/rubygem-rmagick/Makefile index f1c8d7315b73..f5aee40175ba 100644 --- a/graphics/rubygem-rmagick/Makefile +++ b/graphics/rubygem-rmagick/Makefile @@ -2,7 +2,7 @@ PORTNAME= rmagick PORTVERSION= 2.16.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics rubygems MASTER_SITES= RG @@ -17,7 +17,7 @@ OPTIONS_DEFAULT=X11 USE_RUBY= yes USES= gem pkgconfig -X11_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick -X11_LIB_DEPENDS_OFF= libMagickWand-6.so:graphics/ImageMagick-nox11 +X11_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 +X11_LIB_DEPENDS_OFF= libMagickWand-6.so:graphics/ImageMagick6-nox11 .include <bsd.port.mk> diff --git a/graphics/s2tc/Makefile b/graphics/s2tc/Makefile index ea3b6a816682..00b0b4109c7c 100644 --- a/graphics/s2tc/Makefile +++ b/graphics/s2tc/Makefile @@ -3,6 +3,7 @@ PORTNAME= s2tc PORTVERSION= 1.0+20151228 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= dbn@FreeBSD.org @@ -12,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= mesa-libs>=0:graphics/mesa-libs -TEST_DEPENDS= convert:graphics/ImageMagick \ +TEST_DEPENDS= convert:graphics/ImageMagick6 \ nvcompress:graphics/nvidia-texture-tools \ wget:ftp/wget diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile index 8c15a9eb146c..cf394e410c9b 100644 --- a/graphics/synfigstudio/Makefile +++ b/graphics/synfigstudio/Makefile @@ -3,7 +3,7 @@ PORTNAME= synfigstudio PORTVERSION= 1.2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics multimedia MASTER_SITES= SF/synfig/releases/${PORTVERSION}/source @@ -15,7 +15,7 @@ LICENSE= GPLv2+ BUILD_DEPENDS= etl>=0.04.19_1:devel/etl LIB_DEPENDS= libHalf.so:graphics/ilmbase \ libIlmImf.so:graphics/openexr \ - libMagick++-6.so:graphics/ImageMagick \ + libMagick++-6.so:graphics/ImageMagick6 \ libfftw3.so:math/fftw3 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ diff --git a/graphics/timg/Makefile b/graphics/timg/Makefile index be4e840685e7..df953dad39cf 100644 --- a/graphics/timg/Makefile +++ b/graphics/timg/Makefile @@ -3,7 +3,7 @@ PORTNAME= timg PORTVERSION= 0.9.5 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= uzsolt@uzsolt.hu @@ -11,7 +11,7 @@ COMMENT= Terminal Image Viewer LICENSE= GPLv2 -LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick +LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 USE_GITHUB= yes GH_ACCOUNT= hzeller diff --git a/graphics/ttygif/Makefile b/graphics/ttygif/Makefile index 877855d4e834..da188b011f7a 100644 --- a/graphics/ttygif/Makefile +++ b/graphics/ttygif/Makefile @@ -2,6 +2,7 @@ PORTNAME= ttygif PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= olivier@FreeBSD.org @@ -10,7 +11,7 @@ COMMENT= Converts a ttyrec file into animated gif LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= convert:graphics/ImageMagick +RUN_DEPENDS= convert:graphics/ImageMagick6 USE_GITHUB= yes GH_ACCOUNT= icholy diff --git a/graphics/variety/Makefile b/graphics/variety/Makefile index e090299737db..afe55d56ced0 100644 --- a/graphics/variety/Makefile +++ b/graphics/variety/Makefile @@ -3,7 +3,7 @@ PORTNAME= variety PORTVERSION= 0.5.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= https://launchpad.net/variety/trunk/${PORTVERSION}/+download/ \ http://nivit.altervista.org/FreeBSD/ports/distfiles/ @@ -26,7 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${ ${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${PY_FLAVOR} \ - ImageMagick>=6.9.0.4,1:graphics/ImageMagick \ + ImageMagick6>=6.9.0.4,1:graphics/ImageMagick6 \ bash>=4.3.33:shells/bash \ ca_root_nss>=3.17.4:security/ca_root_nss \ coreutils>=8.23:sysutils/coreutils \ diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile index 7f8d3cb4d240..a13c61bbf823 100644 --- a/graphics/xd3d/Makefile +++ b/graphics/xd3d/Makefile @@ -3,7 +3,7 @@ PORTNAME= xd3d PORTVERSION= 8.3.1 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics math MASTER_SITES= http://www.cmap.polytechnique.fr/~jouve/xd3d/ @@ -29,7 +29,7 @@ LICENSE= GPLv2 OPTIONS_DEFINE= DOCS EXAMPLES .if !defined(WITHOUT_IMAGEMAGICK) -RUN_DEPENDS+= convert:graphics/ImageMagick +RUN_DEPENDS+= convert:graphics/ImageMagick6 .endif .if !defined(WITHOUT_GIFSICLE) RUN_DEPENDS+= gifsicle:graphics/gifsicle diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile index ca603afb38f4..70086e06e65d 100644 --- a/graphics/zbar/Makefile +++ b/graphics/zbar/Makefile @@ -3,7 +3,7 @@ PORTNAME= zbar PORTVERSION= 0.10 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics MASTER_SITES= SF @@ -28,7 +28,7 @@ X11_USE= XORG=ice,sm,x11,xau,xcb,xdmcp,xext,xv X11_CONFIGURE_ON= --with-x=yes X11_CONFIGURE_OFF= --with-x=no --without-xshm --without-xv -IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick +IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick=yes IMAGEMAGICK_CONFIGURE_OFF= --with-imagemagick=no |