From owner-svn-ports-head@FreeBSD.ORG  Sat Sep 22 12:31:10 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3B6661065673;
	Sat, 22 Sep 2012 12:31:10 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2741D8FC12;
	Sat, 22 Sep 2012 12:31:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8MCVA90066246;
	Sat, 22 Sep 2012 12:31:10 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8MCV9hE066243;
	Sat, 22 Sep 2012 12:31:09 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201209221231.q8MCV9hE066243@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sat, 22 Sep 2012 12:31:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304671 - head/www/horde-base
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 22 Sep 2012 12:31:10 -0000

Author: mm
Date: Sat Sep 22 12:31:09 2012
New Revision: 304671
URL: http://svn.freebsd.org/changeset/ports/304671

Log:
  Fix CONFLICTS with horde4
  
  Reported by:	Andrea Venturoli

Modified:
  head/www/horde-base/Makefile

Modified: head/www/horde-base/Makefile
==============================================================================
--- head/www/horde-base/Makefile	Sat Sep 22 11:53:59 2012	(r304670)
+++ head/www/horde-base/Makefile	Sat Sep 22 12:31:09 2012	(r304671)
@@ -78,7 +78,7 @@ RUN_DEPENDS+=	${PEARDIR}/Date.php:${PORT
 		${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP   \
 		${PEARDIR}/MDB2/Schema/Validate.php:${PORTSDIR}/databases/pear-MDB2_Schema
 
-CONFLICTS=	horde-2.*
+CONFLICTS=	horde-4*
 
 USE_GETTEXT=	yes
 USE_PHP=	ctype gettext session