question about PR: ports/147009: Mk/bsd.apache.mk: [patch] default to www/apache22

[Olli Hauer]

On 2011-01-07 07:33, Philip M. Gollucci wrote:
> On 1/6/2011 7:23 PM, Olli Hauer wrote:
>> I found a working solution for PR ports/147009
>>  Mk/bsd.apache.mk: [patch] default to www/apache22
>>
>> I tested the following diff in a clean chroot environment
> Will this also work for USE_APACHE= 24 or 24+
> which is on the event horizon (2-3 months)
> 
> If so, pav should schedule it for a -exp run after 8.2  (there will be
> some fallout to fix)  Thanks for the help!
> 

Yes it will work, but only if you adjust the following in bsd.apache.mk
else apache24 is unknown.

 .elif ${USE_APACHE:C/\.//:C/\+//:M[12][320]} != ""
to
 .elif ${USE_APACHE:C/\.//:C/\+//:M[12][3204]} != ""


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//} == ""


The following lines in bsd.apache.mk should be reviewed, for example
APACHE_SUPPORTED_VERSION is nowhere used in ports/MK/*

# Print warnings
_ERROR_MSG= : Error from bsd.apache.mk.
APACHE_SUPPORTED_VERSION=   13 20 22
.if ${USE_APACHE:Mcommon*} != ""
AP_PORT_IS_SERVER=  YES
.elif ${USE_APACHE:C/\.//:C/\+//:M[12][320]} != ""
AP_PORT_IS_MODULE=  YES
.else
IGNORE=     ${_ERROR_MSG} Illegal use of USE_APACHE
.endif


For the next test I used the following expression in bsd.apache.mk
 .elif ${USE_APACHE:C/\.//:C/\+//:S/^13//:S/^20//:S/^22//:S/^24//} == ""

and the command `make -V APACHE_VERSION -V APACHE_PORT'


Results:
================================================
USE_APACHE= 1.3 / 13  => APACHE_VERSION=13
USE_APACHE= 1.3+/13+  => APACHE_VERSION=22

USE_APACHE= 2.0 / 20  => APACHE_VERSION=20
USE_APACHE= 2.0+/20+  => APACHE_VERSION=22

USE_APACHE= 2.2 / 22  => APACHE_VERSION=22
USE_APACHE= 2.2+/ 22+ => APACHE_VERSION=22

USE_APACHE= 2.4 / 24  => APACHE_VERSION=24
USE_APACHE= 2.4+/ 24+ => APACHE_VERSION=24


Additional results with "APACHE_PORT= www/apache22"
in /etc/make.conf and fire `make' command.
================================================
USE_APACHE= 1.3 / 13  => APACHE_VERSION=13, make: error version ...
USE_APACHE= 1.3+/13+  => APACHE_VERSION=22, make: OK

USE_APACHE= 2.0 / 20  => APACHE_VERSION=20, make: error version ...
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 ...