From owner-svn-ports-head@FreeBSD.ORG  Tue Jul  8 22:44:49 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BBC81483;
 Tue,  8 Jul 2014 22:44:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A4D102D24;
 Tue,  8 Jul 2014 22:44:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s68MinbN086011;
 Tue, 8 Jul 2014 22:44:49 GMT (envelope-from ohauer@svn.freebsd.org)
Received: (from ohauer@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s68MinNt086004;
 Tue, 8 Jul 2014 22:44:49 GMT (envelope-from ohauer@svn.freebsd.org)
Message-Id: <201407082244.s68MinNt086004@svn.freebsd.org>
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Tue, 8 Jul 2014 22:44:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r361316 - head/www/apache24
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Jul 2014 22:44:49 -0000

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