diff options
Diffstat (limited to 'www')
-rw-r--r-- | www/coppermine/Makefile | 2 | ||||
-rw-r--r-- | www/fgallery/Makefile | 4 | ||||
-rw-r--r-- | www/gallery2/Makefile | 2 | ||||
-rw-r--r-- | www/gpx2map/Makefile | 4 | ||||
-rw-r--r-- | www/igal2/Makefile | 4 | ||||
-rw-r--r-- | www/ilias/Makefile | 5 | ||||
-rw-r--r-- | www/ilias6/Makefile | 3 | ||||
-rw-r--r-- | www/nginx-devel/Makefile.extmod | 4 | ||||
-rw-r--r-- | www/nginx/Makefile.extmod | 4 | ||||
-rw-r--r-- | www/p5-jQuery-File-Upload/Makefile | 3 | ||||
-rw-r--r-- | www/serendipity/Makefile | 2 | ||||
-rw-r--r-- | www/trafficserver/Makefile | 4 | ||||
-rw-r--r-- | www/twiki-MathModePlugin/Makefile | 2 | ||||
-rw-r--r-- | www/typo3-10/Makefile | 4 | ||||
-rw-r--r-- | www/typo3-11/Makefile | 4 | ||||
-rw-r--r-- | www/typo3-9/Makefile | 6 |
16 files changed, 27 insertions, 30 deletions
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 |