From owner-freebsd-apache@FreeBSD.ORG Fri Jan 7 14:33:15 2011 Return-Path: Delivered-To: apache@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C09B81065673; Fri, 7 Jan 2011 14:33:15 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from u18-124.dslaccess.de (unknown [194.231.39.124]) by mx1.freebsd.org (Postfix) with ESMTP id 6A7588FC0A; Fri, 7 Jan 2011 14:33:15 +0000 (UTC) Received: from [172.20.1.100] (unknown [172.20.1.100]) by u18-124.dslaccess.de (Postfix) with ESMTPSA id 2A1D5205E0; Fri, 7 Jan 2011 15:33:10 +0100 (CET) Message-ID: <4D272510.9030908@FreeBSD.org> Date: Fri, 07 Jan 2011 15:37:04 +0100 From: Olli Hauer User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.13) Gecko/20101207 Thunderbird/3.1.7 MIME-Version: 1.0 To: "Philip M. Gollucci" References: <4D243209.5040703@FreeBSD.org> <4D24BED1.7070004@p6m7g8.com> <4D265CF2.5090208@FreeBSD.org> <4D26B3C6.4050804@p6m7g8.com> In-Reply-To: <4D26B3C6.4050804@p6m7g8.com> X-Enigmail-Version: 1.1.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: ohauer@FreeBSD.org, "Philip M. Gollucci" , apache@FreeBSD.org Subject: Re: question about PR: ports/147009: Mk/bsd.apache.mk: [patch] default to www/apache22 X-BeenThere: freebsd-apache@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: ohauer@FreeBSD.org List-Id: Support of apache-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Jan 2011 14:33:15 -0000 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 ...