From owner-svn-ports-head@FreeBSD.ORG  Mon Jan 28 01:24:56 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])
 by hub.freebsd.org (Postfix) with ESMTP id CC66BD5C;
 Mon, 28 Jan 2013 01:24:56 +0000 (UTC)
 (envelope-from swills@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A614FFB1;
 Mon, 28 Jan 2013 01:24:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0S1Ou13064190;
 Mon, 28 Jan 2013 01:24:56 GMT (envelope-from swills@svn.freebsd.org)
Received: (from swills@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0S1Ou9N064188;
 Mon, 28 Jan 2013 01:24:56 GMT (envelope-from swills@svn.freebsd.org)
Message-Id: <201301280124.r0S1Ou9N064188@svn.freebsd.org>
From: Steve Wills <swills@FreeBSD.org>
Date: Mon, 28 Jan 2013 01:24:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r311088 - 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: Mon, 28 Jan 2013 01:24:56 -0000

Author: swills
Date: Mon Jan 28 01:24:55 2013
New Revision: 311088
URL: http://svnweb.freebsd.org/changeset/ports/311088

Log:
  - Revert previous change to patch file. The goal was to prevent a warning with
    Ruby 1.9, but this just caused problems with Ruby 1.8.
  
  PR:		ports/175558

Modified:
  head/sysutils/puppet/Makefile
  head/sysutils/puppet/files/optpatch-package_origin

Modified: head/sysutils/puppet/Makefile
==============================================================================
--- head/sysutils/puppet/Makefile	Mon Jan 28 01:08:15 2013	(r311087)
+++ head/sysutils/puppet/Makefile	Mon Jan 28 01:24:55 2013	(r311088)
@@ -3,7 +3,7 @@
 
 PORTNAME=	puppet
 PORTVERSION=	3.0.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 

Modified: head/sysutils/puppet/files/optpatch-package_origin
==============================================================================
--- head/sysutils/puppet/files/optpatch-package_origin	Mon Jan 28 01:08:15 2013	(r311087)
+++ head/sysutils/puppet/files/optpatch-package_origin	Mon Jan 28 01:24:55 2013	(r311088)
@@ -30,8 +30,8 @@
  
 -  def self.listcmd
 -    command(:pkginfo)
-+  class_variable_set(:@@lock, Mutex.new)
-+  class_variable_set(:@@ports_index, new)
++  @@lock = Mutex.new
++  @@ports_index = nil
 +
 +  # fix bug in URI::FTP merge method that tries to set typecode
 +  # even when other is a string.