From owner-svn-ports-all@freebsd.org Wed Apr 1 14:33:27 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 164202BD87B for ; Wed, 1 Apr 2020 14:33:27 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48spbB271Fz3M5x for ; Wed, 1 Apr 2020 14:33:26 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: sunpoet) by smtp.freebsd.org (Postfix) with ESMTPSA id 5E1B11F607 for ; Wed, 1 Apr 2020 14:33:17 +0000 (UTC) (envelope-from sunpoet@freebsd.org) Received: by mail-ed1-f46.google.com with SMTP id cf14so100038edb.13 for ; Wed, 01 Apr 2020 07:33:17 -0700 (PDT) X-Gm-Message-State: ANhLgQ3b7H0Y2YgqKjygDFGUQR6cAYP8pYbkrNwBO+hE4MXYP+qzRHQ0 QSjlSXLRVhxhtwLUGQajFpIYScLo62DOu94xLDVRig== X-Google-Smtp-Source: ADFU+vuPWUveEG6I5a4nRfP172FAk4HUYNZRhbuoY3Lb/n0/iB4hWdHlg1xtgA9wtT31ojkJD9t3MHZQhUhWBGSz6oM= X-Received: by 2002:a50:951e:: with SMTP id u30mr20692580eda.144.1585751595593; Wed, 01 Apr 2020 07:33:15 -0700 (PDT) MIME-Version: 1.0 References: <202003282231.02SMV9Rb091960@repo.freebsd.org> In-Reply-To: <202003282231.02SMV9Rb091960@repo.freebsd.org> From: Po-Chuan Hsieh Date: Wed, 1 Apr 2020 22:32:39 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r529764 - in head: devel/gitaly devel/gitaly/files www/gitlab-ce To: Matthias Fechner Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Apr 2020 14:33:27 -0000 On Sun, Mar 29, 2020 at 6:31 AM Matthias Fechner wrote: > Author: mfechner > Date: Sat Mar 28 22:31:09 2020 > New Revision: 529764 > URL: https://svnweb.freebsd.org/changeset/ports/529764 > > Log: > Fix Gemfile for rubygem-rails60 6.0.2.2 update. > > Modified: > head/devel/gitaly/Makefile > head/devel/gitaly/files/patch-ruby_Gemfile > head/www/gitlab-ce/Makefile > > Modified: head/devel/gitaly/Makefile > > ============================================================================== > --- head/devel/gitaly/Makefile Sat Mar 28 21:05:11 2020 (r529763) > +++ head/devel/gitaly/Makefile Sat Mar 28 22:31:09 2020 (r529764) > @@ -2,7 +2,7 @@ > > PORTNAME= gitaly > DISTVERSION= 12.9.1 > -PORTREVISION= 0 > +PORTREVISION= 1 > CATEGORIES= devel > > MAINTAINER= mfechner@FreeBSD.org > @@ -17,7 +17,7 @@ MY_DEPENDS= git>=2.22:devel/git \ > rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \ > > rubygem-github-linguist>=7.5<8.0:textproc/rubygem-github-linguist \ > > rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \ > - > rubygem-activesupport60>=6.0.2.1<6.1:devel/rubygem-activesupport60 \ > + rubygem-activesupport60=6.0.2.2:devel/rubygem-activesupport60 > \ > FYI, using "=" here would cause failure if PORTREVISION bumped. I guess ">=6.0.2.2<6.0.2.3" is exactly what you want. > rubygem-rdoc>=6.1<7.0:devel/rubygem-rdoc \ > rubygem-gitlab-gollum-lib>=4.2.7.8<4.2.8.0:www/rubygem-gitlab-gollum-lib > \ > rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter > \ > > Modified: head/devel/gitaly/files/patch-ruby_Gemfile > > ============================================================================== > --- head/devel/gitaly/files/patch-ruby_Gemfile Sat Mar 28 21:05:11 2020 > (r529763) > +++ head/devel/gitaly/files/patch-ruby_Gemfile Sat Mar 28 22:31:09 2020 > (r529764) > @@ -1,13 +1,13 @@ > ---- ruby/Gemfile.orig 2020-03-26 12:14:07 UTC > +--- ruby/Gemfile.orig 2020-03-26 12:14:05 UTC > +++ ruby/Gemfile > @@ -6,7 +6,7 @@ gem 'bundler', '>= 1.17.3' > gem 'rugged', '~> 0.28' > gem 'github-linguist', '~> 7.5', require: 'linguist' > gem 'gitlab-markup', '~> 1.7.0' > -gem 'activesupport', '6.0.2' > -+gem 'activesupport', '6.0.2.1' > ++gem 'activesupport', '6.0.2.2' > gem 'rdoc', '~> 6.0' > - gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false > + gem 'gitlab-gollum-lib', '~> 4.2.7.8', require: false > gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false > @@ -16,7 +16,7 @@ gem 'faraday', '~> 0.12' > gem 'rbtrace', require: false > > Modified: head/www/gitlab-ce/Makefile > > ============================================================================== > --- head/www/gitlab-ce/Makefile Sat Mar 28 21:05:11 2020 (r529763) > +++ head/www/gitlab-ce/Makefile Sat Mar 28 22:31:09 2020 (r529764) > @@ -21,7 +21,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \ > gitlab-pages>=1.17.0:www/gitlab-pages \ > redis>=3.2.12:databases/redis \ > yarn>=1.10.0:www/yarn \ > - rubygem-rails60>=6.0.2.2<6.0.3:www/rubygem-rails60 \ > + rubygem-rails60=6.0.2.2:www/rubygem-rails60 \ > same here. rubygem-bootsnap>=1.4.6<2.0:devel/rubygem-bootsnap \ > rubygem-nakayoshi_fork>=0.0.4<0.1.0:devel/rubygem-nakayoshi_fork \ > rubygem-responders-rails60>=3.0<4.0:www/rubygem-responders-rails60 > \ > _______________________________________________ > svn-ports-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-ports-all > To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" >