Date: Thu, 5 Oct 2017 01:56:46 +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: r451264 - head/sysutils/cfengine36 Message-ID: <201710050156.v951ukUm074074@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Thu Oct 5 01:56:45 2017 New Revision: 451264 URL: https://svnweb.freebsd.org/changeset/ports/451264 Log: Move the MASTERDIR/CONFLICT logic to a more appropriate place in the Makefile. Modified: head/sysutils/cfengine36/Makefile (contents, props changed) Modified: head/sysutils/cfengine36/Makefile ============================================================================== --- head/sysutils/cfengine36/Makefile Thu Oct 5 01:56:32 2017 (r451263) +++ head/sysutils/cfengine36/Makefile Thu Oct 5 01:56:45 2017 (r451264) @@ -4,12 +4,6 @@ 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/ DISTFILES= ${PORTNAME}-${PORTVERSION}-2.tar.gz @@ -18,6 +12,13 @@ MAINTAINER= cy@FreeBSD.org # gjb@FreeBSD.org is also committer for this port # skreuzer@FreeBSD.org is also committer for this port COMMENT= Systems administration tool for networks + +CONFLICTS= cfengine-2* cfengine3[0-57-9]-* cfengine31[0-9]-* +.if !defined(MASTERDIR) +PKGNAMESUFFIX= 36 +PORTEPOCH?= 2 +CONFLICTS+= cfengine-3.* +.endif LICENSE= GPLv3
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710050156.v951ukUm074074>