From 4f3dde191d0a5063d394c5a0de8bb002bafb987e Mon Sep 17 00:00:00 2001 From: Andrej Zverev Date: Tue, 3 Jul 2012 17:38:41 +0000 Subject: [PATCH] graphics/ImageMagick can change package name via PKGNAMESUFFIX. We should not rely on this. Reported by: Jarrod Sayers Pointy hat: az@ --- devel/bugzilla/Makefile | 2 +- devel/bugzilla3/Makefile | 2 +- devel/p5-Project-Gantt/Makefile | 2 +- graphics/gscan2pdf/Makefile | 2 +- graphics/npretty/Makefile | 2 +- graphics/p5-CAD-Drawing/Makefile | 2 +- graphics/p5-Image-Heatmap/Makefile | 2 +- graphics/p5-Image-Magick-Iterator/Makefile | 2 +- graphics/renrot/Makefile | 2 +- net-mgmt/nagiosgrapher/Makefile | 2 +- security/p5-GD-SecurityImage/Makefile | 4 ++-- www/MT/Makefile | 2 +- www/twiki-MathModePlugin/Makefile | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile index 043e04c2cf14..e0d36efaf877 100644 --- a/devel/bugzilla/Makefile +++ b/devel/bugzilla/Makefile @@ -111,7 +111,7 @@ RUN_DEPENDS+= p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \ .endif .ifdef WITH_BMP2PNG -RUN_DEPENDS+= ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick +RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick .endif .if defined(WITH_XMLRPC) || defined(WITH_JSONRPC) diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile index 06cd62e477e3..25d14625d328 100644 --- a/devel/bugzilla3/Makefile +++ b/devel/bugzilla3/Makefile @@ -111,7 +111,7 @@ RUN_DEPENDS+= p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \ .endif .ifdef WITH_BMP2PNG -RUN_DEPENDS+= ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick +RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick .endif .if defined(WITH_XMLRPC) || defined(WITH_JSONRPC) diff --git a/devel/p5-Project-Gantt/Makefile b/devel/p5-Project-Gantt/Makefile index 0be67f734d56..d4b3e087d874 100644 --- a/devel/p5-Project-Gantt/Makefile +++ b/devel/p5-Project-Gantt/Makefile @@ -16,7 +16,7 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Create Gantt charts to manage project scheduling BUILD_DEPENDS= p5-Class-Date>=0:${PORTSDIR}/devel/p5-Class-Date \ - ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick + convert:${PORTSDIR}/graphics/ImageMagick RUN_DEPENDS:= ${BUILD_DEPENDS} PERL_CONFIGURE= yes diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile index c5356fa1544c..1ee56db44c49 100644 --- a/graphics/gscan2pdf/Makefile +++ b/graphics/gscan2pdf/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= p5-Test-Perl-Critic>=0:${PORTSDIR}/textproc/p5-Test-Perl-Critic \ p5-Sys-SigAction>=0:${PORTSDIR}/devel/p5-Sys-SigAction \ p5-forks>=0:${PORTSDIR}/devel/p5-forks \ p5-Proc-ProcessTable>=0:${PORTSDIR}/devel/p5-Proc-ProcessTable \ - ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick \ + convert:${PORTSDIR}/graphics/ImageMagick \ p5-Goo-Canvas>=0:${PORTSDIR}/devel/p5-Goo-Canvas \ p5-Pango>=0:${PORTSDIR}/x11-toolkits/p5-Pango \ p5-Acme-Damn>=0:${PORTSDIR}/devel/p5-Acme-Damn \ diff --git a/graphics/npretty/Makefile b/graphics/npretty/Makefile index 7f77a5241cf7..fb48155e07a6 100644 --- a/graphics/npretty/Makefile +++ b/graphics/npretty/Makefile @@ -16,7 +16,7 @@ MAINTAINER= peter@pean.org COMMENT= A simple web-gallery generator written in perl RUN_DEPENDS= p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \ - ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick \ + convert:${PORTSDIR}/graphics/ImageMagick \ p5-forks>=0:${PORTSDIR}/devel/p5-forks LIB_DEPENDS+= Magick.*:${PORTSDIR}/graphics/ImageMagick diff --git a/graphics/p5-CAD-Drawing/Makefile b/graphics/p5-CAD-Drawing/Makefile index d4532146e01f..d161b62240d8 100644 --- a/graphics/p5-CAD-Drawing/Makefile +++ b/graphics/p5-CAD-Drawing/Makefile @@ -18,7 +18,7 @@ COMMENT= Methods to create, load, and save vector graphics RUN_DEPENDS= p5-Math-Vec>=0:${PORTSDIR}/math/p5-Math-Vec \ p5-CAD-Calc>=0:${PORTSDIR}/math/p5-CAD-Calc \ p5-MatrixReal>=0:${PORTSDIR}/math/p5-MatrixReal \ - ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick \ + convert:${PORTSDIR}/graphics/ImageMagick \ p5-Stream>=0:${PORTSDIR}/devel/p5-Stream \ p5-Math-Geometry-Planar>=0:${PORTSDIR}/math/p5-Math-Geometry-Planar BUILD_DEPENDS:= ${RUN_DEPENDS} diff --git a/graphics/p5-Image-Heatmap/Makefile b/graphics/p5-Image-Heatmap/Makefile index 4c150a18aa4d..80f0f5def31f 100644 --- a/graphics/p5-Image-Heatmap/Makefile +++ b/graphics/p5-Image-Heatmap/Makefile @@ -18,7 +18,7 @@ COMMENT= Convert geographic coordinates into a graphical heatmap LICENSE_COMB= dual LICENSE= ART20 GPLv1 -RUN_DEPENDS= ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick +RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick WRKSRC= ${WRKDIR}/${PORTNAME} PERL_CONFIGURE= yes diff --git a/graphics/p5-Image-Magick-Iterator/Makefile b/graphics/p5-Image-Magick-Iterator/Makefile index ed1d5e71e8b5..27438ae97aad 100644 --- a/graphics/p5-Image-Magick-Iterator/Makefile +++ b/graphics/p5-Image-Magick-Iterator/Makefile @@ -16,7 +16,7 @@ PKGNAMEPREFIX= p5- MAINTAINER= gslin@gslin.org COMMENT= Sequentially read Image::Magick object from a filehandle -RUN_DEPENDS= ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick \ +RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \ p5-Image-PBMlib>=0:${PORTSDIR}/graphics/p5-Image-PBMlib PERL_CONFIGURE= yes diff --git a/graphics/renrot/Makefile b/graphics/renrot/Makefile index 7c8987e7eada..9c8063a20754 100644 --- a/graphics/renrot/Makefile +++ b/graphics/renrot/Makefile @@ -28,7 +28,7 @@ PORTDOCS= AUTHORS README ChangeLog NEWS TODO .include .if defined(WITH_IMAGEMAGICK) -RUN_DEPENDS+= ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick +RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick .endif post-install: diff --git a/net-mgmt/nagiosgrapher/Makefile b/net-mgmt/nagiosgrapher/Makefile index 9e7f046f5b70..a38084bfe811 100644 --- a/net-mgmt/nagiosgrapher/Makefile +++ b/net-mgmt/nagiosgrapher/Makefile @@ -19,7 +19,7 @@ COMMENT= Collects the output from Nagios and generates graphs BUILD_DEPENDS= \ p5-GD>=0:${PORTSDIR}/graphics/p5-GD \ rrdtool>=0:${PORTSDIR}/databases/rrdtool \ - ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick \ + convert:${PORTSDIR}/graphics/ImageMagick \ p5-URI>=0:${PORTSDIR}/net/p5-URI \ p5-Calendar-Simple>=0:${PORTSDIR}/devel/p5-Calendar-Simple \ ${LOCALBASE}/bin/nagios:${PORTSDIR}/net-mgmt/nagios diff --git a/security/p5-GD-SecurityImage/Makefile b/security/p5-GD-SecurityImage/Makefile index a69019d029b9..6ae8eb1345d2 100644 --- a/security/p5-GD-SecurityImage/Makefile +++ b/security/p5-GD-SecurityImage/Makefile @@ -34,8 +34,8 @@ MAN3= GD::SecurityImage.3 \ .include .if ${PORT_OPTIONS:MIMAGEMAGICK} -BUILD_DEPENDS+= ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick -RUN_DEPENDS+= ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick +BUILD_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick +RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick .endif .include diff --git a/www/MT/Makefile b/www/MT/Makefile index 65dc076306d0..d2370fbee361 100644 --- a/www/MT/Makefile +++ b/www/MT/Makefile @@ -29,7 +29,7 @@ OPTIONS= APACHE "USE_APACHE" off \ .if !defined(WITHOUT_OPTIONAL_MODULES) RUN_DEPENDS+= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \ - ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick \ + convert:${PORTSDIR}/graphics/ImageMagick \ p5-Crypt-DSA>=0:${PORTSDIR}/security/p5-Crypt-DSA \ p5-Mail-Sendmail>=0:${PORTSDIR}/mail/p5-Mail-Sendmail \ p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \ diff --git a/www/twiki-MathModePlugin/Makefile b/www/twiki-MathModePlugin/Makefile index bb394a24f3e2..4dbf72baa81f 100644 --- a/www/twiki-MathModePlugin/Makefile +++ b/www/twiki-MathModePlugin/Makefile @@ -15,7 +15,7 @@ COMMENT= Include LaTeX formatted math in your TWiki pages RUN_DEPENDS= dvipng:${PORTSDIR}/print/teTeX-base \ latex:${PORTSDIR}/print/teTeX-base \ - ImageMagick>=0:${PORTSDIR}/graphics/ImageMagick + convert:${PORTSDIR}/graphics/ImageMagick post-patch: ${REINPLACE_CMD} -i '' -e 's!=/usr/bin!=${LOCALBASE}/bin!g; s!=/bin!=/usr/bin!g;' \