svn commit: r326451 - head/sysutils/rubygem-hiera-puppet

[Greg Larkin]

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