CVS commit: pkgsrc/devel/ruby-redmine42

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Jan 15 15:09:32 UTC 2023

Modified Files:
        pkgsrc/devel/ruby-redmine42: Makefile distinfo
        pkgsrc/devel/ruby-redmine42/patches: patch-Gemfile

Log Message:
devel/ruby-redmine42: relax dependency

Relax dependency to mini-magick and nokogiri.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/ruby-redmine42/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/ruby-redmine42/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/ruby-redmine42/patches/patch-Gemfile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ruby-redmine42/Makefile
diff -u pkgsrc/devel/ruby-redmine42/Makefile:1.17 pkgsrc/devel/ruby-redmine42/Makefile:1.18
--- pkgsrc/devel/ruby-redmine42/Makefile:1.17   Sat Dec  3 06:40:09 2022
+++ pkgsrc/devel/ruby-redmine42/Makefile        Sun Jan 15 15:09:32 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2022/12/03 06:40:09 taca Exp $
+# $NetBSD: Makefile,v 1.18 2023/01/15 15:09:32 taca Exp $
 
 DISTNAME=      redmine-${RM_VERSION}
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/redmine/redmine${RM_VER}/}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  https://www.redmine.org/releases/
 
@@ -20,7 +21,8 @@ RUBY_VERSIONS_ACCEPTED=       27
 
 RUBY_RAILS_ACCEPTED=   52
 
-OVERRIDE_GEMSPEC+=     csv>=3.1.1 i18n>=1.8.2 mini_mime>=1.0.1
+OVERRIDE_GEMSPEC+=     csv>=3.1.1 i18n>=1.8.2 mini_mime>=1.0.1 \
+                       mini-magick>=4.11.0 nokogiri>=1.13.6
 
 REPLACE_RUBY+= bin/*
 REPLACE_RUBY+= extra/mail_handler/rdm-mailhandler.rb
@@ -51,7 +53,7 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-rqrcode>=1.2
 DEPENDS+=      ${RUBY_PKGPREFIX}-net-ldap>=0.17.0<0.18:../../net/ruby-net-ldap
 DEPENDS+=      ${RUBY_PKGPREFIX}-ruby-openid>=2.9.2<2.10:../../security/ruby-ruby-openid
 DEPENDS+=      ${RUBY_PKGPREFIX}-rack-openid>=1.4.2:../../security/ruby-rack-openid
-DEPENDS+=      ${RUBY_PKGPREFIX}-mini-magick>=4.11.0<4.12:../../graphics/ruby-mini-magick
+DEPENDS+=      ${RUBY_PKGPREFIX}-mini-magick>=4.11.0:../../graphics/ruby-mini-magick
 DEPENDS+=      ${RUBY_PKGPREFIX}-redcarpet>=3.5.1<3.6:../../textproc/ruby-redcarpet
 
 .include "options.mk"

Index: pkgsrc/devel/ruby-redmine42/distinfo
diff -u pkgsrc/devel/ruby-redmine42/distinfo:1.12 pkgsrc/devel/ruby-redmine42/distinfo:1.13
--- pkgsrc/devel/ruby-redmine42/distinfo:1.12   Sat Dec  3 06:40:09 2022
+++ pkgsrc/devel/ruby-redmine42/distinfo        Sun Jan 15 15:09:32 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2022/12/03 06:40:09 taca Exp $
+$NetBSD: distinfo,v 1.13 2023/01/15 15:09:32 taca Exp $
 
 BLAKE2s (redmine-4.2.9.tar.gz) = f13f82335fd8c8d069a51dd556ff4487d7b5f90b9cab0eb569bd49099c4b8fe7
 SHA512 (redmine-4.2.9.tar.gz) = b0c6cade20dbcb4dd5c88081fb44f63dc3687b3735d47572e71bfeff0e17d2e4c9281afc10cf3b9679ab1e492a71a260a1d3fac5b660af5226849ccac4e0dd36
 Size (redmine-4.2.9.tar.gz) = 3043566 bytes
-SHA1 (patch-Gemfile) = 995dc55fcf3f8b77eade831d24918b0445180366
+SHA1 (patch-Gemfile) = 9b2e4d2ebe70fa34ed2ec2535b60e8faddb0543c
 SHA1 (patch-lib_tasks_initializers.rake) = 73c4594c94abd28e628bbd172565b161f0e54fff

Index: pkgsrc/devel/ruby-redmine42/patches/patch-Gemfile
diff -u pkgsrc/devel/ruby-redmine42/patches/patch-Gemfile:1.8 pkgsrc/devel/ruby-redmine42/patches/patch-Gemfile:1.9
--- pkgsrc/devel/ruby-redmine42/patches/patch-Gemfile:1.8       Sat Dec  3 06:40:09 2022
+++ pkgsrc/devel/ruby-redmine42/patches/patch-Gemfile   Sun Jan 15 15:09:32 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-Gemfile,v 1.8 2022/12/03 06:40:09 taca Exp $
+$NetBSD: patch-Gemfile,v 1.9 2023/01/15 15:09:32 taca Exp $
 
 Relax dependency.
 
 --- Gemfile.orig       2022-12-01 15:40:06.000000000 +0000
 +++ Gemfile
-@@ -3,17 +3,17 @@ source 'https://rubygems.org'
+@@ -3,25 +3,25 @@ source 'https://rubygems.org'
  ruby '>= 2.4.0', '< 2.8.0'
  gem 'bundler', '>= 1.12.0'
  
@@ -26,15 +26,25 @@ Relax dependency.
  gem 'nokogiri', (if Gem.ruby_version < Gem::Version.new('2.5.0')
                     '~> 1.10.10'
                   elsif Gem.ruby_version < Gem::Version.new('2.6.0')
-@@ -21,7 +21,7 @@ gem 'nokogiri', (if Gem.ruby_version < G
+                    '~> 1.12.5'
                   else
-                    '~> 1.13.6'
+-                   '~> 1.13.6'
++                   '~> 1.13'
                   end)
 -gem 'i18n', '~> 1.8.2'
 +gem 'i18n', '~> 1.8'
  gem "rbpdf", "~> 1.20.0"
  gem 'addressable'
  gem 'rubyzip', '~> 2.3.0'
+@@ -47,7 +47,7 @@ end
+ 
+ # Optional gem for exporting the gantt to a PNG file
+ group :minimagick do
+-  gem 'mini_magick', '~> 4.11.0'
++  gem 'mini_magick', '>= 4.11.0'
+ end
+ 
+ # Optional Markdown support, not for JRuby
 @@ -70,7 +70,7 @@ if File.exist?(database_file)
        when 'mysql2'
          gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw]