From owner-svn-ports-head@FreeBSD.ORG  Wed Jul  3 15:12:05 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 8380D911;
 Wed,  3 Jul 2013 15:12:05 +0000 (UTC) (envelope-from gjb@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 7491B11DD;
 Wed,  3 Jul 2013 15:12:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63FC5mU009893;
 Wed, 3 Jul 2013 15:12:05 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63FC4D7009890;
 Wed, 3 Jul 2013 15:12:04 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201307031512.r63FC4D7009890@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 3 Jul 2013 15:12:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322232 - in head/sysutils: cfengine32 cfengine33
 cfengine35
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: Wed, 03 Jul 2013 15:12:05 -0000

Author: gjb
Date: Wed Jul  3 15:12:04 2013
New Revision: 322232
URL: http://svnweb.freebsd.org/changeset/ports/322232

Log:
  Add missing conflicts.
  
  Approved by:	cy (maintainer, implicit)

Modified:
  head/sysutils/cfengine32/Makefile
  head/sysutils/cfengine33/Makefile
  head/sysutils/cfengine35/Makefile

Modified: head/sysutils/cfengine32/Makefile
==============================================================================
--- head/sysutils/cfengine32/Makefile	Wed Jul  3 15:10:49 2013	(r322231)
+++ head/sysutils/cfengine32/Makefile	Wed Jul  3 15:12:04 2013	(r322232)
@@ -16,7 +16,7 @@ COMMENT=	A systems administration tool f
 LATEST_LINK=	cfengine32
 FETCH_BEFORE_ARGS=   -o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-[2]* cfengine-3.[34]* cfengine-devel-*
+CONFLICTS=	cfengine-[2]* cfengine-3.[345]* cfengine-devel-*
 
 USE_RC_SUBR=	cf-execd cf-serverd
 

Modified: head/sysutils/cfengine33/Makefile
==============================================================================
--- head/sysutils/cfengine33/Makefile	Wed Jul  3 15:10:49 2013	(r322231)
+++ head/sysutils/cfengine33/Makefile	Wed Jul  3 15:12:04 2013	(r322232)
@@ -15,7 +15,7 @@ COMMENT=	A systems administration tool f
 LATEST_LINK=	cfengine33
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-2* cfengine-3.[24]* cfengine-devel-*
+CONFLICTS=	cfengine-2* cfengine-3.[245]* cfengine-devel-*
 
 USE_RC_SUBR=	cf-execd cf-serverd
 

Modified: head/sysutils/cfengine35/Makefile
==============================================================================
--- head/sysutils/cfengine35/Makefile	Wed Jul  3 15:10:49 2013	(r322231)
+++ head/sysutils/cfengine35/Makefile	Wed Jul  3 15:12:04 2013	(r322232)
@@ -18,7 +18,7 @@ LATEST_LINK=	cfengine35
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-[23]*
+CONFLICTS=	cfengine-[234]*
 
 USE_RC_SUBR=	cf-execd cf-serverd