archivers/rubygem-fpm: convert to patches

12 files changed, 140 insertions, 7 deletions

diff --git a/archivers/rubygem-fpm/Makefile b/archivers/rubygem-fpm/Makefile
index 1d8c91b6e06d..aa64529fd17a 100644
--- a/archivers/rubygem-fpm/Makefile
+++ b/archivers/rubygem-fpm/Makefile
@@ -25,16 +25,10 @@ USES=		gem
 USE_RUBY=	yes
 
 NO_ARCH=	yes
-REINPLACE_ARGS=	-i ''
 
 PLIST_FILES=	bin/fpm
 
 post-patch:
-	@${REINPLACE_CMD} -e '/childprocess/ s|= 0.9.0|>&|' ${WRKSRC}/${GEMSPEC}
-	@${REINPLACE_CMD} -e '/clamp/ s|~> 1\.0\.0|~> 1.0|' ${WRKSRC}/${GEMSPEC}
-	@${REINPLACE_CMD} -e '/ruby-xz/ s|~> 0\.2\.3|>= 0|' ${WRKSRC}/${GEMSPEC}
-# Remove backports
-	@${REINPLACE_CMD} -e '/backports/d' ${WRKSRC}/${GEMSPEC}
-	@${REINPLACE_CMD} -e '/require "backports"/d' ${WRKSRC}/lib/fpm/package.rb ${WRKSRC}/lib/fpm/package/*.rb
+	@${RM} ${WRKSRC}/${GEMSPEC}.orig ${WRKSRC}/lib/fpm/package.rb.orig ${WRKSRC}/lib/fpm/package/*.rb.orig
 
 .include <bsd.port.mk>
diff --git a/archivers/rubygem-fpm/files/patch-gemspec b/archivers/rubygem-fpm/files/patch-gemspec
new file mode 100644
index 000000000000..c509351e204a
--- /dev/null
+++ b/archivers/rubygem-fpm/files/patch-gemspec
@@ -0,0 +1,53 @@
+--- fpm.gemspec.orig	2019-12-03 09:44:49 UTC
++++ fpm.gemspec
+@@ -25,13 +25,12 @@
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_runtime_dependency(%q<json>.freeze, [">= 1.7.7", "< 2.0"])
+       s.add_runtime_dependency(%q<cabin>.freeze, [">= 0.6.0"])
+-      s.add_runtime_dependency(%q<backports>.freeze, [">= 2.6.2"])
+       s.add_runtime_dependency(%q<arr-pm>.freeze, ["~> 0.0.10"])
+-      s.add_runtime_dependency(%q<clamp>.freeze, ["~> 1.0.0"])
+-      s.add_runtime_dependency(%q<childprocess>.freeze, ["= 0.9.0"])
++      s.add_runtime_dependency(%q<clamp>.freeze, ["~> 1.0"])
++      s.add_runtime_dependency(%q<childprocess>.freeze, [">= 0.9.0"])
+       s.add_runtime_dependency(%q<ffi>.freeze, [">= 0"])
+       s.add_development_dependency(%q<rake>.freeze, ["~> 10"])
+-      s.add_runtime_dependency(%q<ruby-xz>.freeze, ["~> 0.2.3"])
++      s.add_runtime_dependency(%q<ruby-xz>.freeze, [">= 0"])
+       s.add_runtime_dependency(%q<pleaserun>.freeze, ["~> 0.0.29"])
+       s.add_runtime_dependency(%q<stud>.freeze, [">= 0"])
+       s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0.0"])
+@@ -40,13 +39,12 @@
+     else
+       s.add_dependency(%q<json>.freeze, [">= 1.7.7", "< 2.0"])
+       s.add_dependency(%q<cabin>.freeze, [">= 0.6.0"])
+-      s.add_dependency(%q<backports>.freeze, [">= 2.6.2"])
+       s.add_dependency(%q<arr-pm>.freeze, ["~> 0.0.10"])
+-      s.add_dependency(%q<clamp>.freeze, ["~> 1.0.0"])
+-      s.add_dependency(%q<childprocess>.freeze, ["= 0.9.0"])
++      s.add_dependency(%q<clamp>.freeze, ["~> 1.0"])
++      s.add_dependency(%q<childprocess>.freeze, [">= 0.9.0"])
+       s.add_dependency(%q<ffi>.freeze, [">= 0"])
+       s.add_dependency(%q<rake>.freeze, ["~> 10"])
+-      s.add_dependency(%q<ruby-xz>.freeze, ["~> 0.2.3"])
++      s.add_dependency(%q<ruby-xz>.freeze, [">= 0"])
+       s.add_dependency(%q<pleaserun>.freeze, ["~> 0.0.29"])
+       s.add_dependency(%q<stud>.freeze, [">= 0"])
+       s.add_dependency(%q<rspec>.freeze, ["~> 3.0.0"])
+@@ -56,13 +54,12 @@
+   else
+     s.add_dependency(%q<json>.freeze, [">= 1.7.7", "< 2.0"])
+     s.add_dependency(%q<cabin>.freeze, [">= 0.6.0"])
+-    s.add_dependency(%q<backports>.freeze, [">= 2.6.2"])
+     s.add_dependency(%q<arr-pm>.freeze, ["~> 0.0.10"])
+-    s.add_dependency(%q<clamp>.freeze, ["~> 1.0.0"])
+-    s.add_dependency(%q<childprocess>.freeze, ["= 0.9.0"])
++    s.add_dependency(%q<clamp>.freeze, ["~> 1.0"])
++    s.add_dependency(%q<childprocess>.freeze, [">= 0.9.0"])
+     s.add_dependency(%q<ffi>.freeze, [">= 0"])
+     s.add_dependency(%q<rake>.freeze, ["~> 10"])
+-    s.add_dependency(%q<ruby-xz>.freeze, ["~> 0.2.3"])
++    s.add_dependency(%q<ruby-xz>.freeze, [">= 0"])
+     s.add_dependency(%q<pleaserun>.freeze, ["~> 0.0.29"])
+     s.add_dependency(%q<stud>.freeze, [">= 0"])
+     s.add_dependency(%q<rspec>.freeze, ["~> 3.0.0"])
diff --git a/archivers/rubygem-fpm/files/patch-lib_fpm_package_apk.rb b/archivers/rubygem-fpm/files/patch-lib_fpm_package_apk.rb
new file mode 100644
index 000000000000..c2eb9276816f
--- /dev/null
+++ b/archivers/rubygem-fpm/files/patch-lib_fpm_package_apk.rb
@@ -0,0 +1,10 @@
+--- lib/fpm/package/apk.rb.orig	2019-12-03 14:42:58 UTC
++++ lib/fpm/package/apk.rb
+@@ -3,7 +3,6 @@ require "fpm/namespace"
+ require "fpm/package"
+ require "fpm/errors"
+ require "fpm/util"
+-require "backports"
+ require "fileutils"
+ require "digest"
+ require 'digest/sha1'
diff --git a/archivers/rubygem-fpm/files/patch-lib_fpm_package_deb.rb b/archivers/rubygem-fpm/files/patch-lib_fpm_package_deb.rb
new file mode 100644
index 000000000000..72f5d315add8
--- /dev/null
+++ b/archivers/rubygem-fpm/files/patch-lib_fpm_package_deb.rb
@@ -0,0 +1,10 @@
+--- lib/fpm/package/deb.rb.orig	2019-12-03 14:42:58 UTC
++++ lib/fpm/package/deb.rb
+@@ -3,7 +3,6 @@ require "fpm/namespace"
+ require "fpm/package"
+ require "fpm/errors"
+ require "fpm/util"
+-require "backports"
+ require "fileutils"
+ require "digest"
+ 
diff --git a/archivers/rubygem-fpm/files/patch-lib_fpm_package_dir.rb b/archivers/rubygem-fpm/files/patch-lib_fpm_package_dir.rb
new file mode 100644
index 000000000000..b71d608ea008
--- /dev/null
+++ b/archivers/rubygem-fpm/files/patch-lib_fpm_package_dir.rb
@@ -0,0 +1,9 @@
+--- lib/fpm/package/dir.rb.orig	2019-12-03 14:42:58 UTC
++++ lib/fpm/package/dir.rb
+@@ -1,6 +1,5 @@
+ require "fpm/package"
+ require "fpm/util"
+-require "backports"
+ require "fileutils"
+ require "find"
+ require "socket"
diff --git a/archivers/rubygem-fpm/files/patch-lib_fpm_package_empty.rb b/archivers/rubygem-fpm/files/patch-lib_fpm_package_empty.rb
new file mode 100644
index 000000000000..4a6e3592554d
--- /dev/null
+++ b/archivers/rubygem-fpm/files/patch-lib_fpm_package_empty.rb
@@ -0,0 +1,8 @@
+--- lib/fpm/package/empty.rb.orig	2019-12-03 14:42:58 UTC
++++ lib/fpm/package/empty.rb
+@@ -1,5 +1,4 @@
+ require "fpm/package"
+-require "backports"
+ 
+ # Empty Package type. For strict/meta/virtual package creation
+ 
diff --git a/archivers/rubygem-fpm/files/patch-lib_fpm_package_freebsd.rb b/archivers/rubygem-fpm/files/patch-lib_fpm_package_freebsd.rb
new file mode 100644
index 000000000000..8e488ad20897
--- /dev/null
+++ b/archivers/rubygem-fpm/files/patch-lib_fpm_package_freebsd.rb
@@ -0,0 +1,7 @@
+--- lib/fpm/package/freebsd.rb.orig	2019-12-03 14:42:58 UTC
++++ lib/fpm/package/freebsd.rb
+@@ -1,4 +1,3 @@
+-require "backports" # gem backports
+ require "fpm/package"
+ require "fpm/util"
+ require "digest"
diff --git a/archivers/rubygem-fpm/files/patch-lib_fpm_package_pacman.rb b/archivers/rubygem-fpm/files/patch-lib_fpm_package_pacman.rb
new file mode 100644
index 000000000000..027dae1d837b
--- /dev/null
+++ b/archivers/rubygem-fpm/files/patch-lib_fpm_package_pacman.rb
@@ -0,0 +1,10 @@
+--- lib/fpm/package/pacman.rb.orig	2019-12-03 14:42:58 UTC
++++ lib/fpm/package/pacman.rb
+@@ -1,7 +1,6 @@
+ # -*- coding: utf-8 -*-
+ require "fpm/package"
+ require "fpm/util"
+-require "backports"
+ require "fileutils"
+ require "find"
+ 
diff --git a/archivers/rubygem-fpm/files/patch-lib_fpm_package_rpm.rb b/archivers/rubygem-fpm/files/patch-lib_fpm_package_rpm.rb
new file mode 100644
index 000000000000..b3ab1bd2a272
--- /dev/null
+++ b/archivers/rubygem-fpm/files/patch-lib_fpm_package_rpm.rb
@@ -0,0 +1,8 @@
+--- lib/fpm/package/rpm.rb.orig	2019-12-03 14:42:58 UTC
++++ lib/fpm/package/rpm.rb
+@@ -1,5 +1,4 @@
+ require "fpm/package"
+-require "backports"
+ require "fileutils"
+ require "find"
+ require "arr-pm/file" # gem 'arr-pm'
diff --git a/archivers/rubygem-fpm/files/patch-lib_fpm_package_sh.rb b/archivers/rubygem-fpm/files/patch-lib_fpm_package_sh.rb
new file mode 100644
index 000000000000..dade3f601587
--- /dev/null
+++ b/archivers/rubygem-fpm/files/patch-lib_fpm_package_sh.rb
@@ -0,0 +1,10 @@
+--- lib/fpm/package/sh.rb.orig	2019-12-03 14:42:58 UTC
++++ lib/fpm/package/sh.rb
+@@ -3,7 +3,6 @@ require "fpm/namespace"
+ require "fpm/package"
+ require "fpm/errors"
+ require "fpm/util"
+-require "backports"
+ require "fileutils"
+ require "digest"
+ 
diff --git a/archivers/rubygem-fpm/files/patch-lib_fpm_package_tar.rb b/archivers/rubygem-fpm/files/patch-lib_fpm_package_tar.rb
new file mode 100644
index 000000000000..7da01a62a36e
--- /dev/null
+++ b/archivers/rubygem-fpm/files/patch-lib_fpm_package_tar.rb
@@ -0,0 +1,7 @@
+--- lib/fpm/package/tar.rb.orig	2019-12-03 14:42:58 UTC
++++ lib/fpm/package/tar.rb
+@@ -1,4 +1,3 @@
+-require "backports" # gem backports
+ require "fpm/package"
+ require "fpm/util"
+ require "fileutils"
diff --git a/archivers/rubygem-fpm/files/patch-lib_fpm_package_zip.rb b/archivers/rubygem-fpm/files/patch-lib_fpm_package_zip.rb
new file mode 100644
index 000000000000..a94cbddabca2
--- /dev/null
+++ b/archivers/rubygem-fpm/files/patch-lib_fpm_package_zip.rb
@@ -0,0 +1,7 @@
+--- lib/fpm/package/zip.rb.orig	2019-12-03 14:42:58 UTC
++++ lib/fpm/package/zip.rb
+@@ -1,4 +1,3 @@
+-require "backports" # gem backports
+ require "fpm/package"
+ require "fpm/util"
+ require "fileutils"