From owner-svn-ports-head@FreeBSD.ORG  Wed Aug 29 08:41:08 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 71F5C106564A;
	Wed, 29 Aug 2012 08:41:08 +0000 (UTC)
	(envelope-from fjoe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D3858FC0C;
	Wed, 29 Aug 2012 08:41:08 +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 q7T8f8Hf013648;
	Wed, 29 Aug 2012 08:41:08 GMT (envelope-from fjoe@svn.freebsd.org)
Received: (from fjoe@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7T8f8df013646;
	Wed, 29 Aug 2012 08:41:08 GMT (envelope-from fjoe@svn.freebsd.org)
Message-Id: <201208290841.q7T8f8df013646@svn.freebsd.org>
From: Max Khon <fjoe@FreeBSD.org>
Date: Wed, 29 Aug 2012 08:41:08 +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: r303324 - head/misc/dahdi-kmod
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: Wed, 29 Aug 2012 08:41:08 -0000

Author: fjoe
Date: Wed Aug 29 08:41:07 2012
New Revision: 303324
URL: http://svn.freebsd.org/changeset/ports/303324

Log:
  Fix CONFLICTS definition.

Modified:
  head/misc/dahdi-kmod/Makefile

Modified: head/misc/dahdi-kmod/Makefile
==============================================================================
--- head/misc/dahdi-kmod/Makefile	Wed Aug 29 08:39:22 2012	(r303323)
+++ head/misc/dahdi-kmod/Makefile	Wed Aug 29 08:41:07 2012	(r303324)
@@ -22,8 +22,6 @@ COMMENT=	Digium/Asterisk Hardware Device
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/dahdi_cfg:${PORTSDIR}/misc/dahdi
 
-CONFLICTS=	dahdi-kmod26-*
-
 DAHDI_VERSION=		2.4.0-rc5
 DAHDI_TOOLS_VERSION=	2.4.0-rc1
 OSLEC_VERSION=		2.6.35.4
@@ -48,7 +46,7 @@ MAKE_ARGS=	ADDITIONAL_DRIVERS="wcb1xxp" 
 GROUPS=		dahdi
 
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
-CONFLICTS=	zaptel-[0-9]*
+CONFLICTS=	zaptel-[0-9]* dahdi-kmod26-*
 
 .include <bsd.port.pre.mk>