diff options
| author | Michael Moll <mmoll@FreeBSD.org> | 2015-08-08 20:44:11 +0000 |
|---|---|---|
| committer | Michael Moll <mmoll@FreeBSD.org> | 2015-08-08 20:44:11 +0000 |
| commit | d7517bd832798010f9bf84c0f34577aa49ae02fc (patch) | |
| tree | 8d28e000f5b322c19cb02ca2aa94f4b4a61b3794 | |
| parent | 48ef6aa21d6ef0407925cfed032f8f1077607c01 (diff) | |
| download | ports-d7517bd832798010f9bf84c0f34577aa49ae02fc.tar.gz ports-d7517bd832798010f9bf84c0f34577aa49ae02fc.zip | |
Notes
| -rw-r--r-- | sysutils/puppet/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/puppet/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/puppet/files/patch-lib_puppet_vendor_safe__yaml_lib_safe__yaml.rb | 11 |
3 files changed, 14 insertions, 9 deletions
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile index 0cbbf3c644f1..e6910a08c0bc 100644 --- a/sysutils/puppet/Makefile +++ b/sysutils/puppet/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= puppet -PORTVERSION= 3.8.1 -PORTREVISION= 1 +PORTVERSION= 3.8.2 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ @@ -52,11 +51,6 @@ BROKEN= PACKAGE_ROOT option patch is incompatible with PACKAGE_ORIGIN patch. .include <bsd.port.pre.mk> -# puppet 4.x should support ruby 2.2.x -.if ${RUBY_VER} >= 2.2 -BROKEN= Does not work with Ruby 2.2 -.endif - .if ${PORT_OPTIONS:MPACKAGE_ORIGIN} EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_origin RUN_DEPENDS+= rubygem-bzip2-ruby>=0:${PORTSDIR}/archivers/rubygem-bzip2-ruby diff --git a/sysutils/puppet/distinfo b/sysutils/puppet/distinfo index ecc7ac078fbf..8c98c2bd0782 100644 --- a/sysutils/puppet/distinfo +++ b/sysutils/puppet/distinfo @@ -1,2 +1,2 @@ -SHA256 (puppet-3.8.1.tar.gz) = 033d99125276c7062fa5928e3de38c5e487b406530b3c50e84027b3abfd945a8 -SIZE (puppet-3.8.1.tar.gz) = 2633982 +SHA256 (puppet-3.8.2.tar.gz) = 5a89c623f22fc96a2919801ff874b10f8f1a66e95c09976c73b257b8bbc39986 +SIZE (puppet-3.8.2.tar.gz) = 2637591 diff --git a/sysutils/puppet/files/patch-lib_puppet_vendor_safe__yaml_lib_safe__yaml.rb b/sysutils/puppet/files/patch-lib_puppet_vendor_safe__yaml_lib_safe__yaml.rb new file mode 100644 index 000000000000..f81c496bd057 --- /dev/null +++ b/sysutils/puppet/files/patch-lib_puppet_vendor_safe__yaml_lib_safe__yaml.rb @@ -0,0 +1,11 @@ +--- lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb.orig 2015-08-06 16:17:42 UTC ++++ lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb +@@ -3,7 +3,7 @@ require "yaml" + # This needs to be defined up front in case any internal classes need to base + # their behavior off of this. + module SafeYAML +- YAML_ENGINE = defined?(YAML::ENGINE) ? YAML::ENGINE.yamler : "syck" ++ YAML_ENGINE = defined?(YAML::ENGINE) ? YAML::ENGINE.yamler : (defined?(Psych) && YAML == Psych ? "psych" : "syck") + end + + require "set" |