Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Jul 2013 15:12:04 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
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
Message-ID:  <201307031512.r63FC4D7009890@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307031512.r63FC4D7009890>