From owner-svn-ports-all@FreeBSD.ORG Wed Oct 30 21:11:46 2013 Return-Path: Delivered-To: svn-ports-all@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 57551A0D; Wed, 30 Oct 2013 21:11:46 +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 448C323F9; Wed, 30 Oct 2013 21:11:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ULBk5J050456; Wed, 30 Oct 2013 21:11:46 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ULBj0E050454; Wed, 30 Oct 2013 21:11:45 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201310302111.r9ULBj0E050454@svn.freebsd.org> From: Steve Wills Date: Wed, 30 Oct 2013 21:11:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332174 - in head/sysutils/rubygem-facter: . 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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Oct 2013 21:11:46 -0000 Author: swills Date: Wed Oct 30 21:11:45 2013 New Revision: 332174 URL: http://svnweb.freebsd.org/changeset/ports/332174 Log: - Add patch dropped in last commit - Bump PORTREVISION Pointyhat to: swills Added: head/sysutils/rubygem-facter/files/ head/sysutils/rubygem-facter/files/patch-lib-facter-zpool_version.rb (contents, props changed) Modified: head/sysutils/rubygem-facter/Makefile Modified: head/sysutils/rubygem-facter/Makefile ============================================================================== --- head/sysutils/rubygem-facter/Makefile Wed Oct 30 20:59:22 2013 (r332173) +++ head/sysutils/rubygem-facter/Makefile Wed Oct 30 21:11:45 2013 (r332174) @@ -3,6 +3,7 @@ PORTNAME= facter PORTVERSION= 1.7.3 +PORTREVISION= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG \ http://downloads.puppetlabs.com/facter/ Added: head/sysutils/rubygem-facter/files/patch-lib-facter-zpool_version.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rubygem-facter/files/patch-lib-facter-zpool_version.rb Wed Oct 30 21:11:45 2013 (r332174) @@ -0,0 +1,11 @@ +--- lib/facter/zpool_version.rb.orig ++++ lib/facter/zpool_version.rb +@@ -4,7 +4,7 @@ + setcode do + if Facter::Util::Resolution.which('zpool') + zpool_v = Facter::Util::Resolution.exec('zpool upgrade -v') +- zpool_version = zpool_v.match(/ZFS pool version (\d+)./).captures.first unless zpool_v.nil? ++ zpool_version = zpool_v.scan(/^\s+(\d+)\s+/m).flatten.last unless zpool_v.nil? + end + end + end