From owner-svn-ports-head@FreeBSD.ORG  Sat Oct 26 02:22:08 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 5AB4B75;
 Sat, 26 Oct 2013 02:22:08 +0000 (UTC)
 (envelope-from swills@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 2D35820A4;
 Sat, 26 Oct 2013 02:22:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9Q2M8qa053585;
 Sat, 26 Oct 2013 02:22:08 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9Q2M7m8053580;
 Sat, 26 Oct 2013 02:22:07 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201310260222.r9Q2M7m8053580@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Sat, 26 Oct 2013 02:22:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331647 - in head/sysutils/puppet: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Oct 2013 02:22:08 -0000

Author: swills
Date: Sat Oct 26 02:22:07 2013
New Revision: 331647
URL: http://svnweb.freebsd.org/changeset/ports/331647

Log:
  - Refer to generic ruby binary in rc scripts
  - Fix missing %D in plist

Modified:
  head/sysutils/puppet/Makefile
  head/sysutils/puppet/files/puppet.in
  head/sysutils/puppet/files/puppetmaster.in   (contents, props changed)
  head/sysutils/puppet/pkg-plist

Modified: head/sysutils/puppet/Makefile
==============================================================================
--- head/sysutils/puppet/Makefile	Sat Oct 26 02:04:40 2013	(r331646)
+++ head/sysutils/puppet/Makefile	Sat Oct 26 02:22:07 2013	(r331647)
@@ -3,6 +3,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	3.3.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 

Modified: head/sysutils/puppet/files/puppet.in
==============================================================================
--- head/sysutils/puppet/files/puppet.in	Sat Oct 26 02:04:40 2013	(r331646)
+++ head/sysutils/puppet/files/puppet.in	Sat Oct 26 02:22:07 2013	(r331647)
@@ -24,7 +24,7 @@ load_rc_config "$name"
 
 command="%%PREFIX%%/bin/puppet"
 command_args="agent ${puppet_flags} --rundir=${puppet_rundir}"
-command_interpreter=%%RUBY%%
+command_interpreter=%%PREFIX%%/bin/ruby
 unset puppet_flags
 
 pidfile="${puppet_rundir}/agent.pid"

Modified: head/sysutils/puppet/files/puppetmaster.in
==============================================================================
--- head/sysutils/puppet/files/puppetmaster.in	Sat Oct 26 02:04:40 2013	(r331646)
+++ head/sysutils/puppet/files/puppetmaster.in	Sat Oct 26 02:22:07 2013	(r331647)
@@ -22,7 +22,7 @@ load_rc_config "${name}"
 : ${puppetmaster_rundir="/var/run/puppet"}
 : ${puppetmaster_flags="--rundir=${puppetmaster_rundir}"}
 
-command_interpreter="%%PREFIX%%/bin/ruby18"
+command_interpreter=%%PREFIX%%/bin/ruby
 command="%%PREFIX%%/bin/puppet"
 command_args="master ${puppetmaster_flags}"
 unset puppetmaster_flags

Modified: head/sysutils/puppet/pkg-plist
==============================================================================
--- head/sysutils/puppet/pkg-plist	Sat Oct 26 02:04:40 2013	(r331646)
+++ head/sysutils/puppet/pkg-plist	Sat Oct 26 02:22:07 2013	(r331647)
@@ -14,7 +14,7 @@ bin/puppet
 @dirrmtry etc/puppet
 @unexec rmdir /var/puppet 2>/dev/null || true
 @exec /bin/mkdir -p /var/puppet
-@exec /bin/mkdir -p etc/puppet/modules
+@exec /bin/mkdir -p %D/etc/puppet/modules
 @exec /usr/sbin/chown -Rh puppet:puppet /var/puppet
 @dirrm %%RUBY_SITELIBDIR%%/hiera/backend
 @dirrm %%RUBY_SITELIBDIR%%/hiera