aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2017-10-05 01:56:32 +0000
committerCy Schubert <cy@FreeBSD.org>2017-10-05 01:56:32 +0000
commit39ed3d349b461c2c757edc97a7b05c2cca38ebd6 (patch)
tree0f5b81df4e68b93a0aa7c5a5534728e248af4277
parentc1ac4cfd3a646df9214253cd902556f21e97bd90 (diff)
downloadports-39ed3d349b461c2c757edc97a7b05c2cca38ebd6.tar.gz
ports-39ed3d349b461c2c757edc97a7b05c2cca38ebd6.zip
Notes
Diffstat
-rw-r--r--sysutils/cfengine-masterfiles310/Makefile2
-rw-r--r--sysutils/cfengine-masterfiles311/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/cfengine22/Makefile2
-rw-r--r--sysutils/cfengine310/Makefile4
-rw-r--r--sysutils/cfengine311/Makefile2
-rw-r--r--sysutils/cfengine32/Makefile3
-rw-r--r--sysutils/cfengine33/Makefile3
-rw-r--r--sysutils/cfengine34/Makefile2
-rw-r--r--sysutils/cfengine35/Makefile2
-rw-r--r--sysutils/cfengine36/Makefile2
-rw-r--r--sysutils/cfengine37/Makefile2
-rw-r--r--sysutils/cfengine38/Makefile2
-rw-r--r--sysutils/cfengine39/Makefile2
17 files changed, 33 insertions, 5 deletions
diff --git a/sysutils/cfengine-masterfiles310/Makefile b/sysutils/cfengine-masterfiles310/Makefile
index d05302d7be6c..77aac927f376 100644
--- a/sysutils/cfengine-masterfiles310/Makefile
+++ b/sysutils/cfengine-masterfiles310/Makefile
@@ -16,8 +16,10 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
+CONFLICTS= cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[1-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 310
+CONFLICTS+= cfengine-masterfiles-3.*
.endif
RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
diff --git a/sysutils/cfengine-masterfiles311/Makefile b/sysutils/cfengine-masterfiles311/Makefile
index 90d352ad24b2..381925312076 100644
--- a/sysutils/cfengine-masterfiles311/Makefile
+++ b/sysutils/cfengine-masterfiles311/Makefile
@@ -15,8 +15,10 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
+CONFLICTS= cfengine-masterfiles3[0-9]-* cfengine-masterfiles31[02-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 311
+CONFLICTS+= cfengine-masterfiles-3.*
.endif
RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
diff --git a/sysutils/cfengine-masterfiles36/Makefile b/sysutils/cfengine-masterfiles36/Makefile
index 6f60071db267..2982e9d74646 100644
--- a/sysutils/cfengine-masterfiles36/Makefile
+++ b/sysutils/cfengine-masterfiles36/Makefile
@@ -15,8 +15,10 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
+CONFLICTS= cfengine-masterfiles3[0-57-9]-* cfengine-masterfiles31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 36
+CONFLICTS+= cfengine-masterfiles-3.*
.endif
RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
diff --git a/sysutils/cfengine-masterfiles37/Makefile b/sysutils/cfengine-masterfiles37/Makefile
index f68d424af757..a692a0f8d614 100644
--- a/sysutils/cfengine-masterfiles37/Makefile
+++ b/sysutils/cfengine-masterfiles37/Makefile
@@ -16,8 +16,10 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
+CONFLICTS= cfengine-masterfiles3[0-68-9]-* cfengine-masterfiles31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 37
+CONFLICTS+= cfengine-masterfiles-3.*
.endif
RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
diff --git a/sysutils/cfengine-masterfiles38/Makefile b/sysutils/cfengine-masterfiles38/Makefile
index d77a9d973788..0c0cc4e2407a 100644
--- a/sysutils/cfengine-masterfiles38/Makefile
+++ b/sysutils/cfengine-masterfiles38/Makefile
@@ -16,8 +16,10 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
+CONFLICTS= cfengine-masterfiles3[0-79]-* cfengine-masterfiles31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 38
+CONFLICTS+= cfengine-masterfiles-3.*
.endif
RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
diff --git a/sysutils/cfengine-masterfiles39/Makefile b/sysutils/cfengine-masterfiles39/Makefile
index 351def7bd3b2..2f48a0524cc4 100644
--- a/sysutils/cfengine-masterfiles39/Makefile
+++ b/sysutils/cfengine-masterfiles39/Makefile
@@ -15,8 +15,10 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
+CONFLICTS= cfengine-masterfiles3[0-8]-* cfengine-masterfiles31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 39
+CONFLICTS+= cfengine-masterfiles-3.*
.endif
RUN_DEPENDS= cf-agent:sysutils/cfengine${PKGNAMESUFFIX}
diff --git a/sysutils/cfengine22/Makefile b/sysutils/cfengine22/Makefile
index cbbf5ca8a6d0..6013fc56e44b 100644
--- a/sysutils/cfengine22/Makefile
+++ b/sysutils/cfengine22/Makefile
@@ -16,7 +16,7 @@ CPE_VENDOR= gnu
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-3* cfengine-devel-*
+CONFLICTS= cfengine-3* cfengine-devel-* cfengine3*
USE_RC_SUBR= cfexecd cfservd
diff --git a/sysutils/cfengine310/Makefile b/sysutils/cfengine310/Makefile
index 7f09cfd60882..421167a13703 100644
--- a/sysutils/cfengine310/Makefile
+++ b/sysutils/cfengine310/Makefile
@@ -15,14 +15,14 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
+CONFLICTS= cfengine-2* cfengine3[0-9]-* cfengine31[1-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 310
+CONFLICTS+= cfengine-3.*
.endif
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/cfengine311/Makefile b/sysutils/cfengine311/Makefile
index df5176eb9ddf..c6ff90bb7b0b 100644
--- a/sysutils/cfengine311/Makefile
+++ b/sysutils/cfengine311/Makefile
@@ -15,8 +15,10 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
+CONFLICTS= cfengine-2* cfengine3[0-9]-* cfengine31[02-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 311
+CONFLICTS+= cfengine-3.*
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
diff --git a/sysutils/cfengine32/Makefile b/sysutils/cfengine32/Makefile
index 2a8fb883fadf..22e460611b87 100644
--- a/sysutils/cfengine32/Makefile
+++ b/sysutils/cfengine32/Makefile
@@ -17,7 +17,8 @@ CPE_VENDOR= gnu
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-[2]* cfengine-3.[13-9]* cfengine-devel-*
+CONFLICTS= cfengine-2* 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 8180f76f93d1..8d9b6958db24 100644
--- a/sysutils/cfengine33/Makefile
+++ b/sysutils/cfengine33/Makefile
@@ -16,7 +16,8 @@ CPE_VENDOR= gnu
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
-CONFLICTS= cfengine-2* cfengine-3.[124-9]* cfengine-devel-*
+CONFLICTS= cfengine-2* 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 a3ed38655fa8..12b97345d1c6 100644
--- a/sysutils/cfengine34/Makefile
+++ b/sysutils/cfengine34/Makefile
@@ -13,8 +13,10 @@ MAINTAINER= cy@FreeBSD.org
COMMENT= Systems administration tool for networks
CPE_VENDOR= gnu
+CONFLICTS= cfengine-2* cfengine3[0-35-9]-* cfengine31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 34
+CONFLICTS+= cfengine-3.*
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
diff --git a/sysutils/cfengine35/Makefile b/sysutils/cfengine35/Makefile
index 92b7cf45c314..5092faf82434 100644
--- a/sysutils/cfengine35/Makefile
+++ b/sysutils/cfengine35/Makefile
@@ -18,8 +18,10 @@ CPE_VENDOR= gnu
LIB_DEPENDS= libpcre.so:devel/pcre
+ONFLICTS= cfengine-2* cfengine3[0-46-9]-* cfengine31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 35
+CONFLICTS+= cfengine-3.*
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
diff --git a/sysutils/cfengine36/Makefile b/sysutils/cfengine36/Makefile
index f032d7b55147..c8efbd8ee119 100644
--- a/sysutils/cfengine36/Makefile
+++ b/sysutils/cfengine36/Makefile
@@ -4,9 +4,11 @@
PORTNAME= cfengine
PORTVERSION= 3.6.6
PORTREVISION= 4
+CONFLICTS= cfengine-2* cfengine3[0-57-9]-* cfengine31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 36
PORTEPOCH?= 2
+CONFLICTS+= cfengine-3.*
.endif
CATEGORIES= sysutils
MASTER_SITES= https://cfengine-package-repos.s3.amazonaws.com/tarballs/
diff --git a/sysutils/cfengine37/Makefile b/sysutils/cfengine37/Makefile
index a67785c20eff..f5954becdc75 100644
--- a/sysutils/cfengine37/Makefile
+++ b/sysutils/cfengine37/Makefile
@@ -16,8 +16,10 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
+CONFLICTS= cfengine-2* cfengine3[0-689]-* cfengine31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 37
+CONFLICTS+= cfengine-3.*
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
diff --git a/sysutils/cfengine38/Makefile b/sysutils/cfengine38/Makefile
index e05c262ae254..50d06ae04b1c 100644
--- a/sysutils/cfengine38/Makefile
+++ b/sysutils/cfengine38/Makefile
@@ -16,8 +16,10 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
+CONFLICTS= cfengine-2* cfengine3[0-79]-* cfengine31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 38
+CONFLICTS+= cfengine-3.*
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
diff --git a/sysutils/cfengine39/Makefile b/sysutils/cfengine39/Makefile
index 6b36c7b683b1..531c56568db1 100644
--- a/sysutils/cfengine39/Makefile
+++ b/sysutils/cfengine39/Makefile
@@ -16,8 +16,10 @@ LICENSE= GPLv3
CPE_VENDOR= gnu
+CONFLICTS= cfengine-2* cfengine3[0-8]-* cfengine31[0-9]-*
.if !defined(MASTERDIR)
PKGNAMESUFFIX= 39
+CONFLICTS+= cfengine-3.*
.endif
FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-14 17:21:04 +0000