From owner-svn-ports-all@FreeBSD.ORG  Thu Sep  5 21:53:11 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 5A9177A5;
 Thu,  5 Sep 2013 21:53:11 +0000 (UTC)
 (envelope-from glarkin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 44C302342;
 Thu,  5 Sep 2013 21:53:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r85LrB5q037717;
 Thu, 5 Sep 2013 21:53:11 GMT (envelope-from glarkin@svn.freebsd.org)
Received: (from glarkin@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r85LrBWu037716;
 Thu, 5 Sep 2013 21:53:11 GMT (envelope-from glarkin@svn.freebsd.org)
Message-Id: <201309052153.r85LrBWu037716@svn.freebsd.org>
From: Greg Larkin <glarkin@FreeBSD.org>
Date: Thu, 5 Sep 2013 21:53:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r326451 - head/sysutils/rubygem-hiera-puppet
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Sep 2013 21:53:11 -0000

Author: glarkin
Date: Thu Sep  5 21:53:10 2013
New Revision: 326451
URL: http://svnweb.freebsd.org/changeset/ports/326451

Log:
  - Added CONFLICTS with puppet 3.x.  Hiera-puppet is now included in all
    versions of puppet >=3.0.0
    Ref: http://projects.puppetlabs.com/projects/hiera-puppet
  
  Submitted by:	pkg-fallout

Modified:
  head/sysutils/rubygem-hiera-puppet/Makefile

Modified: head/sysutils/rubygem-hiera-puppet/Makefile
==============================================================================
--- head/sysutils/rubygem-hiera-puppet/Makefile	Thu Sep  5 21:37:54 2013	(r326450)
+++ head/sysutils/rubygem-hiera-puppet/Makefile	Thu Sep  5 21:53:10 2013	(r326451)
@@ -12,6 +12,8 @@ COMMENT=	A data backend for Hiera that q
 RUN_DEPENDS=	puppet>=0:${PORTSDIR}/sysutils/puppet \
 		rubygem-hiera>=1.0:${PORTSDIR}/sysutils/rubygem-hiera
 
+CONFLICTS=	puppet-3.*
+
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes