From owner-svn-ports-head@FreeBSD.ORG Mon Nov 4 02:27:14 2013 Return-Path: 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 2BA9D51A; Mon, 4 Nov 2013 02:27:14 +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 19B282109; Mon, 4 Nov 2013 02:27:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA42RDdC053987; Mon, 4 Nov 2013 02:27:13 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA42RDWl053984; Mon, 4 Nov 2013 02:27:13 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201311040227.rA42RDWl053984@svn.freebsd.org> From: Steve Wills Date: Mon, 4 Nov 2013 02:27:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332664 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Nov 2013 02:27:14 -0000 Author: swills Date: Mon Nov 4 02:27:13 2013 New Revision: 332664 URL: http://svnweb.freebsd.org/changeset/ports/332664 Log: - Again try to fix the rc script to use the right ruby Modified: head/sysutils/puppet/Makefile head/sysutils/puppet/files/puppet.in head/sysutils/puppet/files/puppetmaster.in Modified: head/sysutils/puppet/Makefile ============================================================================== --- head/sysutils/puppet/Makefile Mon Nov 4 02:23:57 2013 (r332663) +++ head/sysutils/puppet/Makefile Mon Nov 4 02:27:13 2013 (r332664) @@ -3,7 +3,7 @@ PORTNAME= puppet PORTVERSION= 3.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ Modified: head/sysutils/puppet/files/puppet.in ============================================================================== --- head/sysutils/puppet/files/puppet.in Mon Nov 4 02:23:57 2013 (r332663) +++ head/sysutils/puppet/files/puppet.in Mon Nov 4 02:27:13 2013 (r332664) @@ -24,7 +24,7 @@ load_rc_config "$name" command="%%PREFIX%%/bin/puppet" command_args="agent ${puppet_flags} --rundir=${puppet_rundir}" -command_interpreter=%%PREFIX%%/bin/ruby +command_interpreter=%%RUBY%% unset puppet_flags pidfile="${puppet_rundir}/agent.pid" Modified: head/sysutils/puppet/files/puppetmaster.in ============================================================================== --- head/sysutils/puppet/files/puppetmaster.in Mon Nov 4 02:23:57 2013 (r332663) +++ head/sysutils/puppet/files/puppetmaster.in Mon Nov 4 02:27:13 2013 (r332664) @@ -22,7 +22,7 @@ load_rc_config "${name}" : ${puppetmaster_rundir="/var/run/puppet"} : ${puppetmaster_flags="--rundir=${puppetmaster_rundir}"} -command_interpreter=%%PREFIX%%/bin/ruby +command_interpreter=%%RUBY%% command="%%PREFIX%%/bin/puppet" command_args="master ${puppetmaster_flags}" unset puppetmaster_flags