svn commit: r303324 - head/misc/dahdi-kmod

[Max Khon]

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>