aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorohauer <ohauer@FreeBSD.org>2013-03-27 05:31:27 +0800
committerohauer <ohauer@FreeBSD.org>2013-03-27 05:31:27 +0800
commit3b3a50136a6ca72d169fb4ba4f96456f196802dc (patch)
tree31930fb04637da441260a9a6c5fc74a07b4edf19
parentf0b5d6aebab9d7c24d8904796b8842d24a16810a (diff)
downloadfreebsd-ports-gnome-3b3a50136a6ca72d169fb4ba4f96456f196802dc.tar.gz
freebsd-ports-gnome-3b3a50136a6ca72d169fb4ba4f96456f196802dc.tar.zst
freebsd-ports-gnome-3b3a50136a6ca72d169fb4ba4f96456f196802dc.zip
- prepare for apache24
-rw-r--r--Mk/bsd.apache.mk10
-rw-r--r--www/apache22/Makefile6
2 files changed, 8 insertions, 8 deletions
diff --git a/Mk/bsd.apache.mk b/Mk/bsd.apache.mk
index bed00aa750e8..d69fafd4ece3 100644
--- a/Mk/bsd.apache.mk
+++ b/Mk/bsd.apache.mk
@@ -81,7 +81,7 @@
Apache_Pre_Include= bsd.apache.mk
DEFAULT_APACHE_VERSION= 22
-APACHE_SUPPORTED_VERSION= 22 # preferred version first
+APACHE_SUPPORTED_VERSION= 22 24 # preferred version first
# Print warnings
_ERROR_MSG= : Error from bsd.apache.mk.
@@ -93,9 +93,9 @@ _ERROR_MSG= : Error from bsd.apache.mk.
.if defined(USE_APACHE) && !empty(USE_APACHE)
. if ${USE_APACHE:Mcommon*} != ""
AP_PORT_IS_SERVER= yes
-. elif ${USE_APACHE:C/\-//:S/^22//:C/\+$//} == ""
+. elif ${USE_APACHE:C/\-//:S/^22//:S/^24//:C/\+$//} == ""
AP_PORT_IS_MODULE= yes
-. if ${USE_APACHE:C/\-//:S/^22//} == "+"
+. if ${USE_APACHE:C/\-//:S/^22//:S/^24//} == "+"
AP_PLUS= yes
. endif
. else
@@ -382,7 +382,7 @@ AP_EXTRAS+= -L ${AP_LIB}
Apache_Post_Include= bsd.apache.mk
.if defined(USE_APACHE_RUN) && !empty(USE_APACHE_RUN)
-. if ${USE_APACHE_RUN:C/\-//:S/^22//:C/\+$//} != ""
+. if ${USE_APACHE_RUN:C/\-//:S/^22//:S/^24//:C/\+$//} != ""
IGNORE= ${_ERROR_MSG} Illegal use of USE_APACHE_RUN ( ${USE_APACHE_RUN} )
. endif
.elif defined(USE_APACHE_RUN)
@@ -390,7 +390,7 @@ IGNORE= ${_ERROR_MSG} Illegal use of USE_APACHE_RUN ( no valid version specified
.endif
.if defined(USE_APACHE_BUILD) && !empty(USE_APACHE_BUILD)
-. if ${USE_APACHE_BUILD:C/\-//:S/^22//:C/\+$//} != ""
+. if ${USE_APACHE_BUILD:C/\-//:S/^22//:S/^24//:C/\+$//} != ""
IGNORE= ${_ERROR_MSG} Illegal use of USE_APACHE_BUILD ( ${USE_APACHE_BUILD} )
. endif
.elif defined(USE_APACHE_BUILD)
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index d4ccb77c8e9b..f6282369db3d 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -19,9 +19,9 @@ MAKE_JOBS_SAFE= yes
LATEST_LINK?= apache22
-CONFLICTS= caudium14-1.* \
- apache-2.0.* apache-*-2.0.* \
- apache-*-2.2.* apache22-*-2.2.*
+CONFLICTS_INSTALL= caudium14-1.* \
+ apache-*-2.2.* apache22-*-2.2.* \
+ apache-*-2.4.* apache24-*-2.4.*
USE_APACHE= common22
USE_BZIP2= yes