diff options
154 files changed, 437 insertions, 439 deletions
@@ -10624,3 +10624,4 @@ science/mei|science/code_saturne|2018-11-04|Code_Saturne merged bft, ecs, fvm, m x11-wm/cde|x11/cde|2018-11-03|Recategorise misc/rumprun||2018-11-06|Has expired: "fails with current compilers" security/ossec-hids-client|security/ossec-hids-agent|2018-10-29|Agent is the name used in documentation +graphics/ImageMagick|graphics/ImageMagick6|2018-11-10|Port renamed diff --git a/audio/beets/Makefile b/audio/beets/Makefile index 8176edb56a3d..e78a73eaa18f 100644 --- a/audio/beets/Makefile +++ b/audio/beets/Makefile @@ -76,7 +76,7 @@ EMBYUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_ FETCHART_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} FFMPEG_RUN_DEPENDS= ffmpeg>=2:multimedia/ffmpeg GMUSIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmusicapi>=0:audio/py-gmusicapi@${PY_FLAVOR} -IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick +IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick6 IPFS_RUN_DEPENDS= ipfs-go:sysutils/ipfs-go KODIUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} LASTFM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylast>=0:audio/py-pylast@${PY_FLAVOR} diff --git a/audio/kwave/Makefile b/audio/kwave/Makefile index 0fbc47490ec4..f38a4f872224 100644 --- a/audio/kwave/Makefile +++ b/audio/kwave/Makefile @@ -7,7 +7,7 @@ CATEGORIES= audio kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Sound editor for KDE -BUILD_DEPENDS= convert:graphics/ImageMagick +BUILD_DEPENDS= convert:graphics/ImageMagick6 LIB_DEPENDS= libaudiofile.so:audio/libaudiofile \ libFLAC.so:audio/flac \ libfftw3.so:math/fftw3 \ diff --git a/audio/mp3plot/Makefile b/audio/mp3plot/Makefile index a6ef7fbc065d..fb286a1249f9 100644 --- a/audio/mp3plot/Makefile +++ b/audio/mp3plot/Makefile @@ -32,7 +32,7 @@ PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz GD_CONFIGURE_ENABLE= gd GD_LIB_DEPENDS= libgd.so:graphics/gd IMAGEMAGICK_CONFIGURE_ENABLE= magick -IMAGEMAGICK_LIB_DEPENDS=libMagick++-6.so:graphics/ImageMagick +IMAGEMAGICK_LIB_DEPENDS=libMagick++-6.so:graphics/ImageMagick6 post-patch: @${REINPLACE_CMD} -e '/bldtype_/s|-O2||g; s|^extra_LD.*||g' ${WRKSRC}/configure diff --git a/comms/apitran/Makefile b/comms/apitran/Makefile index dde56df767cc..d30a9c9a1b23 100644 --- a/comms/apitran/Makefile +++ b/comms/apitran/Makefile @@ -2,6 +2,7 @@ PORTNAME= apitran PORTVERSION= g20180926 +PORTREVISION= 1 CATEGORIES= comms astro hamradio python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYNUMPY} \ sox:audio/sox \ - display:graphics/ImageMagick + display:graphics/ImageMagick6 USES= python:run shebangfix USE_GITHUB= yes diff --git a/comms/gscmxx/Makefile b/comms/gscmxx/Makefile index c2573ea8253e..724cc0aab71a 100644 --- a/comms/gscmxx/Makefile +++ b/comms/gscmxx/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= p5-Image-Size>=0:graphics/p5-Image-Size \ BUILD_DEPENDS= p5-Image-Size>=0:graphics/p5-Image-Size \ p5-Gtk-Perl>=0:x11-toolkits/p5-Gtk-Perl \ scmxx:comms/scmxx \ - convert:graphics/ImageMagick + convert:graphics/ImageMagick6 USES= perl5 USE_PERL5= configure diff --git a/databases/opendbviewer/Makefile b/databases/opendbviewer/Makefile index bf12d856caa2..2eca13a9ec36 100644 --- a/databases/opendbviewer/Makefile +++ b/databases/opendbviewer/Makefile @@ -10,7 +10,7 @@ COMMENT= Simple database explorer LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= convert:graphics/ImageMagick +BUILD_DEPENDS= convert:graphics/ImageMagick6 USES= cmake:outsource compiler:c++11-lang qt:5 USE_GITHUB= yes diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile index fac924de17f7..0bb620620af7 100644 --- a/databases/virtuoso/Makefile +++ b/databases/virtuoso/Makefile @@ -68,7 +68,7 @@ check: .if ${PORT_OPTIONS:MIMAGEMAGICK} CONFIGURE_ARGS+=--enable-imagemagick=${LOCALBASE} -LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick +LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick6 PLIST_SUB+= WITH_IMAGEMAGICK="" .else CONFIGURE_ARGS+=--disable-imagemagick diff --git a/deskutils/ljit/Makefile b/deskutils/ljit/Makefile index 0d4ee4195690..babae4ceef48 100644 --- a/deskutils/ljit/Makefile +++ b/deskutils/ljit/Makefile @@ -3,7 +3,7 @@ PORTNAME= ljit PORTVERSION= 0.2.5 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= deskutils MASTER_SITES= http://kir.vtx.ru/ljit/dl/ \ http://freebsd.nsu.ru/distfiles/ @@ -15,7 +15,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcurl.so:ftp/curl -RUN_DEPENDS= convert:graphics/ImageMagick +RUN_DEPENDS= convert:graphics/ImageMagick6 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/deskutils/shutter/Makefile b/deskutils/shutter/Makefile index 56590ded9d06..40bed076d905 100644 --- a/deskutils/shutter/Makefile +++ b/deskutils/shutter/Makefile @@ -3,7 +3,7 @@ PORTNAME= shutter PORTVERSION= 0.93.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils MASTER_SITES= http://shutter-project.org/wp-content/uploads/releases/tars/ @@ -13,7 +13,7 @@ COMMENT= Screenshot tool LICENSE= GPLv3 GPLv2 # the latter for some shipped cursors LICENSE_COMB= multi -RUN_DEPENDS= ImageMagick>=6.9.3.1,1:graphics/ImageMagick \ +RUN_DEPENDS= ImageMagick6>=6.9.3.1,1:graphics/ImageMagick6 \ librsvg2>=2.40.6:graphics/librsvg2 \ p5-File-BaseDir>=0.03:devel/p5-File-BaseDir \ p5-File-Copy-Recursive>=0.38_1:devel/p5-File-Copy-Recursive \ diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile index 3e14f16d52d5..383bc883b48e 100644 --- a/devel/bugzilla44/Makefile +++ b/devel/bugzilla44/Makefile @@ -70,7 +70,7 @@ MAIL_QUEUEING_RUN_DEPENDS= p5-TheSchwartz>=1.10:devel/p5-TheSchwartz \ p5-File-Slurp>=9999.13:devel/p5-File-Slurp MOVE_BUGZ_RUN_DEPENDS= p5-MIME-Tools>=5.406:mail/p5-MIME-Tools \ p5-XML-Twig>=0:textproc/p5-XML-Twig -BMP2PNG_RUN_DEPENDS= convert:graphics/ImageMagick +BMP2PNG_RUN_DEPENDS= convert:graphics/ImageMagick6 # Note: XML-RPC and JSON-RPC are deprecated in favor of REST # and will likely be removed in the Bugzilla 7.0 release. # XXX SOAP::Lite can be removed if upstream officially depends on diff --git a/devel/bugzilla50/Makefile b/devel/bugzilla50/Makefile index c1bc12903fe8..e5b762e78db4 100644 --- a/devel/bugzilla50/Makefile +++ b/devel/bugzilla50/Makefile @@ -71,7 +71,7 @@ MAIL_QUEUEING_RUN_DEPENDS= p5-TheSchwartz>=1.10:devel/p5-TheSchwartz \ p5-Daemon-Generic>=0:net/p5-Daemon-Generic MOVE_BUGZ_RUN_DEPENDS= p5-MIME-Tools>=5.406:mail/p5-MIME-Tools \ p5-XML-Twig>=0:textproc/p5-XML-Twig -BMP2PNG_RUN_DEPENDS= convert:graphics/ImageMagick +BMP2PNG_RUN_DEPENDS= convert:graphics/ImageMagick6 # Note: XML-RPC and JSON-RPC are deprecated in favor of REST # and will likely be removed in the Bugzilla 7.0 release. # XXX SOAP::Lite can be removed if upstream officially depends on diff --git a/devel/p5-Project-Gantt/Makefile b/devel/p5-Project-Gantt/Makefile index 46cfc0ba5129..c64532a0305b 100644 --- a/devel/p5-Project-Gantt/Makefile +++ b/devel/p5-Project-Gantt/Makefile @@ -3,7 +3,7 @@ PORTNAME= Project-Gantt PORTVERSION= 1.03 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -13,7 +13,7 @@ COMMENT= Create Gantt charts to manage project scheduling BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Class-Date>=0:devel/p5-Class-Date \ - convert:graphics/ImageMagick + convert:graphics/ImageMagick6 USES= perl5 USE_PERL5= configure diff --git a/devel/rubygem-paperclip-rails5/Makefile b/devel/rubygem-paperclip-rails5/Makefile index ada68dcf7153..1a4f3737328d 100644 --- a/devel/rubygem-paperclip-rails5/Makefile +++ b/devel/rubygem-paperclip-rails5/Makefile @@ -3,6 +3,7 @@ PORTNAME= paperclip DISTVERSION= 6.1.0 +PORTREVISION= 2 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails5 @@ -32,7 +33,7 @@ IMAGEMAGICK_DESC= ImageMagick image processing support IMNOX11_DESC= Depend on ImageMagick without X11 support IMX11_DESC= Depend on ImageMagick with X11 support -IMNOX11_RUN_DEPENDS= ImageMagick-nox11>0:graphics/ImageMagick-nox11 -IMX11_RUN_DEPENDS= ImageMagick>0:graphics/ImageMagick +IMNOX11_RUN_DEPENDS= ImageMagick6-nox11>0:graphics/ImageMagick6-nox11 +IMX11_RUN_DEPENDS= ImageMagick6>0:graphics/ImageMagick6 .include <bsd.port.mk> diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile index e68a58c4288f..bef92e2784f8 100644 --- a/devel/synfig/Makefile +++ b/devel/synfig/Makefile @@ -3,7 +3,7 @@ PORTNAME= synfig PORTVERSION= 1.2.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel graphics multimedia MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}/source @@ -15,7 +15,7 @@ LICENSE= GPLv2+ BUILD_DEPENDS= etl>=1.2.1:devel/etl LIB_DEPENDS= libHalf.so:graphics/ilmbase \ libIlmImf.so:graphics/openexr \ - libMagickWand-6.so:graphics/ImageMagick \ + libMagickWand-6.so:graphics/ImageMagick6 \ libavcodec.so:multimedia/ffmpeg \ libboost_program_options.so:devel/boost-libs \ libdv.so:multimedia/libdv \ diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 6d4b1803d8b5..c985e2dcb7f0 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= emacs DISTVERSION= ${EMACS_VER}.${EMACS_REV} +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= editors ipv6 PKGNAMESUFFIX= -devel @@ -155,7 +156,7 @@ LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib M17N_CONFIGURE_WITH= m17n-flt M17N_IMPLIES= XFT -MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick +MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6 MAGICK_CONFIGURE_WITH= imagemagick MAILUTILS_CONFIGURE_WITH= mailutils MAILUTILS_CONFIGURE_ENV_OFF= ac_cv_prog_liblockfile=no ac_cv_lib_lockfile_maillock=no diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index d94d8b5a0965..2de1e36bd5f5 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -161,7 +161,7 @@ LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib M17N_CONFIGURE_WITH= m17n-flt M17N_IMPLIES= XFT -MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick +MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6 MAGICK_CONFIGURE_WITH= imagemagick MAILUTILS_CONFIGURE_WITH= mailutils MAILUTILS_CONFIGURE_ENV_OFF= ac_cv_prog_liblockfile=no ac_cv_lib_lockfile_maillock=no diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile index b32e28955c3f..1f1c97720310 100644 --- a/editors/kile-kde4/Makefile +++ b/editors/kile-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= kile PORTVERSION= 2.1.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= editors kde MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${DISTVERSION} PKGNAMESUFFIX= -kde4 @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -RUN_DEPENDS= identify:graphics/ImageMagick +RUN_DEPENDS= identify:graphics/ImageMagick6 USES= cmake gettext-tools kde:4 qt:4 shared-mime-info tar:bzip2 USE_QT= qmake_build moc_build rcc_build uic_build diff --git a/emulators/mgba/Makefile b/emulators/mgba/Makefile index d79d33906668..a85c00281cfb 100644 --- a/emulators/mgba/Makefile +++ b/emulators/mgba/Makefile @@ -2,7 +2,7 @@ PORTNAME= mgba DISTVERSION= 0.6.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= emulators PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -59,8 +59,8 @@ FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg MAGICK_CMAKE_BOOL= USE_MAGICK -MAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick \ - libMagickCore-6.so:graphics/ImageMagick +MAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 \ + libMagickCore-6.so:graphics/ImageMagick6 QT5_CMAKE_BOOL= BUILD_QT QT5_USE= qt=qmake_build,buildtools_build,core,gui,widgets,network,opengl,multimedia diff --git a/games/enigma/Makefile b/games/enigma/Makefile index b1aebd24c123..b5f7b6e595fe 100644 --- a/games/enigma/Makefile +++ b/games/enigma/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libxerces-c.so.3:textproc/xerces-c3 \ libpng.so:graphics/png \ libenet.so:net/enet \ libcurl.so:ftp/curl -BUILD_DEPENDS= convert:graphics/ImageMagick +BUILD_DEPENDS= convert:graphics/ImageMagick6 USES= gmake localbase pkgconfig USE_SDL= image mixer sdl ttf diff --git a/games/openclaw/Makefile b/games/openclaw/Makefile index 1386cd64ea45..73bd6bed8374 100644 --- a/games/openclaw/Makefile +++ b/games/openclaw/Makefile @@ -28,7 +28,7 @@ OPTIONS_DEFAULT= LAUNCHER LAUNCHER_DESC= Install launcher to manage game settings LAUNCHER_USES= mono -LAUNCHER_BUILD_DEPENDS= convert:graphics/ImageMagick +LAUNCHER_BUILD_DEPENDS= convert:graphics/ImageMagick6 LAUNCHER_PLIST_FILES= bin/ClawLauncher.exe bin/clawlauncher LAUNCHER_DESKTOP_ENTRIES= \ "${GH_PROJECT}" \ diff --git a/games/openspades/Makefile b/games/openspades/Makefile index 18e4cb41529d..203b4ac1ce9c 100644 --- a/games/openspades/Makefile +++ b/games/openspades/Makefile @@ -15,7 +15,7 @@ COMMENT= Compatible client of Ace of Spades LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= convert:graphics/ImageMagick # for building icons +BUILD_DEPENDS= convert:graphics/ImageMagick6 # for building icons LIB_DEPENDS= libcurl.so:ftp/curl NOT_FOR_ARCHS= aarch64 powerpc64 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 diff --git a/japanese/mypaedia-fpw-package/Makefile b/japanese/mypaedia-fpw-package/Makefile index cf97adb1c092..b660da89eb6f 100644 --- a/japanese/mypaedia-fpw-package/Makefile +++ b/japanese/mypaedia-fpw-package/Makefile @@ -3,7 +3,7 @@ PORTNAME= mypaedia-fpw-package PORTVERSION= 1.0.7 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= japanese elisp MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/mypaedia/ @@ -13,7 +13,7 @@ COMMENT= Supplement file to use "mypaedia" on lookup RUN_DEPENDS= sox:audio/sox \ timidity:audio/timidity++ \ xanim:multimedia/xanim \ - display:graphics/ImageMagick + display:graphics/ImageMagick6 NO_BUILD= yes PLIST_SUB= PKGNAME=${PKGNAME} diff --git a/japanese/srd-fpw-package/Makefile b/japanese/srd-fpw-package/Makefile index 3ac137c73fae..27e1940385bd 100644 --- a/japanese/srd-fpw-package/Makefile +++ b/japanese/srd-fpw-package/Makefile @@ -3,14 +3,14 @@ PORTNAME= srd-fpw-package PORTVERSION= 1.0.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= japanese elisp MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/srd/ MAINTAINER= ports@FreeBSD.org COMMENT= Supplement file for lookup to use "Random House" -RUN_DEPENDS= display:graphics/ImageMagick +RUN_DEPENDS= display:graphics/ImageMagick6 # Your PC does not have an audio card always. # realplay:multimedia/linux-realplayer diff --git a/mail/libpst/Makefile b/mail/libpst/Makefile index 5d9732c3f09a..35bb33100546 100644 --- a/mail/libpst/Makefile +++ b/mail/libpst/Makefile @@ -28,11 +28,11 @@ USES= gmake iconv libtool pathfix pkgconfig PORTDOCS= * -PST2DII_BUILD_DEPENDS= convert:graphics/ImageMagick +PST2DII_BUILD_DEPENDS= convert:graphics/ImageMagick6 PST2DII_CONFIGURE_OFF= --enable-dii=no PST2DII_CONFIGURE_ON= --enable-dii=yes PST2DII_LIB_DEPENDS= libgd.so:graphics/gd -PST2DII_RUN_DEPENDS= convert:graphics/ImageMagick +PST2DII_RUN_DEPENDS= convert:graphics/ImageMagick6 post-patch: @${GREP} -lr malloc.h ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' diff --git a/mail/openwebmail/Makefile b/mail/openwebmail/Makefile index 0ff2ed66a751..384dde6008aa 100644 --- a/mail/openwebmail/Makefile +++ b/mail/openwebmail/Makefile @@ -42,7 +42,7 @@ LEARNSPAM_DESC= Learn HAM/SPAM LEARNSPAM_IMPLIES= SPAMCHECK LSOF_DESC= lsof LSOF_RUN_DEPENDS= ${LOCALBASE}/sbin/lsof:sysutils/lsof -MAGICK_RUN_DEPENDS= convert:graphics/ImageMagick +MAGICK_RUN_DEPENDS= convert:graphics/ImageMagick6 PAM_DESC= PAM PAM_RUN_DEPENDS= p5-Authen-PAM>=0:security/p5-Authen-PAM POP3_OVER_SSL_DESC= POP3 Over SSL diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile index 13488e07feab..1fd5844e69b6 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -3,7 +3,7 @@ PORTNAME= asymptote PORTVERSION= 2.44 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -17,7 +17,7 @@ LICENSE_COMB= dual ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libsigsegv.so:devel/libsigsegv -RUN_DEPENDS= animate:graphics/ImageMagick \ +RUN_DEPENDS= animate:graphics/ImageMagick6 \ gv:print/gv \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} diff --git a/math/glgraph/Makefile b/math/glgraph/Makefile index c105878c90b7..8510599edef9 100644 --- a/math/glgraph/Makefile +++ b/math/glgraph/Makefile @@ -3,7 +3,7 @@ PORTNAME= glgraph PORTVERSION= 0.2.6 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= math MASTER_SITES= http://glgraph.kaosu.ch/downl/ DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -15,7 +15,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= p5-OpenGL>=0:graphics/p5-OpenGL \ - import:graphics/ImageMagick + import:graphics/ImageMagick6 USES= perl5 shebangfix tar:bzip2 USE_PERL5= run diff --git a/math/gri/Makefile b/math/gri/Makefile index 8f3c0291b0a2..be79f0acad99 100644 --- a/math/gri/Makefile +++ b/math/gri/Makefile @@ -38,7 +38,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES} -BUILD_DEPENDS+= convert:graphics/ImageMagick +BUILD_DEPENDS+= convert:graphics/ImageMagick6 .endif post-patch: diff --git a/math/sage/Makefile b/math/sage/Makefile index ba7b49400652..9b38f4f751d2 100644 --- a/math/sage/Makefile +++ b/math/sage/Makefile @@ -19,7 +19,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING.txt BUILD_DEPENDS= bash:shells/bash \ - convert:graphics/ImageMagick \ + convert:graphics/ImageMagick6 \ ffmpeg:multimedia/ffmpeg \ automake:devel/automake \ autoconf:devel/autoconf diff --git a/misc/gkrellshoot2/Makefile b/misc/gkrellshoot2/Makefile index c61f57b33869..88cb4974dbca 100644 --- a/misc/gkrellshoot2/Makefile +++ b/misc/gkrellshoot2/Makefile @@ -3,7 +3,7 @@ PORTNAME= gkrellshoot PORTVERSION= 0.4.4 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= misc MASTER_SITES= SF/${PORTNAME}/GkrellM2.0%20Port/${PORTVERSION} PKGNAMESUFFIX= 2 @@ -13,7 +13,7 @@ COMMENT= Screen locking and screen capture plugin for GKrellM 2 BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2 RUN_DEPENDS= gkrellm:sysutils/gkrellm2 \ - import:graphics/ImageMagick + import:graphics/ImageMagick6 USES= pkgconfig diff --git a/misc/img2xterm/Makefile b/misc/img2xterm/Makefile index 3aaae5dd0746..a740b8560efe 100644 --- a/misc/img2xterm/Makefile +++ b/misc/img2xterm/Makefile @@ -3,7 +3,7 @@ PORTNAME= img2xterm PORTVERSION= 1.0.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MAINTAINER= arved@FreeBSD.org @@ -12,7 +12,7 @@ COMMENT= Display images on 256 color xterms LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick +LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 USE_GITHUB= yes GH_ACCOUNT= kfei diff --git a/misc/pyobd/Makefile b/misc/pyobd/Makefile index 87b2999ff326..2e09019d4cb3 100644 --- a/misc/pyobd/Makefile +++ b/misc/pyobd/Makefile @@ -12,7 +12,7 @@ COMMENT= OBD-II compliant car diagnostic tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= convert:graphics/ImageMagick +BUILD_DEPENDS= convert:graphics/ImageMagick6 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${PY_FLAVOR} USES= dos2unix gnome python:2.7 shebangfix diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile index 6eac865c4cc2..bd3237a3c418 100644 --- a/multimedia/dvd-slideshow/Makefile +++ b/multimedia/dvd-slideshow/Makefile @@ -4,7 +4,7 @@ PORTNAME= dvd-slideshow PORTVERSION= 0.8.4 DISTVERSIONSUFFIX= -2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}${DISTVERSIONSUFFIX} \ SF/${PORTNAME}/${PORTNAME}-themes/${THEMEVERSION}-1:themes @@ -15,7 +15,7 @@ MAINTAINER= oz@nixil.net COMMENT= Script to create slideshow-style DVD with some simple menus RUN_DEPENDS= bash:shells/bash \ - identify:graphics/ImageMagick \ + identify:graphics/ImageMagick6 \ mpeg2enc:multimedia/mjpegtools \ ffmpeg:multimedia/ffmpeg \ sox:audio/sox \ diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile index 6b6e15b9c8b7..83ef2e106515 100644 --- a/multimedia/dvdauthor/Makefile +++ b/multimedia/dvdauthor/Makefile @@ -37,7 +37,7 @@ VIDEO-FORMAT_DESC= Use default video format NTSC_DESC= Default video format NTSC PAL_DESC= Default video format PAL -IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick +IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 NTSC_CONFIGURE_ON= --enable-default-video-format=NTSC PAL_CONFIGURE_ON= --enable-default-video-format=PAL diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile index 2c3e13cc51d2..1fee140751fe 100644 --- a/multimedia/dvdrip/Makefile +++ b/multimedia/dvdrip/Makefile @@ -3,7 +3,7 @@ PORTNAME= dvdrip PORTVERSION= 0.98.11 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= multimedia MASTER_SITES= CPAN http://www.exit1.org/dvdrip/dist/ MASTER_SITE_SUBDIR= CPAN:JRED @@ -27,7 +27,7 @@ RUN_DEPENDS= p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \ p5-Event-RPC>=0:devel/p5-Event-RPC \ p5-Locale-libintl>=0:devel/p5-Locale-libintl \ cdrdao:sysutils/cdrdao \ - convert:graphics/ImageMagick \ + convert:graphics/ImageMagick6 \ mplayer:multimedia/mplayer \ pstree:sysutils/pstree \ transcode:multimedia/transcode \ diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 24a2ce7fbd95..8e6026d8aed1 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -91,7 +91,7 @@ ESOUND_CONFIGURE_WITH= esound GNOMEVFS2_USE= GNOME=glib20,gconf2,gnomevfs2 GNOMEVFS2_CONFIGURE_ENABLE= gnomevfs IMAGEMAGICK_CONFIGURE_WITH= imagemagick -IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick +IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 IMAGEMAGICK_IMPLIES= DMX_IMAGE IPV6_CONFIGURE_ENABLE= ipv6 JACK_LIB_DEPENDS= libjack.so:audio/jack diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile index f3fc567f7c8b..de0098e5829a 100644 --- a/multimedia/lives/Makefile +++ b/multimedia/lives/Makefile @@ -3,7 +3,7 @@ PORTNAME= lives PORTVERSION= 2.8.7 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MASTER_SITES= http://lives-video.com/releases/ DISTNAME= LiVES-${PORTVERSION} @@ -37,7 +37,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/analyseplugin:audio/ladspa \ mpg123:audio/mpg123 \ sox:audio/sox \ ogg123:audio/vorbis-tools \ - convert:graphics/ImageMagick \ + convert:graphics/ImageMagick6 \ sswf:graphics/sswf \ mencoder:multimedia/mencoder \ mplayer:multimedia/mplayer \ diff --git a/multimedia/py-moviepy/Makefile b/multimedia/py-moviepy/Makefile index 854615182c6d..ed3be74aeb3c 100644 --- a/multimedia/py-moviepy/Makefile +++ b/multimedia/py-moviepy/Makefile @@ -27,7 +27,7 @@ OPTIONS_SINGLE_IMAGEMAGICK= IMAGEMAGICK6 IMAGEMAGICK7 OPTIONS_DEFAULT=IMAGEMAGICK7 IMAGEMAGICK6_DESC= Use ImageMagick 6.x as backend IMAGEMAGICK7_DESC= Use ImageMagick 7.x as backend -IMAGEMAGICK6_RUN_DEPENDS= convert:graphics/ImageMagick +IMAGEMAGICK6_RUN_DEPENDS= convert:graphics/ImageMagick6 IMAGEMAGICK7_RUN_DEPENDS= convert:graphics/ImageMagick7 .include <bsd.port.mk> diff --git a/multimedia/tovid/Makefile b/multimedia/tovid/Makefile index 34ce71ebcb31..f047adabcfb3 100644 --- a/multimedia/tovid/Makefile +++ b/multimedia/tovid/Makefile @@ -4,7 +4,7 @@ PORTNAME= tovid PORTVERSION= 0.35.2 DISTVERSIONPREFIX= tovid- -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia python MAINTAINER= grepper@gmail.com @@ -18,7 +18,7 @@ LIB_DEPENDS= libTix8.4.3.so:x11-toolkits/tix RUN_DEPENDS= mplayer:multimedia/mplayer \ mplex:multimedia/mjpegtools \ ffmpeg:multimedia/ffmpeg \ - composite:graphics/ImageMagick \ + composite:graphics/ImageMagick6 \ dvdauthor:multimedia/dvdauthor \ growisofs:sysutils/dvd+rw-tools \ sox:audio/sox \ diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 014248f8cfd3..8e81900766da 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -96,7 +96,7 @@ SDL_USE= SDL=sdl SDL_CONFIGURE_ENABLE= sdl SDL_CONFIGURE_ENV_ON= SDL_CONFIG="${SDL_CONFIG}" -IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick +IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 IMAGEMAGICK_CONFIGURE_ENABLE= imagemagick IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick-prefix=${LOCALBASE} diff --git a/net-im/pidgin-latex/Makefile b/net-im/pidgin-latex/Makefile index c15e302f1dfd..eefd05c6f520 100644 --- a/net-im/pidgin-latex/Makefile +++ b/net-im/pidgin-latex/Makefile @@ -3,7 +3,7 @@ PORTNAME= latex PORTVERSION= 1.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net-im MASTER_SITES= SF/pidgin-${PORTNAME}/pidgin-${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= pidgin- @@ -14,7 +14,7 @@ COMMENT= Display LaTeX output in your IMs BUILD_DEPENDS= ${LOCALBASE}/include/pidgin/pidgin.h:net-im/pidgin RUN_DEPENDS= pidgin:net-im/pidgin \ - convert:graphics/ImageMagick + convert:graphics/ImageMagick6 WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME} diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index a08b887e3b48..ecf34481e15f 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -3,6 +3,7 @@ PORTNAME= librenms PORTVERSION= 1.45 +PORTREVISION= 1 # RELEASE_TIMESTAMP is used for a patch inside the vendor code # it represents the release date via: git show --pretty='%H|%ct' -s 1.42.01 # It sits here so you remember to update it with each release @@ -55,9 +56,9 @@ NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios NMAP_RUN_DEPENDS= nmap:security/nmap PYPOLLER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${PY_FLAVOR} PYPOLLER_VARS= PY_MYSQL=:2.7 -X11_RUN_DEPENDS= Magick-config:graphics/ImageMagick \ +X11_RUN_DEPENDS= Magick-config:graphics/ImageMagick6 \ mtr:net/mtr -X11_RUN_DEPENDS_OFF= Magick-config:graphics/ImageMagick-nox11 \ +X11_RUN_DEPENDS_OFF= Magick-config:graphics/ImageMagick6-nox11 \ mtr:net/mtr-nox11 WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index f396edc94282..55b64b7a2b6d 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -103,9 +103,9 @@ ALL_MODULES_USE= XORG=x11 OPENLDAP=yes .if ${PORT_OPTIONS:MALL_MODULES} .if ${PORT_OPTIONS:MX11} -LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick +LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick6 .else -LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick-nox11 +LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick6-nox11 .endif .endif diff --git a/net/scapy/Makefile b/net/scapy/Makefile index b827acef0bf5..24aadbbcf80e 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -36,7 +36,7 @@ SOX_DESC= Support for VoIP PYX_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyx/__init__.py:graphics/py-PyX12@${PY_FLAVOR} PYCRYPTO_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Crypto/__init__.py:security/py-pycrypto@${PY_FLAVOR} PYGNUPLOT_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:math/py-gnuplot@${PY_FLAVOR} -GRAPH_RUN_DEPENDS= ${LOCALBASE}/bin/MagickCore-config:graphics/ImageMagick \ +GRAPH_RUN_DEPENDS= ${LOCALBASE}/bin/MagickCore-config:graphics/ImageMagick6 \ ${LOCALBASE}/bin/dot:graphics/graphviz P0F_BASE_RUN_DEPENDS= ${LOCALBASE}/etc/p0f.fp:net-mgmt/p0f QUESO_BASE_RUN_DEPENDS= ${LOCALBASE}/etc/queso.conf.sample:net/queso diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile index b65ebe222824..5ad67929f57c 100644 --- a/net/tigervnc/Makefile +++ b/net/tigervnc/Makefile @@ -78,7 +78,7 @@ CMAKE_ARGS+= -DBUILD_VIEWER=1 LIB_DEPENDS+= libpng.so:graphics/png \ libfltk.so:x11-toolkits/fltk # ImageMagick is required to generate icons during build process -BUILD_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick +BUILD_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 USE_XORG+= xcursor xfixes xft xinerama PLIST_SUB+= VIEWER="" INSTALLS_ICONS= yes diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index 30605e0b1cc8..87a846311a2c 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -54,7 +54,7 @@ BRAILLE_DESC= Braille embosser support BRAILLE_BUILD_DEPENDS= bash:shells/bash BRAILLE_LIB_DEPENDS= liblouis.so:devel/liblouis \ # liblouisutdml.so:devel/liblouisutdml -BRAILLE_RUN_DEPENDS= convert:graphics/ImageMagick \ +BRAILLE_RUN_DEPENDS= convert:graphics/ImageMagick6 \ pdftotext:graphics/poppler-utils \ bash:shells/bash diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile index f0832e2419eb..e4dad35fb5b9 100644 --- a/print/html2ps/Makefile +++ b/print/html2ps/Makefile @@ -3,7 +3,7 @@ PORTNAME= html2ps DISTVERSION= 1.0b7 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= print www perl5 MASTER_SITES= http://user.it.uu.se/~jan/ \ @@ -15,7 +15,7 @@ COMMENT= HTML to PostScript converter LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= mogrify:graphics/ImageMagick \ +RUN_DEPENDS= mogrify:graphics/ImageMagick6 \ p5-libwww>=0:www/p5-libwww \ weblint++:www/weblint++ \ paperconf:print/libpaper diff --git a/print/kpdftool/Makefile b/print/kpdftool/Makefile index bef62e65c473..df8c0dd2de68 100644 --- a/print/kpdftool/Makefile +++ b/print/kpdftool/Makefile @@ -3,7 +3,7 @@ PORTNAME= kpdftool PORTVERSION= 0.23.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= print MASTER_SITES= http://www.kde-apps.org/CONTENT/content-files/ DISTFILES= 33194-${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} @@ -11,7 +11,7 @@ DISTFILES= 33194-${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Simple utility to manipulate PS and PDF files -RUN_DEPENDS= convert:graphics/ImageMagick +RUN_DEPENDS= convert:graphics/ImageMagick6 USE_QT= qt3support moc_build porting_build uic3_build USES= ghostscript:run qmake qt:4 zip diff --git a/print/latex2rtf/Makefile b/print/latex2rtf/Makefile index a7a9e7a5f3f8..15723279a209 100644 --- a/print/latex2rtf/Makefile +++ b/print/latex2rtf/Makefile @@ -17,7 +17,7 @@ OPTIONS_DEFINE= LATEX2PNG LATEX2PNG_DESC= Install latex2png utility OPTIONS_SUB= yes -LATEX2PNG_RUN_DEPENDS= convert:graphics/ImageMagick +LATEX2PNG_RUN_DEPENDS= convert:graphics/ImageMagick6 MAKE_ARGS+= MANDIR=${PREFIX}/man/man1 CFGDIR=${DATADIR}/cfg \ BINDIR=${PREFIX}/bin diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile index e0230164beff..fe73fdbcfed3 100644 --- a/print/lilypond-devel/Makefile +++ b/print/lilypond-devel/Makefile @@ -17,7 +17,7 @@ LICENSE= GPLv3 BUILD_DEPENDS= pdftexi2dvi:print/texinfo \ t1ascii:print/t1utils \ bash:shells/bash \ - convert:graphics/ImageMagick \ + convert:graphics/ImageMagick6 \ dblatex:textproc/dblatex \ fontforge:print/fontforge \ help2man:misc/help2man \ diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 9b0c9b41a3e4..48b0807420dd 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -3,7 +3,7 @@ PORTNAME= lilypond PORTVERSION= 2.18.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= print audio MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/ @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= pdftexi2dvi:print/texinfo \ t1ascii:print/t1utils \ bash:shells/bash \ - convert:graphics/ImageMagick \ + convert:graphics/ImageMagick6 \ dblatex:textproc/dblatex \ fontforge:print/fontforge \ help2man:misc/help2man \ diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile index cc0f4268481c..5e5a50f0ffa0 100644 --- a/print/muttprint/Makefile +++ b/print/muttprint/Makefile @@ -3,7 +3,7 @@ PORTNAME= muttprint PORTVERSION= 0.73 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print mail MASTER_SITES= SF/muttprint/muttprint/muttprint-${PORTVERSION} @@ -46,9 +46,9 @@ PRINT_COMMAND=lpr -P$$PRINTER .endif .if ${PORT_OPTIONS:MX11} -RUN_DEPENDS+= convert:graphics/ImageMagick +RUN_DEPENDS+= convert:graphics/ImageMagick6 .else -RUN_DEPENDS+= convert:graphics/ImageMagick-nox11 +RUN_DEPENDS+= convert:graphics/ImageMagick6-nox11 .endif pre-everything:: diff --git a/print/pdf-redact-tools/Makefile b/print/pdf-redact-tools/Makefile index bfc061f6a248..a633cf2ab979 100644 --- a/print/pdf-redact-tools/Makefile +++ b/print/pdf-redact-tools/Makefile @@ -3,6 +3,7 @@ PORTNAME= pdf-redact-tools PORTVERSION= 0.1.2 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= print @@ -13,7 +14,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool \ - convert:graphics/ImageMagick + convert:graphics/ImageMagick6 USES= python:2.7 USE_GITHUB= yes diff --git a/print/pdf-tools/Makefile b/print/pdf-tools/Makefile index f54b0cf25e3f..75a44f4cf855 100644 --- a/print/pdf-tools/Makefile +++ b/print/pdf-tools/Makefile @@ -4,6 +4,7 @@ PORTNAME= pdf-tools DISTVERSIONPREFIX= v DISTVERSION= 0.80-125 DISTVERSIONSUFFIX= -g213d685 +PORTREVISION= 1 CATEGORIES= print elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} @@ -20,7 +21,7 @@ BUILD_DEPENDS= cask${EMACS_PKGNAMESUFFIX}>0:devel/cask@${EMACS_FLAVOR} \ LIB_DEPENDS= libpng.so:graphics/png \ libpoppler.so:graphics/poppler \ libpoppler-glib.so:graphics/poppler-glib -RUN_DEPENDS= ImageMagick>=6.9.9.28,1:graphics/ImageMagick \ +RUN_DEPENDS= ImageMagick6>=6.9.9.28,1:graphics/ImageMagick6 \ tablist${EMACS_PKGNAMESUFFIX}>=0.70:devel/tablist@${EMACS_FLAVOR} USES= autoreconf:build emacs gettext-runtime gmake diff --git a/print/texvc/Makefile b/print/texvc/Makefile index b0b0fb5dbda8..891846a45267 100644 --- a/print/texvc/Makefile +++ b/print/texvc/Makefile @@ -2,7 +2,7 @@ PORTNAME= texvc PORTVERSION= 20050202 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= print MASTER_SITES= SF/wikipedia/Support%20files/${PORTNAME}%20Linux-x86%20source%20%2B%20binary DISTNAME= ${PORTNAME}-linux-x86-${PORTVERSION} @@ -23,7 +23,7 @@ OPTIONS_DEFAULT:= ${OPTIONS_DEFINE} RASTER_DESC= rasterization support RASTER_USES= ghostscript:run RASTER_USE= TEX=latex,dvipsk -RASTER_RUN_DEPENDS= convert:graphics/ImageMagick +RASTER_RUN_DEPENDS= convert:graphics/ImageMagick6 MAKE_JOBS_UNSAFE= yes diff --git a/science/xcrysden/Makefile b/science/xcrysden/Makefile index bb7d74979587..1fa48b1ce780 100644 --- a/science/xcrysden/Makefile +++ b/science/xcrysden/Makefile @@ -2,7 +2,7 @@ PORTNAME= xcrysden DISTVERSION= 1.5.60 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= science MASTER_SITES= http://www.xcrysden.org/download/ @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfftw3.so:math/fftw3 RUN_DEPENDS= bwidget>0:x11-toolkits/bwidget \ babel:science/openbabel \ - convert:graphics/ImageMagick \ + convert:graphics/ImageMagick6 \ ppmtompeg:graphics/netpbm \ xwd:x11/xwd diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile index 588509dbfd7a..a3dfcb998ce9 100644 --- a/security/libfprint/Makefile +++ b/security/libfprint/Makefile @@ -3,6 +3,7 @@ PORTNAME= libfprint PORTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://people.freedesktop.org/~anarsoul/ @@ -12,7 +13,7 @@ COMMENT= Library for fingerprint reader devices LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick \ +LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6 \ libnss3.so:security/nss \ libnspr4.so:devel/nspr diff --git a/security/p5-GD-SecurityImage/Makefile b/security/p5-GD-SecurityImage/Makefile index 9ca85cec8178..d6afc2743c8d 100644 --- a/security/p5-GD-SecurityImage/Makefile +++ b/security/p5-GD-SecurityImage/Makefile @@ -30,11 +30,11 @@ USE_PERL5= configure .if ${PORT_OPTIONS:MIMAGEMAGICK} .if ${PORT_OPTIONS:MX11} -IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick -IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick +IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 +IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 .else -IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick-nox11 -IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick-nox11 +IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick6-nox11 +IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick6-nox11 .endif .endif diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile index 0229280aa443..a4d091a8dbfb 100644 --- a/sysutils/xvidcap/Makefile +++ b/sysutils/xvidcap/Makefile @@ -3,7 +3,7 @@ PORTNAME= xvidcap PORTVERSION= 1.1.7 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 1 CATEGORIES= sysutils multimedia MASTER_SITES= SF @@ -18,7 +18,7 @@ BUILD_DEPENDS= xml2po:textproc/gnome-doc-utils \ LIB_DEPENDS= libswscale.so:multimedia/ffmpeg \ libdbus-glib-1.so:devel/dbus-glib \ libmp3lame.so:audio/lame -RUN_DEPENDS= animate:graphics/ImageMagick \ +RUN_DEPENDS= animate:graphics/ImageMagick6 \ gimp:graphics/gimp-app GNU_CONFIGURE= yes diff --git a/textproc/docbook2odf/Makefile b/textproc/docbook2odf/Makefile index 155a9386a503..0a9f2f556fb6 100644 --- a/textproc/docbook2odf/Makefile +++ b/textproc/docbook2odf/Makefile @@ -3,6 +3,7 @@ PORTNAME= docbook2odf PORTVERSION= 0.244 +PORTREVISION= 1 CATEGORIES= textproc perl5 MASTER_SITES= http://open.comsultia.com/docbook2odf/dwn/ @@ -13,7 +14,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libsablot.so:textproc/sablotron \ libxslt.so:textproc/libxslt -RUN_DEPENDS= convert:graphics/ImageMagick \ +RUN_DEPENDS= convert:graphics/ImageMagick6 \ zip:archivers/zip \ p5-Archive-Zip>=0:archivers/p5-Archive-Zip diff --git a/textproc/ecromedos/Makefile b/textproc/ecromedos/Makefile index 31da2817394c..e412b4f6fbf3 100644 --- a/textproc/ecromedos/Makefile +++ b/textproc/ecromedos/Makefile @@ -3,7 +3,7 @@ PORTNAME= ecromedos PORTVERSION= 2.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc print www MASTER_SITES= http://www.ecromedos.net/files/src/${PORTVERSION}/ @@ -14,7 +14,7 @@ LICENSE= GPLv2 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>=0:textproc/py-libxml2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}libxslt>=0:textproc/py-libxslt@${PY_FLAVOR} \ - convert:graphics/ImageMagick \ + convert:graphics/ImageMagick6 \ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} NO_BUILD= yes diff --git a/textproc/eqe/Makefile b/textproc/eqe/Makefile index 465ee64d08e5..709be4e0c221 100644 --- a/textproc/eqe/Makefile +++ b/textproc/eqe/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/GPL.txt BUILD_DEPENDS= p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \ p5-File-Slurp>=0:devel/p5-File-Slurp \ p5-Template-Toolkit>=0:www/p5-Template-Toolkit \ - Magick++-config:graphics/ImageMagick + Magick++-config:graphics/ImageMagick6 USES= perl5 shebangfix tar:bzip2 SHEBANG_FILES= src/eqe src/eqedit diff --git a/textproc/pdfsandwich/Makefile b/textproc/pdfsandwich/Makefile index 4f4c274ce6d3..35c8161eb8d3 100644 --- a/textproc/pdfsandwich/Makefile +++ b/textproc/pdfsandwich/Makefile @@ -2,6 +2,7 @@ PORTNAME= pdfsandwich DISTVERSION= 0.1.7 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/pdfsandwich%20${DISTVERSION}/ @@ -12,7 +13,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= gawk:lang/gawk \ ocamlopt:lang/ocaml -RUN_DEPENDS= convert:graphics/ImageMagick \ +RUN_DEPENDS= convert:graphics/ImageMagick6 \ tesseract:graphics/tesseract \ unpaper:graphics/unpaper diff --git a/textproc/tex2im/Makefile b/textproc/tex2im/Makefile index 9815828cdac0..913879c8be09 100644 --- a/textproc/tex2im/Makefile +++ b/textproc/tex2im/Makefile @@ -3,14 +3,14 @@ PORTNAME= tex2im PORTVERSION= 1.8 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= textproc MASTER_SITES= http://www.nought.de/ MAINTAINER= TsurutaniNaoki@gmail.com COMMENT= Converts LaTeX formulas into high resolution pixmap graphics -RUN_DEPENDS= convert:graphics/ImageMagick \ +RUN_DEPENDS= convert:graphics/ImageMagick6 \ bash:shells/bash USE_TEX= latex diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile index 9ad965ec3223..2724d6d0db54 100644 --- a/www/WebMagick/Makefile +++ b/www/WebMagick/Makefile @@ -3,7 +3,7 @@ PORTNAME= WebMagick PORTVERSION= 2.03p29 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www graphics MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl}-beta/${DISTVERSION} @@ -15,7 +15,7 @@ COMMENT= Image Web Generator - recursively build HTMLs, imagemaps, thumbnails LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick +LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6 RUN_DEPENDS= p5-Sort-Naturally>=0:textproc/p5-Sort-Naturally USES= shebangfix perl5 autoreconf diff --git a/www/august/Makefile b/www/august/Makefile index 766018b1ec89..d79f05f17610 100644 --- a/www/august/Makefile +++ b/www/august/Makefile @@ -3,7 +3,7 @@ PORTNAME= august PORTVERSION= 0.63b -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www editors MASTER_SITES= http://www.erjobe.info/mainwiki/pmwiki/uploads/Main/August/ DISTNAME= ${PORTNAME}${PORTVERSION}.src @@ -14,7 +14,7 @@ COMMENT= HTML editor for the experienced Web author LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/license.txt -RUN_DEPENDS= identify:graphics/ImageMagick \ +RUN_DEPENDS= identify:graphics/ImageMagick6 \ weblint:www/weblint USES= tk diff --git a/www/bigbluebutton/Makefile b/www/bigbluebutton/Makefile index ce5cb8bdcb7d..0965a15b4f0a 100644 --- a/www/bigbluebutton/Makefile +++ b/www/bigbluebutton/Makefile @@ -3,7 +3,7 @@ PORTNAME= bigbluebutton PORTVERSION= 0.71 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www java MASTER_SITES= http://bigbluebutton.org/downloads/${PORTVERSION}/ \ http://bigbluebutton.org/downloads/0.70/:2 \ @@ -18,7 +18,7 @@ MAINTAINER= alex.deiter@gmail.com COMMENT= Web conferencing system for distance education BUILD_DEPENDS= ${LOCALBASE}/bin/pdf2swf:graphics/swftools \ - ${LOCALBASE}/bin/convert:graphics/ImageMagick \ + ${LOCALBASE}/bin/convert:graphics/ImageMagick6 \ ${LOCALBASE}/etc/rc.d/activemq:net/activemq \ ${LOCALBASE}/sbin/nginx:www/nginx \ ${LOCALBASE}/etc/rc.d/tomcat6:www/tomcat6 \ diff --git a/www/bins/Makefile b/www/bins/Makefile index 365de223fc30..b39b9cd1b05b 100644 --- a/www/bins/Makefile +++ b/www/bins/Makefile @@ -3,7 +3,7 @@ PORTNAME= bins PORTVERSION= 1.1.29 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= http://download.gna.org/bins/ @@ -12,7 +12,7 @@ COMMENT= Tool to generate HTML photo albums with XML support RUN_DEPENDS= \ p5-HTML-Parser>=0:www/p5-HTML-Parser \ - convert:graphics/ImageMagick \ + convert:graphics/ImageMagick6 \ p5-Text-Iconv>=0:converters/p5-Text-Iconv \ p5-Text-Unaccent>=0:textproc/p5-Text-Unaccent \ p5-TimeDate>=0:devel/p5-TimeDate \ diff --git a/www/coppermine/Makefile b/www/coppermine/Makefile index 399a7f746fa8..d52ea585f01f 100644 --- a/www/coppermine/Makefile +++ b/www/coppermine/Makefile @@ -16,7 +16,7 @@ IGNORE_WITH_PHP= 70 71 72 73 OPTIONS_DEFINE= DOCS IMAGEMAGICK IMAGEMAGICK_DESC= Use ImageMagick instead of PHP GD extension -IMAGEMAGICK_RUN_DEPENDS+= convert:graphics/ImageMagick +IMAGEMAGICK_RUN_DEPENDS+= convert:graphics/ImageMagick6 USE_PHP= mysql pcre ctype USES= php zip diff --git a/www/fgallery/Makefile b/www/fgallery/Makefile index bc80630adff5..1f694f82709a 100644 --- a/www/fgallery/Makefile +++ b/www/fgallery/Makefile @@ -3,7 +3,7 @@ PORTNAME= fgallery PORTVERSION= 1.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www graphics MAINTAINER= ehaupt@FreeBSD.org @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool \ exiftran:graphics/exiftran \ p5-Cpanel-JSON-XS>=0:converters/p5-Cpanel-JSON-XS \ - convert:graphics/ImageMagick + convert:graphics/ImageMagick6 LIB_DEPENDS= liblcms2.so:graphics/lcms2 USE_GITHUB= yes diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile index 2d455233f572..f51a9230d95a 100644 --- a/www/gallery2/Makefile +++ b/www/gallery2/Makefile @@ -3,7 +3,7 @@ PORTNAME= gallery2 PORTVERSION= 2.3.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www MASTER_SITES= SF/gallery/${PORTNAME}/${PORTVERSION} DISTNAME= gallery-${PORTVERSION}-full @@ -33,7 +33,7 @@ FFMPEG_RUN_DEPENDS= ffmpeg:multimedia/ffmpeg GD_RUN_DEPENDS= pngtogd:graphics/gd GD_USE= PHP=gd GRAPHMAGICK_RUN_DEPENDS=gm:graphics/GraphicsMagick -IMAGEMAGICK_RUN_DEPENDS=convert:graphics/ImageMagick +IMAGEMAGICK_RUN_DEPENDS=convert:graphics/ImageMagick6 JHEAD_RUN_DEPENDS= jhead:graphics/jhead MYSQL_USE= PHP=mysqli NETPBM_RUN_DEPENDS= giftopnm:graphics/netpbm diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile index 6b806410a83d..645a9901c647 100644 --- a/www/gallery3/Makefile +++ b/www/gallery3/Makefile @@ -3,7 +3,7 @@ PORTNAME= gallery3 PORTVERSION= 3.0.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www MASTER_SITES= SF/gallery/${PORTNAME}/${PORTVERSION} DISTNAME= gallery-${PORTVERSION} @@ -54,9 +54,9 @@ RUN_DEPENDS+= gm:graphics/GraphicsMagick .if ${PORT_OPTIONS:MIMAGEMAGICK} .if ${PORT_OPTIONS:MX11} -RUN_DEPENDS+= convert:graphics/ImageMagick +RUN_DEPENDS+= convert:graphics/ImageMagick6 .else -RUN_DEPENDS+= convert:graphics/ImageMagick-nox11 +RUN_DEPENDS+= convert:graphics/ImageMagick6-nox11 .endif .endif diff --git a/www/gpx2map/Makefile b/www/gpx2map/Makefile index a817be155c98..85daf57b1115 100644 --- a/www/gpx2map/Makefile +++ b/www/gpx2map/Makefile @@ -31,7 +31,7 @@ OPTIONS_DEFINE= GNUPLOT GNUPLOT_DESC= Enable draw track profiles GNUPLOT_RUN_DEPENDS= p5-Chart-Gnuplot>=0:graphics/p5-Chart-Gnuplot \ - convert:graphics/ImageMagick + convert:graphics/ImageMagick6 post-patch: @${REINPLACE_CMD} -e "s|gpx2map.google.template|${DATADIR}/gpx2map.google.template|" \ diff --git a/www/igal2/Makefile b/www/igal2/Makefile index cf35fc231b5e..b3ad045416b4 100644 --- a/www/igal2/Makefile +++ b/www/igal2/Makefile @@ -3,6 +3,7 @@ PORTNAME= igal2 PORTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= www graphics MASTER_SITES= http://igal.trexler.at/ @@ -12,7 +13,7 @@ COMMENT= Simple CLI image gallery generator LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= convert:graphics/ImageMagick +RUN_DEPENDS= convert:graphics/ImageMagick6 CONFLICTS= igal-1.* USES= perl5 diff --git a/www/ilias/Makefile b/www/ilias/Makefile index e23e34c0d0b2..aedc1ae80959 100644 --- a/www/ilias/Makefile +++ b/www/ilias/Makefile @@ -3,6 +3,7 @@ PORTNAME= ilias PORTVERSION= 5.3.10 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= www @@ -11,7 +12,7 @@ COMMENT= Powerful, dynamic, PHP and MySQL based e-learning platform LICENSE= GPLv2 -RUN_DEPENDS= convert:graphics/ImageMagick \ +RUN_DEPENDS= convert:graphics/ImageMagick6 \ zip:archivers/zip \ ${UNZIP_CMD}:archivers/unzip \ ${LOCALBASE}/share/pear/PEAR.php:devel/pear@${PHP_FLAVOR} \ diff --git a/www/imgsizer/Makefile b/www/imgsizer/Makefile index 7ab3c25fe0fb..68f176da62b6 100644 --- a/www/imgsizer/Makefile +++ b/www/imgsizer/Makefile @@ -3,6 +3,7 @@ PORTNAME= imgsizer PORTVERSION= 2.9 +PORTREVISION= 1 CATEGORIES= www textproc MASTER_SITES= http://www.catb.org/~esr/imgsizer/ @@ -11,7 +12,7 @@ COMMENT= Tool to autogenerate WIDTH and HEIGHT for IMG HTML tags LICENSE= BSD4CLAUSE -RUN_DEPENDS= identify:graphics/ImageMagick +RUN_DEPENDS= identify:graphics/ImageMagick6 USES= jpeg:run python NO_BUILD= yes diff --git a/www/llgal/Makefile b/www/llgal/Makefile index be4b888f5fd3..dd77b7a0abc1 100644 --- a/www/llgal/Makefile +++ b/www/llgal/Makefile @@ -3,6 +3,7 @@ PORTNAME= llgal PORTVERSION= 0.13.18 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://download.gna.org/llgal/ @@ -20,7 +21,7 @@ RUN_DEPENDS= p5-Image-Size>=0:graphics/p5-Image-Size \ p5-URI>=0:net/p5-URI \ p5-Locale-gettext>=0:devel/p5-Locale-gettext \ p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool \ - convert:graphics/ImageMagick + convert:graphics/ImageMagick6 USES= gettext perl5 gmake tar:bzip2 shebangfix SHEBANG_FILES= llgal.in diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index baa26c341a0f..0c66d3b5fdf3 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -268,7 +268,7 @@ SLOWFS_CACHE_MASTER_SITES= http://labs.frickle.com/files/:slowfs_cache SLOWFS_CACHE_DISTFILES= ngx_slowfs_cache-1.10.tar.gz:slowfs_cache SLOWFS_CACHE_CONFIGURE_ON= --add-module=${WRKDIR}/ngx_slowfs_cache-1.10 -SMALL_LIGHT_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick \ +SMALL_LIGHT_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 \ libpcre.so:devel/pcre SMALL_LIGHT_GH_TUPLE= cubicdaiya:ngx_small_light:v0.9.2:small_light SMALL_LIGHT_VARS= DSO_EXTMODS+=small_light diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 973a43d9912c..341ed4a451c9 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -271,7 +271,7 @@ SLOWFS_CACHE_MASTER_SITES= http://labs.frickle.com/files/:slowfs_cache SLOWFS_CACHE_DISTFILES= ngx_slowfs_cache-1.10.tar.gz:slowfs_cache SLOWFS_CACHE_CONFIGURE_ON= --add-module=${WRKDIR}/ngx_slowfs_cache-1.10 -SMALL_LIGHT_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick \ +SMALL_LIGHT_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 \ libpcre.so:devel/pcre SMALL_LIGHT_GH_TUPLE= cubicdaiya:ngx_small_light:v0.9.2:small_light SMALL_LIGHT_VARS= DSO_EXTMODS+=small_light diff --git a/www/p5-jQuery-File-Upload/Makefile b/www/p5-jQuery-File-Upload/Makefile index 06df3b6af8bc..82e81eec97c0 100644 --- a/www/p5-jQuery-File-Upload/Makefile +++ b/www/p5-jQuery-File-Upload/Makefile @@ -2,7 +2,7 @@ PORTNAME= jQuery-File-Upload PORTVERSION= 0.30 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -11,7 +11,7 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= Perl extension for jQuery File Upload plugin RUN_DEPENDS= \ - convert:graphics/ImageMagick \ + convert:graphics/ImageMagick6 \ p5-Data-GUID>0:devel/p5-Data-GUID \ p5-JSON>0:converters/p5-JSON \ p5-JSON-XS>0:converters/p5-JSON-XS \ diff --git a/www/piwigo/Makefile b/www/piwigo/Makefile index be8d5272cf4c..f0036eeb7276 100644 --- a/www/piwigo/Makefile +++ b/www/piwigo/Makefile @@ -3,7 +3,7 @@ PORTNAME= piwigo DISTVERSION= 2.9.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://piwigo.org/download/dlcounter.php?code=${PORTVERSION}&/ @@ -44,9 +44,9 @@ PLIST_SUB+= WWWOWN="${WWWOWN}" \ .if ${PORT_OPTIONS:MIMAGICK} .if ${PORT_OPTIONS:MX11} -RUN_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick +RUN_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 .else -RUN_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick-nox11 +RUN_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick6-nox11 .endif .endif diff --git a/www/serendipity/Makefile b/www/serendipity/Makefile index c024b6a87560..37db7f2daff2 100644 --- a/www/serendipity/Makefile +++ b/www/serendipity/Makefile @@ -3,6 +3,7 @@ PORTNAME= serendipity PORTVERSION= 2.1.4 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF/php-blog/${PORTNAME}/${PORTVERSION} @@ -27,7 +28,7 @@ OPTIONS_DEFAULT= MYSQL MAGICK MYSQL_USE= PHP=mysqli PGSQL_USE= PHP=pgsql SQLITE_USE= PHP=sqlite3 -MAGICK_RUN_DEPENDS+= convert:graphics/ImageMagick +MAGICK_RUN_DEPENDS+= convert:graphics/ImageMagick6 do-install: @-${MKDIR} ${STAGEDIR}${PREFIX}/${SERENDIPITY} diff --git a/www/twiki-MathModePlugin/Makefile b/www/twiki-MathModePlugin/Makefile index 86019df39d23..794b79226e39 100644 --- a/www/twiki-MathModePlugin/Makefile +++ b/www/twiki-MathModePlugin/Makefile @@ -3,12 +3,13 @@ PORTNAME= MathModePlugin SVNREV= 15934 +PORTREVISION= 1 MASTER_SITES= http://protey.ru/freebsd/distfiles/ \ LOCAL/skv COMMENT= Include LaTeX formatted math in your TWiki pages -RUN_DEPENDS= convert:graphics/ImageMagick +RUN_DEPENDS= convert:graphics/ImageMagick6 USE_TEX= base latex diff --git a/www/typo3-8/Makefile b/www/typo3-8/Makefile index b1685bcecf48..39aa53824711 100644 --- a/www/typo3-8/Makefile +++ b/www/typo3-8/Makefile @@ -60,9 +60,9 @@ ZLIB_USE= PHP=zlib .if ${PORT_OPTIONS:MIMAGICK} .if ${PORT_OPTIONS:MX11} -RUN_DEPENDS+= convert:graphics/ImageMagick +RUN_DEPENDS+= convert:graphics/ImageMagick6 .else -RUN_DEPENDS+= convert:graphics/ImageMagick-nox11 +RUN_DEPENDS+= convert:graphics/ImageMagick6-nox11 .endif .endif diff --git a/www/typo3-9/Makefile b/www/typo3-9/Makefile index 69957f6804b7..0d04511f53bc 100644 --- a/www/typo3-9/Makefile +++ b/www/typo3-9/Makefile @@ -67,9 +67,9 @@ ZLIB_USE= PHP=zlib .if ${PORT_OPTIONS:MIMAGICK} .if ${PORT_OPTIONS:MX11} -RUN_DEPENDS+= convert:graphics/ImageMagick +RUN_DEPENDS+= convert:graphics/ImageMagick6 .else -RUN_DEPENDS+= convert:graphics/ImageMagick-nox11 +RUN_DEPENDS+= convert:graphics/ImageMagick6-nox11 .endif .endif diff --git a/x11-themes/cursor-crystal-theme/Makefile b/x11-themes/cursor-crystal-theme/Makefile index 42a3967ddc5f..580df3c88b5a 100644 --- a/x11-themes/cursor-crystal-theme/Makefile +++ b/x11-themes/cursor-crystal-theme/Makefile @@ -14,7 +14,7 @@ COMMENT= KDE Crystal style X cursor theme LICENSE= LGPL21 -BUILD_DEPENDS= convert:graphics/ImageMagick \ +BUILD_DEPENDS= convert:graphics/ImageMagick6 \ xcursorgen:x11/xcursorgen USES= gmake tar:bzip2 diff --git a/x11-themes/icons-tango-extras/Makefile b/x11-themes/icons-tango-extras/Makefile index 62838661568b..bbe8c36dfa93 100644 --- a/x11-themes/icons-tango-extras/Makefile +++ b/x11-themes/icons-tango-extras/Makefile @@ -13,7 +13,7 @@ COMMENT= Extra set of icons from the Tango project BUILD_DEPENDS= ${LOCALBASE}/libexec/icon-name-mapping:x11-themes/icon-naming-utils \ ${LOCALBASE}/share/icons/Tango/16x16/actions/add.png:x11-themes/icons-tango \ - Magick-config:graphics/ImageMagick + Magick-config:graphics/ImageMagick6 RUN_DEPENDS= ${LOCALBASE}/share/icons/Tango/16x16/actions/add.png:x11-themes/icons-tango GNU_CONFIGURE= yes diff --git a/x11-themes/icons-tango/Makefile b/x11-themes/icons-tango/Makefile index 3455168d5723..c262bc2465c3 100644 --- a/x11-themes/icons-tango/Makefile +++ b/x11-themes/icons-tango/Makefile @@ -12,7 +12,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Basic set of icons for the most common usage BUILD_DEPENDS= ${LOCALBASE}/libexec/icon-name-mapping:x11-themes/icon-naming-utils \ - Magick-config:graphics/ImageMagick + Magick-config:graphics/ImageMagick6 GNU_CONFIGURE= yes USE_GNOME= intlhack diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index 998ea2eb8adf..9725435e8faf 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -14,7 +14,7 @@ COMMENT= Highly configurable, next generation framework window manager LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= convert:graphics/ImageMagick \ +BUILD_DEPENDS= convert:graphics/ImageMagick6 \ ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi RUN_DEPENDS= ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi \ bash:shells/bash diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile index e97bbf979ae5..c9d01530b191 100644 --- a/x11-wm/epplets/Makefile +++ b/x11-wm/epplets/Makefile @@ -3,7 +3,7 @@ PORTNAME= epplets PORTVERSION= 0.14 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-wm MASTER_SITES= SF/enlightenment/${PORTNAME}/${PORTVERSION} @@ -13,7 +13,7 @@ COMMENT= Collection of Enlightenment dock applications BUILD_DEPENDS= e16:x11-wm/e16 LIB_DEPENDS= libcdaudio.so:audio/libcdaudio RUN_DEPENDS= e16:x11-wm/e16 \ - import:graphics/ImageMagick + import:graphics/ImageMagick6 USES= gmake libtool pkgconfig USE_XORG= xext diff --git a/x11-wm/fvwm-crystal/Makefile b/x11-wm/fvwm-crystal/Makefile index 4113175409e9..969d0796937e 100644 --- a/x11-wm/fvwm-crystal/Makefile +++ b/x11-wm/fvwm-crystal/Makefile @@ -3,7 +3,7 @@ PORTNAME= fvwm-crystal PORTVERSION= 3.0.6 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-wm MASTER_SITES= http://download.gna.org/fvwm-crystal/${PORTVERSION}/ @@ -32,7 +32,7 @@ SUDO_DESC= Run text-based applications as superuser HSETROOT_DESC= Allow to set desktop wallpaper CMUS_DESC= Play music via audio/cmus player MROX_RUN_DEPENDS= rox:x11-fm/rox-filer -IMAGEMAGICK_RUN_DEPENDS= display:graphics/ImageMagick +IMAGEMAGICK_RUN_DEPENDS= display:graphics/ImageMagick6 XSCREENSAVER_RUN_DEPENDS= xscreensaver:x11/xscreensaver TRAYER_RUN_DEPENDS= trayer:x11/trayer SUDO_RUN_DEPENDS= sudo:security/sudo diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile index f041ec996b59..15576e39ad50 100644 --- a/x11-wm/libwraster/Makefile +++ b/x11-wm/libwraster/Makefile @@ -2,6 +2,7 @@ PORTNAME= libwraster PORTVERSION= 0.95.8 +PORTREVISION= 1 CATEGORIES= x11-wm windowmaker MASTER_SITES= http://windowmaker.org/pub/source/release/ DISTNAME= WindowMaker-${PORTVERSION} @@ -16,7 +17,7 @@ LIB_DEPENDS= libgif.so:graphics/giflib \ libjbig.so:graphics/jbigkit \ libtiff.so:graphics/tiff \ libwebp.so:graphics/webp \ - libMagickWand-6.so:graphics/ImageMagick + libMagickWand-6.so:graphics/ImageMagick6 USES= jpeg libtool localbase pathfix pkgconfig USE_LDCONFIG= yes diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index a940a906f351..c150a3813fb3 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -3,7 +3,7 @@ PORTNAME= windowmaker PORTVERSION= 0.95.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm windowmaker MASTER_SITES= http://windowmaker.org/pub/source/release/ DISTNAME= WindowMaker-${PORTVERSION} @@ -18,7 +18,7 @@ LIB_DEPENDS= libgif.so:graphics/giflib \ libjbig.so:graphics/jbigkit \ libtiff.so:graphics/tiff \ libwebp.so:graphics/webp \ - libMagickWand-6.so:graphics/ImageMagick \ + libMagickWand-6.so:graphics/ImageMagick6 \ libwraster.so.6:x11-wm/libwraster \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index eb22bee882e1..e84c1cd88070 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -134,7 +134,7 @@ CONFIGURE_ARGS+= --enable-customization .endif .if ${PORT_OPTIONS:MMAGICK} -LIB_DEPENDS+= libMagickCore-6.so:graphics/ImageMagick +LIB_DEPENDS+= libMagickCore-6.so:graphics/ImageMagick6 .else CONFIGURE_ARGS+= --without-magick .endif |