svn commit: r367561 - head/Mk

Olli Hauer ohauer at FreeBSD.org
Sun Sep 7 15:58:06 UTC 2014


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)


More information about the svn-ports-head mailing list