Date: Sat, 10 Nov 2018 19:57:08 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484640 - in head: . audio/beets audio/kwave audio/mp3plot comms/apitran comms/gscmxx databases/opendbviewer databases/virtuoso deskutils/ljit deskutils/shutter devel/bugzilla44 devel/b... Message-ID: <201811101957.wAAJv8tH038200@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sat Nov 10 19:57:07 2018 New Revision: 484640 URL: https://svnweb.freebsd.org/changeset/ports/484640 Log: Update ImageMagick to 6.9.10.14 [1] * Add PKGNAMESUFFIX and rename the directory. This was done to show that IM6 is not the "main" version. But still fully supported by upstream. * Convert a number of options to optionhelpers. * Add option for ISO/IEC 23008-12:2017 HEIF suport * Add comment to pkg-descr explaining IM6's "legacy" tag. * Add comment to the patch-config_policy.xml file why it still needed. Please note that IM7 is not a drop in replacement due to library API and command arguments changes. And as a result ports need to decide for themself which version to use. Chase these changes in all the ports that using IM6. PR: 225102 (based on, only the version update) [1] Submitted by: Pascal Christen <pascal.christen@hostpoint.ch> Added: head/graphics/ImageMagick6/ - copied from r484639, head/graphics/ImageMagick/ head/graphics/ImageMagick6-nox11/ - copied from r484639, head/graphics/ImageMagick-nox11/ Deleted: head/graphics/ImageMagick/ head/graphics/ImageMagick-nox11/ Modified: head/MOVED head/audio/beets/Makefile head/audio/kwave/Makefile head/audio/mp3plot/Makefile head/comms/apitran/Makefile head/comms/gscmxx/Makefile head/databases/opendbviewer/Makefile head/databases/virtuoso/Makefile head/deskutils/ljit/Makefile head/deskutils/shutter/Makefile head/devel/bugzilla44/Makefile head/devel/bugzilla50/Makefile head/devel/p5-Project-Gantt/Makefile head/devel/rubygem-paperclip-rails5/Makefile head/devel/synfig/Makefile head/editors/emacs-devel/Makefile head/editors/emacs/Makefile head/editors/kile-kde4/Makefile head/emulators/mgba/Makefile head/games/enigma/Makefile head/games/openclaw/Makefile head/games/openspades/Makefile head/graphics/ImageMagick6-nox11/Makefile head/graphics/ImageMagick6/Makefile head/graphics/ImageMagick6/distinfo head/graphics/ImageMagick6/files/patch-config_policy.xml head/graphics/ImageMagick6/pkg-descr head/graphics/ImageMagick6/pkg-plist head/graphics/ImageMagick7/Makefile head/graphics/Makefile head/graphics/autotrace/Makefile head/graphics/aview/Makefile head/graphics/converseen/Makefile head/graphics/cuneiform/Makefile head/graphics/curator/Makefile head/graphics/cuttlefish/Makefile head/graphics/danpei/Makefile head/graphics/dcraw-m/Makefile head/graphics/dmtx-utils/Makefile head/graphics/embree/Makefile head/graphics/fpc-imagemagick/Makefile head/graphics/gimp-gmic-plugin/Makefile head/graphics/gscan2pdf/Makefile head/graphics/hdr_tools/Makefile head/graphics/imageindex/Makefile head/graphics/inkscape/Makefile head/graphics/instant-meshes/Makefile head/graphics/kipi-plugin-videoslideshow/Makefile head/graphics/l2p/Makefile head/graphics/libboard/Makefile head/graphics/libdmtx/Makefile head/graphics/npretty/Makefile head/graphics/ocre/Makefile head/graphics/opendx/Makefile head/graphics/openfx-arena/Makefile head/graphics/optar/Makefile head/graphics/p5-CAD-Drawing/Makefile head/graphics/p5-Image-Heatmap/Makefile head/graphics/p5-Image-Magick-Iterator/Makefile head/graphics/pecl-imagick/Makefile head/graphics/pfstools/Makefile head/graphics/php-magickwand/Makefile head/graphics/pqiv/Makefile head/graphics/pstoedit/Makefile head/graphics/py-sk1/Makefile head/graphics/py-sorl-thumbnail/Makefile head/graphics/py-wand/Makefile head/graphics/raster3d/Makefile head/graphics/reallyslick/Makefile head/graphics/recoverjpeg/Makefile head/graphics/renrot/Makefile head/graphics/rubygem-mini_magick/Makefile head/graphics/rubygem-rmagick/Makefile head/graphics/s2tc/Makefile head/graphics/synfigstudio/Makefile head/graphics/timg/Makefile head/graphics/ttygif/Makefile head/graphics/variety/Makefile head/graphics/xd3d/Makefile head/graphics/zbar/Makefile head/japanese/mypaedia-fpw-package/Makefile head/japanese/srd-fpw-package/Makefile head/mail/libpst/Makefile head/mail/openwebmail/Makefile head/math/asymptote/Makefile head/math/glgraph/Makefile head/math/gri/Makefile head/math/sage/Makefile head/misc/gkrellshoot2/Makefile head/misc/img2xterm/Makefile head/misc/pyobd/Makefile head/multimedia/dvd-slideshow/Makefile head/multimedia/dvdauthor/Makefile head/multimedia/dvdrip/Makefile head/multimedia/libxine/Makefile head/multimedia/lives/Makefile head/multimedia/py-moviepy/Makefile head/multimedia/tovid/Makefile head/multimedia/transcode/Makefile head/net-im/pidgin-latex/Makefile head/net-mgmt/librenms/Makefile head/net/freeswitch/Makefile head/net/scapy/Makefile head/net/tigervnc/Makefile head/print/cups-filters/Makefile head/print/html2ps/Makefile head/print/kpdftool/Makefile head/print/latex2rtf/Makefile head/print/lilypond-devel/Makefile head/print/lilypond/Makefile head/print/muttprint/Makefile head/print/pdf-redact-tools/Makefile head/print/pdf-tools/Makefile head/print/texvc/Makefile head/science/xcrysden/Makefile head/security/libfprint/Makefile head/security/p5-GD-SecurityImage/Makefile head/sysutils/xvidcap/Makefile head/textproc/docbook2odf/Makefile head/textproc/ecromedos/Makefile head/textproc/eqe/Makefile head/textproc/pdfsandwich/Makefile head/textproc/tex2im/Makefile head/www/WebMagick/Makefile head/www/august/Makefile head/www/bigbluebutton/Makefile head/www/bins/Makefile head/www/coppermine/Makefile head/www/fgallery/Makefile head/www/gallery2/Makefile head/www/gallery3/Makefile head/www/gpx2map/Makefile head/www/igal2/Makefile head/www/ilias/Makefile head/www/imgsizer/Makefile head/www/llgal/Makefile head/www/nginx-devel/Makefile.extmod head/www/nginx/Makefile.extmod head/www/p5-jQuery-File-Upload/Makefile head/www/piwigo/Makefile head/www/serendipity/Makefile head/www/twiki-MathModePlugin/Makefile head/www/typo3-8/Makefile head/www/typo3-9/Makefile head/x11-themes/cursor-crystal-theme/Makefile head/x11-themes/icons-tango-extras/Makefile head/x11-themes/icons-tango/Makefile head/x11-wm/awesome/Makefile head/x11-wm/epplets/Makefile head/x11-wm/fvwm-crystal/Makefile head/x11-wm/libwraster/Makefile head/x11-wm/windowmaker/Makefile head/x11/xlockmore/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Sat Nov 10 19:55:37 2018 (r484639) +++ head/MOVED Sat Nov 10 19:57:07 2018 (r484640) @@ -10624,3 +10624,4 @@ science/mei|science/code_saturne|2018-11-04|Code_Satur 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 Modified: head/audio/beets/Makefile ============================================================================== --- head/audio/beets/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/audio/beets/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -76,7 +76,7 @@ EMBYUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}request 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} Modified: head/audio/kwave/Makefile ============================================================================== --- head/audio/kwave/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/audio/kwave/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 \ Modified: head/audio/mp3plot/Makefile ============================================================================== --- head/audio/mp3plot/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/audio/mp3plot/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 Modified: head/comms/apitran/Makefile ============================================================================== --- head/comms/apitran/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/comms/apitran/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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-tool ${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 Modified: head/comms/gscmxx/Makefile ============================================================================== --- head/comms/gscmxx/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/comms/gscmxx/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 Modified: head/databases/opendbviewer/Makefile ============================================================================== --- head/databases/opendbviewer/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/databases/opendbviewer/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 Modified: head/databases/virtuoso/Makefile ============================================================================== --- head/databases/virtuoso/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/databases/virtuoso/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 Modified: head/deskutils/ljit/Makefile ============================================================================== --- head/deskutils/ljit/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/deskutils/ljit/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 Modified: head/deskutils/shutter/Makefile ============================================================================== --- head/deskutils/shutter/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/deskutils/shutter/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 \ Modified: head/devel/bugzilla44/Makefile ============================================================================== --- head/devel/bugzilla44/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/devel/bugzilla44/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -70,7 +70,7 @@ MAIL_QUEUEING_RUN_DEPENDS= p5-TheSchwartz>=1.10:devel/ 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 Modified: head/devel/bugzilla50/Makefile ============================================================================== --- head/devel/bugzilla50/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/devel/bugzilla50/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -71,7 +71,7 @@ MAIL_QUEUEING_RUN_DEPENDS= p5-TheSchwartz>=1.10:devel/ 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 Modified: head/devel/p5-Project-Gantt/Makefile ============================================================================== --- head/devel/p5-Project-Gantt/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/devel/p5-Project-Gantt/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 schedul 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 Modified: head/devel/rubygem-paperclip-rails5/Makefile ============================================================================== --- head/devel/rubygem-paperclip-rails5/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/devel/rubygem-paperclip-rails5/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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> Modified: head/devel/synfig/Makefile ============================================================================== --- head/devel/synfig/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/devel/synfig/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 \ Modified: head/editors/emacs-devel/Makefile ============================================================================== --- head/editors/emacs-devel/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/editors/emacs-devel/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 Modified: head/editors/emacs/Makefile ============================================================================== --- head/editors/emacs/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/editors/emacs/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 Modified: head/editors/kile-kde4/Makefile ============================================================================== --- head/editors/kile-kde4/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/editors/kile-kde4/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 Modified: head/emulators/mgba/Makefile ============================================================================== --- head/emulators/mgba/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/emulators/mgba/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 Modified: head/games/enigma/Makefile ============================================================================== --- head/games/enigma/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/games/enigma/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 Modified: head/games/openclaw/Makefile ============================================================================== --- head/games/openclaw/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/games/openclaw/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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}" \ Modified: head/games/openspades/Makefile ============================================================================== --- head/games/openspades/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/games/openspades/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 Modified: head/graphics/ImageMagick6-nox11/Makefile ============================================================================== --- head/graphics/ImageMagick-nox11/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/graphics/ImageMagick6-nox11/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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" Modified: head/graphics/ImageMagick6/Makefile ============================================================================== --- head/graphics/ImageMagick/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/graphics/ImageMagick6/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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,42 +62,120 @@ SAMPLE_FILES= coder.xml colors.xml delegates.xml log.x 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 _IMAGEMAGICK_THREADS_MSG=with threads @@ -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} @@ -369,19 +293,6 @@ USES+= ghostscript:x11 . else 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} Modified: head/graphics/ImageMagick6/distinfo ============================================================================== --- head/graphics/ImageMagick/distinfo Sat Nov 10 19:55:37 2018 (r484639) +++ head/graphics/ImageMagick6/distinfo Sat Nov 10 19:57:07 2018 (r484640) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514224543 -SHA256 (ImageMagick-6.9.9-28.tar.xz) = c1df8dcdd9e8fd910b1d3fa85337beebe8eff1664ed0bf05a353a33afed2bfe1 -SIZE (ImageMagick-6.9.9-28.tar.xz) = 8826584 +TIMESTAMP = 1541454920 +SHA256 (ImageMagick-6.9.10-14.tar.xz) = d123d4ad4e5bf72c51a6f528a2dbbbd4bf4249f25b36045017c9c634db968e6d +SIZE (ImageMagick-6.9.10-14.tar.xz) = 8931552 Modified: head/graphics/ImageMagick6/files/patch-config_policy.xml ============================================================================== --- head/graphics/ImageMagick/files/patch-config_policy.xml Sat Nov 10 19:55:37 2018 (r484639) +++ head/graphics/ImageMagick6/files/patch-config_policy.xml Sat Nov 10 19:57:07 2018 (r484640) @@ -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 @@ Modified: head/graphics/ImageMagick6/pkg-descr ============================================================================== --- head/graphics/ImageMagick/pkg-descr Sat Nov 10 19:55:37 2018 (r484639) +++ head/graphics/ImageMagick6/pkg-descr Sat Nov 10 19:57:07 2018 (r484640) @@ -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/ Modified: head/graphics/ImageMagick6/pkg-plist ============================================================================== --- head/graphics/ImageMagick/pkg-plist Sat Nov 10 19:55:37 2018 (r484639) +++ head/graphics/ImageMagick6/pkg-plist Sat Nov 10 19:57:07 2018 (r484640) @@ -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% %%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% %%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 Modified: head/graphics/ImageMagick7/Makefile ============================================================================== --- head/graphics/ImageMagick7/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/graphics/ImageMagick7/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 \ Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/graphics/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 Modified: head/graphics/autotrace/Makefile ============================================================================== --- head/graphics/autotrace/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/graphics/autotrace/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 Modified: head/graphics/aview/Makefile ============================================================================== --- head/graphics/aview/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/graphics/aview/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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} Modified: head/graphics/converseen/Makefile ============================================================================== --- head/graphics/converseen/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/graphics/converseen/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 \ Modified: head/graphics/cuneiform/Makefile ============================================================================== --- head/graphics/cuneiform/Makefile Sat Nov 10 19:55:37 2018 (r484639) +++ head/graphics/cuneiform/Makefile Sat Nov 10 19:57:07 2018 (r484640) @@ -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 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811101957.wAAJv8tH038200>