From nobody Fri Dec 30 09:13:25 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nk0115McLz2kf77; Fri, 30 Dec 2022 09:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nk011344jz4FpG; Fri, 30 Dec 2022 09:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wah4CKqlWIsRLTprG2MJaqzf7wZDyDs2KJDrWtMX0Bc=; b=CuBVze2+3Jq9mAB3bRc2PV/ZMk/vJ2eiX94BKht6xVjZNp1meOn7qTTpA89BB67PBkBSJP YGbjznbmc/k+V9Fn0Z3yX6n31A+sws7rcxGmX9XPDPneYacY47iCwnh4IV1dySrukyxGUM hQAzLTOTx78qTaBtKrPuzmba8rmLAZLzceMsXm3b9NP1vtKhXmX326/b7Gtuh7dSJKp4xC J2+P459NlIWFv2bG/yMTLbyZjOICu3Garpixt3CoJjR2PzWVJz0tj7olw31ryCT/cxMUgb Q8sQwu+zxfTmrK+n3pG9PmQeP9xKwiSpPc53kqwHHwnArcuR8K5mYRopMqFmWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wah4CKqlWIsRLTprG2MJaqzf7wZDyDs2KJDrWtMX0Bc=; b=oIfpX8b28r953PTY7MqB+RC+hAWfMFfULDn325dIf6LonpWKu4NEy6fpTTeOvmCTSBkCYA i/xsRrk+JJVeWrOpXKCRJ+X25ro+sg0ZzV7umXTsXpzFa4CA2UKLBtJWoLmSZpvkLzM9sv 5u5c/z+SEEo/kLbfqM6ybotsgpQaE9DrjVneh8OsIt3i2iTiK862Gob8QwGy1ISX4D0PbP WTUMsrGRk2KkGoSRe2rAhmJx1wiwyJ7f4MOR6+0fgdY1ZFWxdnl11F5VTcY/K2ysKuK0RW fWJzpXjGGPdfFtYojmUcRuD2BY3y6nic8pdsCVzyiisIrqyIV5nuapAWQz0nhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672391605; a=rsa-sha256; cv=none; b=Un2/dpK8yGiauqU2K9qU0OqRFJTzSD+1iv7iFJLFW1jttNVOXd5UqO9D33GrXXiqRTvh8o Hpz+POloV6zTq5+TKzVkm8U0uOB2tJbA40lwJfvo2vbPIrIEf6qpqz2vB19eFatluvfh9P 7X9KVkoin6uZFNYdwIQnILLcby5pppEzA8Hh+/BcYqvqE3lkfgYwXv6pMG+C0ona6V8tkf Z8xTZIn1BfLi4VSm145LjghcLZGHP07wWIJhhkHuQjiKxJymjsKMrCLc68FSGDzYKwDw7y zSfgFMjqQnmRkOsRc55Ci1Mjz/4SHpNF5e5Huhm340AiImAQ4f3+ehFG5iaS7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nk0112BFgz13Mn; Fri, 30 Dec 2022 09:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BU9DPQC020141; Fri, 30 Dec 2022 09:13:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BU9DPkj020140; Fri, 30 Dec 2022 09:13:25 GMT (envelope-from git) Date: Fri, 30 Dec 2022 09:13:25 GMT Message-Id: <202212300913.2BU9DPkj020140@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 469cb4bffd7d - main - archivers/rubygem-fpm: Update to 1.15.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 469cb4bffd7d8d105e9081226c9814081ddb0194 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=469cb4bffd7d8d105e9081226c9814081ddb0194 commit 469cb4bffd7d8d105e9081226c9814081ddb0194 Author: Po-Chuan Hsieh AuthorDate: 2022-12-30 08:47:03 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-12-30 09:05:17 +0000 archivers/rubygem-fpm: Update to 1.15.0 - Take maintainership Changes: https://github.com/jordansissel/fpm/blob/master/CHANGELOG.rst --- archivers/rubygem-fpm/Makefile | 15 +++++---------- archivers/rubygem-fpm/distinfo | 6 +++--- archivers/rubygem-fpm/files/patch-gemspec | 18 +++++------------- .../rubygem-fpm/files/patch-lib_fpm_package_apk.rb | 10 ---------- .../rubygem-fpm/files/patch-lib_fpm_package_deb.rb | 10 ---------- .../rubygem-fpm/files/patch-lib_fpm_package_dir.rb | 9 --------- .../rubygem-fpm/files/patch-lib_fpm_package_empty.rb | 8 -------- .../rubygem-fpm/files/patch-lib_fpm_package_freebsd.rb | 7 ------- .../rubygem-fpm/files/patch-lib_fpm_package_pacman.rb | 10 ---------- .../rubygem-fpm/files/patch-lib_fpm_package_rpm.rb | 8 -------- .../rubygem-fpm/files/patch-lib_fpm_package_sh.rb | 10 ---------- .../rubygem-fpm/files/patch-lib_fpm_package_tar.rb | 7 ------- .../rubygem-fpm/files/patch-lib_fpm_package_zip.rb | 7 ------- 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 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.freeze, [">= 1.7.7", "< 2.0"]) +@@ -27,7 +27,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency(%q.freeze, [">= 0.6.0"]) -- s.add_runtime_dependency(%q.freeze, [">= 2.6.2"]) - s.add_runtime_dependency(%q.freeze, ["~> 0.0.10"]) + s.add_runtime_dependency(%q.freeze, [">= 2.6.2"]) + s.add_runtime_dependency(%q.freeze, ["~> 0.0.11"]) - s.add_runtime_dependency(%q.freeze, ["~> 1.0.0"]) -- s.add_runtime_dependency(%q.freeze, ["= 0.9.0"]) + s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) -+ s.add_runtime_dependency(%q.freeze, [">= 0.9.0"]) - s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_development_dependency(%q.freeze, ["~> 10"]) -- s.add_runtime_dependency(%q.freeze, ["~> 0.2.3"]) -+ s.add_runtime_dependency(%q.freeze, [">= 0.2.3"]) s.add_runtime_dependency(%q.freeze, ["~> 0.0.29"]) s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_development_dependency(%q.freeze, ["~> 3.0.0"]) + s.add_runtime_dependency(%q.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"