Date: Wed, 10 Aug 2011 21:39:07 -0700 (PDT) From: Russell Jackson <raj@csub.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/159670: [maintainer-update] sysutils/puppet: update to 2.7.3rc1 Message-ID: <201108110439.p7B4d711018036@fbsd.csub.edu> Resent-Message-ID: <201108110520.p7B5KAqY039961@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 159670 >Category: ports >Synopsis: [maintainer-update] sysutils/puppet: update to 2.7.3rc1 >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: Thu Aug 11 05:20:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Russell Jackson >Release: >Organization: >Environment: >Description: >How-To-Repeat: >Fix: diff --git puppet/Makefile puppet/Makefile index 014d9d6..66ab937 100644 --- puppet/Makefile +++ puppet/Makefile @@ -6,23 +6,23 @@ # PORTNAME= puppet -PORTVERSION= 2.6.7 +DISTVERSION= 2.7.3rc1 CATEGORIES= sysutils -MASTER_SITES= http://www.puppetlabs.com/downloads/puppet/ +MASTER_SITES= http://downloads.puppetlabs.com/puppet/ MAINTAINER= raj@csub.edu COMMENT= A configuration management framework written in Ruby -RUN_DEPENDS= ${RUBY_SITELIBDIR}/facter.rb:${PORTSDIR}/sysutils/facter \ - rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas \ - ${RUBY_ARCHLIBDIR}/iconv.so:${PORTSDIR}/converters/ruby-iconv +RUN_DEPENDS= facter>=0:${PORTSDIR}/sysutils/facter \ + rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas CONFLICTS= puppet-devel-[0-9]* NO_BUILD= yes USE_RUBY= yes +USE_RUBY_FEATURES= iconv USE_RC_SUBR= puppet puppetmaster -PORTDOCS= CHANGELOG README LICENSE COPYING +PORTDOCS= CHANGELOG LICENSE README.md PORTEXAMPLES= * PUPPET_USER:= puppet PUPPET_GROUP:= ${PUPPET_USER} @@ -50,7 +50,7 @@ RUN_DEPENDS+= rubygem-mongrel>=0:${PORTSDIR}/www/rubygem-mongrel .if defined(WITH_PACKAGE_ORIGIN) EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_origin -RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bz2.so:${PORTSDIR}/archivers/ruby-bz2 +RUN_DEPENDS+= rubygem-bzip2>=0:${PORTSDIR}/archivers/rubygem-bzip2 .endif .include <bsd.port.pre.mk> diff --git puppet/distinfo puppet/distinfo index 17dcc99..424ccaf 100644 --- puppet/distinfo +++ puppet/distinfo @@ -1,2 +1,2 @@ -SHA256 (puppet-2.6.7.tar.gz) = 90c0741f66d15716cfd76f0b8cd15f5b867056f0180ba160ce868350c6dd4ddc -SIZE (puppet-2.6.7.tar.gz) = 1530756 +SHA256 (puppet-2.7.3rc1.tar.gz) = c1d0a08114f94b727b33d18cec60232ae7b48f107fd23495706e0444c5377036 +SIZE (puppet-2.7.3rc1.tar.gz) = 1710547 diff --git puppet/files/optpatch-package_origin puppet/files/optpatch-package_origin index e1cef54..b3a678e 100644 --- puppet/files/optpatch-package_origin +++ puppet/files/optpatch-package_origin @@ -1,5 +1,5 @@ diff --git lib/puppet/provider/package/freebsd.rb lib/puppet/provider/package/freebsd.rb -index e10a20b..f36e29e 100755 +index e10a20b..7f50e10 100755 --- lib/puppet/provider/package/freebsd.rb +++ lib/puppet/provider/package/freebsd.rb @@ -1,37 +1,165 @@ @@ -11,7 +11,7 @@ index e10a20b..f36e29e 100755 - libraries." +require 'open-uri' +require 'net/ftp' -+require 'bz2' ++require 'bzip2' - commands :pkginfo => "/usr/sbin/pkg_info", - :pkgadd => "/usr/sbin/pkg_add", @@ -99,7 +99,7 @@ index e10a20b..f36e29e 100755 + Puppet.debug "Fetching INDEX: #{uri.inspect}" + begin + open(uri, "r") do |f| -+ BZ2::Reader.open(f.path) do |f| ++ Bzip2::Reader.open(f.path) do |f| + while (line = f.gets) + fields = line.split("|") + pkg_info = self.class.parse_pkg_string(fields[0]) >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108110439.p7B4d711018036>