13 files changed, 13 insertions, 112 deletions

diff --git a/archivers/rubygem-fpm/Makefile b/archivers/rubygem-fpm/Makefile
index 3a1714071b42..a88c490af1c5 100644
--- a/archivers/rubygem-fpm/Makefile
+++ b/archivers/rubygem-fpm/Makefile
@@ -1,23 +1,21 @@
 PORTNAME=	fpm
-PORTVERSION=	1.11.0
+PORTVERSION=	1.15.0
 CATEGORIES=	archivers rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Build packages for multiple platforms with great ease and sanity
 WWW=		https://github.com/jordansissel/fpm
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-arr-pm>=0.0.10<0.1:devel/rubygem-arr-pm \
+RUN_DEPENDS=	rubygem-arr-pm>=0.0.11<0.1:devel/rubygem-arr-pm \
+		rubygem-backports>=2.6.2:devel/rubygem-backports \
 		rubygem-cabin>=0.6.0:devel/rubygem-cabin \
-		rubygem-childprocess>=0.9.0:devel/rubygem-childprocess \
 		rubygem-clamp>=1.0.0<2:devel/rubygem-clamp \
-		rubygem-ffi>=0:devel/rubygem-ffi \
-		rubygem-json1>=1.7.7<2.0:devel/rubygem-json1 \
 		rubygem-pleaserun>=0.0.29<0.1:devel/rubygem-pleaserun \
-		rubygem-ruby-xz>=0.2.3:archivers/rubygem-ruby-xz \
+		rubygem-rexml>=0:textproc/rubygem-rexml \
 		rubygem-stud>=0:devel/rubygem-stud
 
 USES=		gem
@@ -27,7 +25,4 @@ NO_ARCH=	yes
 
 PLIST_FILES=	bin/fpm
 
-post-patch:
-	@${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/distinfo b/archivers/rubygem-fpm/distinfo
index b7d628ba156f..14ebe690bd5d 100644
--- a/archivers/rubygem-fpm/distinfo
+++ b/archivers/rubygem-fpm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561910724
-SHA256 (rubygem/fpm-1.11.0.gem) = 35cb20a0d9b7835a9bff5ae6572dd9ef1fb1b86a4973c10dc5b773fd71d41f4e
-SIZE (rubygem/fpm-1.11.0.gem) = 143872
+TIMESTAMP = 1669058019
+SHA256 (rubygem/fpm-1.15.0.gem) = 3e16d7f8d53c8110ed91cded79af231adeaf337e1f1e7a91f1bb46c40032f9c8
+SIZE (rubygem/fpm-1.15.0.gem) = 152576
diff --git a/archivers/rubygem-fpm/files/patch-gemspec b/archivers/rubygem-fpm/files/patch-gemspec
index 363e3186cad1..3b0acfe62f31 100644
--- a/archivers/rubygem-fpm/files/patch-gemspec
+++ b/archivers/rubygem-fpm/files/patch-gemspec
@@ -1,19 +1,11 @@
---- fpm.gemspec.orig	2021-10-27 13:27:35 UTC
+--- fpm.gemspec.orig	2022-11-18 10:44:05 UTC
 +++ fpm.gemspec
-@@ -26,13 +26,12 @@ Gem::Specification.new do |s|
-   if s.respond_to? :add_runtime_dependency then
-     s.add_runtime_dependency(%q<json>.freeze, [">= 1.7.7", "< 2.0"])
+@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
      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<backports>.freeze, [">= 2.6.2"])
+     s.add_runtime_dependency(%q<arr-pm>.freeze, ["~> 0.0.11"])
 -    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.2.3"])
      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"])
+     s.add_runtime_dependency(%q<rexml>.freeze, [">= 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
deleted file mode 100644
index c2eb9276816f..000000000000
--- a/archivers/rubygem-fpm/files/patch-lib_fpm_package_apk.rb
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 72f5d315add8..000000000000
--- a/archivers/rubygem-fpm/files/patch-lib_fpm_package_deb.rb
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index b71d608ea008..000000000000
--- a/archivers/rubygem-fpm/files/patch-lib_fpm_package_dir.rb
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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
deleted file mode 100644
index 4a6e3592554d..000000000000
--- a/archivers/rubygem-fpm/files/patch-lib_fpm_package_empty.rb
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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
deleted file mode 100644
index 8e488ad20897..000000000000
--- a/archivers/rubygem-fpm/files/patch-lib_fpm_package_freebsd.rb
+++ /dev/null
@@ -1,7 +0,0 @@
---- 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
deleted file mode 100644
index 027dae1d837b..000000000000
--- a/archivers/rubygem-fpm/files/patch-lib_fpm_package_pacman.rb
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index b3ab1bd2a272..000000000000
--- a/archivers/rubygem-fpm/files/patch-lib_fpm_package_rpm.rb
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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
deleted file mode 100644
index dade3f601587..000000000000
--- a/archivers/rubygem-fpm/files/patch-lib_fpm_package_sh.rb
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 7da01a62a36e..000000000000
--- a/archivers/rubygem-fpm/files/patch-lib_fpm_package_tar.rb
+++ /dev/null
@@ -1,7 +0,0 @@
---- 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
deleted file mode 100644
index a94cbddabca2..000000000000
--- a/archivers/rubygem-fpm/files/patch-lib_fpm_package_zip.rb
+++ /dev/null
@@ -1,7 +0,0 @@
---- 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"