svn commit: r489751 - in head/sysutils: cfengine-masterfiles-devel cfengine-masterfiles310 cfengine-masterfiles311 cfengine-masterfiles312 cfengine-masterfiles313 cfengine-masterfiles36 cfengine-ma...
Cy Schubert
cy at FreeBSD.org
Wed Jan 9 03:53:31 UTC 2019
Author: cy
Date: Wed Jan 9 03:53:25 2019
New Revision: 489751
URL: https://svnweb.freebsd.org/changeset/ports/489751
Log:
Remove redundant CONFLICTS.
PR: 234742
Reported by: tobik@
MFH: 2019Q1
Modified:
head/sysutils/cfengine-masterfiles-devel/Makefile
head/sysutils/cfengine-masterfiles310/Makefile
head/sysutils/cfengine-masterfiles311/Makefile
head/sysutils/cfengine-masterfiles312/Makefile
head/sysutils/cfengine-masterfiles313/Makefile
head/sysutils/cfengine-masterfiles36/Makefile
head/sysutils/cfengine-masterfiles37/Makefile
head/sysutils/cfengine-masterfiles38/Makefile
head/sysutils/cfengine-masterfiles39/Makefile
head/sysutils/cfengine310/Makefile
head/sysutils/cfengine311/Makefile
head/sysutils/cfengine312/Makefile
head/sysutils/cfengine313/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
head/sysutils/cfengine39/Makefile
Modified: head/sysutils/cfengine-masterfiles-devel/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles-devel/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine-masterfiles-devel/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -30,8 +30,6 @@ RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-masterfiles[6-9]*
-
MAKE_JOBS_UNSAFE= yes
USES= autoreconf:build cpe gmake python:build shebangfix
HAS_CONFIGURE= yes
Modified: head/sysutils/cfengine-masterfiles310/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles310/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine-masterfiles310/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -28,8 +28,6 @@ RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-masterfiles[6-9]*
-
MAKE_JOBS_UNSAFE= yes
USES= cpe gmake python:build shebangfix
HAS_CONFIGURE= yes
Modified: head/sysutils/cfengine-masterfiles311/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles311/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine-masterfiles311/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -28,8 +28,6 @@ RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-masterfiles[6-9]*
-
MAKE_JOBS_UNSAFE= yes
USES= cpe gmake python:build shebangfix
HAS_CONFIGURE= yes
Modified: head/sysutils/cfengine-masterfiles312/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles312/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine-masterfiles312/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -25,8 +25,6 @@ RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-masterfiles[6-9]*
-
MAKE_JOBS_UNSAFE= yes
USES= cpe gmake python:build shebangfix
HAS_CONFIGURE= yes
Modified: head/sysutils/cfengine-masterfiles313/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles313/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine-masterfiles313/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -25,8 +25,6 @@ RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-masterfiles[6-9]*
-
MAKE_JOBS_UNSAFE= yes
USES= cpe gmake python:build shebangfix
HAS_CONFIGURE= yes
Modified: head/sysutils/cfengine-masterfiles36/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles36/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine-masterfiles36/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -28,8 +28,6 @@ RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-masterfiles[17-9]*
-
MAKE_JOBS_UNSAFE= yes
USES= cpe
HAS_CONFIGURE= yes
Modified: head/sysutils/cfengine-masterfiles37/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles37/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine-masterfiles37/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -28,8 +28,6 @@ RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-masterfiles[1689]*
-
MAKE_JOBS_UNSAFE= yes
USES= cpe python:build shebangfix
HAS_CONFIGURE= yes
Modified: head/sysutils/cfengine-masterfiles38/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles38/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine-masterfiles38/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -29,8 +29,6 @@ RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-masterfiles[1679]*
-
MAKE_JOBS_UNSAFE= yes
USES= cpe python:build shebangfix
HAS_CONFIGURE= yes
Modified: head/sysutils/cfengine-masterfiles39/Makefile
==============================================================================
--- head/sysutils/cfengine-masterfiles39/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine-masterfiles39/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -28,8 +28,6 @@ RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-masterfiles[1678]*
-
MAKE_JOBS_UNSAFE= yes
USES= cpe
HAS_CONFIGURE= yes
Modified: head/sysutils/cfengine310/Makefile
==============================================================================
--- head/sysutils/cfengine310/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine310/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -18,7 +18,7 @@ CPE_VENDOR= gnu
DEPRECATED= OpenSSL 1.1.X is not supported.
EXPIRATION_DATE= 2021-09-30
-CONFLICTS= cfengine-2* cfengine3[0-9]-* cfengine31[1-9]-*
+CONFLICTS= cfengine3[0-9]-* cfengine31[1-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 310
CONFLICTS+= cfengine-3.*
Modified: head/sysutils/cfengine311/Makefile
==============================================================================
--- head/sysutils/cfengine311/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine311/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -19,15 +19,13 @@ CPE_VENDOR= gnu
DEPRECATED= OpenSSL 1.1.X is not supported.
EXPIRATION_DATE= 2021-09-30
-CONFLICTS= cfengine-2* cfengine3[0-9]-* cfengine31[02-9]-*
+CONFLICTS= cfengine3[0-9]-* cfengine31[02-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 311
CONFLICTS+= cfengine-3.*
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-
-CONFLICTS= cfengine-[12-9]*
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
Modified: head/sysutils/cfengine312/Makefile
==============================================================================
--- head/sysutils/cfengine312/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine312/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -15,15 +15,13 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
-CONFLICTS= cfengine-2* cfengine3[0-9]-* cfengine31[013-9]-*
+CONFLICTS= cfengine3[0-9]-* cfengine31[013-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 312
CONFLICTS+= cfengine-3.*
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-
-CONFLICTS= cfengine-[12-9]*
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
Modified: head/sysutils/cfengine313/Makefile
==============================================================================
--- head/sysutils/cfengine313/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine313/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -15,15 +15,13 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
-CONFLICTS= cfengine-2* cfengine3[0-9]-* cfengine31[013-9]-*
+CONFLICTS= cfengine3[0-9]-* cfengine31[013-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 313
CONFLICTS+= cfengine-3.*
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-
-CONFLICTS= cfengine-[12-9]*
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
Modified: head/sysutils/cfengine32/Makefile
==============================================================================
--- head/sysutils/cfengine32/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine32/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -20,7 +20,7 @@ EXPIRATION_DATE= 2021-09-30
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-2* cfengine-3.[13-9]* cfengine-devel-* \
+CONFLICTS= cfengine-3.[13-9]* cfengine-devel-* \
cfengine3[3-9]-* cfengine31[0-9]-*
USE_RC_SUBR= cf-execd cf-serverd
Modified: head/sysutils/cfengine33/Makefile
==============================================================================
--- head/sysutils/cfengine33/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine33/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -19,7 +19,7 @@ EXPIRATION_DATE= 2021-09-30
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-2* cfengine-3.[124-9]* cfengine-devel-* \
+CONFLICTS= cfengine-3.[124-9]* cfengine-devel-* \
cfengine3[0124-9]-* cfengine31[0-9]-*
USE_RC_SUBR= cf-execd cf-serverd
Modified: head/sysutils/cfengine34/Makefile
==============================================================================
--- head/sysutils/cfengine34/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine34/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -16,15 +16,13 @@ CPE_VENDOR= gnu
DEPRECATED= OpenSSL 1.1.X is not supported.
EXPIRATION_DATE= 2021-09-30
-CONFLICTS= cfengine-2* cfengine3[0-35-9]-* cfengine31[0-9]-*
+CONFLICTS= cfengine3[0-35-9]-* cfengine31[0-9]-* cfengine-devel-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 34
CONFLICTS+= cfengine-3.*
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-
-CONFLICTS= cfengine-2* cfengine-3.[1235-9]* cfengine-devel-*
USE_RC_SUBR= cf-execd cf-serverd
Modified: head/sysutils/cfengine35/Makefile
==============================================================================
--- head/sysutils/cfengine35/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine35/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -21,15 +21,13 @@ CPE_VENDOR= gnu
LIB_DEPENDS= libpcre.so:devel/pcre
-ONFLICTS= cfengine-2* cfengine3[0-46-9]-* cfengine31[0-9]-*
+CONFLICTS= cfengine-2* cfengine3[0-46-9]-* cfengine31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 35
CONFLICTS+= cfengine-3.*
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-
-CONFLICTS= cfengine-[12346-9]*
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
Modified: head/sysutils/cfengine36/Makefile
==============================================================================
--- head/sysutils/cfengine36/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine36/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -16,7 +16,7 @@ COMMENT= Systems administration tool for networks
DEPRECATED= OpenSSL 1.1.X is not supported.
EXPIRATION_DATE= 2021-09-30
-CONFLICTS= cfengine-2* cfengine3[0-57-9]-* cfengine31[0-9]-*
+CONFLICTS= cfengine3[0-57-9]-* cfengine31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 36
PORTEPOCH?= 2
@@ -28,8 +28,6 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-
-CONFLICTS= cfengine-[12-57-9]*
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
Modified: head/sysutils/cfengine37/Makefile
==============================================================================
--- head/sysutils/cfengine37/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine37/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -18,15 +18,13 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
-CONFLICTS= cfengine-2* cfengine3[0-689]-* cfengine31[0-9]-*
+CONFLICTS= cfengine3[0-689]-* cfengine31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 37
CONFLICTS+= cfengine-3.*
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-
-CONFLICTS= cfengine-[12-689]*
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
Modified: head/sysutils/cfengine38/Makefile
==============================================================================
--- head/sysutils/cfengine38/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine38/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -19,15 +19,13 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
-CONFLICTS= cfengine-2* cfengine3[0-79]-* cfengine31[0-9]-*
+CONFLICTS= cfengine3[0-79]-* cfengine31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 38
CONFLICTS+= cfengine-3.*
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-
-CONFLICTS= cfengine-[12-79]*
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
Modified: head/sysutils/cfengine39/Makefile
==============================================================================
--- head/sysutils/cfengine39/Makefile Wed Jan 9 03:20:03 2019 (r489750)
+++ head/sysutils/cfengine39/Makefile Wed Jan 9 03:53:25 2019 (r489751)
@@ -18,15 +18,13 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
-CONFLICTS= cfengine-2* cfengine3[0-8]-* cfengine31[0-9]-*
+CONFLICTS= cfengine3[0-8]-* cfengine31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 39
CONFLICTS+= cfengine-3.*
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-
-CONFLICTS= cfengine-[12-78]*
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
More information about the svn-ports-head
mailing list