Date: Mon, 22 Dec 2014 16:53:58 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375246 - head/security/p5-GD-SecurityImage Message-ID: <201412221653.sBMGrw7x035800@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Mon Dec 22 16:53:57 2014 New Revision: 375246 URL: https://svnweb.freebsd.org/changeset/ports/375246 QAT: https://qat.redports.org/buildarchive/r375246/ Log: security/p5-GD-SecurityImage: knob to allow correct DEPENDS for IMAGEMAGICK Allow to select X11 with IMAGEMAGICK (manually). PR: 194284 Submitted by: Frank WAll <fw@moov.de> Modified: head/security/p5-GD-SecurityImage/Makefile Modified: head/security/p5-GD-SecurityImage/Makefile ============================================================================== --- head/security/p5-GD-SecurityImage/Makefile Mon Dec 22 16:45:41 2014 (r375245) +++ head/security/p5-GD-SecurityImage/Makefile Mon Dec 22 16:53:57 2014 (r375246) @@ -3,7 +3,7 @@ PORTNAME= GD-SecurityImage PORTVERSION= 1.72 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= security perl5 MASTER_SITES= CPAN @@ -18,7 +18,8 @@ LICENSE_COMB= dual BUILD_DEPENDS= p5-GD>=0:${PORTSDIR}/graphics/p5-GD RUN_DEPENDS:= ${BUILD_DEPENDS} -OPTIONS_DEFINE= IMAGEMAGICK +OPTIONS_DEFINE= IMAGEMAGICK X11 +OPTIONS_DEFAULT=X11 IMAGEMAGICK_DESC= Build ImageMagick module PORTSCOUT= skipv:1.581 @@ -26,7 +27,16 @@ PORTSCOUT= skipv:1.581 USES= perl5 USE_PERL5= configure -IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick -IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MIMAGEMAGICK} +.if ${PORT_OPTIONS:MX11} +IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick +IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick +.else +IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11 +IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11 +.endif +.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412221653.sBMGrw7x035800>