apache 2.2 ports

[olli hauer]

On 2014-09-08 23:10, olli hauer wrote:
> On 2014-09-08 15:51, Mathieu Arnold wrote:
>>
>>
>> +--On 8 septembre 2014 13:41:54 +0000 Mark Felder <feld at freebsd.org> wrote:
>> | September 6 2014 10:24 AM, "Adam Weinberger" <adamw at adamw.org> wrote: 
>> |> apache team -
>> |> 
>> |> So it seems that setting USE_APACHE=22 doesn’t actually depend on
>> |> apache-2.2. This means that every USE_APACHE=22 port is broken, and as
>> |> of right now won’t have any 10.1 packages.
>> |> 
>> |> I’m happy to go through and add "DEFAULT_VERSIONS= APACHE=22” to
>> |> this ports, but I wanted to check with you guys first. Is that the right
>> |> way to fix it? Is there something else that can be done to make
>> |> USE_APACHE=22 actually depend on apache-2.2?
>> |> 
>> | 
>> | FYI I had to solve this problem today with the following two make.conf
>> | options:
>> | 
>> | DEFAULT_VERSIONS= apache=2.2  
>> | 
>> | (note it's 2.2, not 22 -- bsd.default-versions.mk shows a period should
>> | be used)
>> | 
>> | APACHE_PORT= www/apache22
>> | 
>> | 
>> | Previously I only had the DEFAULT_VERSIONS entry and it worked fine.
>> | Suddenly I needed to add APACHE_PORT as well. This is with an up to date
>> | ports tree -- my packages build automatically every 8 hours.
>>
>> Yes, bapt sent a patch to fix that
>> <https://people.freebsd.org/~bapt/apache-version.diff>
> 
> Sorry for breaking and delay!
> 
> Seems I miss the mail with the notice from babt, anyway looking right now into his patch and found an issue with the patch on 8.x / 9.x but it is working on 10.
> 
> Simple test on 8.4 or 9.3 with an apache22 only port
> $ make -V APACHE_PORT
> www/apache} => no value but a closing '}'
> 
> It looks like the following line cannot be processed on 8.4 / 9.3
> _APACHE_WANTED_VERSION:=        ${_APACHE_WANTED_VERSIONS:O:u:M${DEFAULT_APACHE_VERSION}}
> 
> 
> Before this line the values are (verified with .warning line):
> - _APACHE_WANTED_VERSIONS=22
> -  DEFAULT_APACHE_VERSION=24
> 
> => M${DEFAULT_APACHE_VERSION} is not expanded and the construct returns '}'
> 
> Now all other checks are failing and no valid port can be calculated
> 
> 
> If I set this line to
> _APACHE_WANTED_VERSION:=        ${_APACHE_WANTED_VERSIONS:O:u:M24}
> 
> I get the expected www/apache22 value.
> 
> 
> Scratch my head and remember PR 181717, but thats not the case here.

The patch from babt seems to work on 8.4 when the surrounding ${} is removed.

- _APACHE_WANTED_VERSION:=        ${_APACHE_WANTED_VERSIONS:O:u:M${DEFAULT_APACHE_VERSION}}
+ _APACHE_WANTED_VERSION:=        ${_APACHE_WANTED_VERSIONS:O:u:MDEFAULT_APACHE_VERSION}

Not sure why M${opt} is working with an .if statement but not here except on FreeBSD 10
Even with a custom make (source from 10 build on 8.4) the issue persist it must be something different.

As first workaround I reverted bsd.apache.mk to r366839 until I have more information ...