diff options
| author | ohauer <ohauer@FreeBSD.org> | 2014-09-07 23:58:05 +0800 |
|---|---|---|
| committer | ohauer <ohauer@FreeBSD.org> | 2014-09-07 23:58:05 +0800 |
| commit | 956340dccfcefe3ffcb46ef829fe7aa0aa1adf0a (patch) | |
| tree | d79a1f31bb0a19cd6dba73683f2f4c2306049307 | |
| parent | f8197139f838cecc70cbaf2d16d52908a115d060 (diff) | |
| download | freebsd-ports-gnome-956340dccfcefe3ffcb46ef829fe7aa0aa1adf0a.tar.gz freebsd-ports-gnome-956340dccfcefe3ffcb46ef829fe7aa0aa1adf0a.tar.zst freebsd-ports-gnome-956340dccfcefe3ffcb46ef829fe7aa0aa1adf0a.zip | |
- fix build for ports defining USE_APACHE=22, USE_APACHE_(BUILD|RUN)=22
spotted by adam@
| -rw-r--r-- | Mk/bsd.apache.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk index f61ed7ed22e4..bd431a7c1980 100644 --- a/Mk/bsd.apache.mk +++ b/Mk/bsd.apache.mk @@ -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) |