Date: Fri, 07 Jan 2011 20:35:18 +0100 From: Olli Hauer <ohauer@FreeBSD.org> To: "Philip M. Gollucci" <pgollucci@p6m7g8.com> Cc: ohauer@FreeBSD.org, "Philip M. Gollucci" <pgollucci@FreeBSD.org>, apache@FreeBSD.org Subject: Re: question about PR: ports/147009: Mk/bsd.apache.mk: [patch] default to www/apache22 Message-ID: <4D276AF6.5090804@FreeBSD.org> In-Reply-To: <4D275E83.2000204@p6m7g8.com> References: <4D243209.5040703@FreeBSD.org> <4D24BED1.7070004@p6m7g8.com> <4D265CF2.5090208@FreeBSD.org> <4D26B3C6.4050804@p6m7g8.com> <4D272510.9030908@FreeBSD.org> <4D275E83.2000204@p6m7g8.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2011-01-07 19:42, Philip M. Gollucci wrote:
> On 01/07/11 14:37, Olli Hauer wrote:
>> However I'm a friend of more explicit test, so I like this more.
>>
>> .elif ${USE_APACHE:C/\.//:C/\+//:C/13//:C/20//:C/22//:C/24//} == ""
>> or
>> .elif ${USE_APACHE:C/\.//:C/\+//:S/^13//:S/^20//:S/^22//:S/^24//} == ""
> Seems logical.
>
>> The following lines in bsd.apache.mk should be reviewed, for example
>> APACHE_SUPPORTED_VERSION is nowhere used in ports/MK/*
> This is used in some ports though I'm not sure I'm a fan of it.
>
>> ================================================
>> USE_APACHE= 1.3 / 13 => APACHE_VERSION=13, make: error version ...
> this shouldn't fail, it should use 13
>
>> USE_APACHE= 1.3+/13+ => APACHE_VERSION=22, make: OK
>>
>> USE_APACHE= 2.0 / 20 => APACHE_VERSION=20, make: error version ...
> ditto above, should use 20
>
>> USE_APACHE= 2.0+/20+ => APACHE_VERSION=22, make: OK
>>
>> USE_APACHE= 2.2 / 22 => APACHE_VERSION=22, make: OK
>> USE_APACHE= 2.2+/ 22+ => APACHE_VERSION=22, make: OK
>>
>> USE_APACHE= 2.4 / 24 => APACHE_VERSION=24, make: error version ...
>> USE_APACHE= 2.4+/ 24+ => APACHE_VERSION=24, make: error version ...
> both of these should use 24
>
> bsd.perl.mk / bsd.python.mk might be helpful for the 'range' or -+ logic
> though I'm not sure its compatible.
No, I think the fail is valid, since this was the second test case,
where I defined *"APACHE_PORT= www/apache22"* in /etc/make.conf!
You stripped the following column header for this tests
> Additional results with "APACHE_PORT= www/apache22"
> in /etc/make.conf and fire `make' command.
Without /etc/make.conf (first test case) all tests are success.
I uploaded the last diff against bsd.apache.mk
http://people.freebsd.org/~ohauer/diffs/PR_147009_ports__Mk__bsd.apache.mk.diff
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4D276AF6.5090804>