From owner-svn-ports-all@freebsd.org  Thu Oct  5 01:56:47 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2B9AFE27C60;
 Thu,  5 Oct 2017 01:56:47 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id ED88A7ED4C;
 Thu,  5 Oct 2017 01:56:46 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v951ukUh074075;
 Thu, 5 Oct 2017 01:56:46 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v951ukUm074074;
 Thu, 5 Oct 2017 01:56:46 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201710050156.v951ukUm074074@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Thu, 5 Oct 2017 01:56:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r451264 - head/sysutils/cfengine36
X-SVN-Group: ports-head
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: head/sysutils/cfengine36
X-SVN-Commit-Revision: 451264
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Oct 2017 01:56:47 -0000

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