Date: Thu, 5 Oct 2017 01:56:33 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451263 - in head/sysutils: cfengine-masterfiles310 cfengine-masterfiles311 cfengine-masterfiles36 cfengine-masterfiles37 cfengine-masterfiles38 cfengine-masterfiles39 cfengine22 cfengi... Message-ID: <201710050156.v951uXT1073948@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Thu Oct 5 01:56:32 2017 New Revision: 451263 URL: https://svnweb.freebsd.org/changeset/ports/451263 Log: Register conflicts among the syslog-ng family of ports. Reported by: rodrigo Modified: head/sysutils/cfengine-masterfiles310/Makefile (contents, props changed) head/sysutils/cfengine-masterfiles311/Makefile (contents, props changed) head/sysutils/cfengine-masterfiles36/Makefile (contents, props changed) head/sysutils/cfengine-masterfiles37/Makefile (contents, props changed) head/sysutils/cfengine-masterfiles38/Makefile (contents, props changed) head/sysutils/cfengine-masterfiles39/Makefile (contents, props changed) head/sysutils/cfengine22/Makefile (contents, props changed) head/sysutils/cfengine310/Makefile (contents, props changed) head/sysutils/cfengine311/Makefile (contents, props changed) head/sysutils/cfengine32/Makefile (contents, props changed) head/sysutils/cfengine33/Makefile (contents, props changed) head/sysutils/cfengine34/Makefile (contents, props changed) head/sysutils/cfengine35/Makefile (contents, props changed) head/sysutils/cfengine36/Makefile (contents, props changed) head/sysutils/cfengine37/Makefile (contents, props changed) head/sysutils/cfengine38/Makefile (contents, props changed) head/sysutils/cfengine39/Makefile (contents, props changed) Modified: head/sysutils/cfengine-masterfiles310/Makefile ============================================================================== --- head/sysutils/cfengine-masterfiles310/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine-masterfiles310/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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} Modified: head/sysutils/cfengine-masterfiles311/Makefile ============================================================================== --- head/sysutils/cfengine-masterfiles311/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine-masterfiles311/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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} Modified: head/sysutils/cfengine-masterfiles36/Makefile ============================================================================== --- head/sysutils/cfengine-masterfiles36/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine-masterfiles36/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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} Modified: head/sysutils/cfengine-masterfiles37/Makefile ============================================================================== --- head/sysutils/cfengine-masterfiles37/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine-masterfiles37/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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} Modified: head/sysutils/cfengine-masterfiles38/Makefile ============================================================================== --- head/sysutils/cfengine-masterfiles38/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine-masterfiles38/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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} Modified: head/sysutils/cfengine-masterfiles39/Makefile ============================================================================== --- head/sysutils/cfengine-masterfiles39/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine-masterfiles39/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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} Modified: head/sysutils/cfengine22/Makefile ============================================================================== --- head/sysutils/cfengine22/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine22/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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 Modified: head/sysutils/cfengine310/Makefile ============================================================================== --- head/sysutils/cfengine310/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine310/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -15,13 +15,13 @@ 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 Modified: head/sysutils/cfengine311/Makefile ============================================================================== --- head/sysutils/cfengine311/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine311/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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} Modified: head/sysutils/cfengine32/Makefile ============================================================================== --- head/sysutils/cfengine32/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine32/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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 Modified: head/sysutils/cfengine33/Makefile ============================================================================== --- head/sysutils/cfengine33/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine33/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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 Modified: head/sysutils/cfengine34/Makefile ============================================================================== --- head/sysutils/cfengine34/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine34/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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} Modified: head/sysutils/cfengine35/Makefile ============================================================================== --- head/sysutils/cfengine35/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine35/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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} Modified: head/sysutils/cfengine36/Makefile ============================================================================== --- head/sysutils/cfengine36/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine36/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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/ Modified: head/sysutils/cfengine37/Makefile ============================================================================== --- head/sysutils/cfengine37/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine37/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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} Modified: head/sysutils/cfengine38/Makefile ============================================================================== --- head/sysutils/cfengine38/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine38/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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} Modified: head/sysutils/cfengine39/Makefile ============================================================================== --- head/sysutils/cfengine39/Makefile Thu Oct 5 01:56:06 2017 (r451262) +++ head/sysutils/cfengine39/Makefile Thu Oct 5 01:56:32 2017 (r451263) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710050156.v951uXT1073948>