Date: Fri, 7 Jan 2011 21:50:04 GMT From: Olli Hauer <ohauer@FreeBSD.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/147009: Mk/bsd.apache.mk: [patch] default to www/apache22 Message-ID: <201101072150.p07Lo4pK043547@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/147009; it has been noted by GNATS. From: Olli Hauer <ohauer@FreeBSD.org> To: <bug-followup@FreeBSD.org> Cc: <ohauer@FreeBSD.org> Subject: Re: ports/147009: Mk/bsd.apache.mk: [patch] default to www/apache22 Date: Fri, 7 Jan 2011 22:43:59 +0100 (CET) The following patch set apache22 as default if USE_APACHE= [13|20]+ is defined. If no '+' is used in USE_APACHE then the requested version is used. I discussed the patch with Philip on freebsd-apache. http://lists.freebsd.org/pipermail/freebsd-apache/2011-January/002084.html A copy of the patch is also aviable for download. http://people.freebsd.org/~ohauer/diffs/PR_147009_ports__Mk__bsd.apache.mk.diff --- patch_Mk__bsd.apache.mk.txt begins here --- Index: Mk/bsd.apache.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.apache.mk,v retrieving revision 1.26 diff -u -r1.26 bsd.apache.mk --- Mk/bsd.apache.mk 7 Jun 2010 14:38:44 -0000 1.26 +++ Mk/bsd.apache.mk 7 Jan 2011 20:21:58 -0000 @@ -19,12 +19,14 @@ Apache_Pre_Include= bsd.apache.mk +DEFAULT_APACHE_VERSION= 22 + # 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]} != "" +.elif ${USE_APACHE:C/\.//:C/\+//:S/^13//:S/^20//:S/^22//:S/^24//} == "" AP_PORT_IS_MODULE= YES .else IGNORE= ${_ERROR_MSG} Illegal use of USE_APACHE @@ -259,8 +261,12 @@ .else AP_CUR_VERSION= none . if !defined(APACHE_PORT) -#Fallback to smallest version... +# If we found '13+' or '20+' make apache22 the default +. if ${USE_APACHE:C/\.//:S/^13//:S/^20//:C/\+/PLUS/} == "PLUS" +APACHE_VERSION= ${DEFAULT_APACHE_VERSION} +. else APACHE_VERSION= ${AP_VERSION:C/\+//} +. endif . endif .endif --- patch_Mk__bsd.apache.mk.txt ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101072150.p07Lo4pK043547>