diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2014-02-12 01:12:28 +0800 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2014-02-12 01:12:28 +0800 |
| commit | 86f9c3213fedaee916ce6fac5675a6c4a491c9f4 (patch) | |
| tree | 4b45c659dba2de58b7a82565f8150d99524ff260 /Mk/bsd.apache.mk | |
| parent | c3d325f339e8fe2945c22f4f9137f837d3a7208c (diff) | |
| download | freebsd-ports-gnome-86f9c3213fedaee916ce6fac5675a6c4a491c9f4.tar.gz freebsd-ports-gnome-86f9c3213fedaee916ce6fac5675a6c4a491c9f4.tar.zst freebsd-ports-gnome-86f9c3213fedaee916ce6fac5675a6c4a491c9f4.zip | |
Use default-versions.mk for Apache, PHP, MySQL And PostgreSQL.
Submitted by: Allan Jude
Reviewed by: bdrewery, ohauer (apache), mat
With hat: portmgr
Diffstat (limited to 'Mk/bsd.apache.mk')
| -rw-r--r-- | Mk/bsd.apache.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk index aba1fb2cd239..38bcc9d0b181 100644 --- a/Mk/bsd.apache.mk +++ b/Mk/bsd.apache.mk @@ -80,7 +80,13 @@ Apache_Pre_Include= bsd.apache.mk -DEFAULT_APACHE_VERSION= 22 +.include "${PORTSDIR}/Mk/bsd.default-versions.mk" + +.if defined(DEFAULT_APACHE_VER) +WARNING+= "DEFAULT_APACHE_VER is defined, consider using DEFAULT_VERSIONS=apache=${DEFAULT_APACHE_VER} instead" +.endif + +DEFAULT_APACHE_VERSION?= ${APACHE_DEFAULT:S/.//} APACHE_SUPPORTED_VERSION= 22 24 # preferred version first # Print warnings @@ -285,6 +291,8 @@ 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} .endif .if defined(USE_APACHE) @@ -335,13 +343,11 @@ IGNORE?= PREFIX must be equal to APXS_PREFIX. . endif .endif -.if ${APACHE_VERSION} >= 22 AP_BUILDEXT= la APACHEMODDIR= libexec/apache${APACHE_VERSION} APACHEINCLUDEDIR=include/apache${APACHE_VERSION} APACHEETCDIR= etc/apache${APACHE_VERSION} APACHE_PORT?= www/apache${APACHE_VERSION} -.endif PLIST_SUB+= APACHEMODDIR="${APACHEMODDIR}" \ APACHEINCLUDEDIR="${APACHEINCLUDEDIR}" \ |