svn commit: r361316 - head/www/apache24

[Olli Hauer]

Author: ohauer
Date: Tue Jul  8 22:44:48 2014
New Revision: 361316
URL: http://svnweb.freebsd.org/changeset/ports/361316
QAT: https://qat.redports.org/buildarchive/r361316/

Log:
  - revert conflict (apache22 has MPM sub ports)

Modified:
  head/www/apache24/Makefile

Modified: head/www/apache24/Makefile
==============================================================================
--- head/www/apache24/Makefile	Tue Jul  8 22:42:57 2014	(r361315)
+++ head/www/apache24/Makefile	Tue Jul  8 22:44:48 2014	(r361316)
@@ -15,7 +15,8 @@ LIB_DEPENDS=	libexpat.so:${PORTSDIR}/tex
 		libapr-1.so.0.5.1:${PORTSDIR}/devel/apr1 \
 		libpcre.so:${PORTSDIR}/devel/pcre
 
-CONFLICTS_INSTALL=	caudium14-1.* apache22-*
+CONFLICTS_INSTALL=	caudium14-1.* \
+			apache-*-2.2.* apache22-*
 
 USE_APACHE=	common24
 USES=		tar:bzip2 iconv perl5 libtool cpe