CVS commit: pkgsrc/devel/ruby-redmine42

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue Jan 18 13:35:42 UTC 2022

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 ruby-csv.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/ruby-redmine42/Makefile \
    pkgsrc/devel/ruby-redmine42/distinfo
cvs rdiff -u -r1.3 -r1.4 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.6 pkgsrc/devel/ruby-redmine42/Makefile:1.7
--- pkgsrc/devel/ruby-redmine42/Makefile:1.6    Sun Dec 19 14:03:56 2021
+++ pkgsrc/devel/ruby-redmine42/Makefile        Tue Jan 18 13:35:42 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2021/12/19 14:03:56 taca Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/18 13:35:42 taca Exp $
 
 DISTNAME=      redmine-${RM_VERSION}
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/redmine/redmine${RM_VER}/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel
 MASTER_SITES=  https://www.redmine.org/releases/
 
@@ -19,7 +19,7 @@ RUBY_VERSIONS_ACCEPTED=       26 27
 
 RUBY_RAILS_ACCEPTED=   52
 
-OVERRIDE_GEMSPEC+=     nokogiri>=1.11.0 mini_mime>=1.0.1
+OVERRIDE_GEMSPEC+=     nokogiri>=1.11.0 mini_mime>=1.0.1 csv>=3.1.1
 
 .include "../../lang/ruby/modules.mk"
 
@@ -33,7 +33,7 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-actionpack${
 DEPENDS+=      ${RUBY_PKGPREFIX}-roadie-rails${RUBY_RAILS}>=2.2.0<2.3:../../mail/ruby-roadie-rails
 DEPENDS+=      ${RUBY_PKGPREFIX}-marcel>=1.0.0:../../devel/ruby-marcel
 DEPENDS+=      ${RUBY_PKGPREFIX}-mail>=2.7.1<2.8:../../mail/ruby-mail
-DEPENDS+=      ${RUBY_PKGPREFIX}-csv>=3.1.1<3.2:../../textproc/ruby-csv
+DEPENDS+=      ${RUBY_PKGPREFIX}-csv>=3.1.1:../../textproc/ruby-csv
 DEPENDS+=      ${RUBY_PKGPREFIX}-nokogiri>=1.11.1:../../textproc/ruby-nokogiri
 DEPENDS+=      ${RUBY_PKGPREFIX}-i18n>=1.8.2<1.9:../../devel/ruby-i18n
 DEPENDS+=      ${RUBY_PKGPREFIX}-rbpdf>=1.20.0<1.21:../../print/ruby-rbpdf
Index: pkgsrc/devel/ruby-redmine42/distinfo
diff -u pkgsrc/devel/ruby-redmine42/distinfo:1.6 pkgsrc/devel/ruby-redmine42/distinfo:1.7
--- pkgsrc/devel/ruby-redmine42/distinfo:1.6    Sun Dec 19 15:22:15 2021
+++ pkgsrc/devel/ruby-redmine42/distinfo        Tue Jan 18 13:35:42 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2021/12/19 15:22:15 taca Exp $
+$NetBSD: distinfo,v 1.7 2022/01/18 13:35:42 taca Exp $
 
 BLAKE2s (redmine-4.2.3.tar.gz) = f9a7aa9bdedda2c5432f874e59cf24c2ca9b014379d158a88a7501f918510cd0
 SHA512 (redmine-4.2.3.tar.gz) = 456117b0d5d72ee58c87def84327e29f79937fa71098b48a80103e3e6653648c0df46afcc4f533803384ba7413e690538deeee33e263d86dd9e4e5dec65144e3
 Size (redmine-4.2.3.tar.gz) = 3039136 bytes
-SHA1 (patch-Gemfile) = 55b067e5b172156cac90c0f38dcf7626d58b7150
+SHA1 (patch-Gemfile) = 51c230536189c2c4d25e53b2608c663a52bccac8
 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.3 pkgsrc/devel/ruby-redmine42/patches/patch-Gemfile:1.4
--- pkgsrc/devel/ruby-redmine42/patches/patch-Gemfile:1.3       Sun Dec 19 14:03:57 2021
+++ pkgsrc/devel/ruby-redmine42/patches/patch-Gemfile   Tue Jan 18 13:35:42 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-Gemfile,v 1.3 2021/12/19 14:03:57 taca Exp $
+$NetBSD: patch-Gemfile,v 1.4 2022/01/18 13:35:42 taca Exp $
 
 Relax dependency.
 
 --- Gemfile.orig       2021-10-10 03:00:39.000000000 +0000
 +++ Gemfile
-@@ -3,10 +3,10 @@ source 'https://rubygems.org'
+@@ -3,17 +3,17 @@ source 'https://rubygems.org'
  ruby '>= 2.4.0', '< 2.8.0'
  gem 'bundler', '>= 1.12.0'
  
@@ -17,6 +17,14 @@ Relax dependency.
  gem 'request_store', '~> 1.5.0'
  gem "mini_mime", "~> 1.0.1"
  gem "actionpack-xml_parser"
+ gem 'roadie-rails', (RUBY_VERSION < '2.5' ? '~> 1.3.0' : '~> 2.2.0')
+ gem 'marcel'
+ gem "mail", "~> 2.7.1"
+-gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '~> 3.1.1')
++gem 'csv', (RUBY_VERSION < '2.5' ? ['>= 3.1.1', '<= 3.1.5'] : '>= 3.1.1')
+ gem 'nokogiri', (RUBY_VERSION < '2.5' ? '~> 1.10.0' : '~> 1.11.1')
+ gem 'i18n', '~> 1.8.2'
+ gem "rbpdf", "~> 1.20.0"
 @@ -79,26 +79,6 @@ else
    warn("Please configure your config/database.yml first")
  end