Date: Tue, 3 Dec 2019 14:58:13 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518944 - in head/archivers/rubygem-fpm: . files Message-ID: <201912031458.xB3EwDNI024150@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Tue Dec 3 14:58:13 2019 New Revision: 518944 URL: https://svnweb.freebsd.org/changeset/ports/518944 Log: archivers/rubygem-fpm: convert to patches Added: head/archivers/rubygem-fpm/files/ head/archivers/rubygem-fpm/files/patch-gemspec (contents, props changed) head/archivers/rubygem-fpm/files/patch-lib_fpm_package_apk.rb (contents, props changed) head/archivers/rubygem-fpm/files/patch-lib_fpm_package_deb.rb (contents, props changed) head/archivers/rubygem-fpm/files/patch-lib_fpm_package_dir.rb (contents, props changed) head/archivers/rubygem-fpm/files/patch-lib_fpm_package_empty.rb (contents, props changed) head/archivers/rubygem-fpm/files/patch-lib_fpm_package_freebsd.rb (contents, props changed) head/archivers/rubygem-fpm/files/patch-lib_fpm_package_pacman.rb (contents, props changed) head/archivers/rubygem-fpm/files/patch-lib_fpm_package_rpm.rb (contents, props changed) head/archivers/rubygem-fpm/files/patch-lib_fpm_package_sh.rb (contents, props changed) head/archivers/rubygem-fpm/files/patch-lib_fpm_package_tar.rb (contents, props changed) head/archivers/rubygem-fpm/files/patch-lib_fpm_package_zip.rb (contents, props changed) Modified: head/archivers/rubygem-fpm/Makefile (contents, props changed) Modified: head/archivers/rubygem-fpm/Makefile ============================================================================== --- head/archivers/rubygem-fpm/Makefile Tue Dec 3 14:56:20 2019 (r518943) +++ head/archivers/rubygem-fpm/Makefile Tue Dec 3 14:58:13 2019 (r518944) @@ -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> Added: head/archivers/rubygem-fpm/files/patch-gemspec ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/rubygem-fpm/files/patch-gemspec Tue Dec 3 14:58:13 2019 (r518944) @@ -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"]) Added: head/archivers/rubygem-fpm/files/patch-lib_fpm_package_apk.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/rubygem-fpm/files/patch-lib_fpm_package_apk.rb Tue Dec 3 14:58:13 2019 (r518944) @@ -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' Added: head/archivers/rubygem-fpm/files/patch-lib_fpm_package_deb.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/rubygem-fpm/files/patch-lib_fpm_package_deb.rb Tue Dec 3 14:58:13 2019 (r518944) @@ -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" + Added: head/archivers/rubygem-fpm/files/patch-lib_fpm_package_dir.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/rubygem-fpm/files/patch-lib_fpm_package_dir.rb Tue Dec 3 14:58:13 2019 (r518944) @@ -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" Added: head/archivers/rubygem-fpm/files/patch-lib_fpm_package_empty.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/rubygem-fpm/files/patch-lib_fpm_package_empty.rb Tue Dec 3 14:58:13 2019 (r518944) @@ -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 + Added: head/archivers/rubygem-fpm/files/patch-lib_fpm_package_freebsd.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/rubygem-fpm/files/patch-lib_fpm_package_freebsd.rb Tue Dec 3 14:58:13 2019 (r518944) @@ -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" Added: head/archivers/rubygem-fpm/files/patch-lib_fpm_package_pacman.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/rubygem-fpm/files/patch-lib_fpm_package_pacman.rb Tue Dec 3 14:58:13 2019 (r518944) @@ -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" + Added: head/archivers/rubygem-fpm/files/patch-lib_fpm_package_rpm.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/rubygem-fpm/files/patch-lib_fpm_package_rpm.rb Tue Dec 3 14:58:13 2019 (r518944) @@ -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' Added: head/archivers/rubygem-fpm/files/patch-lib_fpm_package_sh.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/rubygem-fpm/files/patch-lib_fpm_package_sh.rb Tue Dec 3 14:58:13 2019 (r518944) @@ -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" + Added: head/archivers/rubygem-fpm/files/patch-lib_fpm_package_tar.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/rubygem-fpm/files/patch-lib_fpm_package_tar.rb Tue Dec 3 14:58:13 2019 (r518944) @@ -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" Added: head/archivers/rubygem-fpm/files/patch-lib_fpm_package_zip.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/archivers/rubygem-fpm/files/patch-lib_fpm_package_zip.rb Tue Dec 3 14:58:13 2019 (r518944) @@ -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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912031458.xB3EwDNI024150>