diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2016-01-12 02:52:19 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2016-01-12 02:52:19 +0000 |
| commit | 2d81392e309c405abc88f0e7097ae2bba8d576b4 (patch) | |
| tree | 5aaa745e2898bc07744ce30289fb3b0f4965429c /sysutils | |
| parent | - Update to 1.8 (diff) | |
Correct CONFLICTS.
Notes
Notes:
svn path=/head/; revision=405826
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/cfengine-masterfiles36/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/cfengine-masterfiles37/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/cfengine-masterfiles38/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/cfengine32/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/cfengine33/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/cfengine34/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/cfengine35/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/cfengine36/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/cfengine37/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/cfengine38/Makefile | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/sysutils/cfengine-masterfiles36/Makefile b/sysutils/cfengine-masterfiles36/Makefile index abc4d4f63f80..2284953f420c 100644 --- a/sysutils/cfengine-masterfiles36/Makefile +++ b/sysutils/cfengine-masterfiles36/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= cf-agent:${PORTSDIR}/sysutils/cfengine${PKGNAMESUFFIX} FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-masterfiles[234]* +CONFLICTS= cfengine-masterfiles[7-9]* MAKE_JOBS_UNSAFE= yes USES= cpe diff --git a/sysutils/cfengine-masterfiles37/Makefile b/sysutils/cfengine-masterfiles37/Makefile index 99e749269d50..b9a1ec1a4dd4 100644 --- a/sysutils/cfengine-masterfiles37/Makefile +++ b/sysutils/cfengine-masterfiles37/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= cf-agent:${PORTSDIR}/sysutils/cfengine${PKGNAMESUFFIX} FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-masterfiles[234]* +CONFLICTS= cfengine-masterfiles[689]* MAKE_JOBS_UNSAFE= yes USES= cpe diff --git a/sysutils/cfengine-masterfiles38/Makefile b/sysutils/cfengine-masterfiles38/Makefile index 003dff6c217a..f4f7e55771fc 100644 --- a/sysutils/cfengine-masterfiles38/Makefile +++ b/sysutils/cfengine-masterfiles38/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= cf-agent:${PORTSDIR}/sysutils/cfengine${PKGNAMESUFFIX} FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} -CONFLICTS= cfengine-masterfiles[234]* +CONFLICTS= cfengine-masterfiles[679]* MAKE_JOBS_UNSAFE= yes USES= cpe diff --git a/sysutils/cfengine32/Makefile b/sysutils/cfengine32/Makefile index 2740f885ecb1..5a2c615fbaf6 100644 --- a/sysutils/cfengine32/Makefile +++ b/sysutils/cfengine32/Makefile @@ -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 diff --git a/sysutils/cfengine33/Makefile b/sysutils/cfengine33/Makefile index 1b26befc14cb..d39339fbe08a 100644 --- a/sysutils/cfengine33/Makefile +++ b/sysutils/cfengine33/Makefile @@ -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 diff --git a/sysutils/cfengine34/Makefile b/sysutils/cfengine34/Makefile index 8b6f6615a50f..5dd18b707a07 100644 --- a/sysutils/cfengine34/Makefile +++ b/sysutils/cfengine34/Makefile @@ -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 diff --git a/sysutils/cfengine35/Makefile b/sysutils/cfengine35/Makefile index f3537297536d..92f2f3e386af 100644 --- a/sysutils/cfengine35/Makefile +++ b/sysutils/cfengine35/Makefile @@ -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 diff --git a/sysutils/cfengine36/Makefile b/sysutils/cfengine36/Makefile index d1c98e81470a..2d7a9307b90b 100644 --- a/sysutils/cfengine36/Makefile +++ b/sysutils/cfengine36/Makefile @@ -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 diff --git a/sysutils/cfengine37/Makefile b/sysutils/cfengine37/Makefile index 4f384647ab97..17f53959bd04 100644 --- a/sysutils/cfengine37/Makefile +++ b/sysutils/cfengine37/Makefile @@ -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 diff --git a/sysutils/cfengine38/Makefile b/sysutils/cfengine38/Makefile index 7eb18807f5f2..723c669b9128 100644 --- a/sysutils/cfengine38/Makefile +++ b/sysutils/cfengine38/Makefile @@ -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 |