Date: Sun, 31 Dec 2006 13:44:57 -0300 From: Alejandro Pulver <alepulver@FreeBSD.org> To: Erwin Lansing <erwin@FreeBSD.org> Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/Mk bsd.wx.mk Message-ID: <20061231134457.57f35c07@phobos.mars.bsd> In-Reply-To: <20061231114135.GZ16049@droso.net> References: <200612310434.kBV4YRXS037540@repoman.freebsd.org> <20061231114135.GZ16049@droso.net>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Sun, 31 Dec 2006 12:41:35 +0100
Erwin Lansing <erwin@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@bamse:audio/py-karaoke> make -V _WX_VER_MERGED
> 2.4 2.6 2.8
> erwin@bamse:audio/py-karaoke> make -V _WX_VER
> 2.8
> erwin@bamse:audio/py-karaoke> make -V _WX_FILE_python_2.4
> /usr/local/lib/python2.4/site-packages/wx/__init__.py
> erwin@bamse:audio/py-karaoke> make -V _WX_FILE_python_2.8
>
> erwin@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
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (FreeBSD)
iD8DBQFFl+kQiV05EpRcP2ERAkp6AKCMecUKGZU1q1/yL/f1gvM145OqYgCgwqQZ
DHqq7PHVYVqvMdZfU/GEB7I=
=w0pg
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061231134457.57f35c07>