Date: Fri, 28 Feb 2020 16:09:16 +0000 (UTC) From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527337 - in head/www: redmine redmine4 redmine4/files Message-ID: <202002281609.01SG9Gq1078192@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Fri Feb 28 16:09:16 2020 New Revision: 527337 URL: https://svnweb.freebsd.org/changeset/ports/527337 Log: Update to 4.0.6. Disable the RMAGIC option, it causes conflict with different versions of imagemagick. This problem is fixed in redmine 4.1, hopefully they'll backport the fix to the 4.0 branch. Use the correct redmine version when building redmine plugins. Mark www/redmine as deprecated with end of 2020Q2 to give maintainer enough time to upgrade everything to redmine4. Redmine version 3 should not be included in 2020Q3 anymore. PR: 244288 Submitted by: mikael@ Reported by: nork@ninth-nine.com Reviewed by: mfechner@ Differential Revision: https://reviews.freebsd.org/D23682 Modified: head/www/redmine/Makefile head/www/redmine4/Makefile head/www/redmine4/bsd.redmine.mk head/www/redmine4/distinfo head/www/redmine4/files/patch-Gemfile Modified: head/www/redmine/Makefile ============================================================================== --- head/www/redmine/Makefile Fri Feb 28 15:10:30 2020 (r527336) +++ head/www/redmine/Makefile Fri Feb 28 16:09:16 2020 (r527337) @@ -13,6 +13,10 @@ COMMENT= Flexible project management web application LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/COPYING +DEPRECATED= EOLed upstream +# Remove the port before 2020Q3 +EXPIRATION_DATE= 2020-06-25 + RUN_DEPENDS= rubygem-bundler>=1.5.0:sysutils/rubygem-bundler \ rubygem-rails4>=4.2.11.1:www/rubygem-rails4 \ rubygem-jquery-rails>=3.1.4:www/rubygem-jquery-rails \ Modified: head/www/redmine4/Makefile ============================================================================== --- head/www/redmine4/Makefile Fri Feb 28 15:10:30 2020 (r527336) +++ head/www/redmine4/Makefile Fri Feb 28 16:09:16 2020 (r527337) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= redmine -PORTVERSION= 4.0.5 -PORTREVISION= 4 +PORTVERSION= 4.0.6 CATEGORIES= www MASTER_SITES= https://www.redmine.org/releases/ PKGNAMESUFFIX= 4 @@ -37,8 +36,6 @@ RUN_DEPENDS= rubygem-bundler>=1.5.0:sysutils/rubygem-b USES= cpe USE_RUBY= yes -CONFLICTS_INSTALL= redmine - NO_ARCH= yes NO_BUILD= yes @@ -48,7 +45,7 @@ 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_DEFAULT=MYSQL MARKDOWN THIN OPTIONS_SUB= yes POSTGRESQL_DESC=Enable PostgreSQL support MARKDOWN_DESC= Enable Markdown support @@ -64,6 +61,16 @@ RMAGIC_RUN_DEPENDS= rubygem-rmagick>=2.16.0:graphics/r 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 <bsd.port.options.mk> + +.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 \ Modified: head/www/redmine4/bsd.redmine.mk ============================================================================== --- head/www/redmine4/bsd.redmine.mk Fri Feb 28 15:10:30 2020 (r527336) +++ head/www/redmine4/bsd.redmine.mk Fri Feb 28 16:09:16 2020 (r527337) @@ -43,9 +43,9 @@ # .include "${.CURDIR}/../../www/redmine/bsd.redmine.mk" # }}} -PKGNAMEPREFIX?= redmine- +PKGNAMEPREFIX?= redmine4- -RUN_DEPENDS+= redmine>=2.0:www/redmine +RUN_DEPENDS+= redmine4>=4.0:www/redmine4 USE_RUBY= yes .if !defined(PLIST) Modified: head/www/redmine4/distinfo ============================================================================== --- head/www/redmine4/distinfo Fri Feb 28 15:10:30 2020 (r527336) +++ head/www/redmine4/distinfo Fri Feb 28 16:09:16 2020 (r527337) @@ -1,3 +1,3 @@ -TIMESTAMP = 1573401952 -SHA256 (redmine-4.0.5.tar.gz) = 64eabe6867fd5d14d1b4c584417b9b71fbb9b68a019400eeb03e1f2147c369e8 -SIZE (redmine-4.0.5.tar.gz) = 2519900 +TIMESTAMP = 1582635822 +SHA256 (redmine-4.0.6.tar.gz) = 173c4de0ce0a8b2b1e340b6f50d88dfc4ec3a3a7aae11acde201a15613aec8c4 +SIZE (redmine-4.0.6.tar.gz) = 2520461 Modified: head/www/redmine4/files/patch-Gemfile ============================================================================== --- head/www/redmine4/files/patch-Gemfile Fri Feb 28 15:10:30 2020 (r527336) +++ head/www/redmine4/files/patch-Gemfile Fri Feb 28 16:09:16 2020 (r527337) @@ -1,13 +1,11 @@ ---- Gemfile.orig 2019-10-19 09:33:33 UTC +--- Gemfile.orig 2020-02-25 14:28:07 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 "mini_mime", "~> 1.0.1" @@ -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'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002281609.01SG9Gq1078192>