summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorohauer <ohauer@FreeBSD.org>2014-09-21 15:47:08 +0000
committerohauer <ohauer@FreeBSD.org>2014-09-21 15:47:08 +0000
commitfa9a63ef94737b890b2aa966c90b283459567aa7 (patch)
treef9e628f69dace425abf48ce9c5ea6a6b02b4c6b1
parentb30574b67d2bafbd6d821fb6b9dffedbe45a18ae (diff)
downloadFreeBSD-ports-fa9a63ef94737b890b2aa966c90b283459567aa7.zip
FreeBSD-ports-fa9a63ef94737b890b2aa966c90b283459567aa7.tar.gz
- 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>
-rw-r--r--Mk/bsd.apache.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk
index bb9d453..3f2f8c0 100644
--- a/Mk/bsd.apache.mk
+++ b/Mk/bsd.apache.mk
@@ -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
OpenPOWER on IntegriCloud