From owner-svn-ports-head@FreeBSD.ORG  Sun Dec 16 12:07:33 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 350BBC10;
 Sun, 16 Dec 2012 12:07:33 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 188518FC14;
 Sun, 16 Dec 2012 12:07:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBGC7W21071335;
 Sun, 16 Dec 2012 12:07:32 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBGC7Wn9071333;
 Sun, 16 Dec 2012 12:07:32 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201212161207.qBGC7Wn9071333@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sun, 16 Dec 2012 12:07:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r309003 - head/devel/pear-channel-horde
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.14
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: Sun, 16 Dec 2012 12:07:33 -0000

Author: mm
Date: Sun Dec 16 12:07:32 2012
New Revision: 309003
URL: http://svnweb.freebsd.org/changeset/ports/309003

Log:
  Add conflict with all horde3 packages to new bsd.horde.mk

Modified:
  head/devel/pear-channel-horde/bsd.horde.mk

Modified: head/devel/pear-channel-horde/bsd.horde.mk
==============================================================================
--- head/devel/pear-channel-horde/bsd.horde.mk	Sun Dec 16 12:05:19 2012	(r309002)
+++ head/devel/pear-channel-horde/bsd.horde.mk	Sun Dec 16 12:07:32 2012	(r309003)
@@ -11,6 +11,8 @@ RUN_DEPENDS+=	${PEARDIR}/PEAR.php:${PORT
 PKGNAMEPREFIX?=	pear-
 HORDE_DIR?=	www/horde
 
+CONFLICTS+=	horde3-*.[0-9]*
+
 DIST_SUBDIR=	Horde
 PEAR_CHANNEL=	horde
 PEAR_AUTOINSTALL=	yes