CVS commit: pkgsrc/devel/ruby-redmine60

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Feb 11 07:51:15 UTC 2026

Modified Files:
        pkgsrc/devel/ruby-redmine60: INSTALL Makefile PLIST distinfo options.mk
        pkgsrc/devel/ruby-redmine60/patches: patch-Gemfile
Added Files:
        pkgsrc/devel/ruby-redmine60/files: README-pkgsrc
Removed Files:
        pkgsrc/devel/ruby-redmine60: MESSAGE

Log Message:
devel/ruby-redmine60: package overhaul

* Move MESSAGE to README-pkgsrc.
* Change dependency to textproc/ruby-actionpack-xml_parser.
* Fix various dependency in Gemfile.
* Add dependency to databases/ruby-with_advisory_lock53 with mysql option.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ruby-redmine60/INSTALL \
    pkgsrc/devel/ruby-redmine60/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/ruby-redmine60/MESSAGE
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ruby-redmine60/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ruby-redmine60/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ruby-redmine60/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ruby-redmine60/files/README-pkgsrc
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ruby-redmine60/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-redmine60/INSTALL
diff -u pkgsrc/devel/ruby-redmine60/INSTALL:1.1 pkgsrc/devel/ruby-redmine60/INSTALL:1.2
--- pkgsrc/devel/ruby-redmine60/INSTALL:1.1     Fri Dec 13 17:19:28 2024
+++ pkgsrc/devel/ruby-redmine60/INSTALL Wed Feb 11 07:51:14 2026
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: INSTALL,v 1.1 2024/12/13 17:19:28 taca Exp $
+# $NetBSD: INSTALL,v 1.2 2026/02/11 07:51:14 taca Exp $
 
 WWWGRP="@WWWGRP@"
 WWWOWN="@WWWOWN@"
@@ -9,6 +9,8 @@ RM_DIR="@PREFIX@/@RM_DIR@"
 case "${STAGE}" in
 POST-INSTALL)
        cd ${RM_DIR} &&
+               bundle@RUBY_SUFFIX@ config \
+                       set --local without 'development test'
                ${CHOWN} -R ${WWWOWN} ${RM_DIR}
                ${CHGRP} -R ${WWWGRP} ${RM_DIR}
        ;;
Index: pkgsrc/devel/ruby-redmine60/options.mk
diff -u pkgsrc/devel/ruby-redmine60/options.mk:1.1 pkgsrc/devel/ruby-redmine60/options.mk:1.2
--- pkgsrc/devel/ruby-redmine60/options.mk:1.1  Fri Dec 13 17:19:28 2024
+++ pkgsrc/devel/ruby-redmine60/options.mk      Wed Feb 11 07:51:14 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2024/12/13 17:19:28 taca Exp $
+# $NetBSD: options.mk,v 1.2 2026/02/11 07:51:14 taca Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.redmine60
 
@@ -16,6 +16,7 @@ PLIST_VARS+=                  unicorn
 ###
 .if !empty(PKG_OPTIONS:Mmysql)
 DEPENDS+=      ${RUBY_PKGPREFIX}-mysql2>=0.5.0<0.6:../../databases/ruby-mysql2
+DEPENDS+=      ${RUBY_PKGPREFIX}-with_advisory_lock53>=5.3.0<6:../../databases/ruby-with_advisory_lock53
 .elif !empty(PKG_OPTIONS:Mpgsql)
 DEPENDS+=      ${RUBY_PKGPREFIX}-pg>=1.5.3<2.0:../../databases/ruby-pg
 .elif !empty(PKG_OPTIONS:Msqlite3)

Index: pkgsrc/devel/ruby-redmine60/Makefile
diff -u pkgsrc/devel/ruby-redmine60/Makefile:1.11 pkgsrc/devel/ruby-redmine60/Makefile:1.12
--- pkgsrc/devel/ruby-redmine60/Makefile:1.11   Sun Jan 18 15:51:11 2026
+++ pkgsrc/devel/ruby-redmine60/Makefile        Wed Feb 11 07:51:14 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2026/01/18 15:51:11 taca Exp $
+# $NetBSD: Makefile,v 1.12 2026/02/11 07:51:14 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/
 
@@ -29,7 +30,7 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-rouge>=4.5.0
 
 # ruby-mail depends it.
 #DEPENDS+=     ${RUBY_PKGPREFIX}-mini_mime>=1.1.0<1.2:../../mail/ruby-mini_mime
-DEPENDS+=      ${RUBY_PKGPREFIX}-actionpack${RUBY_RAILS}-xml_parser>=2.0:../../textproc/ruby-actionpack-xml_parser
+DEPENDS+=      ${RUBY_PKGPREFIX}-actionpack-xml_parser>=2.0:../../textproc/ruby-actionpack-xml_parser
 DEPENDS+=      ${RUBY_PKGPREFIX}-roadie-rails32_${RUBY_RAILS}>=3.2.0<3.3:../../mail/ruby-roadie-rails32
 DEPENDS+=      ${RUBY_PKGPREFIX}-marcel>=1.0.0:../../devel/ruby-marcel
 DEPENDS+=      ${RUBY_PKGPREFIX}-mail>=2.8.1<2.9:../../mail/ruby-mail
@@ -55,11 +56,12 @@ REPLACE_RUBY+=      bin/*
 REPLACE_RUBY+= extra/mail_handler/rdm-mailhandler.rb
 REPLACE_RUBY+= extra/svn/reposman.rb
 
-SUBST_CLASSES+=                shell
-SUBST_FILES.shell=     ${DESTDIR}${PREFIX}/bin/redmine60_*${RUBY_SUFFIX}.sh
-SUBST_MESSAGE.shell=   Fixing paths in helper shell scripts.
-SUBST_VARS.shell=      PREFIX RUBY RM_DIR
-SUBST_STAGE.shell=     post-install
+SUBST_CLASSES+=                path
+SUBST_FILES.path+=     ${DESTDIR}${PREFIX}/bin/redmine60_*${RUBY_SUFFIX}.sh
+SUBST_FILES.path+=     ${DESTDIR}${PREFIX}/${RM_DIR}/README-pkgsrc
+SUBST_MESSAGE.path=    Fixing paths in helper shell scripts and documents.
+SUBST_VARS.path=       PREFIX RM_DIR RM_VER RUBY RUBY_SUFFIX RCD_SCRIPTS_DIR
+SUBST_STAGE.path=      post-install
 
 EGDIR=         ${PREFIX}/share/examples/${RUBY_PKGPREFIX}-redmine60
 INSTALLATION_DIRS=     bin ${EGDIR} ${RM_DIR} ${RM_DIR}/config
@@ -71,6 +73,7 @@ CONF_FILES+=  ${EGDIR}/database.yml.examp
 CONF_FILES+=   ${EGDIR}/additional_environment.rb.example \
                        ${RM_DIR}/config/additional_environment.rb
 REQD_FILES+=   /dev/null ${RM_DIR}/Gemfile.lock
+OWN_DIRS+=     ${RM_DIR}/.bundle
 
 PKG_GROUPS=    ${APACHE_GROUP}
 PKG_USERS=     ${APACHE_USER}:${APACHE_GROUP}
@@ -91,6 +94,7 @@ do-install:
                ${DESTDIR}${PREFIX}/bin/redmine60_migrate_db${RUBY_SUFFIX}.sh
        ${INSTALL_SCRIPT} ${FILESDIR}/redmine60_load_default_data.sh \
                ${DESTDIR}${PREFIX}/bin/redmine60_load_default_data${RUBY_SUFFIX}.sh
+       ${INSTALL_DATA} ${FILESDIR}/README-pkgsrc ${DESTDIR}${PREFIX}/${RM_DIR}
 
 post-install: unicorn-post-install
        ${FIND} ${DESTDIR}${PREFIX} -name '.*' -exec ${RM} -rf {} +

Index: pkgsrc/devel/ruby-redmine60/PLIST
diff -u pkgsrc/devel/ruby-redmine60/PLIST:1.5 pkgsrc/devel/ruby-redmine60/PLIST:1.6
--- pkgsrc/devel/ruby-redmine60/PLIST:1.5       Sun Jan 18 15:51:11 2026
+++ pkgsrc/devel/ruby-redmine60/PLIST   Wed Feb 11 07:51:14 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2026/01/18 15:51:11 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2026/02/11 07:51:14 taca Exp $
 bin/redmine60_generate_secret_token${RUBY_SUFFIX}.sh
 bin/redmine60_load_default_data${RUBY_SUFFIX}.sh
 bin/redmine60_migrate_db${RUBY_SUFFIX}.sh
@@ -11,6 +11,7 @@ ${RM_DIR}/CONTRIBUTING.md
 ${RM_DIR}/Gemfile
 ${PLIST.unicorn}${RM_DIR}/Gemfile.local
 ${RM_DIR}/LICENSE.txt
+${RM_DIR}/README-pkgsrc
 ${RM_DIR}/README.rdoc
 ${RM_DIR}/Rakefile
 ${RM_DIR}/app/assets/fonts/NotoSans-Bold.woff2

Index: pkgsrc/devel/ruby-redmine60/distinfo
diff -u pkgsrc/devel/ruby-redmine60/distinfo:1.7 pkgsrc/devel/ruby-redmine60/distinfo:1.8
--- pkgsrc/devel/ruby-redmine60/distinfo:1.7    Sun Jan 18 15:51:11 2026
+++ pkgsrc/devel/ruby-redmine60/distinfo        Wed Feb 11 07:51:14 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2026/01/18 15:51:11 taca Exp $
+$NetBSD: distinfo,v 1.8 2026/02/11 07:51:14 taca Exp $
 
 BLAKE2s (redmine-6.0.8.tar.gz) = 0273e56a7df7e0edc093fbad6174c38e71aa09236b8ce32a650ce7ecb6c4282b
 SHA512 (redmine-6.0.8.tar.gz) = c0005a8cf7f8208a96a77b81820bb4520ca69d24692248f02e36c225c53b84b11d84f1bc56e227064d956c371426a85f0f9f5f3676f5a189f984b58a429cd75a
 Size (redmine-6.0.8.tar.gz) = 4070190 bytes
-SHA1 (patch-Gemfile) = 400b8c6463dddcd20f2161f1d4081d1a547efce4
+SHA1 (patch-Gemfile) = e1c60b6da33cb638018ef5215955e15753912ccc
 SHA1 (patch-config_additional__environment.rb.example) = 7ad913800c5f31fdd9b71aa92294bdbeea7b77fe
 SHA1 (patch-lib_redmine_scm_adapters_mercurial_redminehelper.py) = 87db1005896b2a962b8b93ec5b5b7d313ae6f691
 SHA1 (patch-lib_tasks_initializers.rake) = d5ccb73cff6baedee9dfbe7563e25925f1ff9d85

Index: pkgsrc/devel/ruby-redmine60/patches/patch-Gemfile
diff -u pkgsrc/devel/ruby-redmine60/patches/patch-Gemfile:1.5 pkgsrc/devel/ruby-redmine60/patches/patch-Gemfile:1.6
--- pkgsrc/devel/ruby-redmine60/patches/patch-Gemfile:1.5       Sun Jan 18 15:51:11 2026
+++ pkgsrc/devel/ruby-redmine60/patches/patch-Gemfile   Wed Feb 11 07:51:14 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-Gemfile,v 1.5 2026/01/18 15:51:11 taca Exp $
+$NetBSD: patch-Gemfile,v 1.6 2026/02/11 07:51:14 taca Exp $
 
 * Relax dependency.
 * Do not load gem for developemt and test.
@@ -75,3 +75,19 @@ $NetBSD: patch-Gemfile,v 1.5 2026/01/18 
        when /sqlserver/
          gem 'tiny_tds', '~> 2.1.2'
          gem 'activerecord-sqlserver-adapter', '~> 7.2.0'
+@@ -94,6 +94,7 @@ group :development, :test do
+   gem 'debug'
+ end
+ 
++if false
+ group :development do
+   gem 'listen', '~> 3.3'
+   gem 'yard', require: false
+@@ -118,6 +119,7 @@ group :test do
+   # `bin/rails test` fails at startup with minitest >= 6.0
+   gem 'minitest', '< 6.0'
+ end
++end
+ 
+ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+ if File.exist?(local_gemfile)

Added files:

Index: pkgsrc/devel/ruby-redmine60/files/README-pkgsrc
diff -u /dev/null pkgsrc/devel/ruby-redmine60/files/README-pkgsrc:1.1
--- /dev/null   Wed Feb 11 07:51:15 2026
+++ pkgsrc/devel/ruby-redmine60/files/README-pkgsrc     Wed Feb 11 07:51:14 2026
@@ -0,0 +1,73 @@
+===========================================================================
+$NetBSD: README-pkgsrc,v 1.1 2026/02/11 07:51:14 taca Exp $
+
+To use Redmine with nginx, you will need to perform the following steps.
+For more information, please refer
+<https://www.redmine.org/projects/redmine/wiki/RedmineInstall>.
+
+1. If you want to use with MySQL server (by default), install
+   databases/mysql80-* (or mariadb) and enable it.
+   Then, create the database.
+
+2. Install nginx httpd server, www/nginx.
+
+3. Setup Redmine database:
+
+       $ mysql -u root -p
+       > create database redmine character set utf8;
+       > create database redmine_development character set utf8;
+       > create user 'redmine'@'localhost' identified by 'redmine_password';
+       > grant all privileges on redmine.* to 'redmine'@'localhost';
+       > grant all privileges on redmine_development.* to 'redmine'@'localhost';
+
+4. Set the database password for the redmine and redmine_development databases
+   in @PREFIX@/@RM_DIR@/config/database.yml;
+
+5. Create secret token and write to
+   @PREFIX@/@RM_DIR@/config/configuration.yml
+
+       # redmine@RM_VER@_generate_secret_token@RUBY_SUFFIX@.sh
+       # vi config/configuration.yml
+         [...]
+         secret_token: 'YOUR_SECRET_KEY'
+         [...]
+
+6. Import some data to Redmine database, select your locale, and migrate the DB:
+
+       # redmine@RM_VER@_migrate_db@RUBY_SUFFIX@.sh
+
+7. Setup nginx.
+
+       # vi @PREFIX@/etc/nginx/nginx.conf
+       http {
+       upstream unicorn_redmine {
+               server unix:@PREFIX@/@RM_DIR@/unicorn.redmine.sock fail_timeout=0;
+       }
+       server {
+       listen       80;
+       server_name  localhost;
+
+       root @PREFIX@/@RM_DIR@;
+       try_files $uri @unicorn_redmine;
+
+       location @unicorn_redmine {
+               proxy_set_header Host $http_host;
+               proxy_pass http://unicorn_redmine;
+       }
+
+       error_page   500 502 503 504  /50x.html;
+               location = /50x.html {
+               root   share/examples/nginx/html;
+       }
+       }
+
+8. Start Redmine with Unicorn.
+
+       # @RCD_SCRIPTS_DIR@/redmine@RM_VER@_unicorn@RUBY_SUFFIX@ start
+
+9. Start nginx.
+
+       # @RCD_SCRIPTS_DIR@/nginx start
+
+10. Access Redmine with username: admin and password: admin.
+===========================================================================