svn commit: r367561 - head/Mk

[Baptiste Daroussin]

On Sun, Sep 07, 2014 at 03:58:05PM +0000, Olli Hauer wrote:
> Author: ohauer
> Date: Sun Sep  7 15:58:05 2014
> New Revision: 367561
> URL: http://svnweb.freebsd.org/changeset/ports/367561
> QAT: https://qat.redports.org/buildarchive/r367561/
> 
> Log:
>   - fix build for ports defining USE_APACHE=22, USE_APACHE_(BUILD|RUN)=22
>   
>   spotted by adam@
> 
> Modified:
>   head/Mk/bsd.apache.mk
> 
> Modified: head/Mk/bsd.apache.mk
> ==============================================================================
> --- head/Mk/bsd.apache.mk	Sun Sep  7 15:56:30 2014	(r367560)
> +++ head/Mk/bsd.apache.mk	Sun Sep  7 15:58:05 2014	(r367561)
> @@ -288,8 +288,9 @@ APACHE_MPM!=		${APXS} -q MPM_NAME
>  .	endif
>  .elif defined(APACHE_PORT)
>  _APACHE_VERSION!=	${ECHO_CMD} ${APACHE_PORT} | ${SED} -ne 's,.*/apache\([0-9]*\).*,\1,p'
> -.else
> -_APACHE_VERSION:=	${DEFAULT_APACHE_VERSION}
> +#.else
> +# the next line breaks ports with USE_APACHE(_RUN|_BUILD)=22
> +#_APACHE_VERSION:=	${DEFAULT_APACHE_VERSION}
>  .endif
>  
>  .if defined(USE_APACHE)
> 

This breaks DEFAULT_VERSIONS=apache=2.2 which now always default on 2.4

regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20140908/42e4616e/attachment.sig>