Page MenuHomeFreeBSD
Files F168327389

D32754.id99854.diff
No OneTemporary
Actions

D32754.id99854.diff
View Options

diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,29 @@
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
--- a/Mk/Scripts/qa.sh
+++ b/Mk/Scripts/qa.sh
@@ -597,6 +597,15 @@
# 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
--- /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
--- a/audio/beets/Makefile
+++ b/audio/beets/Makefile
@@ -68,7 +68,7 @@
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
--- a/audio/kwave/Makefile
+++ b/audio/kwave/Makefile
@@ -5,7 +5,6 @@
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 @@
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
--- a/audio/mp3plot/Makefile
+++ b/audio/mp3plot/Makefile
@@ -31,7 +31,7 @@
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
--- a/cad/alliance/Makefile
+++ b/cad/alliance/Makefile
@@ -18,10 +18,9 @@
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
--- a/comms/apitran/Makefile
+++ b/comms/apitran/Makefile
@@ -14,10 +14,9 @@
${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
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -60,7 +60,7 @@
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
--- a/databases/opendbviewer/Makefile
+++ b/databases/opendbviewer/Makefile
@@ -9,9 +9,7 @@
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
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -74,7 +74,7 @@
.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
--- a/deskutils/goesimage/Makefile
+++ b/deskutils/goesimage/Makefile
@@ -9,11 +9,10 @@
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
--- a/deskutils/py-paperless/Makefile
+++ b/deskutils/py-paperless/Makefile
@@ -67,10 +67,10 @@
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
--- a/devel/bugzilla44/Makefile
+++ b/devel/bugzilla44/Makefile
@@ -69,7 +69,7 @@
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
--- a/devel/bugzilla50/Makefile
+++ b/devel/bugzilla50/Makefile
@@ -69,7 +69,7 @@
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
--- a/devel/p5-Project-Gantt/Makefile
+++ b/devel/p5-Project-Gantt/Makefile
@@ -11,10 +11,9 @@
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
--- a/devel/rubygem-paperclip-rails5/Makefile
+++ b/devel/rubygem-paperclip-rails5/Makefile
@@ -32,7 +32,7 @@
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
--- a/devel/rubygem-paperclip-rails50/Makefile
+++ b/devel/rubygem-paperclip-rails50/Makefile
@@ -12,8 +12,7 @@
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 @@
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
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -162,7 +162,7 @@
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
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -175,7 +175,7 @@
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
--- a/emulators/mgba/Makefile
+++ b/emulators/mgba/Makefile
@@ -61,8 +61,7 @@
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
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -14,13 +14,12 @@
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
--- a/games/openclaw/Makefile
+++ b/games/openclaw/Makefile
@@ -25,8 +25,7 @@
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
--- a/games/openfodder/Makefile
+++ b/games/openfodder/Makefile
@@ -36,7 +36,7 @@
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
--- a/games/openspades/Makefile
+++ b/games/openspades/Makefile
@@ -15,7 +15,6 @@
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 @@
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
--- a/games/sgt-puzzles/Makefile
+++ b/games/sgt-puzzles/Makefile
@@ -14,9 +14,7 @@
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
--- a/games/tuxpaint/Makefile
+++ b/games/tuxpaint/Makefile
@@ -11,14 +11,13 @@
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
--- a/graphics/acidwarp-sdl/Makefile
+++ b/graphics/acidwarp-sdl/Makefile
@@ -5,9 +5,7 @@
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
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -27,7 +27,7 @@
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
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -9,10 +9,11 @@
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
--- a/graphics/chafa/Makefile
+++ b/graphics/chafa/Makefile
@@ -14,11 +14,9 @@
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
--- a/graphics/converseen/Makefile
+++ b/graphics/converseen/Makefile
@@ -9,9 +9,7 @@
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
--- a/graphics/curator/Makefile
+++ b/graphics/curator/Makefile
@@ -9,13 +9,11 @@
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
--- a/graphics/cuttlefish/Makefile
+++ b/graphics/cuttlefish/Makefile
@@ -10,10 +10,9 @@
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
--- a/graphics/dcraw-m/Makefile
+++ b/graphics/dcraw-m/Makefile
@@ -11,14 +11,13 @@
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
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -17,7 +17,6 @@
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 @@
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
--- a/graphics/dmtx-utils/Makefile
+++ b/graphics/dmtx-utils/Makefile
@@ -11,10 +11,9 @@
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
--- a/graphics/fpc-imagemagick/Makefile
+++ b/graphics/fpc-imagemagick/Makefile
@@ -13,6 +13,6 @@
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
--- a/graphics/freetype-gl/Makefile
+++ b/graphics/freetype-gl/Makefile
@@ -14,9 +14,8 @@
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
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -15,7 +15,6 @@
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 @@
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
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -15,7 +15,6 @@
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 @@
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 @@
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
--- a/graphics/hdr_tools/Makefile
+++ b/graphics/hdr_tools/Makefile
@@ -16,9 +16,8 @@
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
--- a/graphics/imageindex/Makefile
+++ b/graphics/imageindex/Makefile
@@ -10,11 +10,10 @@
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
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -96,7 +96,7 @@
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
--- a/graphics/instant-meshes/Makefile
+++ b/graphics/instant-meshes/Makefile
@@ -10,12 +10,11 @@
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
--- a/graphics/kxstitch/Makefile
+++ b/graphics/kxstitch/Makefile
@@ -7,10 +7,7 @@
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
--- a/graphics/l2p/Makefile
+++ b/graphics/l2p/Makefile
@@ -8,8 +8,6 @@
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 @@
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
--- a/graphics/libboard/Makefile
+++ b/graphics/libboard/Makefile
@@ -10,9 +10,7 @@
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
--- a/graphics/meh/Makefile
+++ b/graphics/meh/Makefile
@@ -14,9 +14,8 @@
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
--- a/graphics/npretty/Makefile
+++ b/graphics/npretty/Makefile
@@ -13,13 +13,12 @@
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
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -15,12 +15,11 @@
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
--- a/graphics/openfx-arena/Makefile
+++ b/graphics/openfx-arena/Makefile
@@ -17,7 +17,6 @@
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 @@
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
--- a/graphics/optar/Makefile
+++ b/graphics/optar/Makefile
@@ -15,11 +15,10 @@
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
--- a/graphics/p5-CAD-Drawing/Makefile
+++ b/graphics/p5-CAD-Drawing/Makefile
@@ -18,10 +18,9 @@
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
--- a/graphics/p5-Image-Heatmap/Makefile
+++ b/graphics/p5-Image-Heatmap/Makefile
@@ -13,10 +13,8 @@
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
--- a/graphics/p5-Image-Magick-Iterator/Makefile
+++ b/graphics/p5-Image-Magick-Iterator/Makefile
@@ -11,10 +11,9 @@
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
--- a/graphics/p5-Image-OCR-Tesseract/Makefile
+++ b/graphics/p5-Image-OCR-Tesseract/Makefile
@@ -10,12 +10,11 @@
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
--- a/graphics/pecl-imagick-im7/Makefile
+++ b/graphics/pecl-imagick-im7/Makefile
@@ -12,7 +12,7 @@
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
--- a/graphics/pecl-imagick/Makefile
+++ b/graphics/pecl-imagick/Makefile
@@ -17,8 +17,8 @@
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
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -55,7 +55,7 @@
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
--- a/graphics/pqiv/Makefile
+++ b/graphics/pqiv/Makefile
@@ -51,7 +51,7 @@
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
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -32,7 +32,7 @@
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
--- a/graphics/py-sorl-thumbnail/Makefile
+++ b/graphics/py-sorl-thumbnail/Makefile
@@ -33,7 +33,7 @@
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
--- a/graphics/py-wand/Makefile
+++ b/graphics/py-wand/Makefile
@@ -27,15 +27,15 @@
.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
--- a/graphics/raster3d/Makefile
+++ b/graphics/raster3d/Makefile
@@ -30,7 +30,7 @@
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
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -10,10 +10,9 @@
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
--- a/graphics/recoverjpeg/Makefile
+++ b/graphics/recoverjpeg/Makefile
@@ -12,10 +12,9 @@
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
--- a/graphics/renrot/Makefile
+++ b/graphics/renrot/Makefile
@@ -22,7 +22,7 @@
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
--- a/graphics/rubygem-mini_magick/Makefile
+++ b/graphics/rubygem-mini_magick/Makefile
@@ -27,15 +27,15 @@
.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
--- a/graphics/rubygem-rmagick/Makefile
+++ b/graphics/rubygem-rmagick/Makefile
@@ -16,7 +16,7 @@
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
--- a/graphics/s2tc/Makefile
+++ b/graphics/s2tc/Makefile
@@ -12,11 +12,10 @@
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
--- a/graphics/synfig/Makefile
+++ b/graphics/synfig/Makefile
@@ -15,7 +15,6 @@
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 @@
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
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -15,7 +15,6 @@
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 @@
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
--- a/graphics/ttygif/Makefile
+++ b/graphics/ttygif/Makefile
@@ -9,12 +9,10 @@
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
--- a/graphics/variety/Makefile
+++ b/graphics/variety/Makefile
@@ -25,10 +25,9 @@
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
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -91,9 +91,9 @@
.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
--- a/graphics/xd3d/Makefile
+++ b/graphics/xd3d/Makefile
@@ -28,7 +28,7 @@
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
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -59,7 +59,7 @@
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
--- a/japanese/mypaedia-fpw-package/Makefile
+++ b/japanese/mypaedia-fpw-package/Makefile
@@ -11,8 +11,9 @@
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
--- a/japanese/srd-fpw-package/Makefile
+++ b/japanese/srd-fpw-package/Makefile
@@ -9,12 +9,11 @@
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
--- a/mail/libpst/Makefile
+++ b/mail/libpst/Makefile
@@ -28,11 +28,9 @@
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
--- a/math/glgraph/Makefile
+++ b/math/glgraph/Makefile
@@ -13,10 +13,9 @@
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
--- a/math/gri/Makefile
+++ b/math/gri/Makefile
@@ -32,7 +32,7 @@
.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
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -149,7 +149,6 @@
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 @@
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
--- a/misc/gkrellshoot2/Makefile
+++ b/misc/gkrellshoot2/Makefile
@@ -11,10 +11,9 @@
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
--- a/misc/img2xterm/Makefile
+++ b/misc/img2xterm/Makefile
@@ -10,11 +10,9 @@
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
--- a/misc/pyobd/Makefile
+++ b/misc/pyobd/Makefile
@@ -11,10 +11,9 @@
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
--- a/multimedia/dvd-slideshow/Makefile
+++ b/multimedia/dvd-slideshow/Makefile
@@ -14,7 +14,6 @@
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 @@
${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
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -46,7 +46,7 @@
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
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -26,7 +26,6 @@
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 @@
${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
--- a/multimedia/emby-server/Makefile
+++ b/multimedia/emby-server/Makefile
@@ -106,9 +106,11 @@
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
--- a/multimedia/libopenshot/Makefile
+++ b/multimedia/libopenshot/Makefile
@@ -40,7 +40,7 @@
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
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -100,7 +100,7 @@
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
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -81,8 +81,7 @@
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
--- a/multimedia/py-moviepy/Makefile
+++ b/multimedia/py-moviepy/Makefile
@@ -30,7 +30,7 @@
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
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -96,7 +96,7 @@
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
--- a/multimedia/vapoursynth/Makefile
+++ b/multimedia/vapoursynth/Makefile
@@ -81,8 +81,7 @@
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
--- a/net-im/pidgin-latex/Makefile
+++ b/net-im/pidgin-latex/Makefile
@@ -12,12 +12,11 @@
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
--- a/net-im/purple-discord/Makefile
+++ b/net-im/purple-discord/Makefile
@@ -8,11 +8,10 @@
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
--- a/net-mgmt/librenms/Makefile
+++ b/net-mgmt/librenms/Makefile
@@ -74,10 +74,10 @@
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
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -33,8 +33,8 @@
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
--- a/net/tigervnc-viewer/Makefile
+++ b/net/tigervnc-viewer/Makefile
@@ -3,10 +3,9 @@
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
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -56,11 +56,11 @@
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
--- a/print/html2ps/Makefile
+++ b/print/html2ps/Makefile
@@ -13,13 +13,12 @@
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
--- a/print/latex2rtf/Makefile
+++ b/print/latex2rtf/Makefile
@@ -18,8 +18,8 @@
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
--- a/print/lilypond-devel/Makefile
+++ b/print/lilypond-devel/Makefile
@@ -12,7 +12,6 @@
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/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
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -12,7 +12,6 @@
LICENSE= GPLv3
BUILD_DEPENDS= bash:shells/bash \
- convert:graphics/ImageMagick7 \
dblatex:textproc/dblatex \
fontforge:print/fontforge \
help2man:misc/help2man \
@@ -30,7 +29,7 @@
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
--- a/print/muttprint/Makefile
+++ b/print/muttprint/Makefile
@@ -45,9 +45,9 @@
.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
--- a/print/pdf-redact-tools/Makefile
+++ b/print/pdf-redact-tools/Makefile
@@ -13,10 +13,9 @@
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
--- a/print/pdf-tools/Makefile
+++ b/print/pdf-tools/Makefile
@@ -15,13 +15,12 @@
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
--- a/print/texvc/Makefile
+++ b/print/texvc/Makefile
@@ -19,9 +19,8 @@
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
--- a/science/xcrysden/Makefile
+++ b/science/xcrysden/Makefile
@@ -15,11 +15,10 @@
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
--- a/security/libfprint/Makefile
+++ b/security/libfprint/Makefile
@@ -12,12 +12,11 @@
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
--- a/security/p5-GD-SecurityImage/Makefile
+++ b/security/p5-GD-SecurityImage/Makefile
@@ -33,11 +33,9 @@
.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
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -19,10 +19,9 @@
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
--- a/textproc/docbook2odf/Makefile
+++ b/textproc/docbook2odf/Makefile
@@ -13,11 +13,10 @@
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
--- a/textproc/eqe/Makefile
+++ b/textproc/eqe/Makefile
@@ -14,10 +14,9 @@
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
--- a/textproc/pdfsandwich/Makefile
+++ b/textproc/pdfsandwich/Makefile
@@ -11,12 +11,11 @@
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
--- a/textproc/qr/Makefile
+++ b/textproc/qr/Makefile
@@ -11,10 +11,9 @@
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
--- a/www/coppermine/Makefile
+++ b/www/coppermine/Makefile
@@ -13,7 +13,7 @@
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
--- a/www/fgallery/Makefile
+++ b/www/fgallery/Makefile
@@ -13,10 +13,10 @@
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
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -33,7 +33,7 @@
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
--- a/www/gpx2map/Makefile
+++ b/www/gpx2map/Makefile
@@ -28,8 +28,8 @@
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
--- a/www/igal2/Makefile
+++ b/www/igal2/Makefile
@@ -30,8 +30,8 @@
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
--- a/www/ilias/Makefile
+++ b/www/ilias/Makefile
@@ -13,8 +13,7 @@
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 @@
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
--- a/www/ilias6/Makefile
+++ b/www/ilias6/Makefile
@@ -14,7 +14,6 @@
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 @@
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
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -299,8 +299,8 @@
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
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -291,8 +291,8 @@
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
--- a/www/p5-jQuery-File-Upload/Makefile
+++ b/www/p5-jQuery-File-Upload/Makefile
@@ -9,7 +9,6 @@
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 @@
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
--- a/www/serendipity/Makefile
+++ b/www/serendipity/Makefile
@@ -32,7 +32,7 @@
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
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -66,9 +66,9 @@
.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
--- a/www/twiki-MathModePlugin/Makefile
+++ b/www/twiki-MathModePlugin/Makefile
@@ -8,7 +8,7 @@
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
--- a/www/typo3-10/Makefile
+++ b/www/typo3-10/Makefile
@@ -64,9 +64,9 @@
.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
--- a/www/typo3-11/Makefile
+++ b/www/typo3-11/Makefile
@@ -64,9 +64,9 @@
.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
--- a/www/typo3-9/Makefile
+++ b/www/typo3-9/Makefile
@@ -67,9 +67,9 @@
.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
--- a/x11-fonts/fontpreview/Makefile
+++ b/x11-fonts/fontpreview/Makefile
@@ -10,13 +10,12 @@
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
--- a/x11-themes/cursor-crystal-theme/Makefile
+++ b/x11-themes/cursor-crystal-theme/Makefile
@@ -13,10 +13,9 @@
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
--- a/x11-themes/icons-tango-extras/Makefile
+++ b/x11-themes/icons-tango-extras/Makefile
@@ -10,12 +10,11 @@
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
--- a/x11-themes/icons-tango/Makefile
+++ b/x11-themes/icons-tango/Makefile
@@ -10,11 +10,10 @@
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
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -13,8 +13,7 @@
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 @@
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
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -11,10 +11,9 @@
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
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -37,7 +37,7 @@
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
--- a/x11-wm/nscde/Makefile
+++ b/x11-wm/nscde/Makefile
@@ -14,7 +14,6 @@
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 @@
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
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -54,7 +54,7 @@
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
--- a/x11/py-pyscreenshot/Makefile
+++ b/x11/py-pyscreenshot/Makefile
@@ -13,10 +13,9 @@
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
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -79,8 +79,8 @@
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

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 28, 3:37 PM (19 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37464668
Default Alt Text
D32754.id99854.diff (77 KB)

Event Timeline