cvs commit: ports/Mk bsd.wx.mk

[Alejandro Pulver]

On Sun, 31 Dec 2006 12:41:35 +0100
Erwin Lansing <erwin at FreeBSD.org> wrote:

> On Sun, Dec 31, 2006 at 04:34:27AM +0000, Alejandro Pulver wrote:
> > alepulver    2006-12-31 04:34:27 UTC
> > 
> >   FreeBSD ports repository
> > 
> >   Modified files:
> >     Mk                   bsd.wx.mk 
> >   Log:
> [snip]
> >   - Remove _WX_ILLEGAL_VERS_* added in the last update to 2.8. The reason is
> >     that each port should choose the version it can use, that includes taking
> >     into account available components (also this brings much more chicken and
> >     egg problems so the code could get really messy).
> 
> This broke INDEX as there is no x11-toolkits/py-wxPython28 port and this
> is now detected.
> 
> erwin at bamse:audio/py-karaoke> make -V _WX_VER_MERGED
>  2.4 2.6 2.8
> erwin at bamse:audio/py-karaoke> make -V _WX_VER
> 2.8
> erwin at bamse:audio/py-karaoke> make -V _WX_FILE_python_2.4
> /usr/local/lib/python2.4/site-packages/wx/__init__.py
> erwin at bamse:audio/py-karaoke> make -V _WX_FILE_python_2.8
> 
> erwin at bamse:audio/py-karaoke> 
> 
> Can you please add the python 2.8 bits or revert this part of the
> commit?
> 

Hello.

It was intentionally done. Below the following handles it:

.if !defined(_WX_PORT_${_WX_COMP}_${_WX_VER})
IGNORE?=				selected a WxWidgets component (${_WX_COMP}) which is not available for the selected version (${_WX_VER})
.endif

The problem is that the dependency is added anyways (it does define
IGNORE though), but that can be easily fixed:

-.if ${_WX_COMPS_FINAL:M${newcomp}} == ""
+.if ${_WX_COMPS_FINAL:M${newcomp}} == "" && !defined(IGNORE)
 _WX_COMPS_FINAL+=		${newcomp}
 .endif

Best Regards,
Ale
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-ports/attachments/20061231/79f1d1fa/signature.pgp