Bug 194284
| Summary: | [PATCH] security/p5-GD-SecurityImage: handle OPTIONS_UNSET=X11 | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Frank Wall <freebsd> | ||||||||
| Component: | Individual Port(s) | Assignee: | freebsd-perl (Nobody) <perl> | ||||||||
| Status: | Closed FIXED | ||||||||||
| Severity: | Affects Only Me | CC: | florian.heigl, freebsd, pi | ||||||||
| Priority: | --- | Flags: | freebsd:
maintainer-feedback?
(perl) |
||||||||
| Version: | Latest | ||||||||||
| Hardware: | amd64 | ||||||||||
| OS: | Any | ||||||||||
| Attachments: |
|
||||||||||
Auto-assigned to maintainer perl@FreeBSD.org Also ran into this with poudriere... The patch works, could it please get reviewed / submitted? Created attachment 150852 [details]
updated patch
As pointed out in a similar bug report (#194283) my original patch was incomplete. I've submitted a new patch. (In reply to Frank Wall from comment #4) > As pointed out in a similar bug report (#194283) my original patch was > incomplete. I've submitted a new patch. It will not work. Options helpers must be defined before bsd.port.options.mk is included. You should do something along the lines of: .if ${PORT_OPTIONS:MIMAGEMAGICK} .if ${PORT_OPTIONS:MX11} BUILD_DEPENDS+= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick RUN_DEPENDS+= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick .else BUILD_DEPENDS+= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11 RUN_DEPENDS+= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11 .endif .endif Created attachment 150853 [details]
revised patch
(In reply to Mathieu Arnold from comment #5) > It will not work. Options helpers must be defined before > bsd.port.options.mk is included. Of course, thanks. X11 depends on IMAGEMAGICK being set, right ? There is no use in X11 being set and IMAGEMAGICK not ? (In reply to Kurt Jaeger from comment #8) > X11 depends on IMAGEMAGICK being set, right ? There is no use in X11 > being set and IMAGEMAGICK not ? Exactly. A commit references this bug: Author: pi Date: Mon Dec 22 16:53:58 UTC 2014 New revision: 375246 URL: https://svnweb.freebsd.org/changeset/ports/375246 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> Changes: head/security/p5-GD-SecurityImage/Makefile While the patch works (and is committed now), there is a general issue still unresolved: - the ports options scheme should have a knob that conditionally sets one option in relation to some other knob - even better would be if a knob of one port (here: the X11 knob of the ImageMagick port) could be inherited in some other port (here: p5-GD-SecurityImage) (In reply to Kurt Jaeger from comment #11) > While the patch works (and is committed now), there is a general issue still > unresolved: > > - the ports options scheme should have a knob that conditionally sets > one option in relation to some other knob > - even better would be if a knob of one port (here: the X11 knob of the > ImageMagick port) could be inherited in some other port (here: > p5-GD-SecurityImage) Patches to Mk/bsd.options.mk *are* welcome :-) |
Created attachment 148164 [details] patch security/p5-GD-SecurityImage Attached patch adds a check to use the -nox11 version of ImageMagick if OPTIONS_UNSET=X11 is set.