diff options
Diffstat (limited to 'sysutils/puppet')
-rw-r--r-- | sysutils/puppet/Makefile | 3 | ||||
-rw-r--r-- | sysutils/puppet/distinfo | 4 | ||||
-rw-r--r-- | sysutils/puppet/files/patch-lib__puppet__rails__resource.rb | 15 | ||||
-rw-r--r-- | sysutils/puppet/pkg-plist | 1 |
4 files changed, 3 insertions, 20 deletions
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile index b789157890fb..e66490740f89 100644 --- a/sysutils/puppet/Makefile +++ b/sysutils/puppet/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 3.4.3 -PORTREVISION= 1 +PORTVERSION= 3.6.1 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ diff --git a/sysutils/puppet/distinfo b/sysutils/puppet/distinfo index df93977d5aae..3f7c83f3ddd2 100644 --- a/sysutils/puppet/distinfo +++ b/sysutils/puppet/distinfo @@ -1,2 +1,2 @@ -SHA256 (puppet-3.4.3.tar.gz) = 5f991b54b6a272914f4dda5aaafb86f08855d65adad46941a72192feefe2ba0f -SIZE (puppet-3.4.3.tar.gz) = 1952505 +SHA256 (puppet-3.6.1.tar.gz) = f3f8ba0243398f4a79a5f62e780a90b12dd0d770266256b446385952a1f0002f +SIZE (puppet-3.6.1.tar.gz) = 2248333 diff --git a/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb b/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb deleted file mode 100644 index 4f7edf4d7731..000000000000 --- a/sysutils/puppet/files/patch-lib__puppet__rails__resource.rb +++ /dev/null @@ -1,15 +0,0 @@ ---- ./lib/puppet/rails/resource.rb.orig 2013-10-07 18:00:47.000000000 +0000 -+++ ./lib/puppet/rails/resource.rb 2013-12-20 16:47:14.340897154 +0000 -@@ -84,7 +84,11 @@ - end - - def [](param) -- super || parameter(param) -+ if param == 'id' -+ super -+ else -+ super || parameter(param) -+ end - end - - # Make sure this resource is equivalent to the provided Parser resource. diff --git a/sysutils/puppet/pkg-plist b/sysutils/puppet/pkg-plist index e6877e0fad46..47e88aa24af1 100644 --- a/sysutils/puppet/pkg-plist +++ b/sysutils/puppet/pkg-plist @@ -43,7 +43,6 @@ man/man8/puppet.8.gz %%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 |