svn commit: r367561 - head/Mk

[Mathieu Arnold]

+--On 8 septembre 2014 00:34:42 +0200 Baptiste Daroussin <bapt at FreeBSD.org>
wrote:
| 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

Ah, I was wondering why my apache 2.2 poudriere build had migrated to 2.4
all by themselves...


-- 
Mathieu Arnold