From owner-svn-ports-all@FreeBSD.ORG  Sat Oct  6 21:45:14 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 956C71065673;
	Sat,  6 Oct 2012 21:45:14 +0000 (UTC)
	(envelope-from anders@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F30C8FC17;
	Sat,  6 Oct 2012 21:45:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q96LjEoS047004;
	Sat, 6 Oct 2012 21:45:14 GMT (envelope-from anders@svn.freebsd.org)
Received: (from anders@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q96LjEaQ047002;
	Sat, 6 Oct 2012 21:45:14 GMT (envelope-from anders@svn.freebsd.org)
Message-Id: <201210062145.q96LjEaQ047002@svn.freebsd.org>
From: Anders Nordby <anders@FreeBSD.org>
Date: Sat, 6 Oct 2012 21:45:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r305406 - head/sysutils/puppet26
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Sat, 06 Oct 2012 21:45:14 -0000

Author: anders
Date: Sat Oct  6 21:45:14 2012
New Revision: 305406
URL: http://svn.freebsd.org/changeset/ports/305406

Log:
  Resurrect Puppet 2.6, useful for those who have a Puppet master running
  2.6.
  
  Approved by:	swills (current sysutils/puppet maintainer)

Added:
  head/sysutils/puppet26/
     - copied from r272469, head/sysutils/puppet/
Modified:
  head/sysutils/puppet26/Makefile   (contents, props changed)

Modified: head/sysutils/puppet26/Makefile
==============================================================================
--- head/sysutils/puppet/Makefile	Sun Apr 10 16:11:49 2011	(r272469)
+++ head/sysutils/puppet26/Makefile	Sat Oct  6 21:45:14 2012	(r305406)
@@ -10,14 +10,14 @@ PORTVERSION=	2.6.7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.puppetlabs.com/downloads/puppet/
 
-MAINTAINER=	raj@csub.edu
+MAINTAINER=	anders@FreeBSD.org
 COMMENT=	A configuration management framework written in Ruby
 
 RUN_DEPENDS=	${RUBY_SITELIBDIR}/facter.rb:${PORTSDIR}/sysutils/facter \
 		rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas \
 		${RUBY_ARCHLIBDIR}/iconv.so:${PORTSDIR}/converters/ruby-iconv
 
-CONFLICTS=	puppet-devel-[0-9]*
+CONFLICTS=	puppet-[0-9]*
 
 NO_BUILD=	yes
 USE_RUBY=	yes