svn commit: r455210 - in head: . Mk/Uses accessibility accessibility/accerciser accessibility/caribou accessibility/orca accessibility/py-atspi accessibility/py-speech-dispatcher accessibility/py3-...

[Mathieu Arnold]

Le 07/12/2017 à 13:12, Jan Beich a écrit :
> Mathieu Arnold <mat at FreeBSD.org> writes:
>
>> Le 07/12/2017 à 00:16, Jan Beich a écrit :
>>
>>> Mathieu Arnold <mat at 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=      ${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
> ===================================================================
> --- Mk/Uses/python.mk	(revision 455493)
> +++ Mk/Uses/python.mk	(working copy)
> @@ -436,7 +436,7 @@ FLAVOR=	${FLAVORS:[1]}
>  .  endif
>  .endif
>  
> -.if ${FLAVOR:Mpy[23]*}
> +.if ${FLAVOR:U:Mpy[23]*}
>  _PYTHON_VERSION=	${FLAVOR:S/py//:C/(.)/\1./}
>  .endif
>  
>
-- 
Mathieu Arnold