aboutsummaryrefslogtreecommitdiff
path: root/sysutils/puppet6
diff options
context:
space:
mode:
authorRomain Tartière <romain@FreeBSD.org>2019-04-24 17:13:25 +0000
committerRomain Tartière <romain@FreeBSD.org>2019-04-24 17:13:25 +0000
commit10569b82b1bde288e8d1d5f2cf3eba16953a8b3c (patch)
tree3410b6bad8e4ffee5b7aef6f9dcf6394ce73946d /sysutils/puppet6
parentf2b5c4d2064e7d6f0d01451227289e67f91a6ec1 (diff)
downloadports-10569b82b1bde288e8d1d5f2cf3eba16953a8b3c.tar.gz
ports-10569b82b1bde288e8d1d5f2cf3eba16953a8b3c.zip
Fix the gem package provider
The problem has been fixed upstream in the master branch but has not been released yet. While here, relax the fast_gettext dependency (issue is being worked on with upstream). With hat: puppet
Notes
Notes: svn path=/head/; revision=499866
Diffstat (limited to 'sysutils/puppet6')
-rw-r--r--sysutils/puppet6/Makefile1
-rw-r--r--sysutils/puppet6/files/patch-.gemspec11
-rw-r--r--sysutils/puppet6/files/patch-lib_puppet_provider_package_gem.rb11
3 files changed, 23 insertions, 0 deletions
diff --git a/sysutils/puppet6/Makefile b/sysutils/puppet6/Makefile
index 769eb1d03159..b0ffa5ee05c6 100644
--- a/sysutils/puppet6/Makefile
+++ b/sysutils/puppet6/Makefile
@@ -2,6 +2,7 @@
PORTNAME= puppet
PORTVERSION= 6.4.1
+PORTREVISION= 1
CATEGORIES= sysutils
PKGNAMESUFFIX= 6
diff --git a/sysutils/puppet6/files/patch-.gemspec b/sysutils/puppet6/files/patch-.gemspec
new file mode 100644
index 000000000000..4a6fb02cf2d4
--- /dev/null
+++ b/sysutils/puppet6/files/patch-.gemspec
@@ -0,0 +1,11 @@
+--- .gemspec.orig
++++ .gemspec
+@@ -34,7 +34,7 @@
+ s.add_runtime_dependency(%q<facter>, [">= 2.4.0", "< 4"])
+ s.add_runtime_dependency(%q<hiera>, [">= 3.2.1", "< 4"])
+ s.add_runtime_dependency(%q<semantic_puppet>, "~> 1.0")
+- s.add_runtime_dependency(%q<fast_gettext>, "~> 1.1.2")
++ s.add_runtime_dependency(%q<fast_gettext>, "~> 1.1")
+ s.add_runtime_dependency(%q<locale>, "~> 2.1")
+ s.add_runtime_dependency(%q<multi_json>, "~> 1.13")
+ s.add_runtime_dependency(%q<httpclient>, "~> 2.8")
diff --git a/sysutils/puppet6/files/patch-lib_puppet_provider_package_gem.rb b/sysutils/puppet6/files/patch-lib_puppet_provider_package_gem.rb
new file mode 100644
index 000000000000..2a14928de53e
--- /dev/null
+++ b/sysutils/puppet6/files/patch-lib_puppet_provider_package_gem.rb
@@ -0,0 +1,11 @@
+--- lib/puppet/provider/package/gem.rb.orig 2019-04-09 12:24:52 UTC
++++ lib/puppet/provider/package/gem.rb
+@@ -128,7 +128,7 @@ Puppet::Type.type(:package).provide :gem, :parent => P
+ end
+ end
+ else
+- command << "--no-rdoc" << "--no-ri" << resource[:name]
++ command << "--no-document" << resource[:name]
+ end
+
+ output = execute(command, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}})