diff options
| author | Clement Laforet <clement@FreeBSD.org> | 2005-12-04 00:18:15 +0000 |
|---|---|---|
| committer | Clement Laforet <clement@FreeBSD.org> | 2005-12-04 00:18:15 +0000 |
| commit | 05684b80dd9f4d8c5476c1d6e62071a324b34c20 (patch) | |
| tree | 01d8d1db8758fd8bcaa69e038bc69e689bcabfa4 /Mk/bsd.apache.mk | |
| parent | fa7483a9eea716cfdfbe1daade35d20b8893880e (diff) | |
| download | ports-05684b80dd9f4d8c5476c1d6e62071a324b34c20.tar.gz ports-05684b80dd9f4d8c5476c1d6e62071a324b34c20.zip | |
Notes
Diffstat (limited to 'Mk/bsd.apache.mk')
| -rw-r--r-- | Mk/bsd.apache.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk index f6c43b68aa33..72b9cbffc49e 100644 --- a/Mk/bsd.apache.mk +++ b/Mk/bsd.apache.mk @@ -34,7 +34,7 @@ AP_PORT_IS_MODULE= YES #### for backward compatibility .elif ${USE_APACHE:L} == yes . if defined(WITH_APACHE2) -APACHE_PORT?= www/apache2 +APACHE_PORT?= www/apache20 . else APACHE_PORT?= www/apache13 . endif @@ -293,9 +293,7 @@ IGNORE?= PREFIX must be egal to APXS_PREFIX. AP_BUILDEXT= la PLIST_SUB+= APACHEMODDIR="libexec/apache2" \ APACHEINCLUDEDIR="include/apache2" -# XXX We postpone www/apache2 => www/apache20 migration -#APACHE_PORT= www/apache${APACHE_VERSION} -APACHE_PORT= www/apache2 +APACHE_PORT= www/apache${APACHE_VERSION} .elif ${APACHE_VERSION} >= "21" AP_BUILDEXT= la PLIST_SUB+= APACHEMODDIR="libexec/apache${APACHE_VERSION}" \ @@ -307,6 +305,7 @@ PLIST_SUB+= APACHEMODDIR="libexec/apache" \ APACHEINCLUDEDIR="include/apache" APACHE_PORT?= www/apache13 .endif + .for VAR in ${OVERRIDABLE_VARS} . if defined(AP${APACHE_VERSION}_${VAR}) ${VAR} =${AP${APACHE_VERSION}_${VAR}} |