devel/ruby-redmine50: relax dependency Remove upper bound version for ruby-sqlite3 dependency. Bump PKGREVISION.diff -r1.19 -r1.20 pkgsrc/devel/ruby-redmine50/Makefile
(taca)
@@ -1,17 +1,18 @@ | @@ -1,17 +1,18 @@ | |||
1 | # $NetBSD: Makefile,v 1.19 2024/03/10 15:20:02 taca Exp $ | 1 | # $NetBSD: Makefile,v 1.20 2024/05/05 14:42:01 taca Exp $ | |
2 | 2 | |||
3 | DISTNAME= redmine-${RM_VERSION} | 3 | DISTNAME= redmine-${RM_VERSION} | |
4 | PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/redmine/redmine${RM_VER}/} | 4 | PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/redmine/redmine${RM_VER}/} | |
5 | PKGREVISION= 1 | |||
5 | CATEGORIES= devel | 6 | CATEGORIES= devel | |
6 | MASTER_SITES= https://www.redmine.org/releases/ | 7 | MASTER_SITES= https://www.redmine.org/releases/ | |
7 | 8 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= https://www.redmine.org/ | 10 | HOMEPAGE= https://www.redmine.org/ | |
10 | COMMENT= Flexible project management web application | 11 | COMMENT= Flexible project management web application | |
11 | LICENSE= gnu-gpl-v2 # and so on. | 12 | LICENSE= gnu-gpl-v2 # and so on. | |
12 | 13 | |||
13 | RM_VERSION= 5.0.8 | 14 | RM_VERSION= 5.0.8 | |
14 | 15 | |||
15 | NO_BUILD= yes | 16 | NO_BUILD= yes | |
16 | 17 | |||
17 | RUBY_VERSIONS_ACCEPTED= 31 | 18 | RUBY_VERSIONS_ACCEPTED= 31 |
@@ -1,9 +1,9 @@ | @@ -1,9 +1,9 @@ | |||
1 | $NetBSD: distinfo,v 1.11 2024/03/10 15:20:02 taca Exp $ | 1 | $NetBSD: distinfo,v 1.12 2024/05/05 14:42:01 taca Exp $ | |
2 | 2 | |||
3 | BLAKE2s (redmine-5.0.8.tar.gz) = 5eddbf1ec9879585f9f18a9395a69ebee4457e1c691813f75bcec62a458eb26d | 3 | BLAKE2s (redmine-5.0.8.tar.gz) = 5eddbf1ec9879585f9f18a9395a69ebee4457e1c691813f75bcec62a458eb26d | |
4 | SHA512 (redmine-5.0.8.tar.gz) = 12eb5c4ef90c512b747283b8b2e167157775867d60bc0d8fdec7bcd79ebfa6a86bd8bcd8d9b3acab99fbc8670543c456f12bf699e9d59aafb7b7446ae8ed1123 | 4 | SHA512 (redmine-5.0.8.tar.gz) = 12eb5c4ef90c512b747283b8b2e167157775867d60bc0d8fdec7bcd79ebfa6a86bd8bcd8d9b3acab99fbc8670543c456f12bf699e9d59aafb7b7446ae8ed1123 | |
5 | Size (redmine-5.0.8.tar.gz) = 3150853 bytes | 5 | Size (redmine-5.0.8.tar.gz) = 3150853 bytes | |
6 | SHA1 (patch-Gemfile) = 0cb9f6c75a746edea91b10d13e833a0b4887c69f | 6 | SHA1 (patch-Gemfile) = fad9c75653ef362d4d179395dcbc5f15d7bbdd13 | |
7 | SHA1 (patch-config_additional__environment.rb.example) = 7ad913800c5f31fdd9b71aa92294bdbeea7b77fe | 7 | SHA1 (patch-config_additional__environment.rb.example) = 7ad913800c5f31fdd9b71aa92294bdbeea7b77fe | |
8 | SHA1 (patch-lib_redmine_scm_adapters_mercurial_redminehelper.py) = 87db1005896b2a962b8b93ec5b5b7d313ae6f691 | 8 | SHA1 (patch-lib_redmine_scm_adapters_mercurial_redminehelper.py) = 87db1005896b2a962b8b93ec5b5b7d313ae6f691 | |
9 | SHA1 (patch-lib_tasks_initializers.rake) = 73c4594c94abd28e628bbd172565b161f0e54fff | 9 | SHA1 (patch-lib_tasks_initializers.rake) = 73c4594c94abd28e628bbd172565b161f0e54fff |
@@ -1,35 +1,35 @@ | @@ -1,35 +1,35 @@ | |||
1 | # $NetBSD: options.mk,v 1.1 2022/09/03 13:53:58 taca Exp $ | 1 | # $NetBSD: options.mk,v 1.2 2024/05/05 14:42:01 taca Exp $ | |
2 | 2 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.redmine50 | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.redmine50 | |
4 | 4 | |||
5 | PKG_OPTIONS_REQUIRED_GROUPS= db | 5 | PKG_OPTIONS_REQUIRED_GROUPS= db | |
6 | PKG_OPTIONS_GROUP.db= mysql pgsql sqlite3 # mssql | 6 | PKG_OPTIONS_GROUP.db= mysql pgsql sqlite3 # mssql | |
7 | PKG_SUPPORTED_OPTIONS+= ruby-unicorn | 7 | PKG_SUPPORTED_OPTIONS+= ruby-unicorn | |
8 | PKG_SUGGESTED_OPTIONS= mysql ruby-unicorn | 8 | PKG_SUGGESTED_OPTIONS= mysql ruby-unicorn | |
9 | 9 | |||
10 | PLIST_VARS+= unicorn | 10 | PLIST_VARS+= unicorn | |
11 | 11 | |||
12 | .include "../../mk/bsd.options.mk" | 12 | .include "../../mk/bsd.options.mk" | |
13 | 13 | |||
14 | ### | 14 | ### | |
15 | ### Use mysql, pgsql, or sqlite3 backend | 15 | ### Use mysql, pgsql, or sqlite3 backend | |
16 | ### | 16 | ### | |
17 | .if !empty(PKG_OPTIONS:Mmysql) | 17 | .if !empty(PKG_OPTIONS:Mmysql) | |
18 | DEPENDS+= ${RUBY_PKGPREFIX}-mysql2>=0.5.0<0.6:../../databases/ruby-mysql2 | 18 | DEPENDS+= ${RUBY_PKGPREFIX}-mysql2>=0.5.0<0.6:../../databases/ruby-mysql2 | |
19 | .elif !empty(PKG_OPTIONS:Mpgsql) | 19 | .elif !empty(PKG_OPTIONS:Mpgsql) | |
20 | DEPENDS+= ${RUBY_PKGPREFIX}-pg>=1.2.2<2.0:../../databases/ruby-pg | 20 | DEPENDS+= ${RUBY_PKGPREFIX}-pg>=1.2.2<2.0:../../databases/ruby-pg | |
21 | .elif !empty(PKG_OPTIONS:Msqlite3) | 21 | .elif !empty(PKG_OPTIONS:Msqlite3) | |
22 | DEPENDS+= ${RUBY_PKGPREFIX}-sqlite3>=1.4.0<1.5:../../databases/ruby-sqlite3 | 22 | DEPENDS+= ${RUBY_PKGPREFIX}-sqlite3>=1.4.0:../../databases/ruby-sqlite3 | |
23 | .endif | 23 | .endif | |
24 | 24 | |||
25 | ### | 25 | ### | |
26 | ### Use Unicorn web server | 26 | ### Use Unicorn web server | |
27 | ### | 27 | ### | |
28 | .if !empty(PKG_OPTIONS:Mruby-unicorn) || make (distinfo) || make (mdi) | 28 | .if !empty(PKG_OPTIONS:Mruby-unicorn) || make (distinfo) || make (mdi) | |
29 | DEPENDS+= ${RUBY_PKGPREFIX}-unicorn-[0-9]*:../../www/ruby-unicorn | 29 | DEPENDS+= ${RUBY_PKGPREFIX}-unicorn-[0-9]*:../../www/ruby-unicorn | |
30 | 30 | |||
31 | PLIST.unicorn= yes | 31 | PLIST.unicorn= yes | |
32 | 32 | |||
33 | SUBST_CLASSES+= prefix | 33 | SUBST_CLASSES+= prefix | |
34 | SUBST_STAGE.prefix= pre-install | 34 | SUBST_STAGE.prefix= pre-install | |
35 | SUBST_MESSAGE.prefix= Setting PREFIX, RUBY_SUFFIX and RM_DIR. | 35 | SUBST_MESSAGE.prefix= Setting PREFIX, RUBY_SUFFIX and RM_DIR. |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-Gemfile,v 1.9 2024/03/10 15:20:02 taca Exp $ | 1 | $NetBSD: patch-Gemfile,v 1.10 2024/05/05 14:42:01 taca Exp $ | |
2 | 2 | |||
3 | * Relax dependency. | 3 | * Relax dependency. | |
4 | * Do not load gem for developemt and test. | 4 | * Do not load gem for developemt and test. | |
5 | 5 | |||
6 | --- Gemfile.orig 2024-03-04 19:55:01.000000000 +0000 | 6 | --- Gemfile.orig 2024-03-04 19:55:01.000000000 +0000 | |
7 | +++ Gemfile | 7 | +++ Gemfile | |
8 | @@ -3,9 +3,9 @@ source 'https://rubygems.org' | 8 | @@ -3,9 +3,9 @@ source 'https://rubygems.org' | |
9 | ruby '>= 2.5.0', '< 3.2.0' | 9 | ruby '>= 2.5.0', '< 3.2.0' | |
10 | gem 'bundler', '>= 1.12.0' | 10 | gem 'bundler', '>= 1.12.0' | |
11 | 11 | |||
12 | -gem 'rails', '6.1.7.7' | 12 | -gem 'rails', '6.1.7.7' | |
13 | +gem 'rails', '~> 6.1.7' | 13 | +gem 'rails', '~> 6.1.7' | |
14 | gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') | 14 | gem 'globalid', '~> 0.4.2' if Gem.ruby_version < Gem::Version.new('2.6.0') | |
@@ -44,35 +44,38 @@ $NetBSD: patch-Gemfile,v 1.9 2024/03/10 | @@ -44,35 +44,38 @@ $NetBSD: patch-Gemfile,v 1.9 2024/03/10 | |||
44 | + gem 'mini_magick', '>= 4.11.0' | 44 | + gem 'mini_magick', '>= 4.11.0' | |
45 | end | 45 | end | |
46 | 46 | |||
47 | # Optional Markdown support, not for JRuby | 47 | # Optional Markdown support, not for JRuby | |
48 | @@ -54,7 +54,7 @@ gem 'redcarpet', '~> 3.5.1', groups: [:m | 48 | @@ -54,7 +54,7 @@ gem 'redcarpet', '~> 3.5.1', groups: [:m | |
49 | 49 | |||
50 | # Optional CommonMark support, not for JRuby | 50 | # Optional CommonMark support, not for JRuby | |
51 | group :common_mark do | 51 | group :common_mark do | |
52 | - gem "html-pipeline", "~> 2.13.2" | 52 | - gem "html-pipeline", "~> 2.13.2" | |
53 | + gem "html-pipeline", "~> 2.13" | 53 | + gem "html-pipeline", "~> 2.13" | |
54 | gem "commonmarker", (Gem.ruby_version < Gem::Version.new('2.6.0') ? '0.21.0' : '~> 0.23.8') | 54 | gem "commonmarker", (Gem.ruby_version < Gem::Version.new('2.6.0') ? '0.21.0' : '~> 0.23.8') | |
55 | gem "sanitize", "~> 6.0" | 55 | gem "sanitize", "~> 6.0" | |
56 | gem 'deckar01-task_list', '2.3.2' | 56 | gem 'deckar01-task_list', '2.3.2' | |
57 | @@ -75,7 +75,7 @@ if File.exist?(database_file) | 57 | @@ -75,9 +75,9 @@ if File.exist?(database_file) | |
58 | when 'mysql2' | 58 | when 'mysql2' | |
59 | gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] | 59 | gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] | |
60 | when /postgresql/ | 60 | when /postgresql/ | |
61 | - gem "pg", "~> 1.2.2", :platforms => [:mri, :mingw, :x64_mingw] | 61 | - gem "pg", "~> 1.2.2", :platforms => [:mri, :mingw, :x64_mingw] | |
62 | + gem "pg", "~> 1.2", :platforms => [:mri, :mingw, :x64_mingw] | 62 | + gem "pg", "~> 1.2", :platforms => [:mri, :mingw, :x64_mingw] | |
63 | when /sqlite3/ | 63 | when /sqlite3/ | |
64 | gem "sqlite3", "~> 1.4.0", :platforms => [:mri, :mingw, :x64_mingw] | 64 | - gem "sqlite3", "~> 1.4.0", :platforms => [:mri, :mingw, :x64_mingw] | |
65 | + gem "sqlite3", ">= 1.4.0", :platforms => [:mri, :mingw, :x64_mingw] | |||
65 | when /sqlserver/ | 66 | when /sqlserver/ | |
67 | gem "tiny_tds", "~> 2.1.2", :platforms => [:mri, :mingw, :x64_mingw] | |||
68 | gem "activerecord-sqlserver-adapter", "~> 6.1.0", :platforms => [:mri, :mingw, :x64_mingw] | |||
66 | @@ -92,6 +92,7 @@ else | 69 | @@ -92,6 +92,7 @@ else | |
67 | warn("Please configure your config/database.yml first") | 70 | warn("Please configure your config/database.yml first") | |
68 | end | 71 | end | |
69 | 72 | |||
70 | +if false | 73 | +if false | |
71 | group :development do | 74 | group :development do | |
72 | gem 'listen', '~> 3.3' | 75 | gem 'listen', '~> 3.3' | |
73 | gem "yard" | 76 | gem "yard" | |
74 | @@ -118,6 +119,7 @@ group :test do | 77 | @@ -118,6 +119,7 @@ group :test do | |
75 | gem 'rubocop-performance', '~> 1.13.0' | 78 | gem 'rubocop-performance', '~> 1.13.0' | |
76 | gem 'rubocop-rails', '~> 2.14.0' | 79 | gem 'rubocop-rails', '~> 2.14.0' | |
77 | end | 80 | end | |
78 | +end | 81 | +end |