diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-10-30 18:08:16 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-12-11 13:50:53 +0000 |
| commit | 45526ecbeec33dbb87f0b678d4c04988aab9b657 (patch) | |
| tree | b77614b463af0ed929512fcc838ff5cb20c96275 | |
| parent | a148ebec4e0afe980f949de0dea5ef4931cb7e86 (diff) | |
| download | ports-45526ecbeec33dbb87f0b678d4c04988aab9b657.tar.gz ports-45526ecbeec33dbb87f0b678d4c04988aab9b657.zip | |
framework: Add new USES 'magick' for graphics/ImageMagick*
A new USES has been added to depend on ImageMagick.
USES=magick
adds a LIB_DEPENDS on graphics/ImageMagick${IMAGEMAGICK_DEFAULT}.
If a specific version is required, use for example
USES=magick:6 resp. USES=magick:7
If only a build, run or test is required, use for example
USES=magick:build resp. USES=magick:6,build,test
If a dependency on the nox11 flavor is required, use for example
USES=magick:nox11 resp. USES=magick:7,nox11,run,test
See magick.mk for more details on the available flags.
The tree has been completely converted to make use of this.
Approved by: bapt
Differential Revision: https://reviews.freebsd.org/D32754
146 files changed, 343 insertions, 313 deletions
@@ -10,6 +10,29 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20211211: +AUTHOR: tcberner@FreeBSD.org + + A new USES has been added to depend on ImageMagick. + + USES=magick + + adds a LIB_DEPENDS on graphics/ImageMagick${IMAGEMAGICK_DEFAULT}. + + If a specific version is required, use for example + + USES=magick:6 resp. USES=magick:7 + + If only a build, run or test is required, use for example + + USES=magick:build resp. USES=magick:6,build,test + + If a dependency on the nox11 flavor is required, use for example + + USES=magick:nox11 resp. USES=magick:7,nox11,run,test + + See magick.mk for more details on the available flags. + 20211122: AUTHOR: bapt@FreeBSD.org diff --git a/Mk/Scripts/qa.sh b/Mk/Scripts/qa.sh index 9caf01581b47..539fc4a73fdd 100644 --- a/Mk/Scripts/qa.sh +++ b/Mk/Scripts/qa.sh @@ -597,6 +597,15 @@ proxydeps_suggest_uses() { # lua elif expr ${pkg} : "^lang/lua" > /dev/null; then warn "you need USES+=lua" + # magick + elif [ ${pkg} = "graphics/ImageMagick6" ] ; then + warn "you need USES=magick:6" + elif [ ${pkg} = "graphics/ImageMagick6-nox11" ] ; then + warn "you need USES=magick:6,nox11" + elif [ ${pkg} = "graphics/ImageMagick7" ] ; then + warn "you need USES=magick:7" + elif [ ${pkg} = "graphics/ImageMagick7-nox11" ] ; then + warn "you need USES=magick:7,nox11" # motif elif [ ${pkg} = "x11-toolkits/lesstif" -o ${pkg} = "x11-toolkits/open-motif" ]; then warn "you need USES+=motif" diff --git a/Mk/Uses/magick.mk b/Mk/Uses/magick.mk new file mode 100644 index 000000000000..1d44270031ab --- /dev/null +++ b/Mk/Uses/magick.mk @@ -0,0 +1,93 @@ +# Handle dependency on ImageMagick +# +# Feature: magick +# Usage: USES=magick:ARGS +# Valid ARGS: [version],[kinds],[flavor] +# +# version The chooseable versions are <none>, 6 and 7. +# USES=magick -- depend on ${IMAGEMAGICK_DEFAULT} (default) +# USES=magick:6 -- depend on ImageMagick6 +# USES=magick:7 -- depend on ImageMagick7 +# +# flavor The flavors are <none> and nox11 +# USES=magick -- depend on the default flavor (default) +# USES=magick:nox11 -- depend on the nox11 flavor +# +# kinds The dependency kinds are <none>, lib, build, run and test +# USES=magick -- add a LIB_DEPENDS (default) +# USES=magick:lib -- add a LIB_DEPENDS +# USES=magick:build -- add a BUILD_DEPENDS +# USES=magick:run -- add a RUN_DEPENDS +# USES=magick:test -- add a TEST_DEPENDS +# USES=build,run -- add a BUILD_- and RUN_DEPENDS +# +# In short, on a default ports tree +# USES=magick +# is equivalent to +# USES=magick:7,lib +# +# MAINTAINER: tcberner@FreeBSD.org +# + +.if ! defined(_INCLUDE_USES_MAGICK_MK) +_INCLUDE_USES_MAGICK_MK= YES + +#=== Version selection === +_magick_versions= 6 7 + +_magick_version= # +. for _ver in ${_magick_versions:O:u} +. if ${magick_ARGS:M${_ver}} +. if empty(_magick_version) +_magick_version= ${_ver} +. else +IGNORE= Incorrect USES=magick:${magick_ARGS} - multiple versions defined +. endif +. endif +. endfor +# Fallback to the default version +.if empty(_magick_version) +_magick_version= ${IMAGEMAGICK_DEFAULT} +.endif + +#=== Flavor selection === +_magick_flavors= nox11 +_magick_flavor= # +. for _flavor in ${_magick_flavors:O:u} +. if ${magick_ARGS:M${_flavor}} +. if empty(_magick_flavor) +_magick_flavor= -${_flavor} +. else +IGNORE= Incorrect USES=magick:${magick_ARGS} - multiple flavors defined +. endif +. endif +. endfor + +#=== Dependeny selection === +_magick_depends= lib build run test +_magick_depend= # +. for _depend in ${_magick_depends:O:u} +. if ${magick_ARGS:M${_depend}} +_magick_depend+= ${_depend} +. endif +. endfor +.if empty(_magick_depend) +_magick_depend= lib +.endif + +#=== Dependency setup === +_MAGICK_PORT= graphics/ImageMagick${_magick_version}${_magick_flavor} +_MAGICK_LIB= libMagick++-${_magick_version}.so +_MAGICK_PKG= ImageMagick${_magick_version}${_magick_flavor} + +_MAGICK_BUILD_DEPENDS= ${_MAGICK_PKG}>=${_magick_version}:${_MAGICK_PORT} +_MAGICK_LIB_DEPENDS= ${_MAGICK_LIB}:${_MAGICK_PORT} +_MAGICK_RUN_DEPENDS= ${_MAGICK_PKG}>=${_magick_version}:${_MAGICK_PORT} +_MAGICK_TEST_DEPENDS= ${_MAGICK_PKG}>=${_magick_version}:${_MAGICK_PORT} + +#=== Actual dependency creation === +. for _kind in ${_magick_depend} +${_kind:tu}_DEPENDS+= ${_MAGICK_${_kind:tu}_DEPENDS} +. endfor + +.endif diff --git a/audio/beets/Makefile b/audio/beets/Makefile index c6b6fd0961b3..be43c7e2d2b2 100644 --- a/audio/beets/Makefile +++ b/audio/beets/Makefile @@ -68,7 +68,7 @@ DISCOGS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discogs-client>=2.2.1:audio/py-disco EMBYUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} FETCHART_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} FFMPEG_RUN_DEPENDS= ffmpeg>=2:multimedia/ffmpeg -IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick6 +IMAGEMAGICK_USES= magick:6,run 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 a305c8d16369..0d6cf318f4b4 100644 --- a/audio/kwave/Makefile +++ b/audio/kwave/Makefile @@ -5,7 +5,6 @@ CATEGORIES= audio kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= Sound editor for KDE -BUILD_DEPENDS= convert:graphics/ImageMagick6 LIB_DEPENDS= libaudiofile.so:audio/libaudiofile \ libFLAC.so:audio/flac \ libfftw3.so:math/fftw3 \ @@ -17,7 +16,7 @@ LIB_DEPENDS= libaudiofile.so:audio/libaudiofile \ libvorbisenc.so:audio/libvorbis USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:5 \ - localbase:ldflags pkgconfig qt:5 tar:xz + localbase:ldflags magick:6,build pkgconfig qt:5 tar:xz USE_KDE= archive auth bookmarks codecs completion config configwidgets \ coreaddons crash dbusaddons i18n iconthemes itemviews \ jobwidgets kio service solid sonnet textwidgets widgetsaddons \ diff --git a/audio/mp3plot/Makefile b/audio/mp3plot/Makefile index 5aca195200b4..82a07d7b7fee 100644 --- a/audio/mp3plot/Makefile +++ b/audio/mp3plot/Makefile @@ -31,7 +31,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/ImageMagick6 +IMAGEMAGICK_USES= magick:6 post-patch: @${REINPLACE_CMD} -e '/bldtype_/s|-O2||g; s|^extra_LD.*||g' ${WRKSRC}/configure diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile index 9b9f8473d2d1..b39afaabe8b1 100644 --- a/cad/alliance/Makefile +++ b/cad/alliance/Makefile @@ -18,10 +18,9 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_aarch64= fails to link: collect2: error: ld returned 1 exit status -BUILD_DEPENDS= convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} \ - fig2dev:print/fig2dev +BUILD_DEPENDS= fig2dev:print/fig2dev -USES= autoreconf:build gmake libtool motif tar:bz2 xorg +USES= autoreconf:build gmake libtool magick:build motif tar:bz2 xorg USE_GCC= yes USE_TEX= dvipsk:build latex:build USE_XORG= ice sm x11 xext xt diff --git a/comms/apitran/Makefile b/comms/apitran/Makefile index 3c8243103655..8785f27f503f 100644 --- a/comms/apitran/Makefile +++ b/comms/apitran/Makefile @@ -14,10 +14,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYNUMPY} \ ${PY_PILLOW} \ - sox:audio/sox \ - display:graphics/ImageMagick6 + sox:audio/sox -USES= python:3.6+,run shebangfix +USES= magick:6,run python:3.6+,run shebangfix USE_GITHUB= yes GH_ACCOUNT= rsj56 GH_TAGNAME= d209347 diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index 5420f7783a82..2a38e0cef473 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -60,7 +60,7 @@ OPTIONS_DEFAULT= BDB CURL GMAGICK DAVIS_CONFIGURE_ON= --enable-davis -IMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 +IMAGICK_USES= magick:6 IMAGICK_CONFIGURE_WITH= imagemagick GMAGICK_LIB_DEPENDS= libGraphicsMagickWand.so:graphics/GraphicsMagick diff --git a/databases/opendbviewer/Makefile b/databases/opendbviewer/Makefile index a89512df01f3..4d7987782786 100644 --- a/databases/opendbviewer/Makefile +++ b/databases/opendbviewer/Makefile @@ -9,9 +9,7 @@ COMMENT= Simple database explorer LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= convert:graphics/ImageMagick6 - -USES= cmake compiler:c++11-lang qt:5 +USES= cmake compiler:c++11-lang magick:6,build qt:5 USE_GITHUB= yes GH_ACCOUNT= Jet1oeil USE_QT= core gui network sql sql-sqlite3 testlib widgets \ diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile index 0dcaa0eb5ca7..61fec3050978 100644 --- a/databases/virtuoso/Makefile +++ b/databases/virtuoso/Makefile @@ -74,7 +74,7 @@ BROKEN_FreeBSD_14= OpenSSL version 1.1.0 or greater is currently not supported .if ${PORT_OPTIONS:MIMAGEMAGICK} CONFIGURE_ARGS+=--enable-imagemagick=${LOCALBASE} -LIB_DEPENDS+= libMagickWand-6.so:graphics/ImageMagick6 +USES+= magick:6 PLIST_SUB+= WITH_IMAGEMAGICK="" .else CONFIGURE_ARGS+=--disable-imagemagick diff --git a/deskutils/goesimage/Makefile b/deskutils/goesimage/Makefile index 11dc98caa647..780b7e5126ad 100644 --- a/deskutils/goesimage/Makefile +++ b/deskutils/goesimage/Makefile @@ -9,11 +9,10 @@ LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/UNLICENSE RUN_DEPENDS= bash:shells/bash \ - convert:graphics/ImageMagick6 \ curl:ftp/curl \ nitrogen:sysutils/nitrogen -USES= shebangfix +USES= magick:6,run shebangfix SHEBANG_FILES= goesimage USE_GITHUB= yes GH_ACCOUNT= pigmonkey diff --git a/deskutils/py-paperless/Makefile b/deskutils/py-paperless/Makefile index f80911ff5b16..8531da3df54e 100644 --- a/deskutils/py-paperless/Makefile +++ b/deskutils/py-paperless/Makefile @@ -67,10 +67,10 @@ IMAGICK7_X11_DESC= ImageMagick7 with X11 support DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.8.3,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_USES= gmake -IMAGICK6_X11_RUN_DEPENDS= convert:graphics/ImageMagick6 -IMAGICK6_NOX11_RUN_DEPENDS= convert:graphics/ImageMagick6-nox11 -IMAGICK7_X11_RUN_DEPENDS= convert:graphics/ImageMagick7 -IMAGICK7_NOX11_RUN_DEPENDS= convert:graphics/ImageMagick7-nox11 +IMAGICK6_X11_USES= magick:6,run +IMAGICK6_NOX11_USES= magick:6,run,nox11 +IMAGICK7_X11_USES= magick:7,run +IMAGICK7_NOX11_USES= magick:7,run,nox11 PORTDOCS= * diff --git a/devel/bugzilla44/Makefile b/devel/bugzilla44/Makefile index c7fc8f096b84..73de5c3d4a9e 100644 --- a/devel/bugzilla44/Makefile +++ b/devel/bugzilla44/Makefile @@ -69,7 +69,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/ImageMagick6 +BMP2PNG_USES= magick:6,run # 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 589602d9f5e0..82766f276fb8 100644 --- a/devel/bugzilla50/Makefile +++ b/devel/bugzilla50/Makefile @@ -69,7 +69,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/ImageMagick6 +BMP2PNG_USES= magick:6,run # 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 11df7bb64e32..c977094188e1 100644 --- a/devel/p5-Project-Gantt/Makefile +++ b/devel/p5-Project-Gantt/Makefile @@ -11,10 +11,9 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Create Gantt charts to manage project scheduling BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-Class-Date>=0:devel/p5-Class-Date \ - convert:graphics/ImageMagick6 +RUN_DEPENDS= p5-Class-Date>=0:devel/p5-Class-Date -USES= perl5 +USES= magick:6,run perl5 USE_PERL5= configure WRKSRC= ${WRKDIR}/Gantt diff --git a/devel/rubygem-paperclip-rails5/Makefile b/devel/rubygem-paperclip-rails5/Makefile index 6e000f154c30..71e2358e3185 100644 --- a/devel/rubygem-paperclip-rails5/Makefile +++ b/devel/rubygem-paperclip-rails5/Makefile @@ -32,7 +32,7 @@ OPTIONS_DEFAULT= IMNOX11 IMNOX11_DESC= Depend on ImageMagick without X11 support IMX11_DESC= Depend on ImageMagick with X11 support -IMNOX11_RUN_DEPENDS= ImageMagick6-nox11>0:graphics/ImageMagick6-nox11 -IMX11_RUN_DEPENDS= ImageMagick6>0:graphics/ImageMagick6 +IMNOX11_USES= magick:6,run,nox11 +IMX11_USES= magick:6,run .include <bsd.port.mk> diff --git a/devel/rubygem-paperclip-rails50/Makefile b/devel/rubygem-paperclip-rails50/Makefile index e1b19e51dc5a..f69dc8b34825 100644 --- a/devel/rubygem-paperclip-rails50/Makefile +++ b/devel/rubygem-paperclip-rails50/Makefile @@ -12,8 +12,7 @@ COMMENT= Easy upload management for ActiveRecord LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ImageMagick7-nox11>=0:graphics/ImageMagick7-nox11 \ - rubygem-activemodel50>0:databases/rubygem-activemodel50 \ +RUN_DEPENDS= rubygem-activemodel50>0:databases/rubygem-activemodel50 \ rubygem-activesupport50>=0:devel/rubygem-activesupport50 \ rubygem-mimemagic>=0.3.0:misc/rubygem-mimemagic \ rubygem-mime-types>=0:misc/rubygem-mime-types \ @@ -21,7 +20,7 @@ RUN_DEPENDS= ImageMagick7-nox11>=0:graphics/ImageMagick7-nox11 \ NO_ARCH= yes USE_RUBY= yes -USES= cpe gem +USES= cpe gem magick:7,nox11,run CPE_VENDOR= thoughtbot .include <bsd.port.mk> diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index b66daf43c41e..3e69668d544f 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -162,7 +162,7 @@ LCMS2_CONFIGURE_WITH= lcms2 M17N_IMPLIES= XFT M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib M17N_CONFIGURE_WITH= m17n-flt -MAGICK_LIB_DEPENDS= libMagickCore-7.so:graphics/ImageMagick7 +MAGICK_USES= magick:7 MAGICK_CONFIGURE_WITH= imagemagick MAILUTILS_LIB_DEPENDS= libmailutils.so:mail/mailutils MAILUTILS_CONFIGURE_WITH= mailutils diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index a432d0572fa8..17c0af6d3613 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -175,7 +175,7 @@ LCMS2_CONFIGURE_WITH= lcms2 M17N_IMPLIES= XFT M17N_LIB_DEPENDS= libm17n.so:devel/m17n-lib M17N_CONFIGURE_WITH= m17n-flt -MAGICK_LIB_DEPENDS= libMagickCore-7.so:graphics/ImageMagick7 +MAGICK_USES= magick:7 MAGICK_CONFIGURE_WITH= imagemagick MAILUTILS_LIB_DEPENDS= libmailutils.so:mail/mailutils MAILUTILS_CONFIGURE_WITH= mailutils diff --git a/emulators/mgba/Makefile b/emulators/mgba/Makefile index 844e0fcd3027..f727b8e6c2e2 100644 --- a/emulators/mgba/Makefile +++ b/emulators/mgba/Makefile @@ -61,8 +61,7 @@ LIBRETRO_CMAKE_BOOL= BUILD_LIBRETRO LIBRETRO_CMAKE_ON= -DLIBRETRO_LIBDIR:PATH="${PREFIX}/lib/libretro" LIBRETRO_CONFLICTS_INSTALL= libretro-mgba -MAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 \ - libMagickCore-6.so:graphics/ImageMagick6 +MAGICK_USES= magick:6 MAGICK_CMAKE_BOOL= USE_MAGICK QT5_USES= desktop-file-utils qt:5 diff --git a/games/enigma/Makefile b/games/enigma/Makefile index 26758c47be45..9cb448453776 100644 --- a/games/enigma/Makefile +++ b/games/enigma/Makefile @@ -14,13 +14,12 @@ 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/ImageMagick6 USE_GITHUB= yes GH_ACCOUNT= Enigma-Game GH_PROJECT= Enigma -USES= autoreconf:build gettext gmake iconv localbase pkgconfig sdl +USES= autoreconf:build gettext gmake iconv localbase magick:6,build pkgconfig sdl GNU_CONFIGURE= yes USE_SDL= sdl2 image2 mixer2 ttf2 CONFIGURE_ARGS= --with-system-enet diff --git a/games/openclaw/Makefile b/games/openclaw/Makefile index b2b158bc017a..b03b6693d46e 100644 --- a/games/openclaw/Makefile +++ b/games/openclaw/Makefile @@ -25,8 +25,7 @@ OPTIONS_DEFINE= LAUNCHER OPTIONS_DEFAULT= LAUNCHER LAUNCHER_DESC= Install launcher to manage game settings -LAUNCHER_USES= mono -LAUNCHER_BUILD_DEPENDS= convert:graphics/ImageMagick6 +LAUNCHER_USES= magick:6,build mono LAUNCHER_PLIST_FILES= bin/ClawLauncher.exe bin/clawlauncher LAUNCHER_DESKTOP_ENTRIES= \ "${GH_PROJECT}" \ diff --git a/games/openfodder/Makefile b/games/openfodder/Makefile index 496ee6c18c63..3c7604e324cd 100644 --- a/games/openfodder/Makefile +++ b/games/openfodder/Makefile @@ -36,7 +36,7 @@ DESKTOP_ENTRIES="${PORTNAME}" \ OPTIONS_DEFINE= DOCS ICONS OPTIONS_DEFAULT=ICONS -ICONS_BUILD_DEPENDS= mogrify:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} +ICONS_USES= magick:build post-patch: @${REINPLACE_CMD} -e 's,clang++,${CXX},' \ diff --git a/games/openspades/Makefile b/games/openspades/Makefile index cd5f8606416e..48f79b74fc3f 100644 --- a/games/openspades/Makefile +++ b/games/openspades/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= bundles non-portable AngelScript -BUILD_DEPENDS= convert:graphics/ImageMagick6 # for building icons LIB_DEPENDS= libcurl.so:ftp/curl \ libopusfile.so:audio/opusfile @@ -23,7 +22,7 @@ USE_GITHUB= yes GH_ACCOUNT= yvt USES= cmake:insource compiler:c++11-lib desktop-file-utils dos2unix \ - gl gnome openal sdl xorg + gl gnome magick:6,build openal sdl xorg CMAKE_ARGS= -DOPENSPADES_RESOURCES=OFF \ -DOPENSPADES_INSTALL_MAN="man/man6" \ -DOPENSPADES_INSTALL_BINARY="bin" \ diff --git a/games/sgt-puzzles/Makefile b/games/sgt-puzzles/Makefile index bc31b955f096..2623dcb3a505 100644 --- a/games/sgt-puzzles/Makefile +++ b/games/sgt-puzzles/Makefile @@ -14,9 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENCE COMMITHASH= 640f923 -BUILD_DEPENDS= convert:graphics/ImageMagick6-nox11 - -USES= cmake gnome perl5 pkgconfig +USES= cmake gnome magick:6,build,nox11 perl5 pkgconfig USE_PERL5= build CMAKE_ARGS= -DNAME_PREFIX:STRING=sgt- diff --git a/games/tuxpaint/Makefile b/games/tuxpaint/Makefile index 87dad77b9fea..fd41cd2ebb1a 100644 --- a/games/tuxpaint/Makefile +++ b/games/tuxpaint/Makefile @@ -11,14 +11,13 @@ COMMENT= Drawing program designed for young children LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/docs/COPYING.txt -BUILD_DEPENDS= convert:graphics/ImageMagick7 LIB_DEPENDS= libfribidi.so:converters/fribidi \ libpaper.so:print/libpaper \ libimagequant.so:graphics/libimagequant RUN_DEPENDS= anytopnm:graphics/netpbm \ bash:shells/bash -USES= gettext gmake gnome gperf pkgconfig sdl shebangfix +USES= gettext gmake gnome gperf magick:7,build pkgconfig sdl shebangfix SHEBANG_FILES= src/tuxpaint-import.sh USE_GNOME= librsvg2 USE_SDL= image mixer sdl ttf pango diff --git a/graphics/acidwarp-sdl/Makefile b/graphics/acidwarp-sdl/Makefile index 73c4714de01a..6dd4c39a6e21 100644 --- a/graphics/acidwarp-sdl/Makefile +++ b/graphics/acidwarp-sdl/Makefile @@ -5,9 +5,7 @@ CATEGORIES= graphics MAINTAINER= swills@FreeBSD.org COMMENT= Eye candy program which displays various patterns -BUILD_DEPENDS= convert:graphics/ImageMagick7 - -USES= cmake sdl +USES= cmake magick:7,build sdl USE_SDL= sdl2 USE_GITHUB= yes diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile index b2d03ed1272f..aa3332d431d0 100644 --- a/graphics/autotrace/Makefile +++ b/graphics/autotrace/Makefile @@ -27,7 +27,7 @@ OPTIONS_DEFAULT=IMAGEMAGICK MING_DESC= Enable swf interface PSTOEDIT_DESC= Convert postscript to other formats -IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 +IMAGEMAGICK_USES= magick:6 IMAGEMAGICK_CONFIGURE_OFF= --without-magick MING_LIB_DEPENDS= libming.so:graphics/ming diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile index 822c3d21e79f..33d110dce2ef 100644 --- a/graphics/aview/Makefile +++ b/graphics/aview/Makefile @@ -9,10 +9,11 @@ MASTER_SITES= SF/aa-project/${PORTNAME}/${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Graphics viewer for viewing netpbm format on console or X using aalib -RUN_DEPENDS= anytopnm:graphics/netpbm \ - convert:graphics/ImageMagick6 +RUN_DEPENDS= anytopnm:graphics/netpbm LIB_DEPENDS= libaa.so:graphics/aalib +USES= magick:6,run + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} GNU_CONFIGURE= yes diff --git a/graphics/chafa/Makefile b/graphics/chafa/Makefile index 85dbfd62db71..e05b9a676a62 100644 --- a/graphics/chafa/Makefile +++ b/graphics/chafa/Makefile @@ -14,11 +14,9 @@ LICENSE_COMB= multi LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3+ = ${WRKSRC}/COPYING.LESSER -BUILD_DEPENDS= convert:graphics/ImageMagick7 LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libMagickCore-7.so:graphics/ImageMagick7 -USES= gettext-runtime gnome libtool tar:xz +USES= gettext-runtime gnome libtool magick:7 tar:xz USE_GNOME= glib20 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/graphics/converseen/Makefile b/graphics/converseen/Makefile index 3dc1ee0c5c46..3c7d56702b34 100644 --- a/graphics/converseen/Makefile +++ b/graphics/converseen/Makefile @@ -9,9 +9,7 @@ COMMENT= Easy to use graphics conversion utility LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 - -USES= cmake compiler:c++11-lang qt:5 tar:bzip2 +USES= cmake compiler:c++11-lang magick:6 qt:5 tar:bzip2 USE_QT= core gui network widgets \ buildtools_build linguisttools_build qmake_build diff --git a/graphics/curator/Makefile b/graphics/curator/Makefile index 316511ad1756..ac453de88717 100644 --- a/graphics/curator/Makefile +++ b/graphics/curator/Makefile @@ -9,13 +9,11 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Static Image Gallery Generator for web or CD-ROM galleries -USES= python:3.6+ +USES= magick:6,run python:3.6+ USE_PYTHON= distutils autoplist concurrent optsuffix PLIST_FILES= man/man1/curator.1.gz -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 e6416d392f5e..975b711ba90b 100644 --- a/graphics/cuttlefish/Makefile +++ b/graphics/cuttlefish/Makefile @@ -10,10 +10,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Plots diurnal and geographical patterns of supplied data RUN_DEPENDS+= p5-GD>=0:graphics/p5-GD \ - convert:graphics/ImageMagick6 \ gifsicle:graphics/gifsicle -USES= perl5 shebangfix +USES= magick:6,run perl5 shebangfix USE_PERL5= run NO_BUILD= yes SHEBANG_FILES= bin/cuttlefish.pl diff --git a/graphics/dcraw-m/Makefile b/graphics/dcraw-m/Makefile index 9eb5ed09fe44..216d9da706fe 100644 --- a/graphics/dcraw-m/Makefile +++ b/graphics/dcraw-m/Makefile @@ -11,14 +11,13 @@ COMMENT= Modified Decoder for RAW files from digital cameras LICENSE= GPLv2 LIB_DEPENDS= libjasper.so:graphics/jasper \ - liblcms2.so:graphics/lcms2 \ - libMagickWand-6.so:graphics/ImageMagick6 + liblcms2.so:graphics/lcms2 USE_GITHUB= yes GH_ACCOUNT= waitman GH_TAGNAME= 1392579 -USES= jpeg pkgconfig +USES= jpeg magick:6 pkgconfig CFLAGS+= -Wall -I${LOCALBASE}/include \ `MagickWand-config --cflags --cppflags` \ diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 26f63a21d1b9..ecc365909cf4 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -17,7 +17,6 @@ LIB_DEPENDS= libKF5Sane.so:graphics/libksane \ libboost_graph.so:devel/boost-libs \ libexiv2.so:graphics/exiv2 \ libexpat.so:textproc/expat2 \ - libMagickCore-6.so:graphics/ImageMagick6 \ libgphoto2.so:graphics/libgphoto2 \ libicalss.so:devel/libical \ libjasper.so:graphics/jasper \ @@ -31,7 +30,7 @@ LIB_DEPENDS= libKF5Sane.so:graphics/libksane \ libx265.so:multimedia/x265 USES= bison cmake compiler:c++11-lib desktop-file-utils eigen:3 gl \ - gnome jpeg kde:5 pkgconfig qt:5 shebangfix tar:xz xorg + gnome jpeg kde:5 magick:6 pkgconfig qt:5 shebangfix tar:xz xorg USE_GL= gl glu USE_GNOME= glib20 libxml2 libxslt USE_KDE= archive auth bookmarks calendarcore codecs completion config \ diff --git a/graphics/dmtx-utils/Makefile b/graphics/dmtx-utils/Makefile index e5d410d0e4d0..e112c1cc602e 100644 --- a/graphics/dmtx-utils/Makefile +++ b/graphics/dmtx-utils/Makefile @@ -11,10 +11,9 @@ COMMENT= Software for reading and writing Data Matrix barcodes LICENSE= LGPL21+ -LIB_DEPENDS= libdmtx.so:graphics/libdmtx \ - libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} +LIB_DEPENDS= libdmtx.so:graphics/libdmtx -USES= autoreconf libtool localbase tar:bzip2 pkgconfig +USES= autoreconf libtool localbase magick tar:bzip2 pkgconfig USE_GITHUB= yes GH_ACCOUNT= dmtx diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile index 2e0ea1b537b1..cbb9349ca7bc 100644 --- a/graphics/fpc-imagemagick/Makefile +++ b/graphics/fpc-imagemagick/Makefile @@ -13,6 +13,6 @@ OPTIONS_DEFINE= IMAGEMAGICK IMAGEMAGICK_DESC= Install ImageMagick image proccesing tool OPTIONS_DEFAULT= IMAGEMAGICK -IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 +IMAGEMAGICK_USES= magick:6 .include "${MASTERDIR}/Makefile" diff --git a/graphics/freetype-gl/Makefile b/graphics/freetype-gl/Makefile index edee62f51539..26c711dd059e 100644 --- a/graphics/freetype-gl/Makefile +++ b/graphics/freetype-gl/Makefile @@ -14,9 +14,8 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfreetype.so:print/freetype2 -TEST_DEPENDS= ImageMagick${IMAGEMAGICK_DEFAULT}-nox11>0:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}-nox11 -USES= cmake:noninja gl +USES= cmake:noninja gl magick:test,nox11 USE_GL= glew USE_LDCONFIG= yes diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile index fdc85bb1dbfc..1bcfc3d48eda 100644 --- a/graphics/gimp-gmic-plugin/Makefile +++ b/graphics/gimp-gmic-plugin/Makefile @@ -15,7 +15,6 @@ BROKEN= OpenCV4 no longer ships OpencCV-1.0 headers LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick \ libOpenEXR.so:graphics/openexr \ libopencv_video.so:graphics/opencv \ - libMagick++-6.so:graphics/ImageMagick6 \ libavcodec.so:multimedia/ffmpeg \ libfftw3.so:math/fftw3 \ libgimp-2.0.so:graphics/gimp-app \ @@ -27,7 +26,7 @@ BASH_RUN_DEPENDS= bash:shells/bash WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -USES= dos2unix gmake gnome localbase pkgconfig xorg +USES= dos2unix gmake gnome localbase magick:6 pkgconfig xorg USE_GCC= yes USE_GNOME= gtk20 USE_XORG= x11 xext xrandr diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile index b8988f7cbc64..4cb686ca6c48 100644 --- a/graphics/gscan2pdf/Makefile +++ b/graphics/gscan2pdf/Makefile @@ -15,7 +15,6 @@ 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 \ - 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 \ @@ -31,7 +30,6 @@ RUN_DEPENDS:= p5-Proc-ProcessTable>0:devel/p5-Proc-ProcessTable \ cjb2:graphics/djvulibre \ scanimage:graphics/sane-backends \ unpaper:graphics/unpaper \ - 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 \ @@ -57,7 +55,7 @@ RUN_DEPENDS:= p5-Proc-ProcessTable>0:devel/p5-Proc-ProcessTable \ NO_ARCH= yes -USES= desktop-file-utils gettext gmake gnome perl5 tar:xz +USES= desktop-file-utils gettext gmake gnome magick:6,build,run perl5 tar:xz USE_GNOME= gtk30 librsvg2 USE_PERL5= configure diff --git a/graphics/hdr_tools/Makefile b/graphics/hdr_tools/Makefile index 9c184e681ee2..3696c59d9b11 100644 --- a/graphics/hdr_tools/Makefile +++ b/graphics/hdr_tools/Makefile @@ -16,9 +16,8 @@ LICENSE= GPLv3 LIB_DEPENDS= libpopt.so:devel/popt \ libtiff.so:graphics/tiff \ libOpenEXR.so:graphics/openexr \ - libMagick++-6.so:graphics/ImageMagick6 -USES= compiler:c++11-lang gmake pkgconfig tar:tgz +USES= compiler:c++11-lang gmake magick:6 pkgconfig tar:tgz NO_WRKSUBDIR= yes PROGRAMS= hdr_adjust hdr_convert hdr_create hdr_denoise hdr_fix_ca \ diff --git a/graphics/imageindex/Makefile b/graphics/imageindex/Makefile index 9eaaa8ffc532..195fb53c5f6f 100644 --- a/graphics/imageindex/Makefile +++ b/graphics/imageindex/Makefile @@ -10,11 +10,10 @@ MASTER_SITES= http://www.edwinh.org/imageindex/release/ \ MAINTAINER= johnjen@reynoldsnet.org COMMENT= Digital photo gallery tool -RUN_DEPENDS= convert:graphics/ImageMagick6 \ - mplayer:multimedia/mplayer \ +RUN_DEPENDS= mplayer:multimedia/mplayer \ p5-Image-Info>=0:graphics/p5-Image-Info -USES= jpeg perl5 +USES= jpeg magick:6,run perl5 USE_PERL5= run MAKE_ARGS+= PERLPATH=${PERL} PREFIX=${STAGEDIR}${PREFIX} diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index ceecb66ab1cc..9451ba0284ce 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -96,7 +96,7 @@ WPG_LIB_DEPENDS= libwpg-0.3.so:graphics/libwpg03 IMAGICK_DESC= Raster image format library IMAGICK6_DESC= Use ImageMagick6 -IMAGICK6_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 +IMAGICK6_USES= magick:6 IMAGICK6_CMAKE_BOOL= WITH_IMAGE_MAGICK GM_DESC= Use GraphicsMagick GM_LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick diff --git a/graphics/instant-meshes/Makefile b/graphics/instant-meshes/Makefile index ff2df235f08e..570b6818a674 100644 --- a/graphics/instant-meshes/Makefile +++ b/graphics/instant-meshes/Makefile @@ -10,12 +10,11 @@ COMMENT= Interactive field-aligned mesh generator LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= convert:graphics/ImageMagick6 LIB_DEPENDS= libglfw.so:graphics/glfw RUN_DEPENDS= zenity:x11/zenity USES= cmake compiler:c++14-lang eigen:3 gl localbase:ldflags \ - pkgconfig xorg + magick:6,build pkgconfig xorg USE_GITHUB= yes GH_ACCOUNT= wjakob GH_TUPLE= wjakob:nanogui:2a61f03:nanogui/ext/nanogui \ diff --git a/graphics/kxstitch/Makefile b/graphics/kxstitch/Makefile index 9e06fd4ecf13..16d317c3bdda 100644 --- a/graphics/kxstitch/Makefile +++ b/graphics/kxstitch/Makefile @@ -7,10 +7,7 @@ CATEGORIES= graphics kde MAINTAINER= kde@FreeBSD.org COMMENT= Cross stitch pattern editor -LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 \ - libMagickCore-6.so:graphics/ImageMagick6 - -USES= cmake compiler:c++11-lang desktop-file-utils kde:5 qt:5 tar:xz \ +USES= cmake compiler:c++11-lang desktop-file-utils magick:6 kde:5 qt:5 tar:xz \ xorg USE_KDE= auth bookmarks codecs completion config configwidgets coreaddons \ i18n itemviews jobwidgets kio service solid sonnet textwidgets \ diff --git a/graphics/l2p/Makefile b/graphics/l2p/Makefile index 309d30a97f90..b4ee3df5ac59 100644 --- a/graphics/l2p/Makefile +++ b/graphics/l2p/Makefile @@ -8,8 +8,6 @@ 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/ImageMagick6 - NO_BUILD= yes OPTIONS_DEFINE= DOCS @@ -21,7 +19,7 @@ SHEBANG_FILES= ${WRKSRC}/${PORTNAME} USE_PERL5= run USE_TEX= latex dvipsk -USES= perl5 shebangfix zip +USES= magick:6,run perl5 shebangfix zip do-install: ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin diff --git a/graphics/libboard/Makefile b/graphics/libboard/Makefile index b78b549a125b..3caf850d5873 100644 --- a/graphics/libboard/Makefile +++ b/graphics/libboard/Makefile @@ -10,9 +10,7 @@ COMMENT= Vector graphics C++ library LICENSE= LGPL3 -LIB_DEPENDS= libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} - -USES= cmake compiler:c++11-lang localbase +USES= cmake compiler:c++11-lang localbase magick USE_GITHUB= yes GH_ACCOUNT= c-koi diff --git a/graphics/meh/Makefile b/graphics/meh/Makefile index 7057c086a61b..96572333721c 100644 --- a/graphics/meh/Makefile +++ b/graphics/meh/Makefile @@ -14,9 +14,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgif.so:graphics/giflib \ libpng.so:graphics/png -RUN_DEPENDS= convert:graphics/ImageMagick7 -USES= gmake jpeg localbase xorg +USES= gmake jpeg localbase magick:7,run xorg USE_GITHUB= yes GH_ACCOUNT= jhawthorn USE_XORG= x11 xext diff --git a/graphics/npretty/Makefile b/graphics/npretty/Makefile index 12cde71be02c..ea1407141dfe 100644 --- a/graphics/npretty/Makefile +++ b/graphics/npretty/Makefile @@ -13,13 +13,12 @@ LICENSE= GPLv2 RUN_DEPENDS= p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool \ p5-forks>=0:devel/p5-forks -LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6 USE_GITHUB= yes GH_ACCOUNT= gammy NO_BUILD= yes -USES= perl5 shebangfix +USES= magick:6 perl5 shebangfix USE_PERL5= run SHEBANG_FILES= npretty.pl diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile index be09eb304439..db04c9ddcbf9 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -15,12 +15,11 @@ 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/ImageMagick6 \ - libtiff.so:graphics/tiff \ +LIB_DEPENDS= libtiff.so:graphics/tiff \ libcdf.so:science/cdf MAKE_JOBS_UNSAFE= yes -USES= bison compiler:c++17-lang gl gmake libtool motif xorg +USES= bison compiler:c++17-lang gl gmake libtool magick:6 motif xorg USE_XORG= x11 xt xinerama xext xpm xmu sm ice USE_GL= gl glu GNU_CONFIGURE= yes diff --git a/graphics/openfx-arena/Makefile b/graphics/openfx-arena/Makefile index e5418f8d59db..3d1f023e93af 100644 --- a/graphics/openfx-arena/Makefile +++ b/graphics/openfx-arena/Makefile @@ -17,7 +17,6 @@ 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/ImageMagick6 \ libzip.so:archivers/libzip \ libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ @@ -33,7 +32,7 @@ LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio \ libltdl.so:devel/libltdl \ libpoppler.so:graphics/poppler -USES= gl gmake gnome iconv xorg +USES= gl gmake gnome iconv magick:6 xorg USE_GITHUB= yes GH_ACCOUNT= NatronGitHub GH_TUPLE= NatronGitHub:openfx-supportext:e600cae:openfx_supportext/SupportExt \ diff --git a/graphics/optar/Makefile b/graphics/optar/Makefile index 9f05bde159b1..2e47e3b7b978 100644 --- a/graphics/optar/Makefile +++ b/graphics/optar/Makefile @@ -15,11 +15,10 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png -RUN_DEPENDS= convert:graphics/ImageMagick6 WRKSRC= ${WRKDIR}/optar_dist -USES= gmake tar:tgz +USES= gmake magick:6,run tar:tgz PLIST_FILES= bin/optar bin/unoptar bin/pgm2ps diff --git a/graphics/p5-CAD-Drawing/Makefile b/graphics/p5-CAD-Drawing/Makefile index 25e0684aa6d2..1d0389dade6d 100644 --- a/graphics/p5-CAD-Drawing/Makefile +++ b/graphics/p5-CAD-Drawing/Makefile @@ -18,10 +18,9 @@ RUN_DEPENDS= p5-CAD-Calc>=0:math/p5-CAD-Calc \ p5-Math-Geometry-Planar>=0:math/p5-Math-Geometry-Planar \ p5-Math-MatrixReal>=0:math/p5-Math-MatrixReal \ p5-Math-Vec>=0:math/p5-Math-Vec \ - p5-Stream>=0:devel/p5-Stream \ - convert:graphics/ImageMagick6 + p5-Stream>=0:devel/p5-Stream -USES= perl5 +USES= magick:6,run perl5 USE_PERL5= modbuild .include <bsd.port.mk> diff --git a/graphics/p5-Image-Heatmap/Makefile b/graphics/p5-Image-Heatmap/Makefile index 65d515ece604..aeb95bda30fa 100644 --- a/graphics/p5-Image-Heatmap/Makefile +++ b/graphics/p5-Image-Heatmap/Makefile @@ -13,10 +13,8 @@ COMMENT= Convert geographic coordinates into a graphical heatmap LICENSE= ART20 GPLv1 LICENSE_COMB= dual -RUN_DEPENDS= convert:graphics/ImageMagick6 - WRKSRC= ${WRKDIR}/${PORTNAME} -USES= perl5 +USES= magick:6,run perl5 USE_PERL5= configure .include <bsd.port.mk> diff --git a/graphics/p5-Image-Magick-Iterator/Makefile b/graphics/p5-Image-Magick-Iterator/Makefile index 4d181d79871a..5242e953e043 100644 --- a/graphics/p5-Image-Magick-Iterator/Makefile +++ b/graphics/p5-Image-Magick-Iterator/Makefile @@ -11,10 +11,9 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Sequentially read Image::Magick object from a filehandle BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ImageMagick6>=0:graphics/ImageMagick6 \ - p5-Image-PBMlib>=1.05:graphics/p5-Image-PBMlib +RUN_DEPENDS= p5-Image-PBMlib>=1.05:graphics/p5-Image-PBMlib -USES= perl5 +USES= magick:6,build,run perl5 USE_PERL5= configure NO_ARCH= yes diff --git a/graphics/p5-Image-OCR-Tesseract/Makefile b/graphics/p5-Image-OCR-Tesseract/Makefile index df2f7fe82066..60e594cb3fe8 100644 --- a/graphics/p5-Image-OCR-Tesseract/Makefile +++ b/graphics/p5-Image-OCR-Tesseract/Makefile @@ -10,12 +10,11 @@ COMMENT= Read an image with Resseract OCR and get output LICENSE= GPLv3 -MY_DEPENDS= tesseract>0:graphics/tesseract \ - ImageMagick6-nox11>0:graphics/ImageMagick6-nox11 +MY_DEPENDS= tesseract>0:graphics/tesseract BUILD_DEPENDS= ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} -USES= perl5 +USES= magick:6,build,run,nox11 perl5 USE_PERL5= configure NO_ARCH= yes diff --git a/graphics/pecl-imagick-im7/Makefile b/graphics/pecl-imagick-im7/Makefile index 9074c1e8a397..749ee78fde62 100644 --- a/graphics/pecl-imagick-im7/Makefile +++ b/graphics/pecl-imagick-im7/Makefile @@ -12,7 +12,7 @@ MASTERDIR= ${.CURDIR}/../pecl-imagick CONFLICTS_INSTALL= ${PKGNAMEPREFIX}${PORTNAME} -X11_LIB_DEPENDS?= libMagickWand-7.so:graphics/ImageMagick7 -X11_LIB_DEPENDS_OFF?= libMagickWand-7.so:graphics/ImageMagick7-nox11 +X11_USES?= magick:7 +X11_USES_OFF?= magick:7,nox11 .include "${MASTERDIR}/Makefile" diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile index 6a5ec4e4783a..681483fbfee7 100644 --- a/graphics/pecl-imagick/Makefile +++ b/graphics/pecl-imagick/Makefile @@ -17,8 +17,8 @@ CONFLICTS_INSTALL?= ${PKGNAMEPREFIX}${PORTNAME}-im7 OPTIONS_DEFINE= X11 -X11_LIB_DEPENDS?= libMagickWand-6.so:graphics/ImageMagick6 -X11_LIB_DEPENDS_OFF?= libMagickWand-6.so:graphics/ImageMagick6-nox11 +X11_USES?= magick:6 +X11_USES_OFF?= magick:6,nox11 CONFIGURE_ARGS= --with-imagick=${LOCALBASE} diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile index b3b29a9530ed..eaa83e4debf1 100644 --- a/graphics/pfstools/Makefile +++ b/graphics/pfstools/Makefile @@ -55,7 +55,7 @@ OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr \ libImath.so:math/Imath IMAGEMAGICK_CMAKE_BOOL= WITH_ImageMagick -IMAGEMAGICK_LIB_DEPENDS= libMagick++-6.so:graphics/ImageMagick6 +IMAGEMAGICK_USES= magick:6 NETPBM_CMAKE_BOOL= WITH_NetPBM NETPBM_LIB_DEPENDS= libnetpbm.so:graphics/netpbm diff --git a/graphics/pqiv/Makefile b/graphics/pqiv/Makefile index 77f9aa76978d..bbfb754e3df7 100644 --- a/graphics/pqiv/Makefile +++ b/graphics/pqiv/Makefile @@ -51,7 +51,7 @@ SPECTRE_CONFIGURE_WITH= spectre SPECTRE_LIB_DEPENDS= libspectre.so:print/libspectre WAND_CONFIGURE_WITH= wand -WAND_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 +WAND_USES= magick:6 WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 188a3f6049d9..1dfaa1dc90a8 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -32,7 +32,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++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} +MAGICK_USES= magick MAGICK_CONFIGURE_ON= --with-magick MAGICK_CONFIGURE_OFF= --without-magick MING_DESC= Flash support via Ming diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile index 8dd61f6edfd2..3de3a44654de 100644 --- a/graphics/py-sorl-thumbnail/Makefile +++ b/graphics/py-sorl-thumbnail/Makefile @@ -33,7 +33,7 @@ DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_F DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" GRAPHICSMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/gm:graphics/GraphicsMagick -IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 +IMAGEMAGICK_USES= magick:6,run PILLOW_RUN_DEPENDS= ${PY_PILLOW} 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 47aabe40bf95..84ae2963cfa4 100644 --- a/graphics/py-wand/Makefile +++ b/graphics/py-wand/Makefile @@ -27,15 +27,15 @@ IMAGEMAGICK7_DESC= Use ImageMagick 7.x (graphics/ImageMagick7*) .if ${PORT_OPTIONS:MX11} .if ${PORT_OPTIONS:MIMAGEMAGICK7} -LIB_DEPENDS= libMagickWand-7.so:graphics/ImageMagick7 +USES= magick:7 .else -LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 +USES= magick:6 .endif .else .if ${PORT_OPTIONS:MIMAGEMAGICK7} -LIB_DEPENDS= libMagickWand-7.so:graphics/ImageMagick7-nox11 +USES= magick:7,nox11 .else -LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6-nox11 +USES= magick:6,nox11 .endif .endif diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile index 769b85733dcc..7ec93c25dcf8 100644 --- a/graphics/raster3d/Makefile +++ b/graphics/raster3d/Makefile @@ -30,7 +30,7 @@ OPTIONS_DEFINE= IMAGEMAGICK DOCS EXAMPLES OPTIONS_DEFAULT=IMAGEMAGICK OPTIONS_SUB= yes -IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick6 +IMAGEMAGICK_USES= magick:6,run .include <bsd.port.options.mk> diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile index 875b484b8715..f99bb5d44407 100644 --- a/graphics/reallyslick/Makefile +++ b/graphics/reallyslick/Makefile @@ -10,10 +10,9 @@ DISTNAME= rss-glx_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= OpenGL screensaver collection -LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 \ - libGLC.so:graphics/quesoglc +LIB_DEPENDS= libGLC.so:graphics/quesoglc -USES= compiler:c++11-lang gl gmake pathfix pkgconfig tar:bzip2 libtool +USES= compiler:c++11-lang gl gmake magick:6 pathfix pkgconfig tar:bzip2 libtool USE_GL= glut GNU_CONFIGURE= yes diff --git a/graphics/recoverjpeg/Makefile b/graphics/recoverjpeg/Makefile index e8c09d240250..f349f156dedb 100644 --- a/graphics/recoverjpeg/Makefile +++ b/graphics/recoverjpeg/Makefile @@ -12,10 +12,9 @@ COMMENT= Recoverjpeg tries to recover JFIF (JPEG) pictures from a peripheral LICENSE= GPLv2 -RUN_DEPENDS= exif:graphics/exif \ - identify:graphics/ImageMagick6 +RUN_DEPENDS= exif:graphics/exif -USES= python shebangfix +USES= magick:6,run python shebangfix GNU_CONFIGURE= yes SHEBANG_FILES= scripts/remove-duplicates diff --git a/graphics/renrot/Makefile b/graphics/renrot/Makefile index ab78167412ea..761c1a5fbdec 100644 --- a/graphics/renrot/Makefile +++ b/graphics/renrot/Makefile @@ -22,7 +22,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/ImageMagick6 +IMAGEMAGICK_USES= magick:6,run post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} diff --git a/graphics/rubygem-mini_magick/Makefile b/graphics/rubygem-mini_magick/Makefile index 375e4d7cbefe..e1ebe0aea091 100644 --- a/graphics/rubygem-mini_magick/Makefile +++ b/graphics/rubygem-mini_magick/Makefile @@ -27,15 +27,15 @@ NO_ARCH= yes .if ${PORT_OPTIONS:MX11} .if ${PORT_OPTIONS:MIMAGEMAGICK7} -RUN_DEPENDS+= convert:graphics/ImageMagick7 +USES+= magick:7 .else -RUN_DEPENDS+= convert:graphics/ImageMagick6 +USES+= magick:6 .endif .else .if ${PORT_OPTIONS:MIMAGEMAGICK7} -RUN_DEPENDS+= convert:graphics/ImageMagick7-nox11 +USES+= magick:7,nox11 .else -RUN_DEPENDS+= convert:graphics/ImageMagick6-nox11 +USES+= magick:6,nox11 .endif .endif diff --git a/graphics/rubygem-rmagick/Makefile b/graphics/rubygem-rmagick/Makefile index cd8391fc61fd..924a7c125c43 100644 --- a/graphics/rubygem-rmagick/Makefile +++ b/graphics/rubygem-rmagick/Makefile @@ -16,7 +16,7 @@ USE_RUBY= yes OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 -X11_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 -X11_LIB_DEPENDS_OFF= libMagickWand-6.so:graphics/ImageMagick6-nox11 +X11_USES= magick:6 +X11_USES_OFF= magick:6,nox11 .include <bsd.port.mk> diff --git a/graphics/s2tc/Makefile b/graphics/s2tc/Makefile index e8e4bc9e5264..3d3f58b9b06f 100644 --- a/graphics/s2tc/Makefile +++ b/graphics/s2tc/Makefile @@ -12,11 +12,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= libglvnd>=0:graphics/libglvnd -TEST_DEPENDS= convert:graphics/ImageMagick6 \ - nvcompress:graphics/nvidia-texture-tools \ +TEST_DEPENDS= nvcompress:graphics/nvidia-texture-tools \ wget:ftp/wget -USES= autoreconf libtool pathfix +USES= autoreconf libtool magick:6,test pathfix USE_GITHUB= yes USE_LDCONFIG= yes diff --git a/graphics/synfig/Makefile b/graphics/synfig/Makefile index 7c6f144ca011..98938a69cbcf 100644 --- a/graphics/synfig/Makefile +++ b/graphics/synfig/Makefile @@ -15,7 +15,6 @@ BUILD_DEPENDS= etl>=1.2.2:devel/etl \ gsed:textproc/gsed LIB_DEPENDS= libImath.so:math/Imath \ libOpenEXR.so:graphics/openexr \ - libMagickWand-6.so:graphics/ImageMagick6 \ libavcodec.so:multimedia/ffmpeg \ libboost_program_options.so:devel/boost-libs \ libdv.so:multimedia/libdv \ @@ -30,7 +29,7 @@ LIB_DEPENDS= libImath.so:math/Imath \ PORTSCOUT= limitw:1,even USES= autoreconf compiler:c++11-lang gmake gnome iconv jpeg \ - libtool localbase mlt:6 pathfix pkgconfig + libtool localbase magick:6 mlt:6 pathfix pkgconfig USE_CXXSTD= c++11 USE_GITHUB= yes USE_GNOME= cairo glibmm intltool libxml++26 pango diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile index 8759f78f8d9d..6164356c54c0 100644 --- a/graphics/synfigstudio/Makefile +++ b/graphics/synfigstudio/Makefile @@ -15,7 +15,6 @@ BUILD_DEPENDS= etl>=1.2.2:devel/etl \ gsed:textproc/gsed LIB_DEPENDS= libImath.so:math/Imath \ libOpenEXR.so:graphics/openexr \ - libMagick++-6.so:graphics/ImageMagick6 \ libfftw3.so:math/fftw3 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ @@ -25,7 +24,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils PORTSCOUT= limitw:1,even USES= autoreconf compiler:c++11-lang desktop-file-utils \ - gmake gnome libtool localbase mlt:6 pathfix pkgconfig \ + gmake gnome libtool localbase magick:6 mlt:6 pathfix pkgconfig \ shared-mime-info USE_GITHUB= yes GH_ACCOUNT= synfig diff --git a/graphics/ttygif/Makefile b/graphics/ttygif/Makefile index 2d125fc70826..edd48b28181e 100644 --- a/graphics/ttygif/Makefile +++ b/graphics/ttygif/Makefile @@ -9,12 +9,10 @@ COMMENT= Converts a ttyrec file into animated gif LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= convert:graphics/ImageMagick6 - USE_GITHUB= yes GH_ACCOUNT= icholy -USES= gmake +USES= gmake magick:6,run PLIST_FILES= bin/${PORTNAME} diff --git a/graphics/variety/Makefile b/graphics/variety/Makefile index 949fd144b4ac..97425ec3bc84 100644 --- a/graphics/variety/Makefile +++ b/graphics/variety/Makefile @@ -25,10 +25,9 @@ RUN_DEPENDS= ${PY_PILLOW} \ bash>=4.3.33:shells/bash \ ca_root_nss>=3.17.4:security/ca_root_nss \ coreutils>=8.23:sysutils/coreutils \ - ImageMagick6>=6.9.0.4,1:graphics/ImageMagick6 \ yelp>=3.14.1:x11/yelp -USES= desktop-file-utils gettext-tools gnome python:3.5+ shebangfix +USES= desktop-file-utils gettext-tools gnome magick:6,run python:3.5+ shebangfix USE_GITHUB= yes GH_ACCOUNT= varietywalls diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index 9baf0b3a7971..628508884fde 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -91,9 +91,9 @@ X11_CONFIGURE_WITH= x .if ${PORT_OPTIONS:MIMAGEMAGICK} .if ${PORT_OPTIONS:MX11} -LIB_DEPENDS+= libMagickCore-7.so:graphics/ImageMagick7 +USES+= magick:7 .else -LIB_DEPENDS+= libMagickCore-7.so:graphics/ImageMagick7-nox11 +USES+= magick:7,nox11 .endif .endif diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile index 091a8e52ed41..502486ae01f6 100644 --- a/graphics/xd3d/Makefile +++ b/graphics/xd3d/Makefile @@ -28,7 +28,7 @@ LICENSE= GPLv2 OPTIONS_DEFINE= DOCS EXAMPLES .if !defined(WITHOUT_IMAGEMAGICK) -RUN_DEPENDS+= convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} +USES+= magick:run .endif .if !defined(WITHOUT_GIFSICLE) RUN_DEPENDS+= gifsicle:graphics/gifsicle diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile index 92d497a828b9..26d402f7ea6b 100644 --- a/graphics/zbar/Makefile +++ b/graphics/zbar/Makefile @@ -59,7 +59,7 @@ GTK_NONE_CONFIGURE_ON= --with-gtk=no GRAPHICSMAGICK_LIB_DEPENDS= libGraphicsMagickWand.so:graphics/GraphicsMagick GRAPHICSMAGICK_CONFIGURE_WITH= graphicsmagick -IMAGEMAGICK_LIB_DEPENDS= libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} +IMAGEMAGICK_USES= magick IMAGEMAGICK_CONFIGURE_WITH= imagemagick JPEG_USES= jpeg diff --git a/japanese/mypaedia-fpw-package/Makefile b/japanese/mypaedia-fpw-package/Makefile index 38c73ff3800f..fa72a3e59494 100644 --- a/japanese/mypaedia-fpw-package/Makefile +++ b/japanese/mypaedia-fpw-package/Makefile @@ -11,8 +11,9 @@ COMMENT= Supplement file to use "mypaedia" on lookup RUN_DEPENDS= sox:audio/sox \ timidity:audio/timidity++ \ - xanim:multimedia/xanim \ - display:graphics/ImageMagick6 + xanim:multimedia/xanim + +USES= magick:6,run NO_BUILD= yes PLIST_SUB= PKGNAME=${PKGNAME} diff --git a/japanese/srd-fpw-package/Makefile b/japanese/srd-fpw-package/Makefile index 44833199ca31..db48af3df927 100644 --- a/japanese/srd-fpw-package/Makefile +++ b/japanese/srd-fpw-package/Makefile @@ -9,12 +9,11 @@ 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/ImageMagick6 # Your PC does not have an audio card always. # realplay:multimedia/linux-realplayer NO_BUILD= yes -USES= perl5 +USES= magick:6,run perl5 PKG_DIR= ${STAGEDIR}${PREFIX}/share/dict/lookup-package diff --git a/mail/libpst/Makefile b/mail/libpst/Makefile index d7aad9e0475e..cbec84b56ee2 100644 --- a/mail/libpst/Makefile +++ b/mail/libpst/Makefile @@ -28,11 +28,9 @@ OPTIONS_DEFINE= DOCS PST2DII OPTIONS_SUB= yes PST2DII_DESC= Allow Summation Document Image Information output -PST2DII_BUILD_DEPENDS= convert:graphics/ImageMagick6 PST2DII_CONFIGURE_ENABLE= dii +PST2DII_USES= localbase magick:6,build,run PST2DII_LIB_DEPENDS= libgd.so:graphics/gd -PST2DII_RUN_DEPENDS= convert:graphics/ImageMagick6 -PST2DII_USES= localbase post-patch: @${GREP} -lr malloc.h ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' diff --git a/math/glgraph/Makefile b/math/glgraph/Makefile index 78d37f349755..9c76cdc44938 100644 --- a/math/glgraph/Makefile +++ b/math/glgraph/Makefile @@ -13,10 +13,9 @@ COMMENT= OpenGL based function grapher LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= p5-OpenGL>=0:graphics/p5-OpenGL \ - import:graphics/ImageMagick6 +RUN_DEPENDS= p5-OpenGL>=0:graphics/p5-OpenGL -USES= perl5 shebangfix tar:bzip2 +USES= magick:6,run perl5 shebangfix tar:bzip2 USE_PERL5= run SHEBANG_FILES= ${PORTNAME} NO_BUILD= yes diff --git a/math/gri/Makefile b/math/gri/Makefile index c8a13310bc8e..5c887edc0cf1 100644 --- a/math/gri/Makefile +++ b/math/gri/Makefile @@ -32,7 +32,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MEXAMPLES} -BUILD_DEPENDS+= convert:graphics/ImageMagick6 +USES+= magick:6,build .endif post-patch: diff --git a/math/sage/Makefile b/math/sage/Makefile index cdd81e16205e..4e40552d072c 100644 --- a/math/sage/Makefile +++ b/math/sage/Makefile @@ -149,7 +149,6 @@ BUILD_DEPENDS= bash:shells/bash \ three.js>0:www/threejs \ yasm:devel/yasm \ gtar:archivers/gtar \ - convert:graphics/ImageMagick6 \ ffmpeg:multimedia/ffmpeg \ ${LOCALBASE}/lib/libBLT.a:x11-toolkits/blt LIB_DEPENDS= libarb.so:math/arb \ @@ -338,8 +337,8 @@ RUN_DEPENDS= bash:shells/bash \ pixz:archivers/pixz USES= autoreconf blaslapack:openblas compiler:c++11-lib fortran \ - gettext gmake gnome iconv jpeg libtool localbase ncurses \ - ninja:build perl5 pkgconfig python:3.7+ readline shebangfix \ + gettext gmake gnome iconv jpeg libtool localbase magick:6,build \ + ncurses ninja:build perl5 pkgconfig python:3.7+ readline shebangfix \ sqlite tk xorg USE_TEX= latex:build pdftex:build tex:build USE_XORG= x11 xext xscrnsaver diff --git a/misc/gkrellshoot2/Makefile b/misc/gkrellshoot2/Makefile index e433951b943f..02613b75d34b 100644 --- a/misc/gkrellshoot2/Makefile +++ b/misc/gkrellshoot2/Makefile @@ -11,10 +11,9 @@ MAINTAINER= ports@FreeBSD.org 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/ImageMagick6 +RUN_DEPENDS= gkrellm:sysutils/gkrellm2 -USES= pkgconfig +USES= magick:6,run pkgconfig PLIST_FILES= libexec/gkrellm2/plugins/gkrellshoot.so WRKSRC= ${WRKDIR}/gkrellShoot-${PORTVERSION} diff --git a/misc/img2xterm/Makefile b/misc/img2xterm/Makefile index fe3e8b3e012f..b6d311810326 100644 --- a/misc/img2xterm/Makefile +++ b/misc/img2xterm/Makefile @@ -10,11 +10,9 @@ COMMENT= Display images on 256 color xterms LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 - USE_GITHUB= yes GH_ACCOUNT= kfei -USES= gmake ncurses +USES= gmake magick:6 ncurses PLIST_FILES= bin/img2xterm .include <bsd.port.pre.mk> diff --git a/misc/pyobd/Makefile b/misc/pyobd/Makefile index 73e16be43cd1..c7a1eca86b2e 100644 --- a/misc/pyobd/Makefile +++ b/misc/pyobd/Makefile @@ -11,10 +11,9 @@ COMMENT= OBD-II compliant car diagnostic tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= convert:graphics/ImageMagick6 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} -USES= dos2unix gnome python shebangfix +USES= dos2unix gnome magick:6,build python shebangfix DOS2UNIX_FILES= ${PORTNAME}.desktop SHEBANG_FILES= ${PORTNAME} USE_WX= 3.0 diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile index 3d03257b878c..beb0506738bc 100644 --- a/multimedia/dvd-slideshow/Makefile +++ b/multimedia/dvd-slideshow/Makefile @@ -14,7 +14,6 @@ MAINTAINER= oz@nixil.net COMMENT= Script to create slideshow-style DVD with some simple menus RUN_DEPENDS= bash:shells/bash \ - identify:graphics/ImageMagick6 \ mpeg2enc:multimedia/mjpegtools \ ffmpeg:multimedia/ffmpeg \ sox:audio/sox \ @@ -24,6 +23,8 @@ RUN_DEPENDS= bash:shells/bash \ ${LOCALBASE}/share/fonts/urwfonts-ttf/README:x11-fonts/urwfonts-ttf \ cdrecord:sysutils/cdrtools +USES= magick:6,run + NO_BUILD= yes DATADIR= ${PREFIX}/share/apps/${PORTNAME} diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile index c3ef5cb72e2b..1ff51b2e761c 100644 --- a/multimedia/dvdauthor/Makefile +++ b/multimedia/dvdauthor/Makefile @@ -46,7 +46,7 @@ VIDEO-FORMAT_DESC= Use default video format GRAPHICSMAGICK_CONFIGURE_WITH= graphicsmagick GRAPHICSMAGICK_LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick IMAGEMAGICK6_CONFIGURE_WITH= imagemagick -IMAGEMAGICK6_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6 +IMAGEMAGICK6_USES= magick:6 MANPAGES_BUILD_DEPENDS= docbook2man:textproc/docbook-utils \ docbook-sgml>0:textproc/docbook-sgml NTSC_CONFIGURE_ON= --enable-default-video-format=NTSC diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile index 8a841c9f2316..4f56023429e4 100644 --- a/multimedia/dvdrip/Makefile +++ b/multimedia/dvdrip/Makefile @@ -26,7 +26,6 @@ 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/ImageMagick6 \ mplayer:multimedia/mplayer \ pstree:sysutils/pstree \ transcode:multimedia/transcode \ @@ -34,7 +33,7 @@ RUN_DEPENDS= p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \ ${LOCALBASE}/sbin/fping:net/fping \ cdrecord:sysutils/cdrtools -USES= gettext perl5 shebangfix +USES= gettext magick:6,run perl5 shebangfix USE_PERL5= configure patch SHEBANG_FILES= bin/dvdrip* diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile index f01bdaa2d0db..3aa99e91a5c1 100644 --- a/multimedia/emby-server/Makefile +++ b/multimedia/emby-server/Makefile @@ -106,9 +106,11 @@ OPTIONS_DEFAULT= LAME X11 LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CONFIGURE_ENABLE= libmp3lame -X11_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 -X11_LIB_DEPENDS_OFF= libMagickWand-6.so:graphics/ImageMagick6-nox11 -X11_USES= xorg +SMB_USES= samba:lib +SMB_CONFIGURE_ENABLE= libsmbclient + +X11_USES= xorg magick:6 +X11_USES_OFF= magick:6,nox11 X11_USE= xorg=x11 FFVERSION= 2021_02_27 diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile index c76c6793575f..2d9846bd34d2 100644 --- a/multimedia/libopenshot/Makefile +++ b/multimedia/libopenshot/Makefile @@ -40,7 +40,7 @@ DOCS_CMAKE_BOOL= ENABLE_DOCS DOCS_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Doxygen DOCS_CMAKE_ON= -DCMAKE_INSTALL_DOCDIR:PATH=${DOCSDIR_REL:Q} DOCS_PORTDOCS= * -IMAGEMAGICK_LIB_DEPENDS= libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} +IMAGEMAGICK_USES= magick IMAGEMAGICK_CMAKE_BOOL= ENABLE_MAGICK IMAGEMAGICK_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_ImageMagick OPENCV_LIB_DEPENDS= libopencv_core.so:graphics/opencv \ diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 8a9a1b87a64f..1e2e561232d3 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -100,7 +100,7 @@ DVB_BUILD_DEPENDS= v4l_compat>=1.0.20100321:multimedia/v4l_compat DVB_CONFIGURE_ENABLE= dvb GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_ON= --enable-tls -IMAGEMAGICK_LIB_DEPENDS= libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} +IMAGEMAGICK_USES= magick IMAGEMAGICK_CONFIGURE_WITH= imagemagick IMAGEMAGICK_IMPLIES= DMX_IMAGE IPV6_CONFIGURE_ENABLE= ipv6 diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile index 430d07ed5adc..769d36ceb4b7 100644 --- a/multimedia/lives/Makefile +++ b/multimedia/lives/Makefile @@ -81,8 +81,7 @@ FREI0R_BUILD_DEPENDS= frei0r>0:graphics/frei0r FREI0R_CONFIGURE_OFF= --disable-frei0r FREI0R_RUN_DEPENDS= frei0r>0:graphics/frei0r GHOSTSCRIPT_USES= ghostscript:run -IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} \ - composite:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} +IMAGEMAGICK_USES= magick:run JACK_CONFIGURE_OFF= --disable-jack JACK_LIB_DEPENDS= libjack.so:audio/jack \ libjackserver.so:audio/jack diff --git a/multimedia/py-moviepy/Makefile b/multimedia/py-moviepy/Makefile index 89719fa520d1..3b375090ca28 100644 --- a/multimedia/py-moviepy/Makefile +++ b/multimedia/py-moviepy/Makefile @@ -30,7 +30,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/ImageMagick6 -IMAGEMAGICK7_RUN_DEPENDS= convert:graphics/ImageMagick7 +IMAGEMAGICK6_USES= magick:6,run +IMAGEMAGICK7_USES= magick:7,run .include <bsd.port.mk> diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 238befda0cf5..8aff1232bd93 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -96,7 +96,7 @@ SDL_USES= sdl SDL_USE= SDL=sdl SDL_CONFIGURE_ENABLE= sdl -IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 +IMAGEMAGICK_USES= magick:6 IMAGEMAGICK_CONFIGURE_ENABLE= imagemagick IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick-prefix=${LOCALBASE} diff --git a/multimedia/vapoursynth/Makefile b/multimedia/vapoursynth/Makefile index 3fd170b53e90..73b4e0fd45a0 100644 --- a/multimedia/vapoursynth/Makefile +++ b/multimedia/vapoursynth/Makefile @@ -81,8 +81,7 @@ ASS_CONFIGURE_ENABLE= subtext EEDI3_DESC= Very slow edge directed interpolation EEDI3_CONFIGURE_ENABLE= eedi3 -IMAGEMAGICK_LIB_DEPENDS= libMagick++-7.so:graphics/ImageMagick7 -IMAGEMAGICK_USES= compiler:c++11-lib +IMAGEMAGICK_USES= compiler:c++11-lib magick:7 IMAGEMAGICK_CONFIGURE_ENABLE= imwri TESSERACT_DESC= Optical Character Recognition via Tesseract diff --git a/net-im/pidgin-latex/Makefile b/net-im/pidgin-latex/Makefile index 161fe0f0bef3..ec1438e3e132 100644 --- a/net-im/pidgin-latex/Makefile +++ b/net-im/pidgin-latex/Makefile @@ -12,12 +12,11 @@ MAINTAINER= mainland@apeiron.net 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/ImageMagick6 +RUN_DEPENDS= pidgin:net-im/pidgin WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME} -USES= gmake gnome pkgconfig tar:bzip2 +USES= gmake gnome magick:6,run pkgconfig tar:bzip2 USE_TEX= latex USE_GNOME= gtk20 MAKE_ARGS= CC="${CC}" diff --git a/net-im/purple-discord/Makefile b/net-im/purple-discord/Makefile index f0b66eb23f8e..6268f9b968d4 100644 --- a/net-im/purple-discord/Makefile +++ b/net-im/purple-discord/Makefile @@ -8,11 +8,10 @@ COMMENT= Discord plugin for libpurple LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= convert:graphics/ImageMagick6 LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ libpurple.so:net-im/libpurple -USES= dos2unix gettext gmake gnome pkgconfig +USES= dos2unix gettext gmake gnome magick:6,build pkgconfig USE_GNOME= glib20 USE_LDCONFIG= yes USE_GITHUB= yes diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index bb269408592e..37283690fcba 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -74,10 +74,10 @@ MYSQLD_USES_OFF= mysql:client NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins NMAP_RUN_DEPENDS= nmap:security/nmap WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client -X11_RUN_DEPENDS= Magick-config:graphics/ImageMagick6 \ - mtr:net/mtr -X11_RUN_DEPENDS_OFF= Magick-config:graphics/ImageMagick6-nox11 \ - mtr:net/mtr-nox11 +X11_RUN_DEPENDS= mtr:net/mtr +X11_RUN_DEPENDS_OFF= mtr:net/mtr-nox11 +X11_USES= magick:6 +X11_USES_OFF= magick:6,nox11 _ROOT_FILES= addhost.php adduser.php alerts.php artisan \ billing-calculate.php check-services.php composer.json \ diff --git a/net/scapy/Makefile b/net/scapy/Makefile index 98af99fecd8e..1f1595d0640d 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -33,8 +33,8 @@ PYX_DESC= PostScript and PDF graphs drawing QUESO_BASE_DESC=queso OS signatures database SOX_DESC= Support for VoIP -GRAPH_RUN_DEPENDS= ${LOCALBASE}/bin/MagickCore-config:graphics/ImageMagick6 \ - ${LOCALBASE}/bin/dot:graphics/graphviz +GRAPH_USES= magick:6,run +GRAPH_RUN_DEPENDS= ${LOCALBASE}/bin/dot:graphics/graphviz IPYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR} NMAP_RUN_DEPENDS= ${LOCALBASE}/share/nmap/nmap-os-db:security/nmap MANUF_RUN_DEPENDS= ${LOCALBASE}/share/wireshark/manuf:net/wireshark diff --git a/net/tigervnc-viewer/Makefile b/net/tigervnc-viewer/Makefile index aa85245c5574..a0a8e19c2d22 100644 --- a/net/tigervnc-viewer/Makefile +++ b/net/tigervnc-viewer/Makefile @@ -3,10 +3,9 @@ CATEGORIES= net COMMENT= TigerVNC Viewer -USES+= gnome iconv jpeg xorg +USES+= gnome iconv jpeg magick:7,build xorg USE_XORG+= ice pixman sm x11 xcursor xext xfixes xft xi xinerama xrender xrandr -BUILD_DEPENDS+= convert:graphics/ImageMagick7 # to generate icons during build LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \ libpng.so:graphics/png \ libfltk.so:x11-toolkits/fltk diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index b680a662265c..97cbbb0b593b 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -56,11 +56,11 @@ OPTIONS_SUB= yes BRAILLE_CONFIGURE_ENABLE= braille BRAILLE_DESC= Braille embosser support +BRAILLE_USES= magick:run BRAILLE_BUILD_DEPENDS= bash:shells/bash BRAILLE_LIB_DEPENDS= liblouis.so:devel/liblouis \ # liblouisutdml.so:devel/liblouisutdml -BRAILLE_RUN_DEPENDS= convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} \ - pdftotext:graphics/poppler-utils \ +BRAILLE_RUN_DEPENDS= pdftotext:graphics/poppler-utils \ bash:shells/bash COLORD_CONFIGURE_ENABLE= dbus diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile index ade49fadc83e..d03fe002ecfa 100644 --- a/print/html2ps/Makefile +++ b/print/html2ps/Makefile @@ -13,13 +13,12 @@ COMMENT= HTML to PostScript converter LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= mogrify:graphics/ImageMagick6 \ - p5-libwww>=0:www/p5-libwww \ +RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \ weblint++:www/weblint++ \ paperconf:print/libpaper NO_BUILD= yes -USES= ghostscript:run perl5 +USES= ghostscript:run magick:6,run perl5 SUB_FILES= html2psrc diff --git a/print/latex2rtf/Makefile b/print/latex2rtf/Makefile index 6c0b64c77885..d1a151303efe 100644 --- a/print/latex2rtf/Makefile +++ b/print/latex2rtf/Makefile @@ -18,8 +18,8 @@ OPTIONS_DEFINE= LATEX2PNG LATEX2PNG_DESC= Install latex2png utility OPTIONS_SUB= yes +LATEX2PNG_USES= magick:6,run LATEX2PNG_USE= TEX=dvipsk,latex,xetex -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 ea4400ce8749..fd4e13c0ba4c 100644 --- a/print/lilypond-devel/Makefile +++ b/print/lilypond-devel/Makefile @@ -12,7 +12,6 @@ COMMENT= GNU music typesetter LICENSE= GPLv3 BUILD_DEPENDS= bash:shells/bash \ - convert:graphics/ImageMagick7 \ dblatex:textproc/dblatex \ fontforge:print/fontforge \ help2man:misc/help2man \ @@ -30,7 +29,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \ mftrace:print/mftrace -USES= bison:build compiler:c++11-lib cpe ghostscript gmake gnome perl5 \ +USES= bison:build compiler:c++11-lib cpe ghostscript gmake gnome magick:7,build perl5 \ pkgconfig python:3.5+ USE_CXXSTD= c++11 USE_GNOME= pango diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 4e67611c670c..8c32aa5f7a38 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -12,7 +12,6 @@ COMMENT= GNU music typesetter LICENSE= GPLv3 BUILD_DEPENDS= bash:shells/bash \ - convert:graphics/ImageMagick7 \ dblatex:textproc/dblatex \ fontforge:print/fontforge \ help2man:misc/help2man \ @@ -30,7 +29,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejav mftrace:print/mftrace USES= bison:build compiler:c++11-lib cpe ghostscript gmake gnome \ - perl5 pkgconfig python:3.5+ + magick:7,build perl5 pkgconfig python:3.5+ USE_CXXSTD= c++11 USE_GNOME= pango USE_PERL5= build diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile index d4dcc5171d31..6e63e0aca984 100644 --- a/print/muttprint/Makefile +++ b/print/muttprint/Makefile @@ -45,9 +45,9 @@ PRINT_COMMAND=lpr -P$$PRINTER .endif .if ${PORT_OPTIONS:MX11} -RUN_DEPENDS+= convert:graphics/ImageMagick6 +USES+= magick:6,run .else -RUN_DEPENDS+= convert:graphics/ImageMagick6-nox11 +USES+= magick:6,run,nox11 .endif pre-everything:: diff --git a/print/pdf-redact-tools/Makefile b/print/pdf-redact-tools/Makefile index cbfdfe9f914f..8d1611745205 100644 --- a/print/pdf-redact-tools/Makefile +++ b/print/pdf-redact-tools/Makefile @@ -13,10 +13,9 @@ COMMENT= Securely redact and strip metadata from PDF files LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool \ - convert:graphics/ImageMagick6 +RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool -USES= python:3.6+ +USES= magick:6,run python:3.6+ USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils diff --git a/print/pdf-tools/Makefile b/print/pdf-tools/Makefile index 76e9d57ff593..5ee16d5c0ef7 100644 --- a/print/pdf-tools/Makefile +++ b/print/pdf-tools/Makefile @@ -15,13 +15,12 @@ BROKEN_FreeBSD_12_powerpc64= fails to configure on powerpc64 elfv1: cannot find BUILD_DEPENDS= cask${EMACS_PKGNAMESUFFIX}>0:devel/cask@${EMACS_FLAVOR} \ tablist${EMACS_PKGNAMESUFFIX}>=0.70.4:devel/tablist@${EMACS_FLAVOR} -LIB_DEPENDS= libMagickCore-7.so:graphics/ImageMagick7 \ - libpng.so:graphics/png \ +LIB_DEPENDS= libpng.so:graphics/png \ libpoppler-glib.so:graphics/poppler-glib \ libpoppler.so:graphics/poppler RUN_DEPENDS= tablist${EMACS_PKGNAMESUFFIX}>=0.70:devel/tablist@${EMACS_FLAVOR} -USES= autoreconf:build emacs gettext-runtime gmake gnome +USES= autoreconf:build emacs gettext-runtime gmake gnome magick:7 USE_GITHUB= yes GH_ACCOUNT= vedang USE_GNOME= cairo glib20 diff --git a/print/texvc/Makefile b/print/texvc/Makefile index 6c9c3228970e..f9a506ee804b 100644 --- a/print/texvc/Makefile +++ b/print/texvc/Makefile @@ -19,9 +19,8 @@ OPTIONS_DEFINE= RASTER OPTIONS_DEFAULT:= ${OPTIONS_DEFINE} RASTER_DESC= rasterization support -RASTER_USES= ghostscript:run +RASTER_USES= ghostscript:run magick:6,run RASTER_USE= TEX=latex,dvipsk -RASTER_RUN_DEPENDS= convert:graphics/ImageMagick6 MAKE_JOBS_UNSAFE= yes diff --git a/science/xcrysden/Makefile b/science/xcrysden/Makefile index 56348489f833..e8459172cb27 100644 --- a/science/xcrysden/Makefile +++ b/science/xcrysden/Makefile @@ -15,11 +15,10 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \ libTogl2.0.so:graphics/togl RUN_DEPENDS= bwidget>0:x11-toolkits/bwidget \ obabel:science/openbabel \ - convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} \ ppmtompeg:graphics/netpbm \ xwd:x11/xwd -USES= fortran gl gmake localbase:ldflags tcl tk xorg +USES= fortran gl gmake localbase:ldflags magick:run tcl tk xorg USE_GL= gl glu USE_XORG= x11 xmu diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile index e0197500c32c..c7b5ee71c677 100644 --- a/security/libfprint/Makefile +++ b/security/libfprint/Makefile @@ -12,12 +12,11 @@ COMMENT= Library for fingerprint reader devices LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6 \ - libnss3.so:security/nss \ +LIB_DEPENDS= libnss3.so:security/nss \ libnspr4.so:devel/nspr GNU_CONFIGURE= yes -USES= gnome libtool pathfix pkgconfig tar:xz xorg +USES= gnome libtool magick:6 pathfix pkgconfig tar:xz xorg USE_LDCONFIG= yes USE_GNOME= glib20 USE_XORG= pixman diff --git a/security/p5-GD-SecurityImage/Makefile b/security/p5-GD-SecurityImage/Makefile index 9dedb1f1c3d1..6fab41e478df 100644 --- a/security/p5-GD-SecurityImage/Makefile +++ b/security/p5-GD-SecurityImage/Makefile @@ -33,11 +33,9 @@ NO_ARCH= yes .if ${PORT_OPTIONS:MIMAGEMAGICK} .if ${PORT_OPTIONS:MX11} -BUILD_DEPENDS+= convert:graphics/ImageMagick6 -RUN_DEPENDS+= convert:graphics/ImageMagick6 +USES+= magick:6,build,run .else -BUILD_DEPENDS+= convert:graphics/ImageMagick6-nox11 -RUN_DEPENDS+= convert:graphics/ImageMagick6-nox11 +USES+= magick:6,build,run,nox11 .endif .endif diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile index e6cefaa3b5fa..ccef2be8ad16 100644 --- a/sysutils/xvidcap/Makefile +++ b/sysutils/xvidcap/Makefile @@ -19,10 +19,9 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libfontconfig.so:x11-fonts/fontconfig \ libmp3lame.so:audio/lame -RUN_DEPENDS= animate:graphics/ImageMagick6 \ - gimp:graphics/gimp-app +RUN_DEPENDS= gimp:graphics/gimp-app -USES= gettext gmake gnome localbase pkgconfig xorg +USES= gettext gmake gnome localbase magick:6,run pkgconfig xorg USE_GNOME= cairo gdkpixbuf2 glib20 libglade2 intltool USE_XORG= x11 xext xmu ice xfixes xdamage diff --git a/textproc/docbook2odf/Makefile b/textproc/docbook2odf/Makefile index 8e12021a76ce..639071d7d89e 100644 --- a/textproc/docbook2odf/Makefile +++ b/textproc/docbook2odf/Makefile @@ -13,11 +13,10 @@ LICENSE= GPLv2 LIB_DEPENDS= libsablot.so:textproc/sablotron \ libxslt.so:textproc/libxslt -RUN_DEPENDS= convert:graphics/ImageMagick6 \ - zip:archivers/zip \ +RUN_DEPENDS= zip:archivers/zip \ p5-Archive-Zip>=0:archivers/p5-Archive-Zip -USES= desktop-file-utils perl5 shebangfix +USES= desktop-file-utils magick:6,run perl5 shebangfix SHEBANG_FILES= utils/maketests utils/${PORTNAME} USE_PERL5= run NO_BUILD= yes diff --git a/textproc/eqe/Makefile b/textproc/eqe/Makefile index c9c49a6b6e60..09fbcdd4c749 100644 --- a/textproc/eqe/Makefile +++ b/textproc/eqe/Makefile @@ -14,10 +14,9 @@ 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/ImageMagick6 + p5-Template-Toolkit>=0:www/p5-Template-Toolkit -USES= perl5 shebangfix tar:bzip2 +USES= magick:6,build perl5 shebangfix tar:bzip2 SHEBANG_FILES= src/eqe src/eqedit USE_TEX= tex NO_ARCH= yes diff --git a/textproc/pdfsandwich/Makefile b/textproc/pdfsandwich/Makefile index 1119e0294214..64df3824e550 100644 --- a/textproc/pdfsandwich/Makefile +++ b/textproc/pdfsandwich/Makefile @@ -11,12 +11,11 @@ LICENSE= GPLv2 BUILD_DEPENDS= gawk:lang/gawk \ ocamlopt:lang/ocaml -RUN_DEPENDS= convert:graphics/ImageMagick6 \ - pdfunite:graphics/poppler-utils \ +RUN_DEPENDS= pdfunite:graphics/poppler-utils \ tesseract:graphics/tesseract \ unpaper:graphics/unpaper -USES= gmake ghostscript:run tar:bz2 +USES= gmake ghostscript:run magick:6,run tar:bz2 GNU_CONFIGURE= yes PLIST_FILES= bin/pdfsandwich \ diff --git a/textproc/qr/Makefile b/textproc/qr/Makefile index 90f10314f1e2..552dcb628dad 100644 --- a/textproc/qr/Makefile +++ b/textproc/qr/Makefile @@ -11,10 +11,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libqrencode.so:graphics/libqrencode TEST_DEPENDS= ${LOCALBASE}/share/fonts/freefont-ttf/FreeMono.ttf:x11-fonts/freefont-ttf \ autom4te:devel/autoconf \ - convert:graphics/ImageMagick6 \ zbarimg:graphics/zbar -USES= gmake +USES= gmake magick:6,test USE_CSTD= c99 USE_GITHUB= yes GH_ACCOUNT= Y2Z diff --git a/www/coppermine/Makefile b/www/coppermine/Makefile index 7e2c4f458dce..f1f0da242936 100644 --- a/www/coppermine/Makefile +++ b/www/coppermine/Makefile @@ -13,7 +13,7 @@ USES= php OPTIONS_DEFINE= DOCS IMAGEMAGICK IMAGEMAGICK_DESC= Use ImageMagick instead of PHP GD extension -IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick6 +IMAGEMAGICK_USES= magick:6,run IMAGEMAGICK_USE_OFF= PHP=gd USE_PHP= ctype hash json mysqli pcre xml diff --git a/www/fgallery/Makefile b/www/fgallery/Makefile index 9bbc174e6690..eed6ffa04aea 100644 --- a/www/fgallery/Makefile +++ b/www/fgallery/Makefile @@ -13,10 +13,10 @@ 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/ImageMagick6 + p5-Cpanel-JSON-XS>=0:converters/p5-Cpanel-JSON-XS LIB_DEPENDS= liblcms2.so:graphics/lcms2 +USES= magick:6,run USE_GITHUB= yes NO_BUILD= yes NO_ARCH= yes diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile index 59f9e905a79d..2f7fd3da3686 100644 --- a/www/gallery2/Makefile +++ b/www/gallery2/Makefile @@ -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/ImageMagick6 +IMAGEMAGICK_USES= magick:6,run JHEAD_RUN_DEPENDS= jhead:graphics/jhead MYSQL_USE= PHP=mysqli NETPBM_RUN_DEPENDS= giftopnm:graphics/netpbm diff --git a/www/gpx2map/Makefile b/www/gpx2map/Makefile index 85d9ade9ff5b..22f9c733685c 100644 --- a/www/gpx2map/Makefile +++ b/www/gpx2map/Makefile @@ -28,8 +28,8 @@ PLIST_FILES= bin/gpx2map \ OPTIONS_DEFINE= GNUPLOT GNUPLOT_DESC= Enable draw track profiles -GNUPLOT_RUN_DEPENDS= p5-Chart-Gnuplot>=0:graphics/p5-Chart-Gnuplot \ - convert:graphics/ImageMagick6 +GNUPLOT_USES= magick:6,run +GNUPLOT_RUN_DEPENDS= p5-Chart-Gnuplot>=0:graphics/p5-Chart-Gnuplot post-patch: @${REINPLACE_CMD} -e "s|gpx2map.google.template|${DATADIR}/gpx2map.google.template|" \ diff --git a/www/igal2/Makefile b/www/igal2/Makefile index 224bc807e3e0..a0934854ac31 100644 --- a/www/igal2/Makefile +++ b/www/igal2/Makefile @@ -30,8 +30,8 @@ IMAGICK_X11_DESC=With X11 support EXIF_RUN_DEPENDS= p5-Image-ExifTool>=7.0:graphics/p5-Image-ExifTool -IMAGICK_X11_RUN_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 -IMAGICK_NOX11_RUN_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick6-nox11 +IMAGICK_X11_USES= magick:6,run +IMAGICK_NOX11_USES= magick:6,run,nox11 post-patch: ${REINPLACE_CMD} -e 's|%%LIBDIR%%|${PREFIX}/lib/igal2|' ${WRKSRC}/igal2 diff --git a/www/ilias/Makefile b/www/ilias/Makefile index b8b575f8f776..d18bdd98fbd0 100644 --- a/www/ilias/Makefile +++ b/www/ilias/Makefile @@ -13,8 +13,7 @@ LICENSE= GPLv2 CONFLICTS= ilias6 PORTSCOUT= limit:^5\. -RUN_DEPENDS= convert:graphics/ImageMagick6 \ - zip:archivers/zip \ +RUN_DEPENDS= zip:archivers/zip \ ${UNZIP_CMD}:archivers/unzip \ ${LOCALBASE}/share/pear/PEAR.php:devel/pear@${PHP_FLAVOR} \ ${LOCALBASE}/share/pear/Auth/Auth.php:security/pear-Auth@${PHP_FLAVOR} \ @@ -26,7 +25,7 @@ USE_GITHUB= yes GH_ACCOUNT= ILIAS-eLearning GH_PROJECT= ILIAS -USES= cpe jpeg php +USES= cpe jpeg magick:6,run php NO_BUILD= yes PLIST= ${WRKDIR}/plist USE_PHP= pdo_mysql session zlib gd pdf dom xsl pcre simplexml diff --git a/www/ilias6/Makefile b/www/ilias6/Makefile index e8304a80a985..3c34fd22d233 100644 --- a/www/ilias6/Makefile +++ b/www/ilias6/Makefile @@ -14,7 +14,6 @@ LICENSE= GPLv2 CONFLICTS= ilias-5.4.[0-9]* RUN_DEPENDS= composer:devel/php-composer \ - convert:graphics/ImageMagick6 \ zip:archivers/zip \ ${UNZIP_CMD}:archivers/unzip \ ${LOCALBASE}/share/pear/PEAR.php:devel/pear@${PHP_FLAVOR} \ @@ -27,7 +26,7 @@ USE_GITHUB= yes GH_ACCOUNT= ILIAS-eLearning GH_PROJECT= ILIAS -USES= cpe jpeg php +USES= cpe jpeg magick:6,run php NO_BUILD= yes PLIST= ${WRKDIR}/plist USE_PHP= curl ldap pdo_mysql gd pdf dom pcre session simplexml \ diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 368297fc8371..95995623743c 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -299,8 +299,8 @@ SHIBBOLETH_VARS= DSO_EXTMODS+=shibboleth SLOWFS_CACHE_GH_TUPLE= baysao:ngx_slowfs_cache:d011a18:slowfs_cache SLOWFS_CACHE_VARS= DSO_EXTMODS+=slowfs_cache -SMALL_LIGHT_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 \ - libpcre.so:devel/pcre +SMALL_LIGHT_USES= magick:6 +SMALL_LIGHT_LIB_DEPENDS= libpcre.so:devel/pcre SMALL_LIGHT_GH_TUPLE= kawakibi:ngx_small_light:2f5e1d0:small_light SMALL_LIGHT_VARS= DSO_EXTMODS+=small_light diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod index 1d62ca609ae7..223f1c7745db 100644 --- a/www/nginx/Makefile.extmod +++ b/www/nginx/Makefile.extmod @@ -291,8 +291,8 @@ SHIBBOLETH_VARS= DSO_EXTMODS+=shibboleth SLOWFS_CACHE_GH_TUPLE= baysao:ngx_slowfs_cache:d011a18:slowfs_cache SLOWFS_CACHE_VARS= DSO_EXTMODS+=slowfs_cache -SMALL_LIGHT_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 \ - libpcre.so:devel/pcre +SMALL_LIGHT_USES= magick:6 +SMALL_LIGHT_LIB_DEPENDS= 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 db462ff54819..f440884ab992 100644 --- a/www/p5-jQuery-File-Upload/Makefile +++ b/www/p5-jQuery-File-Upload/Makefile @@ -9,7 +9,6 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Perl extension for jQuery File Upload plugin RUN_DEPENDS= \ - 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 \ @@ -17,7 +16,7 @@ RUN_DEPENDS= \ p5-URI>0:net/p5-URI BUILD_DEPENDS= ${RUN_DEPENDS} -USES= perl5 +USES= magick:6,run perl5 USE_PERL5= configure NO_ARCH= YES diff --git a/www/serendipity/Makefile b/www/serendipity/Makefile index 059cb4adcc0d..f69719c3e0bd 100644 --- a/www/serendipity/Makefile +++ b/www/serendipity/Makefile @@ -32,7 +32,7 @@ OPTIONS_DEFAULT= MYSQL MAGICK MYSQL_USE= PHP=mysqli PGSQL_USE= PHP=pgsql SQLITE_USE= PHP=sqlite3 -MAGICK_RUN_DEPENDS+= convert:graphics/ImageMagick7 +MAGICK_USES= magick:7,run do-install: @-${MKDIR} ${STAGEDIR}${PREFIX}/${SERENDIPITY} diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile index 8771f1c8ecc9..96a3ea79f641 100644 --- a/www/trafficserver/Makefile +++ b/www/trafficserver/Makefile @@ -66,9 +66,9 @@ IMAGEMAGICK_DESC= Enable ats-magick & webp convert plugin .if ${PORT_OPTIONS:MIMAGEMAGICK} .if ${PORT_OPTIONS:MX11} -RUN_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 +USES+= magick:6 .else -RUN_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick6-nox11 +USES+= magick:6,nox11 .endif .endif diff --git a/www/twiki-MathModePlugin/Makefile b/www/twiki-MathModePlugin/Makefile index 33b81c5d3c1b..b904daf7b55c 100644 --- a/www/twiki-MathModePlugin/Makefile +++ b/www/twiki-MathModePlugin/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= http://protey.ru/freebsd/distfiles/ \ COMMENT= Include LaTeX formatted math in your TWiki pages -RUN_DEPENDS= convert:graphics/ImageMagick6 +USES= magick:6,run USE_TEX= base latex diff --git a/www/typo3-10/Makefile b/www/typo3-10/Makefile index 5cf58c1d7c8f..c320d6037aeb 100644 --- a/www/typo3-10/Makefile +++ b/www/typo3-10/Makefile @@ -64,9 +64,9 @@ ZLIB_USE= PHP=zlib .if ${PORT_OPTIONS:MIMAGICK} .if ${PORT_OPTIONS:MX11} -RUN_DEPENDS+= convert:graphics/ImageMagick6 +USES+= magick:6,run .else -RUN_DEPENDS+= convert:graphics/ImageMagick6-nox11 +USES+= magick:6,run,nox11 .endif .endif diff --git a/www/typo3-11/Makefile b/www/typo3-11/Makefile index a0474ff06563..11077a71ab7f 100644 --- a/www/typo3-11/Makefile +++ b/www/typo3-11/Makefile @@ -64,9 +64,9 @@ ZLIB_USE= PHP=zlib .if ${PORT_OPTIONS:MIMAGICK} .if ${PORT_OPTIONS:MX11} -RUN_DEPENDS+= convert:graphics/ImageMagick7 +USES+= magick:7,run .else -RUN_DEPENDS+= convert:graphics/ImageMagick7-nox11 +USES+= magick:7,run,nox11 .endif .endif diff --git a/www/typo3-9/Makefile b/www/typo3-9/Makefile index b1b261269493..8bf1eda4b007 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/ImageMagick6 -.else -RUN_DEPENDS+= convert:graphics/ImageMagick6-nox11 +USES+= magick:6,run +else +USES+= magick:6,run,nox11 .endif .endif diff --git a/x11-fonts/fontpreview/Makefile b/x11-fonts/fontpreview/Makefile index fb98b0fb36f9..eed37649245b 100644 --- a/x11-fonts/fontpreview/Makefile +++ b/x11-fonts/fontpreview/Makefile @@ -10,13 +10,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= bash:shells/bash \ - convert:graphics/ImageMagick7 \ fzf:textproc/fzf \ getopt>0:misc/getopt \ sxiv:graphics/sxiv \ xdotool:x11/xdotool -USES= shebangfix +USES= magick:7,run shebangfix USE_GITHUB= yes GH_ACCOUNT= sdushantha SHEBANG_FILES= ${PORTNAME} diff --git a/x11-themes/cursor-crystal-theme/Makefile b/x11-themes/cursor-crystal-theme/Makefile index dd382b274a00..2ab2f840d9f0 100644 --- a/x11-themes/cursor-crystal-theme/Makefile +++ b/x11-themes/cursor-crystal-theme/Makefile @@ -13,10 +13,9 @@ COMMENT= KDE Crystal style X cursor theme LICENSE= LGPL21 -BUILD_DEPENDS= convert:graphics/ImageMagick6 \ - xcursorgen:x11/xcursorgen +BUILD_DEPENDS= xcursorgen:x11/xcursorgen -USES= gmake tar:bzip2 +USES= gmake magick:6,build tar:bzip2 post-patch: @${REINPLACE_CMD} -e 's|function ||' \ diff --git a/x11-themes/icons-tango-extras/Makefile b/x11-themes/icons-tango-extras/Makefile index 9d4d6f88f93f..2105ffea5c21 100644 --- a/x11-themes/icons-tango-extras/Makefile +++ b/x11-themes/icons-tango-extras/Makefile @@ -10,12 +10,11 @@ MAINTAINER= ports@FreeBSD.org 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 \ - convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} + ${LOCALBASE}/share/icons/Tango/16x16/actions/add.png:x11-themes/icons-tango RUN_DEPENDS= ${LOCALBASE}/share/icons/Tango/16x16/actions/add.png:x11-themes/icons-tango GNU_CONFIGURE= yes -USES= gmake gnome pkgconfig +USES= gmake gnome magick:build pkgconfig USE_GNOME= intlhack .include <bsd.port.mk> diff --git a/x11-themes/icons-tango/Makefile b/x11-themes/icons-tango/Makefile index a923f57b828f..2e8e60cab8e5 100644 --- a/x11-themes/icons-tango/Makefile +++ b/x11-themes/icons-tango/Makefile @@ -10,11 +10,10 @@ DISTNAME= tango-icon-theme-${PORTVERSION} 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 \ - convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} +BUILD_DEPENDS= ${LOCALBASE}/libexec/icon-name-mapping:x11-themes/icon-naming-utils GNU_CONFIGURE= yes USE_GNOME= intlhack -USES+= gettext-tools gmake gnome pathfix pkgconfig +USES+= gettext-tools gmake gnome magick:build pathfix pkgconfig .include <bsd.port.mk> diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index 49647e21f247..1edfdc9038b9 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -13,8 +13,7 @@ COMMENT= Highly configurable, next generation framework window manager LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= convert:graphics/ImageMagick6 \ - ${LUA_REFMODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi@${LUA_FLAVOR} +BUILD_DEPENDS= ${LUA_REFMODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi@${LUA_FLAVOR} RUN_DEPENDS= ${LUA_REFMODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:devel/lua-lgi@${LUA_FLAVOR} \ bash:shells/bash LIB_DEPENDS= libcairo.so:graphics/cairo \ @@ -29,7 +28,7 @@ LIB_DEPENDS= libcairo.so:graphics/cairo \ CONFLICTS_INSTALL= awesome3 -USES= cmake compiler:c11 gettext gnome iconv pkgconfig lua \ +USES= cmake compiler:c11 gettext gnome iconv magick:6,build pkgconfig lua \ shebangfix xorg USE_GITHUB= yes GH_ACCOUNT= awesomewm diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile index 84754d6f980d..054cf927e87e 100644 --- a/x11-wm/epplets/Makefile +++ b/x11-wm/epplets/Makefile @@ -11,10 +11,9 @@ 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/ImageMagick6 +RUN_DEPENDS= e16:x11-wm/e16 -USES= gl gmake libtool pkgconfig xorg +USES= gl gmake libtool magick:6,run pkgconfig xorg USE_XORG= xext USE_GL= glut USE_LDCONFIG= yes diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile index fd50308e2e8a..146e7a4730f2 100644 --- a/x11-wm/libwraster/Makefile +++ b/x11-wm/libwraster/Makefile @@ -37,7 +37,7 @@ INSTALL_TARGET= install-strip OPTIONS_DEFINE= IMAGEMAGICK OPTIONS_DEFAULT= IMAGEMAGICK -IMAGEMAGICK_LIB_DEPENDS= libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} +IMAGEMAGICK_USES= magick IMAGEMAGICK_CONFIGURE_OFF= --disable-magick .include <bsd.port.options.mk> diff --git a/x11-wm/nscde/Makefile b/x11-wm/nscde/Makefile index 3258915c7afa..ccf3085ae193 100644 --- a/x11-wm/nscde/Makefile +++ b/x11-wm/nscde/Makefile @@ -14,7 +14,6 @@ BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ - convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} \ dunst:sysutils/dunst \ font-bh-lucidatypewriter-100dpi>0:x11-fonts/font-bh-lucidatypewriter-100dpi \ fvwm2:x11-wm/fvwm2 \ @@ -32,7 +31,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR xsettingsd:x11/xsettingsd \ xterm:x11/xterm -USES= gettext pkgconfig:build python:3.7+ shebangfix xorg +USES= gettext magick:run pkgconfig:build python:3.7+ shebangfix xorg USE_GITHUB= yes GH_ACCOUNT= nscde USE_XORG= x11 xext xpm xrandr diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index ae375d214d90..8a3f7cfdbc88 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -54,7 +54,7 @@ OPTIONS_DEFINE= IMAGEMAGICK DOCS NLS OPTIONS_DEFAULT= IMAGEMAGICK OPTIONS_SUB= yes -IMAGEMAGICK_LIB_DEPENDS= libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} +IMAGEMAGICK_USES= magick IMAGEMAGICK_CONFIGURE_OFF= --disable-magick NLS_USES= gettext diff --git a/x11/py-pyscreenshot/Makefile b/x11/py-pyscreenshot/Makefile index 778655964b40..25ca744d8991 100644 --- a/x11/py-pyscreenshot/Makefile +++ b/x11/py-pyscreenshot/Makefile @@ -13,10 +13,9 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${PY_FLAVOR} \ - ${PY_PILLOW} \ - import:graphics/ImageMagick6 + ${PY_PILLOW} -USES= python:3.6+ +USES= magick:6,run python:3.6+ NO_ARCH= yes USE_PYTHON= autoplist distutils diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index dc69e57501c8..00da2b720df4 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -79,8 +79,8 @@ JP_IMPLIES= MB JP_CATEGORIES= japanese JP_VARS= XLOCKMORE_LANG=ja MAGICK_CONFIGURE_WITH= magick -MAGICK_LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6 \ - libpng.so:graphics/png +MAGICK_USES= magick:6 +MAGICK_LIB_DEPENDS= libpng.so:graphics/png GTK2_CONFIGURE_WITH= gtk2 GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libpng.so:graphics/png |