svn commit: r405826 - in head/sysutils: cfengine-masterfiles36 cfengine-masterfiles37 cfengine-masterfiles38 cfengine32 cfengine33 cfengine34 cfengine35 cfengine36 cfengine37 cfengine38

[Cy Schubert]

Author: cy
Date: Tue Jan 12 02:52:19 2016
New Revision: 405826
URL: https://svnweb.freebsd.org/changeset/ports/405826

Log:
  Correct CONFLICTS.

Modified:
  head/sysutils/cfengine-masterfiles36/Makefile
  head/sysutils/cfengine-masterfiles37/Makefile
  head/sysutils/cfengine-masterfiles38/Makefile
  head/sysutils/cfengine32/Makefile
  head/sysutils/cfengine33/Makefile
  head/sysutils/cfengine34/Makefile
  head/sysutils/cfengine35/Makefile
  head/sysutils/cfengine36/Makefile
  head/sysutils/cfengine37/Makefile
  head/sysutils/cfengine38/Makefile

Modified: head/sysutils/cfengine-masterfiles36/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles36/Makefile	Tue Jan 12 02:52:13 2016	(r405825)
+++ head/sysutils/cfengine-masterfiles36/Makefile	Tue Jan 12 02:52:19 2016	(r405826)
@@ -23,7 +23,7 @@ RUN_DEPENDS=	cf-agent:${PORTSDIR}/sysuti
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-masterfiles[234]*
+CONFLICTS=	cfengine-masterfiles[7-9]*
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		cpe

Modified: head/sysutils/cfengine-masterfiles37/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles37/Makefile	Tue Jan 12 02:52:13 2016	(r405825)
+++ head/sysutils/cfengine-masterfiles37/Makefile	Tue Jan 12 02:52:19 2016	(r405826)
@@ -23,7 +23,7 @@ RUN_DEPENDS=	cf-agent:${PORTSDIR}/sysuti
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-masterfiles[234]*
+CONFLICTS=	cfengine-masterfiles[689]*
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		cpe

Modified: head/sysutils/cfengine-masterfiles38/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles38/Makefile	Tue Jan 12 02:52:13 2016	(r405825)
+++ head/sysutils/cfengine-masterfiles38/Makefile	Tue Jan 12 02:52:19 2016	(r405826)
@@ -23,7 +23,7 @@ RUN_DEPENDS=	cf-agent:${PORTSDIR}/sysuti
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-masterfiles[234]*
+CONFLICTS=	cfengine-masterfiles[679]*
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		cpe

Modified: head/sysutils/cfengine32/Makefile
==============================================================================
--- head/sysutils/cfengine32/Makefile	Tue Jan 12 02:52:13 2016	(r405825)
+++ head/sysutils/cfengine32/Makefile	Tue Jan 12 02:52:19 2016	(r405826)
@@ -17,7 +17,7 @@ CPE_VENDOR=	gnu
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-[2]* cfengine-3.[345]* cfengine-devel-*
+CONFLICTS=	cfengine-[2]* cfengine-3.[3-9]* cfengine-devel-*
 
 USE_RC_SUBR=	cf-execd cf-serverd
 

Modified: head/sysutils/cfengine33/Makefile
==============================================================================
--- head/sysutils/cfengine33/Makefile	Tue Jan 12 02:52:13 2016	(r405825)
+++ head/sysutils/cfengine33/Makefile	Tue Jan 12 02:52:19 2016	(r405826)
@@ -16,7 +16,7 @@ CPE_VENDOR=	gnu
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-2* cfengine-3.[245]* cfengine-devel-*
+CONFLICTS=	cfengine-2* cfengine-3.[24-9]* cfengine-devel-*
 
 USE_RC_SUBR=	cf-execd cf-serverd
 

Modified: head/sysutils/cfengine34/Makefile
==============================================================================
--- head/sysutils/cfengine34/Makefile	Tue Jan 12 02:52:13 2016	(r405825)
+++ head/sysutils/cfengine34/Makefile	Tue Jan 12 02:52:19 2016	(r405826)
@@ -19,7 +19,7 @@ PKGNAMESUFFIX=	34
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-2* cfengine-3.[235]* cfengine-devel-*
+CONFLICTS=	cfengine-2* cfengine-3.[235-9]* cfengine-devel-*
 
 USE_RC_SUBR=	cf-execd cf-serverd
 

Modified: head/sysutils/cfengine35/Makefile
==============================================================================
--- head/sysutils/cfengine35/Makefile	Tue Jan 12 02:52:13 2016	(r405825)
+++ head/sysutils/cfengine35/Makefile	Tue Jan 12 02:52:19 2016	(r405826)
@@ -24,7 +24,7 @@ PKGNAMESUFFIX=	35
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-[234]*
+CONFLICTS=	cfengine-[2346-9]*
 
 USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 

Modified: head/sysutils/cfengine36/Makefile
==============================================================================
--- head/sysutils/cfengine36/Makefile	Tue Jan 12 02:52:13 2016	(r405825)
+++ head/sysutils/cfengine36/Makefile	Tue Jan 12 02:52:19 2016	(r405826)
@@ -22,7 +22,7 @@ CPE_VENDOR=	gnu
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-[234]*
+CONFLICTS=	cfengine-[2-57-9]*
 
 USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 

Modified: head/sysutils/cfengine37/Makefile
==============================================================================
--- head/sysutils/cfengine37/Makefile	Tue Jan 12 02:52:13 2016	(r405825)
+++ head/sysutils/cfengine37/Makefile	Tue Jan 12 02:52:19 2016	(r405826)
@@ -21,7 +21,7 @@ PKGNAMESUFFIX=	37
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-[234]*
+CONFLICTS=	cfengine-[2-689]*
 
 USE_RC_SUBR=	cf-execd cf-serverd cf-monitord
 

Modified: head/sysutils/cfengine38/Makefile
==============================================================================
--- head/sysutils/cfengine38/Makefile	Tue Jan 12 02:52:13 2016	(r405825)
+++ head/sysutils/cfengine38/Makefile	Tue Jan 12 02:52:19 2016	(r405826)
@@ -21,7 +21,7 @@ PKGNAMESUFFIX=	38
 
 FETCH_BEFORE_ARGS=	-o ${DISTDIR}/${DISTFILES}
 
-CONFLICTS=	cfengine-[234]*
+CONFLICTS=	cfengine-[2-79]*
 
 USE_RC_SUBR=	cf-execd cf-serverd cf-monitord