svn commit: r368775 - head/Mk

Olli Hauer ohauer at FreeBSD.org
Sun Sep 21 15:47:09 UTC 2014


Author: ohauer
Date: Sun Sep 21 15:47:08 2014
New Revision: 368775
URL: http://svnweb.freebsd.org/changeset/ports/368775
QAT: https://qat.redports.org/buildarchive/r368775/

Log:
  - change check for httpd version s/-V/-v/
  
    -V also checks for config issues in httpd.conf, this can break a build
    in case there are config issues during rebuilds on a live system.
    -v prints the required info without check
  
  with hat apache@
  
  PR:		191471
  Submitted by:	Todd <kovert_at_omniscient.com>

Modified:
  head/Mk/bsd.apache.mk

Modified: head/Mk/bsd.apache.mk
==============================================================================
--- head/Mk/bsd.apache.mk	Sun Sep 21 15:40:47 2014	(r368774)
+++ head/Mk/bsd.apache.mk	Sun Sep 21 15:47:08 2014	(r368775)
@@ -278,7 +278,7 @@ SHORTMODNAME?=	${MODULENAME:S/mod_//}
 SRC_FILE?=	${MODULENAME}.c
 
 .if exists(${HTTPD})
-_APACHE_VERSION!=	${HTTPD} -V | ${SED} -ne 's/^Server version: Apache\/\([0-9]\)\.\([0-9]*\).*/\1\2/p'
+_APACHE_VERSION!=	${HTTPD} -v | ${SED} -ne 's/^Server version: Apache\/\([0-9]\)\.\([0-9]*\).*/\1\2/p'
 .elif defined(APACHE_PORT)
 _APACHE_VERSION!=	${ECHO_CMD} ${APACHE_PORT} | ${SED} -ne 's,.*/apache\([0-9]*\).*,\1,p'
 .endif


More information about the svn-ports-head mailing list