Date: Tue, 31 Dec 2019 12:52:22 -0500 From: Steve Wills <swills@FreeBSD.org> To: Po-Chuan Hsieh <sunpoet@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org, Matthias Fechner <mfechner@FreeBSD.org> Subject: Re: svn commit: r521359 - head/www/gitlab-ce Message-ID: <6e015255-42b6-8966-91bd-c6834524b143@FreeBSD.org> In-Reply-To: <CAMHz58QaZpbYpFHsCCUPy_FnjHvB-cihmExSoF0mh6ZmRf-5cw@mail.gmail.com> References: <201912291258.xBTCwLwD010368@repo.freebsd.org> <08c175ed-6e70-b351-0144-b8c3f2ce4c03@FreeBSD.org> <CAMHz58QaZpbYpFHsCCUPy_FnjHvB-cihmExSoF0mh6ZmRf-5cw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------8F101CBC43069A38CB71C295 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Any objections to the attached patch? Steve On 12/31/19 6:20 AM, Po-Chuan Hsieh wrote: > Hi Steve, > > Thanks for pointing that out. > But adding rubygem-sidekiq5-cron breaks current naming rule for rubygem > ports. > > We have other 2 options: > - Remove or rename bin/sidekiq executables from rubygem-sidekiq5 > - Change rubygem-sidekiq-cron to use rubygem-sidekiq5 > > I would choose the latter. What do you think? > > Regards, > sunpoet > > On Tue, Dec 31, 2019 at 11:05 AM Steve Wills <swills@freebsd.org > <mailto:swills@freebsd.org>> wrote: > > Hi, > > GitLab package now fails to build because rubygem-sidekiq-cron depends > on rubygem-sidekiq-6.0.4, which conflicts with rubygem-sidekiq5-5.2.7 > because they both install /usr/local/bin/sidekiq. I guess we need a > rubygem-sidekiq5-cron package. > > Steve > > On 12/29/19 7:58 AM, Sunpoet Po-Chuan Hsieh wrote: > > Author: sunpoet > > Date: Sun Dec 29 12:58:21 2019 > > New Revision: 521359 > > URL: https://svnweb.freebsd.org/changeset/ports/521359 > > > > Log: > > Change RUN_DEPENDS from rubygem-sidekiq to rubygem-sidekiq5 > > > > - Bump PORTREVISION for dependency change > > > > Modified: > > head/www/gitlab-ce/Makefile > > > > Modified: head/www/gitlab-ce/Makefile > > > ============================================================================== > > --- head/www/gitlab-ce/Makefile Sun Dec 29 12:58:16 2019 > (r521358) > > +++ head/www/gitlab-ce/Makefile Sun Dec 29 12:58:21 2019 > (r521359) > > @@ -3,7 +3,7 @@ > > > > PORTNAME= gitlab-ce > > PORTVERSION= 12.6.1 > > -PORTREVISION= 0 > > +PORTREVISION= 1 > > CATEGORIES= www devel > > > > MAINTAINER= mfechner@FreeBSD.org > > @@ -126,7 +126,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \ > > rubygem-rack-timeout>=0:www/rubygem-rack-timeout \ > > > rubygem-state_machines-activerecord>=0.6.0<0.7.0:databases/rubygem-state_machines-activerecord \ > > > rubygem-acts-as-taggable-on>=6.0<7.0:www/rubygem-acts-as-taggable-on \ > > - rubygem-sidekiq>=5.2.7<5.3.0:devel/rubygem-sidekiq \ > > + rubygem-sidekiq5>=5.2.7<5.3.0:devel/rubygem-sidekiq5 \ > > rubygem-sidekiq-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \ > > > rubygem-redis-namespace>=1.6.0<1.7.0:databases/rubygem-redis-namespace \ > > > rubygem-gitlab-sidekiq-fetcher=0.5.2:devel/rubygem-gitlab-sidekiq-fetcher \ > > > --------------8F101CBC43069A38CB71C295 Content-Type: text/x-patch; charset=UTF-8; name="gitlab_fix_2019123101.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="gitlab_fix_2019123101.diff" diff --git devel/rubygem-sentry-raven29/Makefile devel/rubygem-sentry-rav= en29/Makefile index 47a3a12be50e..f22ee69690d4 100644 --- devel/rubygem-sentry-raven29/Makefile +++ devel/rubygem-sentry-raven29/Makefile @@ -3,6 +3,7 @@ =20 PORTNAME=3D sentry-raven PORTVERSION=3D 2.9.0 +PORTREVISION=3D 1 CATEGORIES=3D devel rubygems MASTER_SITES=3D RG PKGNAMESUFFIX=3D 29 @@ -20,8 +21,11 @@ USE_RUBY=3D yes =20 NO_ARCH=3D yes =20 -PLIST_FILES=3D bin/raven +PLIST_FILES=3D bin/raven29 =20 PORTSCOUT=3D limit:^2\.9\. =20 +post-patch: + @${MV} ${WRKSRC}/exe/raven ${WRKSRC}/exe/raven29 + .include <bsd.port.mk> diff --git devel/rubygem-sentry-raven29/files/patch-sentry-raven.gemspec = devel/rubygem-sentry-raven29/files/patch-sentry-raven.gemspec new file mode 100644 index 000000000000..15c3dbc82e66 --- /dev/null +++ devel/rubygem-sentry-raven29/files/patch-sentry-raven.gemspec @@ -0,0 +1,14 @@ +--- sentry-raven.gemspec.orig 2019-12-31 17:31:07 UTC ++++ sentry-raven.gemspec +@@ -12,9 +12,9 @@ Gem::Specification.new do |s| + s.date =3D "2019-01-22" + s.description =3D "A gem that provides a client interface for the Sen= try error logger".freeze + s.email =3D "getsentry@googlegroups.com".freeze +- s.executables =3D ["raven".freeze] ++ s.executables =3D ["raven29".freeze] + s.extra_rdoc_files =3D ["README.md".freeze, "LICENSE".freeze] +- s.files =3D [".gitignore".freeze, ".gitmodules".freeze, ".rspec".free= ze, ".rubocop.yml".freeze, ".travis.yml".freeze, "Gemfile".freeze, "LICEN= SE".freeze, "README.md".freeze, "Rakefile".freeze, "changelog.md".freeze,= "exe/raven".freeze, "lib/raven.rb".freeze, "lib/raven/backtrace.rb".free= ze, "lib/raven/base.rb".freeze, "lib/raven/breadcrumbs.rb".freeze, "lib/r= aven/breadcrumbs/activesupport.rb".freeze, "lib/raven/breadcrumbs/logger.= rb".freeze, "lib/raven/cli.rb".freeze, "lib/raven/client.rb".freeze, "lib= /raven/configuration.rb".freeze, "lib/raven/context.rb".freeze, "lib/rave= n/event.rb".freeze, "lib/raven/instance.rb".freeze, "lib/raven/integratio= ns/delayed_job.rb".freeze, "lib/raven/integrations/rack-timeout.rb".freez= e, "lib/raven/integrations/rack.rb".freeze, "lib/raven/integrations/rails= =2Erb".freeze, "lib/raven/integrations/rails/active_job.rb".freeze, "lib/= raven/integrations/rails/controller_methods.rb".freeze, "lib/raven/integr= ations/rails/controller_transaction.rb".freeze, "lib/raven/integrations/r= ails/overrides/debug_exceptions_catcher.rb".freeze, "lib/raven/integratio= ns/rails/overrides/streaming_reporter.rb".freeze, "lib/raven/integrations= /railties.rb".freeze, "lib/raven/integrations/rake.rb".freeze, "lib/raven= /integrations/sidekiq.rb".freeze, "lib/raven/integrations/tasks.rb".freez= e, "lib/raven/interface.rb".freeze, "lib/raven/interfaces/exception.rb".f= reeze, "lib/raven/interfaces/http.rb".freeze, "lib/raven/interfaces/messa= ge.rb".freeze, "lib/raven/interfaces/single_exception.rb".freeze, "lib/ra= ven/interfaces/stack_trace.rb".freeze, "lib/raven/linecache.rb".freeze, "= lib/raven/logger.rb".freeze, "lib/raven/processor.rb".freeze, "lib/raven/= processor/cookies.rb".freeze, "lib/raven/processor/http_headers.rb".freez= e, "lib/raven/processor/post_data.rb".freeze, "lib/raven/processor/remove= circularreferences.rb".freeze, "lib/raven/processor/removestacktrace.rb".= freeze, "lib/raven/processor/sanitizedata.rb".freeze, "lib/raven/processo= r/utf8conversion.rb".freeze, "lib/raven/transports.rb".freeze, "lib/raven= /transports/dummy.rb".freeze, "lib/raven/transports/http.rb".freeze, "lib= /raven/transports/stdout.rb".freeze, "lib/raven/utils/deep_merge.rb".free= ze, "lib/raven/utils/exception_cause_chain.rb".freeze, "lib/raven/utils/r= eal_ip.rb".freeze, "lib/raven/version.rb".freeze, "lib/sentry-raven-witho= ut-integrations.rb".freeze, "lib/sentry-raven.rb".freeze, "sentry-raven.g= emspec".freeze] ++ s.files =3D [".gitignore".freeze, ".gitmodules".freeze, ".rspec".free= ze, ".rubocop.yml".freeze, ".travis.yml".freeze, "Gemfile".freeze, "LICEN= SE".freeze, "README.md".freeze, "Rakefile".freeze, "changelog.md".freeze,= "exe/raven29".freeze, "lib/raven.rb".freeze, "lib/raven/backtrace.rb".fr= eeze, "lib/raven/base.rb".freeze, "lib/raven/breadcrumbs.rb".freeze, "lib= /raven/breadcrumbs/activesupport.rb".freeze, "lib/raven/breadcrumbs/logge= r.rb".freeze, "lib/raven/cli.rb".freeze, "lib/raven/client.rb".freeze, "l= ib/raven/configuration.rb".freeze, "lib/raven/context.rb".freeze, "lib/ra= ven/event.rb".freeze, "lib/raven/instance.rb".freeze, "lib/raven/integrat= ions/delayed_job.rb".freeze, "lib/raven/integrations/rack-timeout.rb".fre= eze, "lib/raven/integrations/rack.rb".freeze, "lib/raven/integrations/rai= ls.rb".freeze, "lib/raven/integrations/rails/active_job.rb".freeze, "lib/= raven/integrations/rails/controller_methods.rb".freeze, "lib/raven/integr= ations/rails/controller_transaction.rb".freeze, "lib/raven/integrations/r= ails/overrides/debug_exceptions_catcher.rb".freeze, "lib/raven/integratio= ns/rails/overrides/streaming_reporter.rb".freeze, "lib/raven/integrations= /railties.rb".freeze, "lib/raven/integrations/rake.rb".freeze, "lib/raven= /integrations/sidekiq.rb".freeze, "lib/raven/integrations/tasks.rb".freez= e, "lib/raven/interface.rb".freeze, "lib/raven/interfaces/exception.rb".f= reeze, "lib/raven/interfaces/http.rb".freeze, "lib/raven/interfaces/messa= ge.rb".freeze, "lib/raven/interfaces/single_exception.rb".freeze, "lib/ra= ven/interfaces/stack_trace.rb".freeze, "lib/raven/linecache.rb".freeze, "= lib/raven/logger.rb".freeze, "lib/raven/processor.rb".freeze, "lib/raven/= processor/cookies.rb".freeze, "lib/raven/processor/http_headers.rb".freez= e, "lib/raven/processor/post_data.rb".freeze, "lib/raven/processor/remove= circularreferences.rb".freeze, "lib/raven/processor/removestacktrace.rb".= freeze, "lib/raven/processor/sanitizedata.rb".freeze, "lib/raven/processo= r/utf8conversion.rb".freeze, "lib/raven/transports.rb".freeze, "lib/raven= /transports/dummy.rb".freeze, "lib/raven/transports/http.rb".freeze, "lib= /raven/transports/stdout.rb".freeze, "lib/raven/utils/deep_merge.rb".free= ze, "lib/raven/utils/exception_cause_chain.rb".freeze, "lib/raven/utils/r= eal_ip.rb".freeze, "lib/raven/version.rb".freeze, "lib/sentry-raven-witho= ut-integrations.rb".freeze, "lib/sentry-raven.rb".freeze, "sentry-raven.g= emspec".freeze] + s.homepage =3D "https://github.com/getsentry/raven-ruby".freeze + s.licenses =3D ["Apache-2.0".freeze] + s.required_ruby_version =3D Gem::Requirement.new(">=3D 1.9.0".freeze)= diff --git devel/rubygem-sidekiq5/Makefile devel/rubygem-sidekiq5/Makefil= e index 9838eb4467fc..d5995b85a152 100644 --- devel/rubygem-sidekiq5/Makefile +++ devel/rubygem-sidekiq5/Makefile @@ -3,6 +3,7 @@ =20 PORTNAME=3D sidekiq PORTVERSION=3D 5.2.7 +PORTREVISION=3D 1 CATEGORIES=3D devel rubygems MASTER_SITES=3D RG PKGNAMESUFFIX=3D 5 @@ -23,8 +24,12 @@ USE_RUBY=3D yes =20 NO_ARCH=3D yes =20 -PLIST_FILES=3D bin/sidekiq bin/sidekiqctl +PLIST_FILES=3D bin/sidekiq5 bin/sidekiqctl5 =20 PORTSCOUT=3D limit:^5\. =20 +post-patch: + @${MV} ${WRKSRC}/bin/sidekiq ${WRKSRC}/bin/sidekiq5 + @${MV} ${WRKSRC}/bin/sidekiqctl ${WRKSRC}/bin/sidekiqctl5 + .include <bsd.port.mk> diff --git devel/rubygem-sidekiq5/files/patch-sidekiq.gemspec devel/rubyg= em-sidekiq5/files/patch-sidekiq.gemspec new file mode 100644 index 000000000000..4c3bb591310c --- /dev/null +++ devel/rubygem-sidekiq5/files/patch-sidekiq.gemspec @@ -0,0 +1,13 @@ +--- sidekiq.gemspec.orig 2019-12-31 16:03:53 UTC ++++ sidekiq.gemspec +@@ -11,8 +11,8 @@ Gem::Specification.new do |s| + s.date =3D "2019-04-22" + s.description =3D "Simple, efficient background processing for Ruby."= =2Efreeze + s.email =3D ["mperham@gmail.com".freeze] +- s.executables =3D ["sidekiq".freeze, "sidekiqctl".freeze] +- s.files =3D [".circleci/config.yml".freeze, ".github/contributing.md"= =2Efreeze, ".github/issue_template.md".freeze, ".gitignore".freeze, ".tra= vis.yml".freeze, "3.0-Upgrade.md".freeze, "4.0-Upgrade.md".freeze, "5.0-U= pgrade.md".freeze, "COMM-LICENSE".freeze, "Changes.md".freeze, "Ent-Chang= es.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "Pro-2.0-Upgrade.md".f= reeze, "Pro-3.0-Upgrade.md".freeze, "Pro-4.0-Upgrade.md".freeze, "Pro-Cha= nges.md".freeze, "README.md".freeze, "Rakefile".freeze, "bin/sidekiq".fre= eze, "bin/sidekiqctl".freeze, "bin/sidekiqload".freeze, "code_of_conduct.= md".freeze, "lib/generators/sidekiq/templates/worker.rb.erb".freeze, "lib= /generators/sidekiq/templates/worker_spec.rb.erb".freeze, "lib/generators= /sidekiq/templates/worker_test.rb.erb".freeze, "lib/generators/sidekiq/wo= rker_generator.rb".freeze, "lib/sidekiq.rb".freeze, "lib/sidekiq/api.rb".= freeze, "lib/sidekiq/cli.rb".freeze, "lib/sidekiq/client.rb".freeze, "lib= /sidekiq/core_ext.rb".freeze, "lib/sidekiq/ctl.rb".freeze, "lib/sidekiq/d= elay.rb".freeze, "lib/sidekiq/exception_handler.rb".freeze, "lib/sidekiq/= extensions/action_mailer.rb".freeze, "lib/sidekiq/extensions/active_recor= d.rb".freeze, "lib/sidekiq/extensions/class_methods.rb".freeze, "lib/side= kiq/extensions/generic_proxy.rb".freeze, "lib/sidekiq/fetch.rb".freeze, "= lib/sidekiq/job_logger.rb".freeze, "lib/sidekiq/job_retry.rb".freeze, "li= b/sidekiq/launcher.rb".freeze, "lib/sidekiq/logging.rb".freeze, "lib/side= kiq/manager.rb".freeze, "lib/sidekiq/middleware/chain.rb".freeze, "lib/si= dekiq/middleware/i18n.rb".freeze, "lib/sidekiq/middleware/server/active_r= ecord.rb".freeze, "lib/sidekiq/paginator.rb".freeze, "lib/sidekiq/process= or.rb".freeze, "lib/sidekiq/rails.rb".freeze, "lib/sidekiq/redis_connecti= on.rb".freeze, "lib/sidekiq/scheduled.rb".freeze, "lib/sidekiq/testing.rb= ".freeze, "lib/sidekiq/testing/inline.rb".freeze, "lib/sidekiq/util.rb".f= reeze, "lib/sidekiq/version.rb".freeze, "lib/sidekiq/web.rb".freeze, "lib= /sidekiq/web/action.rb".freeze, "lib/sidekiq/web/application.rb".freeze, = "lib/sidekiq/web/helpers.rb".freeze, "lib/sidekiq/web/router.rb".freeze, = "lib/sidekiq/worker.rb".freeze, "sidekiq.gemspec".freeze, "web/assets/ima= ges/favicon.ico".freeze, "web/assets/images/logo.png".freeze, "web/assets= /images/status.png".freeze, "web/assets/javascripts/application.js".freez= e, "web/assets/javascripts/dashboard.js".freeze, "web/assets/stylesheets/= application-rtl.css".freeze, "web/assets/stylesheets/application.css".fre= eze, "web/assets/stylesheets/bootstrap-rtl.min.css".freeze, "web/assets/s= tylesheets/bootstrap.css".freeze, "web/locales/ar.yml".freeze, "web/local= es/cs.yml".freeze, "web/locales/da.yml".freeze, "web/locales/de.yml".free= ze, "web/locales/el.yml".freeze, "web/locales/en.yml".freeze, "web/locale= s/es.yml".freeze, "web/locales/fa.yml".freeze, "web/locales/fr.yml".freez= e, "web/locales/he.yml".freeze, "web/locales/hi.yml".freeze, "web/locales= /it.yml".freeze, "web/locales/ja.yml".freeze, "web/locales/ko.yml".freeze= , "web/locales/nb.yml".freeze, "web/locales/nl.yml".freeze, "web/locales/= pl.yml".freeze, "web/locales/pt-br.yml".freeze, "web/locales/pt.yml".free= ze, "web/locales/ru.yml".freeze, "web/locales/sv.yml".freeze, "web/locale= s/ta.yml".freeze, "web/locales/uk.yml".freeze, "web/locales/ur.yml".freez= e, "web/locales/zh-cn.yml".freeze, "web/locales/zh-tw.yml".freeze, "web/v= iews/_footer.erb".freeze, "web/views/_job_info.erb".freeze, "web/views/_n= av.erb".freeze, "web/views/_paging.erb".freeze, "web/views/_poll_link.erb= ".freeze, "web/views/_status.erb".freeze, "web/views/_summary.erb".freeze= , "web/views/busy.erb".freeze, "web/views/dashboard.erb".freeze, "web/vie= ws/dead.erb".freeze, "web/views/layout.erb".freeze, "web/views/morgue.erb= ".freeze, "web/views/queue.erb".freeze, "web/views/queues.erb".freeze, "w= eb/views/retries.erb".freeze, "web/views/retry.erb".freeze, "web/views/sc= heduled.erb".freeze, "web/views/scheduled_job_info.erb".freeze] ++ s.executables =3D ["sidekiq5".freeze, "sidekiqctl5".freeze] ++ s.files =3D [".circleci/config.yml".freeze, ".github/contributing.md"= =2Efreeze, ".github/issue_template.md".freeze, ".gitignore".freeze, ".tra= vis.yml".freeze, "3.0-Upgrade.md".freeze, "4.0-Upgrade.md".freeze, "5.0-U= pgrade.md".freeze, "COMM-LICENSE".freeze, "Changes.md".freeze, "Ent-Chang= es.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "Pro-2.0-Upgrade.md".f= reeze, "Pro-3.0-Upgrade.md".freeze, "Pro-4.0-Upgrade.md".freeze, "Pro-Cha= nges.md".freeze, "README.md".freeze, "Rakefile".freeze, "bin/sidekiq5".fr= eeze, "bin/sidekiqctl5".freeze, "bin/sidekiqload".freeze, "code_of_conduc= t.md".freeze, "lib/generators/sidekiq/templates/worker.rb.erb".freeze, "l= ib/generators/sidekiq/templates/worker_spec.rb.erb".freeze, "lib/generato= rs/sidekiq/templates/worker_test.rb.erb".freeze, "lib/generators/sidekiq/= worker_generator.rb".freeze, "lib/sidekiq.rb".freeze, "lib/sidekiq/api.rb= ".freeze, "lib/sidekiq/cli.rb".freeze, "lib/sidekiq/client.rb".freeze, "l= ib/sidekiq/core_ext.rb".freeze, "lib/sidekiq/ctl.rb".freeze, "lib/sidekiq= /delay.rb".freeze, "lib/sidekiq/exception_handler.rb".freeze, "lib/sideki= q/extensions/action_mailer.rb".freeze, "lib/sidekiq/extensions/active_rec= ord.rb".freeze, "lib/sidekiq/extensions/class_methods.rb".freeze, "lib/si= dekiq/extensions/generic_proxy.rb".freeze, "lib/sidekiq/fetch.rb".freeze,= "lib/sidekiq/job_logger.rb".freeze, "lib/sidekiq/job_retry.rb".freeze, "= lib/sidekiq/launcher.rb".freeze, "lib/sidekiq/logging.rb".freeze, "lib/si= dekiq/manager.rb".freeze, "lib/sidekiq/middleware/chain.rb".freeze, "lib/= sidekiq/middleware/i18n.rb".freeze, "lib/sidekiq/middleware/server/active= _record.rb".freeze, "lib/sidekiq/paginator.rb".freeze, "lib/sidekiq/proce= ssor.rb".freeze, "lib/sidekiq/rails.rb".freeze, "lib/sidekiq/redis_connec= tion.rb".freeze, "lib/sidekiq/scheduled.rb".freeze, "lib/sidekiq/testing.= rb".freeze, "lib/sidekiq/testing/inline.rb".freeze, "lib/sidekiq/util.rb"= =2Efreeze, "lib/sidekiq/version.rb".freeze, "lib/sidekiq/web.rb".freeze, = "lib/sidekiq/web/action.rb".freeze, "lib/sidekiq/web/application.rb".free= ze, "lib/sidekiq/web/helpers.rb".freeze, "lib/sidekiq/web/router.rb".free= ze, "lib/sidekiq/worker.rb".freeze, "sidekiq.gemspec".freeze, "web/assets= /images/favicon.ico".freeze, "web/assets/images/logo.png".freeze, "web/as= sets/images/status.png".freeze, "web/assets/javascripts/application.js".f= reeze, "web/assets/javascripts/dashboard.js".freeze, "web/assets/styleshe= ets/application-rtl.css".freeze, "web/assets/stylesheets/application.css"= =2Efreeze, "web/assets/stylesheets/bootstrap-rtl.min.css".freeze, "web/as= sets/stylesheets/bootstrap.css".freeze, "web/locales/ar.yml".freeze, "web= /locales/cs.yml".freeze, "web/locales/da.yml".freeze, "web/locales/de.yml= ".freeze, "web/locales/el.yml".freeze, "web/locales/en.yml".freeze, "web/= locales/es.yml".freeze, "web/locales/fa.yml".freeze, "web/locales/fr.yml"= =2Efreeze, "web/locales/he.yml".freeze, "web/locales/hi.yml".freeze, "web= /locales/it.yml".freeze, "web/locales/ja.yml".freeze, "web/locales/ko.yml= ".freeze, "web/locales/nb.yml".freeze, "web/locales/nl.yml".freeze, "web/= locales/pl.yml".freeze, "web/locales/pt-br.yml".freeze, "web/locales/pt.y= ml".freeze, "web/locales/ru.yml".freeze, "web/locales/sv.yml".freeze, "we= b/locales/ta.yml".freeze, "web/locales/uk.yml".freeze, "web/locales/ur.ym= l".freeze, "web/locales/zh-cn.yml".freeze, "web/locales/zh-tw.yml".freeze= , "web/views/_footer.erb".freeze, "web/views/_job_info.erb".freeze, "web/= views/_nav.erb".freeze, "web/views/_paging.erb".freeze, "web/views/_poll_= link.erb".freeze, "web/views/_status.erb".freeze, "web/views/_summary.erb= ".freeze, "web/views/busy.erb".freeze, "web/views/dashboard.erb".freeze, = "web/views/dead.erb".freeze, "web/views/layout.erb".freeze, "web/views/mo= rgue.erb".freeze, "web/views/queue.erb".freeze, "web/views/queues.erb".fr= eeze, "web/views/retries.erb".freeze, "web/views/retry.erb".freeze, "web/= views/scheduled.erb".freeze, "web/views/scheduled_job_info.erb".freeze] + s.homepage =3D "http://sidekiq.org".freeze + s.licenses =3D ["LGPL-3.0".freeze] + s.required_ruby_version =3D Gem::Requirement.new(">=3D 2.2.2".freeze)= diff --git www/gitlab-ce/Makefile www/gitlab-ce/Makefile index 8e738f5f4b1f..f954cf633c6c 100644 --- www/gitlab-ce/Makefile +++ www/gitlab-ce/Makefile @@ -3,7 +3,7 @@ =20 PORTNAME=3D gitlab-ce PORTVERSION=3D 12.6.1 -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D www devel =20 MAINTAINER=3D mfechner@FreeBSD.org @@ -129,7 +129,7 @@ MY_DEPENDS=3D git>=3D2.22.2:devel/git \ rubygem-sidekiq5>=3D5.2.7<5.3.0:devel/rubygem-sidekiq5 \ rubygem-sidekiq-cron>=3D1.0<2.0:devel/rubygem-sidekiq-cron \ rubygem-redis-namespace>=3D1.6.0<1.7.0:databases/rubygem-redis-namespac= e \ - rubygem-gitlab-sidekiq-fetcher=3D0.5.2:devel/rubygem-gitlab-sidekiq-fet= cher \ + rubygem-gitlab-sidekiq-fetcher=3D0.5.2_1:devel/rubygem-gitlab-sidekiq-f= etcher \ rubygem-fugit12>=3D1.2.1<1.3.0:devel/rubygem-fugit12 \ rubygem-httparty>=3D0.16.4<0.17.0:www/rubygem-httparty \ rubygem-rainbow>=3D3.0<4.0:devel/rubygem-rainbow \ --------------8F101CBC43069A38CB71C295--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6e015255-42b6-8966-91bd-c6834524b143>