cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant CONFLICTS.

Browse Source 
PR:		234742
Reported by:	tobik@
MFH:		2019Q1
This commit is contained in:
Cy Schubert 2019-01-09 03:53:25 +00:00
parent 7d662f64f8
commit 467c2371dc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=489751
21 changed files with 12 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/cfengine-masterfiles-devel/Makefile
View File

@ -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

2
sysutils/cfengine-masterfiles310/Makefile
View File

@ -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

2
sysutils/cfengine-masterfiles311/Makefile
View File

@ -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

2
sysutils/cfengine-masterfiles312/Makefile
View File

@ -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

2
sysutils/cfengine-masterfiles313/Makefile
View File

@ -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

2
sysutils/cfengine-masterfiles36/Makefile
View File

@ -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

2
sysutils/cfengine-masterfiles37/Makefile
View File

@ -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

2
sysutils/cfengine-masterfiles38/Makefile
View File

@ -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

2
sysutils/cfengine-masterfiles39/Makefile
View File

@ -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

2
sysutils/cfengine310/Makefile
View File

@ -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.*

4
sysutils/cfengine311/Makefile
View File

@ -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

4
sysutils/cfengine312/Makefile
View File

@ -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

4
sysutils/cfengine313/Makefile
View File

@ -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

2
sysutils/cfengine32/Makefile
View File

@ -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

2
sysutils/cfengine33/Makefile
View File

@ -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

4
sysutils/cfengine34/Makefile
View File

@ -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

4
sysutils/cfengine35/Makefile
View File

@ -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

4
sysutils/cfengine36/Makefile
View File

@ -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

4
sysutils/cfengine37/Makefile
View File

@ -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

4
sysutils/cfengine38/Makefile
View File

@ -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

4
sysutils/cfengine39/Makefile
View File

@ -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