Date: Thu, 7 Dec 2017 14:13:21 +0100 From: Mathieu Arnold <mat@FreeBSD.org> To: Jan Beich <jbeich@FreeBSD.org>, Mathieu Arnold <mat@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r455210 - in head: . Mk/Uses accessibility accessibility/accerciser accessibility/caribou accessibility/orca accessibility/py-atspi accessibility/py-speech-dispatcher accessibility/py3-... Message-ID: <9435537e-2f1c-2daa-b579-6c7ac253e6d9@FreeBSD.org> In-Reply-To: <374m-4tz6-wny@FreeBSD.org> References: <201711301550.vAUFoYsm001135@repo.freebsd.org> <o9nb-78gr-wny@FreeBSD.org> <2776e2b9-6614-6331-b7f7-4152c2e635c6@FreeBSD.org> <374m-4tz6-wny@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Le 07/12/2017 =C3=A0 13:12, Jan Beich a =C3=A9crit=C2=A0: > Mathieu Arnold <mat@FreeBSD.org> writes: > >> Le 07/12/2017 =C3=A0 00:16, Jan Beich a =C3=A9crit=C2=A0: >> >>> Mathieu Arnold <mat@FreeBSD.org> writes: >>> >>>> Author: mat >>>> Date: Thu Nov 30 15:50:30 2017 >>>> New Revision: 455210 >>>> URL: https://svnweb.freebsd.org/changeset/ports/455210 >>>> >>>> Log: >>>> Convert Python ports to FLAVORS. >>> [...] >>>> Index: Mk/Uses/python.mk >>> [...] >>>> +.if ${FLAVOR:Mpy[23]*} >>> Shouldn't this use :U like suggested by CHANGES? >> I have absolutely no idea what you are replying to. > Maybe the following would help: > > $ svn blame Mk/Uses/python.mk | sed -n '/:Mpy/,/endif/p' > 455210 mat .if ${FLAVOR:Mpy[23]*} > 455210 mat _PYTHON_VERSION=3D ${FLAVOR:S/py//:C/(.)/\1./} > 455210 mat .endif FLAVOR is only undefined before all includes, it is defined very early in Mk/bsd.port.mk, so there is no need for :U in any Mk/* files. > $ sed -i '' 's/:Mpy/:U&/' Mk/Uses/python.mk > > $ svn diff Mk/Uses/python.mk > Index: Mk/Uses/python.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- Mk/Uses/python.mk (revision 455493) > +++ Mk/Uses/python.mk (working copy) > @@ -436,7 +436,7 @@ FLAVOR=3D ${FLAVORS:[1]} > . endif > .endif > =20 > -.if ${FLAVOR:Mpy[23]*} > +.if ${FLAVOR:U:Mpy[23]*} > _PYTHON_VERSION=3D ${FLAVOR:S/py//:C/(.)/\1./} > .endif > =20 > --=20 Mathieu Arnold
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?9435537e-2f1c-2daa-b579-6c7ac253e6d9>