Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -14250,3 +14250,4 @@ sysutils/hachoir-urwid||2020-02-11|Has expired: Outdated, uses EOLed python27 sysutils/hachoir-wx||2020-02-11|Has expired: Outdated, uses EOLed python27 net/py-xmlrpc||2020-02-12|Has expired: Unmaintained, uses EOLed python27 +www/redmine4|www/redmine40|2020-02-14|Port renamed Index: www/Makefile =================================================================== --- www/Makefile +++ www/Makefile @@ -1831,7 +1831,7 @@ SUBDIR += redmine-sidebar_hide SUBDIR += redmine-single_auth SUBDIR += redmine-wiki_notes - SUBDIR += redmine4 + SUBDIR += redmine40 SUBDIR += rejik SUBDIR += reportmagic SUBDIR += repos-style Index: www/redmine4/Makefile =================================================================== --- www/redmine4/Makefile +++ www/redmine4/Makefile @@ -1,104 +0,0 @@ -# Created by: Bernhard Froehlich -# $FreeBSD$ - -PORTNAME= redmine -PORTVERSION= 4.0.5 -PORTREVISION= 4 -CATEGORIES= www -MASTER_SITES= https://www.redmine.org/releases/ -PKGNAMESUFFIX= 4 - -MAINTAINER= mikael@FreeBSD.org -COMMENT= Flexible project management web application - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/doc/COPYING - -BROKEN= conflicting dependencies - -RUN_DEPENDS= rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \ - rubygem-rails52>=5.2.4.1:www/rubygem-rails52 \ - rubygem-rouge312>=3.12.0:textproc/rubygem-rouge312 \ - rubygem-request_store>=1.0.5:devel/rubygem-request_store \ - rubygem-mini_mime>=1.0.1:mail/rubygem-mini_mime \ - rubygem-actionpack-xml_parser52>=0:textproc/rubygem-actionpack-xml_parser52 \ - rubygem-roadie-rails52>=1.3.0:mail/rubygem-roadie-rails52 \ - rubygem-mimemagic>=0:misc/rubygem-mimemagic \ - rubygem-mail>=2.7.1:mail/rubygem-mail \ - rubygem-nokogiri>=1.10.0:textproc/rubygem-nokogiri \ - rubygem-i18n>=0.7:devel/rubygem-i18n \ - rubygem-sprockets3>=3.7.2:devel/rubygem-sprockets3 \ - rubygem-rbpdf>=1.19.6:print/rubygem-rbpdf \ - rubygem-net-ldap>=0.16:net/rubygem-net-ldap \ - rubygem-ruby-openid>=2.9.2:net/rubygem-ruby-openid \ - rubygem-rack-openid>=0:www/rubygem-rack-openid \ - rubygem-rake>=0:devel/rubygem-rake - -USES= cpe -USE_RUBY= yes - -CONFLICTS_INSTALL= redmine - -NO_ARCH= yes -NO_BUILD= yes - -USERS= ${WWWOWN} -GROUPS= ${WWWGRP} -PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} -SUB_LIST= RUBY_NAME=${RUBY_NAME} - -OPTIONS_DEFINE= MYSQL POSTGRESQL MARKDOWN RMAGIC THIN -OPTIONS_DEFAULT=MYSQL MARKDOWN RMAGIC THIN -OPTIONS_SUB= yes -POSTGRESQL_DESC=Enable PostgreSQL support -MARKDOWN_DESC= Enable Markdown support -RMAGIC_DESC= Enable Gantt charts support -THIN_DESC= Use Thin WEB server -MYSQL_DESC= MySQL database support (via mysql2 rubygem) -NO_OPTIONS_SORT= yes - -MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.5.0:databases/rubygem-mysql2 -POSTGRESQL_RUN_DEPENDS= rubygem-pg>=1.1.4:databases/rubygem-pg -MARKDOWN_RUN_DEPENDS= rubygem-redcarpet>=3.4.0:textproc/rubygem-redcarpet -RMAGIC_RUN_DEPENDS= rubygem-rmagick>=2.16.0:graphics/rubygem-rmagick -THIN_RUN_DEPENDS= rubygem-thin>=1.6.2:www/rubygem-thin -THIN_SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} -THIN_VARS= USE_RC_SUBR=redmine - -post-extract: - @${RM} -r ${WRKSRC}/.hgignore ${WRKSRC}/.gitignore ${WRKSRC}/.github \ - ${WRKSRC}/files/delete.me ${WRKSRC}/log/delete.me - @${MV} ${WRKSRC}/config/settings.yml ${WRKSRC}/config/settings.yml.sample - @${MV} ${WRKSRC}/config/database.yml.example ${WRKSRC}/config/database.yml.sample - -post-patch: - @${RM} ${WRKSRC}/Gemfile.orig - -do-install: - ${MKDIR} ${STAGEDIR}${WWWDIR} - ${MKDIR} ${STAGEDIR}${WWWDIR}/bundler.d - ${MKDIR} ${STAGEDIR}${WWWDIR}/log - ${MKDIR} ${STAGEDIR}${WWWDIR}/public/plugin_assets - ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp - cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} - ${TOUCH} ${STAGEDIR}${WWWDIR}/Gemfile.lock - -do-install-MYSQL-on: - ${CP} ${FILESDIR}/mysql.rb ${STAGEDIR}${WWWDIR}/bundler.d - -do-install-POSTGRESQL-on: - ${CP} ${FILESDIR}/pg.rb ${STAGEDIR}${WWWDIR}/bundler.d - -do-install-MARKDOWN-on: - ${CP} ${FILESDIR}/markdown.rb ${STAGEDIR}${WWWDIR}/bundler.d - -do-install-RMAGIC-on: - ${CP} ${FILESDIR}/rmagic.rb ${STAGEDIR}${WWWDIR}/bundler.d - -do-install-THIN-on: - ${CP} ${FILESDIR}/thin.rb ${STAGEDIR}${WWWDIR}/bundler.d - -post-install: - (cd ${STAGEDIR}${WWWDIR} && ${RM} Gemfile.lock && bundle install --local) - -.include Index: www/redmine4/bsd.redmine.mk =================================================================== --- www/redmine4/bsd.redmine.mk +++ www/redmine4/bsd.redmine.mk @@ -1,80 +0,0 @@ -# Module that simplifies installation of Redmine plugins. -# -# Date created: 2010-09-12 -# Whom: Eygene Ryabinkin -# -# $FreeBSD$ -# -# We're assuming standard plugin installation sequence that is described -# in the https://www.redmine.org/projects/redmine/wiki/Plugins -# -# Basically, we need the following variables to be defined: -# - REDMINE_PLUGIN_NAME: the name of the plugin; -# - WWWDIR: the location of the Redmine installation; -# the default value is ${PREFIX}/www/redmine; -# the directory must lie under ${PREFIX} or such configuration -# will be IGNORE'd; -# - WRKSRC must be set to the root directory of the plugin contents: -# we will copy all objects in this directory to the plugin's -# destination directory, excluding all files named *.orig. -# -# PLIST will be generated automatically, there is no need to worry -# about it. But if you will need to use your own (even the standard -# packaging list in ${PORTDIR}/pkg-plist), set the variable PLIST -# pointing to that file. -# -# You can override the target 'do-build', but in this case, you should -# remember that the target named 'redmine-plugin-plist' does the -# automated generation of the PLIST: use it if you need. -# -# -# Here is an example of a simple Makefile for Redmine plugin: -# {{{ -# PORTNAME= me-the-plugin -# PORTVERSION= 1.0 -# CATEGORIES= www -# MASTER_SITES= http://cool.org.name/some/path/ -# -# MAINTAINER= you@your.org -# COMMENT= Another cool plugin for Redmine -# -# REDMINE_PLUGIN_NAME= redmine_http_auth -# -# .include "${.CURDIR}/../../www/redmine/bsd.redmine.mk" -# }}} - -PKGNAMEPREFIX?= redmine- - -RUN_DEPENDS+= redmine>=2.0:www/redmine - -USE_RUBY= yes -.if !defined(PLIST) -PLIST= ${WRKDIR}/PLIST -_GEN_PLIST= YesPlease -.endif - -WWWDIR?= ${PREFIX}/www/redmine -WWWDIR_REL= ${WWWDIR:S|^${PREFIX}/||} - -.if ${WWWDIR_REL} == ${WWWDIR} -IGNORE= WWWDIR is not a child of PREFIX (${PREFIX}) -.endif - -.if !defined(do-build) -do-build: redmine-plugin-plist - @${DO_NADA} -.endif - -redmine-plugin-plist: -.if defined(_GEN_PLIST) - cd ${WRKSRC} && ${FIND} . -type f | ${GREP} -v '\.orig$$' | ${SED} -e's|^\.|${WWWDIR_REL}/plugins/${REDMINE_PLUGIN_NAME}|' >> ${PLIST} - cd ${WRKSRC} && ${FIND} -d . -empty -type d | ${SED} -e's|^\.|@dir ${WWWDIR_REL}/plugins/${REDMINE_PLUGIN_NAME}|' >> ${PLIST} -.else - @${DO_NADA} -.endif - -do-install: - ${MKDIR} "${STAGEDIR}${WWWDIR}/plugins/${REDMINE_PLUGIN_NAME}" - ${TAR} -C "${WRKSRC}" -cf - --exclude '*.orig' . | ${TAR} -C "${STAGEDIR}${WWWDIR}/plugins/${REDMINE_PLUGIN_NAME}" -xf - - -.include Index: www/redmine4/distinfo =================================================================== --- www/redmine4/distinfo +++ www/redmine4/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1573401952 -SHA256 (redmine-4.0.5.tar.gz) = 64eabe6867fd5d14d1b4c584417b9b71fbb9b68a019400eeb03e1f2147c369e8 -SIZE (redmine-4.0.5.tar.gz) = 2519900 Index: www/redmine4/files/markdown.rb =================================================================== --- www/redmine4/files/markdown.rb +++ www/redmine4/files/markdown.rb @@ -1 +0,0 @@ -gem "redcarpet", ">= 3.4.0" Index: www/redmine4/files/mysql.rb =================================================================== --- www/redmine4/files/mysql.rb +++ www/redmine4/files/mysql.rb @@ -1 +0,0 @@ -gem "mysql2", "~> 0.5.0" Index: www/redmine4/files/patch-Gemfile =================================================================== --- www/redmine4/files/patch-Gemfile +++ www/redmine4/files/patch-Gemfile @@ -1,106 +0,0 @@ ---- Gemfile.orig 2019-10-19 09:33:33 UTC -+++ Gemfile -@@ -2,9 +2,9 @@ source 'https://rubygems.org' - - gem "bundler", ">= 1.5.0" - --gem "rails", "5.2.3" --gem "rouge", "~> 3.3.0" --gem "request_store", "1.0.5" -+gem "rails", "5.2.4.1" -+gem "rouge", "~> 3.12.0" -+gem "request_store", ">= 1.0.5" - gem "mini_mime", "~> 1.0.1" - gem "actionpack-xml_parser" - gem "roadie-rails", "~> 1.3.0" -@@ -13,7 +13,7 @@ gem "mail", "~> 2.7.1" - gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6" - - gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1") --gem "i18n", "~> 0.7.0" -+gem "i18n", ">= 0.7" - gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3" - - # TODO: Remove the following line when #32223 is fixed -@@ -21,7 +21,7 @@ gem "sprockets", "~> 3.7.2" - - # Windows does not include zoneinfo files, so bundle the tzinfo-data gem - gem 'tzinfo-data', platforms: [:mingw, :x64_mingw, :mswin] --gem "rbpdf", "~> 1.19.6" -+gem "rbpdf", "~> 1.19", ">= 1.19.6" - - # Optional gem for LDAP authentication - group :ldap do -@@ -34,63 +34,6 @@ group :openid do - gem "rack-openid" - end - --platforms :mri, :mingw, :x64_mingw do -- # Optional gem for exporting the gantt to a PNG file, not supported with jruby -- group :rmagick do -- gem "rmagick", "~> 2.16.0" -- end -- -- # Optional Markdown support, not for JRuby -- group :markdown do -- gem "redcarpet", "~> 3.4.0" -- end --end -- --# Include database gems for the adapters found in the database --# configuration file --require 'erb' --require 'yaml' --database_file = File.join(File.dirname(__FILE__), "config/database.yml") --if File.exist?(database_file) -- database_config = YAML::load(ERB.new(IO.read(database_file)).result) -- adapters = database_config.values.map {|c| c['adapter']}.compact.uniq -- if adapters.any? -- adapters.each do |adapter| -- case adapter -- when 'mysql2' -- gem "mysql2", "~> 0.5.0", :platforms => [:mri, :mingw, :x64_mingw] -- when /postgresql/ -- gem "pg", "~> 1.1.4", :platforms => [:mri, :mingw, :x64_mingw] -- when /sqlite3/ -- gem "sqlite3", "~>1.3.12", :platforms => [:mri, :mingw, :x64_mingw] -- when /sqlserver/ -- gem "tiny_tds", "~> 1.0.5", :platforms => [:mri, :mingw, :x64_mingw] -- gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw] -- else -- warn("Unknown database adapter `#{adapter}` found in config/database.yml, use Gemfile.local to load your own database gems") -- end -- end -- else -- warn("No adapter found in config/database.yml, please configure it first") -- end --else -- warn("Please configure your config/database.yml first") --end -- --group :development do -- gem "yard" --end -- --group :test do -- gem "rails-dom-testing" -- gem "mocha" -- gem "simplecov", "~> 0.14.1", :require => false -- # For running system tests -- gem 'puma', '~> 3.7' -- gem "capybara", '~> 2.13' -- gem "selenium-webdriver" --end -- - local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") - if File.exists?(local_gemfile) - eval_gemfile local_gemfile -@@ -99,4 +42,8 @@ end - # Load plugins' Gemfiles - Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| - eval_gemfile file -+end -+ -+Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle| -+ self.instance_eval(Bundler.read_file(bundle)) - end Index: www/redmine4/files/pg.rb =================================================================== --- www/redmine4/files/pg.rb +++ www/redmine4/files/pg.rb @@ -1 +0,0 @@ -gem "pg", "~> 1.1.4" Index: www/redmine4/files/redmine.in =================================================================== --- www/redmine4/files/redmine.in +++ www/redmine4/files/redmine.in @@ -1,40 +0,0 @@ -#!/bin/sh - -# $FreeBSD$ - -# PROVIDE: redmine -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# Add the following line to /etc/rc.conf[.local] to enable redmine -# -# redmine_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable redmine. -# redmine_flags (str): Custom additional arguments to be passed -# to redmine. -# redmine_user (str): User account to run thin with. (default: %%WWWOWN%%) -# redmine_group (str): Group to run thin with. (default: %%WWWGRP%%) - -. /etc/rc.subr - -name="redmine" -rcvar=redmine_enable -command=%%RUBY_NAME%% - -pidfile="%%WWWDIR%%/tmp/pids/thin.pid" - -load_rc_config $name - -# add /usr/local/bin to path -export PATH=$PATH:%%PREFIX%%/bin - -# set defaults -: ${redmine_enable="NO"} -: ${redmine_flags="-a 0.0.0.0 -p 3000 -e production"} -: ${redmine_user="%%WWWOWN%%"} -: ${redmine_group="%%WWWGRP%%"} - -command_args="-d -D -c %%WWWDIR%% -u ${redmine_user} -g ${redmine_group}" -start_cmd="%%PREFIX%%/bin/thin ${command_args} ${redmine_flags} start" - -run_rc_command "$1" Index: www/redmine4/files/rmagic.rb =================================================================== --- www/redmine4/files/rmagic.rb +++ www/redmine4/files/rmagic.rb @@ -1 +0,0 @@ -gem "rmagick", "~> 2.16.0" Index: www/redmine4/files/thin.rb =================================================================== --- www/redmine4/files/thin.rb +++ www/redmine4/files/thin.rb @@ -1 +0,0 @@ -gem "thin", ">= 1.6.2" Index: www/redmine4/pkg-descr =================================================================== --- www/redmine4/pkg-descr +++ www/redmine4/pkg-descr @@ -1,23 +0,0 @@ -Redmine is a flexible project management web application -written using Ruby on Rails framework, it is cross-platform -and cross-database. - -Feature Overview: -* Multiple projects support -* Flexible role based access control -* Flexible issue tracking system -* Gantt chart and calendar -* News, documents & files management -* Feeds & email notifications -* Per project wiki -* Per project forums -* Time tracking -* Custom fields for issues, time-entries, projects and users -* SCM integration (SVN, CVS, Git, Mercurial, Bazaar and Darcs) -* Issue creation via email -* Multiple LDAP authentication support -* User self-registration support -* Multilanguage support -* Multiple databases support - -WWW: https://www.redmine.org/ Index: www/redmine4/pkg-message =================================================================== --- www/redmine4/pkg-message +++ www/redmine4/pkg-message @@ -1,18 +0,0 @@ -[ -{ type: install - message: <=1.5.0:sysutils/rubygem-bundler \ rubygem-rails52>=5.2.4.1:www/rubygem-rails52 \ rubygem-rouge312>=3.12.0:textproc/rubygem-rouge312 \ @@ -48,7 +45,7 @@ SUB_LIST= RUBY_NAME=${RUBY_NAME} OPTIONS_DEFINE= MYSQL POSTGRESQL MARKDOWN RMAGIC THIN -OPTIONS_DEFAULT=MYSQL MARKDOWN RMAGIC THIN +OPTIONS_DEFAULT=MYSQL MARKDOWN THIN OPTIONS_SUB= yes POSTGRESQL_DESC=Enable PostgreSQL support MARKDOWN_DESC= Enable Markdown support @@ -64,6 +61,16 @@ THIN_RUN_DEPENDS= rubygem-thin>=1.6.2:www/rubygem-thin THIN_SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} THIN_VARS= USE_RC_SUBR=redmine + +.include + +.if ${PORT_OPTIONS:MRMAGIC} +# rubygem-mini_magick-4.10.1 wants imagemagick7 +# and rubygem-rmagick-2.16.0_6 wants imagemagick6 +# fixed in 4.1.0: https://www.redmine.org/projects/redmine/repository/revisions/18366 +# but not in 4.0-stable as of 2020/02/13 +BROKEN= conflicting dependencies +.endif post-extract: @${RM} -r ${WRKSRC}/.hgignore ${WRKSRC}/.gitignore ${WRKSRC}/.github \ Index: www/redmine40/bsd.redmine.mk =================================================================== --- www/redmine40/bsd.redmine.mk +++ www/redmine40/bsd.redmine.mk @@ -43,9 +43,9 @@ # .include "${.CURDIR}/../../www/redmine/bsd.redmine.mk" # }}} -PKGNAMEPREFIX?= redmine- +PKGNAMEPREFIX?= redmine40- -RUN_DEPENDS+= redmine>=2.0:www/redmine +RUN_DEPENDS+= redmine4>=4.0:www/redmine40 USE_RUBY= yes .if !defined(PLIST) Index: www/redmine40/distinfo =================================================================== --- www/redmine40/distinfo +++ www/redmine40/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1573401952 -SHA256 (redmine-4.0.5.tar.gz) = 64eabe6867fd5d14d1b4c584417b9b71fbb9b68a019400eeb03e1f2147c369e8 -SIZE (redmine-4.0.5.tar.gz) = 2519900 +TIMESTAMP = 1577032002 +SHA256 (redmine-4.0.6.tar.gz) = 173c4de0ce0a8b2b1e340b6f50d88dfc4ec3a3a7aae11acde201a15613aec8c4 +SIZE (redmine-4.0.6.tar.gz) = 2520461 Index: www/redmine40/files/patch-Gemfile =================================================================== --- www/redmine40/files/patch-Gemfile +++ www/redmine40/files/patch-Gemfile @@ -1,15 +1,13 @@ ---- Gemfile.orig 2019-10-19 09:33:33 UTC +--- Gemfile.orig 2019-12-20 12:46:22 UTC +++ Gemfile -@@ -2,9 +2,9 @@ source 'https://rubygems.org' - +@@ -3,8 +3,8 @@ source 'https://rubygems.org' gem "bundler", ">= 1.5.0" --gem "rails", "5.2.3" + gem "rails", "5.2.4.1" -gem "rouge", "~> 3.3.0" -gem "request_store", "1.0.5" -+gem "rails", "5.2.4.1" +gem "rouge", "~> 3.12.0" -+gem "request_store", ">= 1.0.5" ++gem "request_store", ">=1.0.5" gem "mini_mime", "~> 1.0.1" gem "actionpack-xml_parser" gem "roadie-rails", "~> 1.3.0" @@ -84,7 +82,7 @@ - -group :test do - gem "rails-dom-testing" -- gem "mocha" +- gem 'mocha', '>= 1.4.0' - gem "simplecov", "~> 0.14.1", :require => false - # For running system tests - gem 'puma', '~> 3.7' @@ -95,12 +93,11 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exists?(local_gemfile) eval_gemfile local_gemfile -@@ -99,4 +42,8 @@ end - # Load plugins' Gemfiles +@@ -100,3 +43,7 @@ end Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| eval_gemfile file -+end + end + +Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle| + self.instance_eval(Bundler.read_file(bundle)) - end ++ end