From c1aa7d938b8df37139d428ef5a0f05fb0c7b18f1 Mon Sep 17 00:00:00 2001
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Tue, 26 Mar 2013 21:31:27 +0000
Subject: [PATCH] - prepare for apache24

---
 Mk/bsd.apache.mk      | 10 +++++-----
 www/apache22/Makefile |  6 +++---
 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