aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sysutils/cfengine-masterfiles-devel/Makefile2
-rw-r--r--sysutils/cfengine-masterfiles310/Makefile2
-rw-r--r--sysutils/cfengine-masterfiles311/Makefile2
-rw-r--r--sysutils/cfengine-masterfiles312/Makefile2
-rw-r--r--sysutils/cfengine-masterfiles313/Makefile2
-rw-r--r--sysutils/cfengine-masterfiles36/Makefile2
-rw-r--r--sysutils/cfengine-masterfiles37/Makefile2
-rw-r--r--sysutils/cfengine-masterfiles38/Makefile2
-rw-r--r--sysutils/cfengine-masterfiles39/Makefile2
-rw-r--r--sysutils/cfengine310/Makefile2
-rw-r--r--sysutils/cfengine311/Makefile4
-rw-r--r--sysutils/cfengine312/Makefile4
-rw-r--r--sysutils/cfengine313/Makefile4
-rw-r--r--sysutils/cfengine32/Makefile2
-rw-r--r--sysutils/cfengine33/Makefile2
-rw-r--r--sysutils/cfengine34/Makefile4
-rw-r--r--sysutils/cfengine35/Makefile4
-rw-r--r--sysutils/cfengine36/Makefile4
-rw-r--r--sysutils/cfengine37/Makefile4
-rw-r--r--sysutils/cfengine38/Makefile4
-rw-r--r--sysutils/cfengine39/Makefile4
21 files changed, 12 insertions, 48 deletions
diff --git a/sysutils/cfengine-masterfiles-devel/Makefile b/sysutils/cfengine-masterfiles-devel/Makefile
index 372616730109..c9676a07484e 100644
--- a/sysutils/cfengine-masterfiles-devel/Makefile
+++ b/sysutils/cfengine-masterfiles-devel/Makefile
@@ -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
diff --git a/sysutils/cfengine-masterfiles310/Makefile b/sysutils/cfengine-masterfiles310/Makefile
index 446d0895d3d7..dc4a72cf8efc 100644
--- a/sysutils/cfengine-masterfiles310/Makefile
+++ b/sysutils/cfengine-masterfiles310/Makefile
@@ -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
diff --git a/sysutils/cfengine-masterfiles311/Makefile b/sysutils/cfengine-masterfiles311/Makefile
index d78b525085ab..911047105f9a 100644
--- a/sysutils/cfengine-masterfiles311/Makefile
+++ b/sysutils/cfengine-masterfiles311/Makefile
@@ -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
diff --git a/sysutils/cfengine-masterfiles312/Makefile b/sysutils/cfengine-masterfiles312/Makefile
index 3bc712651cb9..63f4336f82ae 100644
--- a/sysutils/cfengine-masterfiles312/Makefile
+++ b/sysutils/cfengine-masterfiles312/Makefile
@@ -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
diff --git a/sysutils/cfengine-masterfiles313/Makefile b/sysutils/cfengine-masterfiles313/Makefile
index 049e2ebe16ee..6f6417c8e977 100644
--- a/sysutils/cfengine-masterfiles313/Makefile
+++ b/sysutils/cfengine-masterfiles313/Makefile
@@ -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
diff --git a/sysutils/cfengine-masterfiles36/Makefile b/sysutils/cfengine-masterfiles36/Makefile
index 4d0e172b28b9..fa9f13e2cac5 100644
--- a/sysutils/cfengine-masterfiles36/Makefile
+++ b/sysutils/cfengine-masterfiles36/Makefile
@@ -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
diff --git a/sysutils/cfengine-masterfiles37/Makefile b/sysutils/cfengine-masterfiles37/Makefile
index a1e056572293..c0051ab79b1e 100644
--- a/sysutils/cfengine-masterfiles37/Makefile
+++ b/sysutils/cfengine-masterfiles37/Makefile
@@ -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
diff --git a/sysutils/cfengine-masterfiles38/Makefile b/sysutils/cfengine-masterfiles38/Makefile
index 1e2fe765222a..8e937e636c35 100644
--- a/sysutils/cfengine-masterfiles38/Makefile
+++ b/sysutils/cfengine-masterfiles38/Makefile
@@ -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
diff --git a/sysutils/cfengine-masterfiles39/Makefile b/sysutils/cfengine-masterfiles39/Makefile
index 51c867f1bf3a..a592af7bbcd9 100644
--- a/sysutils/cfengine-masterfiles39/Makefile
+++ b/sysutils/cfengine-masterfiles39/Makefile
@@ -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
diff --git a/sysutils/cfengine310/Makefile b/sysutils/cfengine310/Makefile
index d708dd92b240..4a592b5173cd 100644
--- a/sysutils/cfengine310/Makefile
+++ b/sysutils/cfengine310/Makefile
@@ -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.*
diff --git a/sysutils/cfengine311/Makefile b/sysutils/cfengine311/Makefile
index 8dc40981979a..c57049abf730 100644
--- a/sysutils/cfengine311/Makefile
+++ b/sysutils/cfengine311/Makefile
@@ -19,7 +19,7 @@ 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.*
@@ -27,8 +27,6 @@ CONFLICTS+= cfengine-3.*
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-[12-9]*
-
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
MAKE_JOBS_UNSAFE= yes
diff --git a/sysutils/cfengine312/Makefile b/sysutils/cfengine312/Makefile
index bde3e2db08bf..c37601635e8a 100644
--- a/sysutils/cfengine312/Makefile
+++ b/sysutils/cfengine312/Makefile
@@ -15,7 +15,7 @@ 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.*
@@ -23,8 +23,6 @@ CONFLICTS+= cfengine-3.*
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-[12-9]*
-
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
MAKE_JOBS_UNSAFE= yes
diff --git a/sysutils/cfengine313/Makefile b/sysutils/cfengine313/Makefile
index 6a6ade175706..5e03cf92f390 100644
--- a/sysutils/cfengine313/Makefile
+++ b/sysutils/cfengine313/Makefile
@@ -15,7 +15,7 @@ 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.*
@@ -23,8 +23,6 @@ CONFLICTS+= cfengine-3.*
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-[12-9]*
-
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
MAKE_JOBS_UNSAFE= yes
diff --git a/sysutils/cfengine32/Makefile b/sysutils/cfengine32/Makefile
index 4703049984e6..5cc70ea35b82 100644
--- a/sysutils/cfengine32/Makefile
+++ b/sysutils/cfengine32/Makefile
@@ -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
diff --git a/sysutils/cfengine33/Makefile b/sysutils/cfengine33/Makefile
index cb4d1e995534..e6a0ba4926b9 100644
--- a/sysutils/cfengine33/Makefile
+++ b/sysutils/cfengine33/Makefile
@@ -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
diff --git a/sysutils/cfengine34/Makefile b/sysutils/cfengine34/Makefile
index 799fd2119fe1..331b169df5c7 100644
--- a/sysutils/cfengine34/Makefile
+++ b/sysutils/cfengine34/Makefile
@@ -16,7 +16,7 @@ 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.*
@@ -24,8 +24,6 @@ CONFLICTS+= cfengine-3.*
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-2* cfengine-3.[1235-9]* cfengine-devel-*
-
USE_RC_SUBR= cf-execd cf-serverd
USES= cpe gmake libtool ssl
diff --git a/sysutils/cfengine35/Makefile b/sysutils/cfengine35/Makefile
index 7375e296c50b..386f7edeb3bf 100644
--- a/sysutils/cfengine35/Makefile
+++ b/sysutils/cfengine35/Makefile
@@ -21,7 +21,7 @@ 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.*
@@ -29,8 +29,6 @@ CONFLICTS+= cfengine-3.*
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-[12346-9]*
-
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
USES= cpe gmake libtool ssl
diff --git a/sysutils/cfengine36/Makefile b/sysutils/cfengine36/Makefile
index 94857632ad22..a4a2f0e29f0e 100644
--- a/sysutils/cfengine36/Makefile
+++ b/sysutils/cfengine36/Makefile
@@ -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
@@ -29,8 +29,6 @@ CPE_VENDOR= gnu
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-[12-57-9]*
-
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
MAKE_JOBS_UNSAFE= yes
diff --git a/sysutils/cfengine37/Makefile b/sysutils/cfengine37/Makefile
index cd596d4cfa61..2d20a72c3147 100644
--- a/sysutils/cfengine37/Makefile
+++ b/sysutils/cfengine37/Makefile
@@ -18,7 +18,7 @@ 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.*
@@ -26,8 +26,6 @@ CONFLICTS+= cfengine-3.*
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-[12-689]*
-
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
MAKE_JOBS_UNSAFE= yes
diff --git a/sysutils/cfengine38/Makefile b/sysutils/cfengine38/Makefile
index 2602fea3b566..2f0e5a86eb30 100644
--- a/sysutils/cfengine38/Makefile
+++ b/sysutils/cfengine38/Makefile
@@ -19,7 +19,7 @@ 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.*
@@ -27,8 +27,6 @@ CONFLICTS+= cfengine-3.*
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-[12-79]*
-
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
MAKE_JOBS_UNSAFE= yes
diff --git a/sysutils/cfengine39/Makefile b/sysutils/cfengine39/Makefile
index 5ba1830a2716..ceb683e86a2a 100644
--- a/sysutils/cfengine39/Makefile
+++ b/sysutils/cfengine39/Makefile
@@ -18,7 +18,7 @@ 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.*
@@ -26,8 +26,6 @@ CONFLICTS+= cfengine-3.*
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-[12-78]*
-
USE_RC_SUBR= cf-execd cf-serverd cf-monitord
MAKE_JOBS_UNSAFE= yes
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-26 12:25:06 +0000