summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorKurt Jaeger <pi@FreeBSD.org>2014-12-22 16:53:57 +0000
committerKurt Jaeger <pi@FreeBSD.org>2014-12-22 16:53:57 +0000
commit6d43411d97fe356c5a603f35200e2ee4abeb4dbb (patch)
tree225cffa15dd003661919d9c1bc92caf040acb896 /security
parent- Revert the previous NIS check, since it does not help at all (diff)
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>
Notes
Notes: svn path=/head/; revision=375246
Diffstat (limited to 'security')
-rw-r--r--security/p5-GD-SecurityImage/Makefile18
1 files changed, 14 insertions, 4 deletions
diff --git a/security/p5-GD-SecurityImage/Makefile b/security/p5-GD-SecurityImage/Makefile
index 70dc40e3f19f..7d00e2106a6e 100644
--- a/security/p5-GD-SecurityImage/Makefile
+++ b/security/p5-GD-SecurityImage/Makefile
@@ -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>