- Update sysutils/puppet to 3.3.0.

Approved by:	swills@

4 files changed, 21 insertions, 13 deletions

diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index cff169c36f7f..1e15f3a6fc6d 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppet
-PORTVERSION=	3.2.4
+PORTVERSION=	3.3.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/puppet/
 
diff --git a/sysutils/puppet/distinfo b/sysutils/puppet/distinfo
index d807f2636c71..18a1dd3da504 100644
--- a/sysutils/puppet/distinfo
+++ b/sysutils/puppet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (puppet-3.2.4.tar.gz) = 8b38f4adee6237b8dd7b1956d90af97f2d0091245d6e30b708bbc8e333001358
-SIZE (puppet-3.2.4.tar.gz) = 1786216
+SHA256 (puppet-3.3.0.tar.gz) = 72a8579332b379f8dfe03d39ac961891db9d1e41919be98ac64caa0e3e2d31a0
+SIZE (puppet-3.3.0.tar.gz) = 1894901
diff --git a/sysutils/puppet/files/optpatch-package_origin b/sysutils/puppet/files/optpatch-package_origin
index 971cb41066a3..0f6cb3aa6e31 100644
--- a/sysutils/puppet/files/optpatch-package_origin
+++ b/sysutils/puppet/files/optpatch-package_origin
@@ -1,6 +1,6 @@
---- lib/puppet/provider/package/freebsd.rb.orig	2012-10-20 00:57:51.000000000 -0400
-+++ lib/puppet/provider/package/freebsd.rb	2012-10-21 14:53:41.054105583 -0400
-@@ -1,37 +1,163 @@
+--- lib/puppet/provider/package/freebsd.rb.ori	2013-09-19 14:43:54.000000000 -0600
++++ lib/puppet/provider/package/freebsd.rb	2013-09-19 14:40:09.000000000 -0600
+@@ -1,35 +1,163 @@
 -Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
 -  desc "The specific form of package management on FreeBSD.  This is an
 -    extremely quirky packaging system, in that it freely mixes between
@@ -46,7 +46,10 @@
    end
  
 -  def install
--    should = @resource.should(:ensure)
+-    if @resource[:source] =~ /\/$/
+-      if @resource[:source] =~ /^(ftp|https?):/
+-        Puppet::Util.withenv :PACKAGESITE => @resource[:source] do
+-          pkgadd "-r", @resource[:name]
 +  def self.parse_pkg_string(pkg_string)
 +    {
 +      :pkg_name => pkg_string.split("-").slice(0..-2).join("-"),
@@ -85,11 +88,7 @@
 +    end
 +    packages
 +  end
- 
--    if @resource[:source] =~ /\/$/
--      if @resource[:source] =~ /^(ftp|https?):/
--        Puppet::Util.withenv :PACKAGESITE => @resource[:source] do
--          pkgadd "-r", @resource[:name]
++
 +  def ports_index
 +    @@lock.synchronize do
 +      if @@ports_index.nil?
@@ -187,7 +186,7 @@
    end
  
    def query
-@@ -44,6 +170,7 @@
+@@ -42,6 +170,7 @@
    end
  
    def uninstall
diff --git a/sysutils/puppet/pkg-plist b/sysutils/puppet/pkg-plist
index ff9a1665df8e..5e85672d14e1 100644
--- a/sysutils/puppet/pkg-plist
+++ b/sysutils/puppet/pkg-plist
@@ -3,6 +3,11 @@ bin/puppet
 %%RUBY_SITELIBDIR%%/hiera/backend/puppet_backend.rb
 %%RUBY_SITELIBDIR%%/hiera/scope.rb
 %%RUBY_SITELIBDIR%%/hiera_puppet.rb
+%%RUBY_SITELIBDIR%%/puppetx/puppetlabs/syntax_checkers/json.rb
+%%RUBY_SITELIBDIR%%/puppetx/puppet/syntax_checker.rb
+%%RUBY_SITELIBDIR%%/puppetx/puppet/bindings_scheme_handler.rb
+%%RUBY_SITELIBDIR%%/puppetx/puppet/hiera2_backend.rb
+%%RUBY_SITELIBDIR%%/puppetx.rb
 %%ETCDIR%%/puppet.conf-dist
 %%ETCDIR%%/auth.conf-dist
 @dirrmtry etc/puppet/modules
@@ -13,3 +18,7 @@ bin/puppet
 @exec /usr/sbin/chown -Rh puppet:puppet /var/puppet
 @dirrm %%RUBY_SITELIBDIR%%/hiera/backend
 @dirrm %%RUBY_SITELIBDIR%%/hiera
+@dirrm %%RUBY_SITELIBDIR%%/puppetx/puppetlabs/syntax_checkers
+@dirrm %%RUBY_SITELIBDIR%%/puppetx/puppetlabs
+@dirrm %%RUBY_SITELIBDIR%%/puppetx/puppet
+@dirrm %%RUBY_SITELIBDIR%%/puppetx