Date: Mon, 5 Oct 2020 07:52:28 +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: r551480 - in head/www/gitlab-ce: . files Message-ID: <202010050752.0957qSdF011389@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Mon Oct 5 07:52:27 2020 New Revision: 551480 URL: https://svnweb.freebsd.org/changeset/ports/551480 Log: Fix dependecy problem with upgrade of rdoc to 6.2.1. PR: 250086 Modified: head/www/gitlab-ce/Makefile head/www/gitlab-ce/files/patch-Gemfile Modified: head/www/gitlab-ce/Makefile ============================================================================== --- head/www/gitlab-ce/Makefile Mon Oct 5 07:51:20 2020 (r551479) +++ head/www/gitlab-ce/Makefile Mon Oct 5 07:52:27 2020 (r551480) @@ -3,7 +3,7 @@ PORTNAME?= gitlab-ce PORTVERSION?= 13.4.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= www devel MAINTAINER?= mfechner@FreeBSD.org @@ -113,7 +113,7 @@ MY_DEPENDS= git>=2.26:devel/git \ rubygem-commonmarker>=0.20<1.0:textproc/rubygem-commonmarker \ rubygem-kramdown>=2.3.0<2.4:textproc/rubygem-kramdown \ rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \ - rubygem-rdoc>=6.1.2<6.2:devel/rubygem-rdoc \ + rubygem-rdoc>=6.1.2<6.3:devel/rubygem-rdoc \ rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \ rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \ Modified: head/www/gitlab-ce/files/patch-Gemfile ============================================================================== --- head/www/gitlab-ce/files/patch-Gemfile Mon Oct 5 07:51:20 2020 (r551479) +++ head/www/gitlab-ce/files/patch-Gemfile Mon Oct 5 07:52:27 2020 (r551480) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2020-09-21 16:23:36 UTC +--- Gemfile.orig 2020-10-01 12:48:52 UTC +++ Gemfile @@ -18,7 +18,7 @@ gem 'default_value_for', '~> 3.3.0' # Supported DBs @@ -17,6 +17,15 @@ # Disable strong_params so that Mash does not respond to :permitted? gem 'hashie-forbidden_attributes' +@@ -148,7 +147,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark + gem 'commonmarker', '~> 0.20' + gem 'kramdown', '~> 2.3.0' + gem 'RedCloth', '~> 4.3.2' +-gem 'rdoc', '~> 6.1.2' ++gem 'rdoc', '~> 6.1' + gem 'org-ruby', '~> 0.9.12' + gem 'creole', '~> 0.5.0' + gem 'wikicloth', '0.8.1' @@ -234,7 +233,7 @@ gem 'redis-rails', '~> 5.0.2' gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010050752.0957qSdF011389>