Date: Thu, 10 Jan 2019 02:27:33 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r489845 - in branches/2019Q1/sysutils: cfengine-masterfiles-devel cfengine-masterfiles310 cfengine-masterfiles311 cfengine-masterfiles312 cfengine-masterfiles313 cfengine-masterfiles36 ... Message-ID: <201901100227.x0A2RXNi056766@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Thu Jan 10 02:27:33 2019 New Revision: 489845 URL: https://svnweb.freebsd.org/changeset/ports/489845 Log: MFH: r489751 Remove redundant CONFLICTS. PR: 234742 Reported by: tobik@ Approved by: portmgr (miwi@) Modified: branches/2019Q1/sysutils/cfengine-masterfiles-devel/Makefile branches/2019Q1/sysutils/cfengine-masterfiles310/Makefile branches/2019Q1/sysutils/cfengine-masterfiles311/Makefile branches/2019Q1/sysutils/cfengine-masterfiles312/Makefile branches/2019Q1/sysutils/cfengine-masterfiles313/Makefile branches/2019Q1/sysutils/cfengine-masterfiles36/Makefile branches/2019Q1/sysutils/cfengine-masterfiles37/Makefile branches/2019Q1/sysutils/cfengine-masterfiles38/Makefile branches/2019Q1/sysutils/cfengine-masterfiles39/Makefile branches/2019Q1/sysutils/cfengine310/Makefile branches/2019Q1/sysutils/cfengine311/Makefile branches/2019Q1/sysutils/cfengine312/Makefile branches/2019Q1/sysutils/cfengine313/Makefile branches/2019Q1/sysutils/cfengine32/Makefile branches/2019Q1/sysutils/cfengine33/Makefile branches/2019Q1/sysutils/cfengine34/Makefile branches/2019Q1/sysutils/cfengine35/Makefile branches/2019Q1/sysutils/cfengine36/Makefile branches/2019Q1/sysutils/cfengine37/Makefile branches/2019Q1/sysutils/cfengine38/Makefile branches/2019Q1/sysutils/cfengine39/Makefile Directory Properties: branches/2019Q1/ (props changed) Modified: branches/2019Q1/sysutils/cfengine-masterfiles-devel/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine-masterfiles-devel/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine-masterfiles-devel/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine-masterfiles310/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine-masterfiles310/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine-masterfiles310/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine-masterfiles311/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine-masterfiles311/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine-masterfiles311/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine-masterfiles312/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine-masterfiles312/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine-masterfiles312/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine-masterfiles313/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine-masterfiles313/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine-masterfiles313/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine-masterfiles36/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine-masterfiles36/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine-masterfiles36/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine-masterfiles37/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine-masterfiles37/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine-masterfiles37/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine-masterfiles38/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine-masterfiles38/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine-masterfiles38/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine-masterfiles39/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine-masterfiles39/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine-masterfiles39/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine310/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine310/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine310/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine311/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine311/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine311/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine312/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine312/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine312/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine313/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine313/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine313/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine32/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine32/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine32/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine33/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine33/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine33/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine34/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine34/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine34/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine35/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine35/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine35/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine36/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine36/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine36/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine37/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine37/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine37/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine38/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine38/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine38/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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: branches/2019Q1/sysutils/cfengine39/Makefile ============================================================================== --- branches/2019Q1/sysutils/cfengine39/Makefile Thu Jan 10 00:40:09 2019 (r489844) +++ branches/2019Q1/sysutils/cfengine39/Makefile Thu Jan 10 02:27:33 2019 (r489845) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901100227.x0A2RXNi056766>