From owner-svn-ports-all@freebsd.org  Fri Apr 15 11:48:33 2016
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 90782AED960;
 Fri, 15 Apr 2016 11:48:33 +0000 (UTC)
 (envelope-from matthew@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 5D83811A8;
 Fri, 15 Apr 2016 11:48:33 +0000 (UTC)
 (envelope-from matthew@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3FBmWDk005034;
 Fri, 15 Apr 2016 11:48:32 GMT (envelope-from matthew@FreeBSD.org)
Received: (from matthew@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3FBmWSa005033;
 Fri, 15 Apr 2016 11:48:32 GMT (envelope-from matthew@FreeBSD.org)
Message-Id: <201604151148.u3FBmWSa005033@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: matthew set sender to
 matthew@FreeBSD.org using -f
From: Matthew Seaman <matthew@FreeBSD.org>
Date: Fri, 15 Apr 2016 11:48:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r413335 - head/www/p5-RT-Extension-SLA
X-SVN-Group: ports-head
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.21
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: Fri, 15 Apr 2016 11:48:33 -0000

Author: matthew
Date: Fri Apr 15 11:48:32 2016
New Revision: 413335
URL: https://svnweb.freebsd.org/changeset/ports/413335

Log:
  Add a CONFLICTS_INSTALL on www/rt44 -- the SLA module has been made a
  standard feature there rather than an add-on.
  
  Remove a duplicate LICENSE setting.

Modified:
  head/www/p5-RT-Extension-SLA/Makefile

Modified: head/www/p5-RT-Extension-SLA/Makefile
==============================================================================
--- head/www/p5-RT-Extension-SLA/Makefile	Fri Apr 15 11:36:24 2016	(r413334)
+++ head/www/p5-RT-Extension-SLA/Makefile	Fri Apr 15 11:48:32 2016	(r413335)
@@ -15,7 +15,8 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	p5-Business-Hours>0:misc/p5-Business-Hours
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-LICENSE=	GPLv2
+# SLA functionality comes as standard in RT 4.4.x
+CONFLICTS_INSTALL=	rt44-4.4.*
 
 NO_ARCH=	yes