From owner-cvs-all@FreeBSD.ORG Sun Dec 31 16:51:42 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 54AD316A417 for ; Sun, 31 Dec 2006 16:51:42 +0000 (UTC) (envelope-from alepulver@FreeBSD.org) Received: from relay02.pair.com (relay02.pair.com [209.68.5.16]) by mx1.freebsd.org (Postfix) with SMTP id EAEAC13C45B for ; Sun, 31 Dec 2006 16:51:41 +0000 (UTC) (envelope-from alepulver@FreeBSD.org) Received: (qmail 62919 invoked by uid 0); 31 Dec 2006 16:44:59 -0000 Received: from unknown (HELO phobos.mars.bsd) (unknown) by unknown with SMTP; 31 Dec 2006 16:44:59 -0000 X-pair-Authenticated: 200.115.252.195 Date: Sun, 31 Dec 2006 13:44:57 -0300 From: Alejandro Pulver To: Erwin Lansing Message-ID: <20061231134457.57f35c07@phobos.mars.bsd> In-Reply-To: <20061231114135.GZ16049@droso.net> References: <200612310434.kBV4YRXS037540@repoman.freebsd.org> <20061231114135.GZ16049@droso.net> X-Mailer: Sylpheed-Claws 2.6.0 (GTK+ 2.10.6; i386-portbld-freebsd6.1) Mime-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_CFWR.bXShgB9zIBJ5BeE=24"; protocol="application/pgp-signature"; micalg=PGP-SHA1 Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/Mk bsd.wx.mk X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Dec 2006 16:51:42 -0000 --Sig_CFWR.bXShgB9zIBJ5BeE=24 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Sun, 31 Dec 2006 12:41:35 +0100 Erwin Lansing wrote: > On Sun, Dec 31, 2006 at 04:34:27AM +0000, Alejandro Pulver wrote: > > alepulver 2006-12-31 04:34:27 UTC > >=20 > > FreeBSD ports repository > >=20 > > Modified files: > > Mk bsd.wx.mk=20 > > Log: > [snip] > > - Remove _WX_ILLEGAL_VERS_* added in the last update to 2.8. The reas= on is > > that each port should choose the version it can use, that includes = taking > > into account available components (also this brings much more chick= en and > > egg problems so the code could get really messy). >=20 > This broke INDEX as there is no x11-toolkits/py-wxPython28 port and this > is now detected. >=20 > 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 >=20 > erwin@bamse:audio/py-karaoke>=20 >=20 > Can you please add the python 2.8 bits or revert this part of the > commit? >=20 Hello. It was intentionally done. Below the following handles it: .if !defined(_WX_PORT_${_WX_COMP}_${_WX_VER}) IGNORE?=3D selected a WxWidgets component (${_WX_COMP}) which is not ava= ilable 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}} =3D=3D "" +.if ${_WX_COMPS_FINAL:M${newcomp}} =3D=3D "" && !defined(IGNORE) _WX_COMPS_FINAL+=3D ${newcomp} .endif Best Regards, Ale --Sig_CFWR.bXShgB9zIBJ5BeE=24 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQFFl+kQiV05EpRcP2ERAkp6AKCMecUKGZU1q1/yL/f1gvM145OqYgCgwqQZ DHqq7PHVYVqvMdZfU/GEB7I= =w0pg -----END PGP SIGNATURE----- --Sig_CFWR.bXShgB9zIBJ5BeE=24--