diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-10-30 20:08:16 +0200 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2021-12-11 14:50:53 +0100 |
| commit | 45526ecbeec33dbb87f0b678d4c04988aab9b657 (patch) | |
| tree | b77614b463af0ed929512fcc838ff5cb20c96275 /x11-wm | |
| parent | security/vaultwarden: Update to 1.23.0 (diff) | |
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
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/awesome/Makefile | 5 | ||||
| -rw-r--r-- | x11-wm/epplets/Makefile | 5 | ||||
| -rw-r--r-- | x11-wm/libwraster/Makefile | 2 | ||||
| -rw-r--r-- | x11-wm/nscde/Makefile | 3 | ||||
| -rw-r--r-- | x11-wm/windowmaker/Makefile | 2 |
5 files changed, 7 insertions, 10 deletions
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 |