ports/150545: [maintainer-update] update sysutils/puppet to 2.6.1rc4

[Russell Jackson]

>Number:         150545
>Category:       ports
>Synopsis:       [maintainer-update] update sysutils/puppet to 2.6.1rc4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 14 00:50:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Russell Jackson
>Release:        
>Organization:
California State University, Bakersfield
>Environment:
>Description:
	Update port to 2.6.1rc4 and fix some rc script issues.
>How-To-Repeat:
>Fix:
Index: distinfo
===================================================================
--- distinfo	(.../branches/vendor/sysutils/puppet)	(revision 15784)
+++ distinfo	(.../trunk/sysutils/puppet)	(revision 15784)
@@ -1,3 +1,3 @@
-MD5 (puppet-2.6.1rc3.tar.gz) = c41ac126ba05c77bcd25752c158c7ab5
-SHA256 (puppet-2.6.1rc3.tar.gz) = 7c5d96ec33b5111bb9e040aac51a6e8e9c34fd2b280f1b8e814950e4fa75d5d2
-SIZE (puppet-2.6.1rc3.tar.gz) = 1491489
+MD5 (puppet-2.6.1rc4.tar.gz) = 3e46f99165d92707ae2e745866481808
+SHA256 (puppet-2.6.1rc4.tar.gz) = 04ba510befcda407d50d8c8719e0cbe59151580daeca43dbb29a08a93d371218
+SIZE (puppet-2.6.1rc4.tar.gz) = 1491877
Index: files/patch-redmine-4573
===================================================================
--- files/patch-redmine-4573	(.../branches/vendor/sysutils/puppet)	(revision 0)
+++ files/patch-redmine-4573	(.../trunk/sysutils/puppet)	(revision 15784)
@@ -0,0 +1,13 @@
+--- lib/puppet/provider/service/freebsd.rb.orig Wed Aug 18 20:14:42 2010
++++ lib/puppet/provider/service/freebsd.rb  Wed Aug 18 23:48:08 2010
+@@ -18,7 +18,9 @@
+   def rcvar
+     rcvar = execute([self.initscript, :rcvar], :failonfail => true, :squelch => false)
+     rcvar = rcvar.split("\n")
+-    rcvar.delete_if {|str| str !~ /^(#\s\S+|\w+enable=.*)$/ }
++    rcvar.delete_if {|str| str !~ /^(#\s\S+|\$?\w+enable=.*)$/ }
++    rcvar[1] = rcvar[1].gsub!(/^\$?(.*)/, '\1')
++    rcvar
+   end
+
+   # Extract service name
Index: files/puppet.in
===================================================================
--- files/puppet.in	(.../branches/vendor/sysutils/puppet)	(revision 15784)
+++ files/puppet.in	(.../trunk/sysutils/puppet)	(revision 15784)
@@ -20,7 +20,7 @@
 
 : ${puppet_enable="NO"}
 : ${puppet_rundir="%%PUPPET_RUNDIR%%"}
-: ${puppet_flags=""}
+: ${puppet_flags="--rundir=${puppet_rundir}"}
 
 command_interpreter="%%PREFIX%%/bin/ruby18"
 command="%%PREFIX%%/bin/puppet"
Index: files/puppetmaster.in
===================================================================
--- files/puppetmaster.in	(.../branches/vendor/sysutils/puppet)	(revision 15784)
+++ files/puppetmaster.in	(.../trunk/sysutils/puppet)	(revision 15784)
@@ -20,7 +20,7 @@
 
 : ${puppetmaster_enable="NO"}
 : ${puppetmaster_rundir="%%PUPPET_RUNDIR%%"}
-: ${puppetmaster_flags=""}
+: ${puppetmaster_flags="--rundir=${puppetmaster_rundir}"}
 : ${puppetmaster_mongrel_ports=""}
 
 command_interpreter="%%PREFIX%%/bin/ruby18"
Index: Makefile
===================================================================
--- Makefile	(.../branches/vendor/sysutils/puppet)	(revision 15784)
+++ Makefile	(.../trunk/sysutils/puppet)	(revision 15784)
@@ -2,11 +2,12 @@
 # Date created:		2007-03-03
 # Whom:			Tomoyuki Sakurai <cherry at trombik.mine.nu>
 #
-# $FreeBSD: ports/sysutils/puppet/Makefile,v 1.16 2010/09/10 04:35:45 pgollucci Exp $
+# $FreeBSD: ports/sysutils/puppet/Makefile,v 1.14 2010/08/04 17:06:24 lwhsu Exp $
 #
 
 PORTNAME=	puppet
-DISTVERSION=	2.6.1rc3
+DISTVERSION=	2.6.1rc4
+PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.puppetlabs.com/downloads/puppet/
>Release-Note:
>Audit-Trail:
>Unformatted: