Date: Wed, 30 Mar 2022 22:27:04 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 698765204587 - main - www/rubygem-gollum: Fix fef2fa5fd8a2a9e170be66133e9d535a9bc6fd4b Message-ID: <202203302227.22UMR4IA068850@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=6987652045875bd891ebc8710ac5b8163818f9b5 commit 6987652045875bd891ebc8710ac5b8163818f9b5 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2022-03-30 22:18:10 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2022-03-30 22:21:53 +0000 www/rubygem-gollum: Fix fef2fa5fd8a2a9e170be66133e9d535a9bc6fd4b - Fix RUN_DEPENDS: - Change from rubygem-sprockets to rubygem-sprockets3 - Remove duplicate misc/rubygem-octicons - Remove superfluous devel/rubygem-mustache0 - Update version requirement of RUN_DEPENDS to match upstream - Sort RUN_DEPENDS - Update patch-gemspec: - Update octicons after rubygem-octicons 17.0.0 update - Remove uglifier after rubygem-uglifier 4.2.0 update - Avoid using %% in Makefile - Bump PORTREVISION for dependency and package change PR: 260207 With hat: ruby --- www/rubygem-gollum/Makefile | 35 +++++++++++++++++----------------- www/rubygem-gollum/files/patch-gemspec | 7 +++---- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/www/rubygem-gollum/Makefile b/www/rubygem-gollum/Makefile index dc8f0840a88b..4a902881beb1 100644 --- a/www/rubygem-gollum/Makefile +++ b/www/rubygem-gollum/Makefile @@ -2,7 +2,7 @@ PORTNAME= gollum PORTVERSION= 5.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www rubygems MASTER_SITES= RG @@ -13,22 +13,21 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= git:devel/git \ - rubygem-gemojione>=3.3.0:graphics/rubygem-gemojione \ - rubygem-gollum-lib>=5.1.3:www/rubygem-gollum-lib \ - rubygem-kramdown>=2.3.1:textproc/rubygem-kramdown \ - rubygem-kramdown-parser-gfm>=1.1.0:textproc/rubygem-kramdown-parser-gfm \ - rubygem-mustache0>=0.99.5:devel/rubygem-mustache0 \ - rubygem-sinatra>=2.1.0:www/rubygem-sinatra \ - rubygem-sinatra-contrib>=2.1.0:www/rubygem-sinatra-contrib \ - rubygem-mustache-sinatra>=1.0.1:devel/rubygem-mustache-sinatra \ - rubygem-useragent>=0.16.2:devel/rubygem-useragent \ - rubygem-octicons>=12.0.0:misc/rubygem-octicons \ - rubygem-sprockets>=3.7:devel/rubygem-sprockets \ - rubygem-sass>=3.5:textproc/rubygem-sass \ - rubygem-uglifier>=4.1:www/rubygem-uglifier \ - rubygem-sprockets-helpers>=1.2:devel/rubygem-sprockets-helpers \ - rubygem-rss>=0.2.9:www/rubygem-rss \ - rubygem-webrick>=1.7.0:www/rubygem-webrick \ + rubygem-gemojione>=4.1<5:graphics/rubygem-gemojione \ + rubygem-gollum-lib>=5.1<6:www/rubygem-gollum-lib \ + rubygem-kramdown>=2.3<3:textproc/rubygem-kramdown \ + rubygem-kramdown-parser-gfm>=1.1.0<1.2:textproc/rubygem-kramdown-parser-gfm \ + rubygem-mustache-sinatra>=1.0<2:devel/rubygem-mustache-sinatra \ + rubygem-octicons>=12.0:misc/rubygem-octicons \ + rubygem-rss>=0.2.9<0.3:www/rubygem-rss \ + rubygem-sass>=3.5<4:textproc/rubygem-sass \ + rubygem-sinatra>=2.0<3:www/rubygem-sinatra \ + rubygem-sinatra-contrib>=2.0<3:www/rubygem-sinatra-contrib \ + rubygem-sprockets3>=3.7<4:devel/rubygem-sprockets3 \ + rubygem-sprockets-helpers>=1.2<2:devel/rubygem-sprockets-helpers \ + rubygem-uglifier>=4.2<5:www/rubygem-uglifier \ + rubygem-useragent>=0.16.2<0.17:devel/rubygem-useragent \ + rubygem-webrick>=1.7<2:www/rubygem-webrick \ USES= cpe gem CPE_VENDOR= ${PORTNAME}_project @@ -39,7 +38,7 @@ NO_ARCH= yes PLIST_FILES= bin/gollum \ bin/gollum-migrate-tags -PLIST_DIRS= %%WWWDIR%% +PLIST_DIRS= ${WWWDIR} post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/www/gollum diff --git a/www/rubygem-gollum/files/patch-gemspec b/www/rubygem-gollum/files/patch-gemspec index 4d9db8799315..98283b8fbc55 100644 --- a/www/rubygem-gollum/files/patch-gemspec +++ b/www/rubygem-gollum/files/patch-gemspec @@ -1,15 +1,14 @@ ---- gollum.gemspec.orig 2022-02-19 10:25:43 UTC +--- gollum.gemspec.orig 2022-03-30 15:36:55 UTC +++ gollum.gemspec @@ -34,13 +34,12 @@ Gem::Specification.new do |s| s.add_runtime_dependency(%q<mustache-sinatra>.freeze, ["~> 1.0"]) s.add_runtime_dependency(%q<useragent>.freeze, ["~> 0.16.2"]) s.add_runtime_dependency(%q<gemojione>.freeze, ["~> 4.1"]) - s.add_runtime_dependency(%q<octicons>.freeze, ["~> 12.0"]) -+ s.add_runtime_dependency(%q<octicons>.freeze, ["~> 16.0"]) ++ s.add_runtime_dependency(%q<octicons>.freeze, [">= 12.0"]) s.add_runtime_dependency(%q<sprockets>.freeze, ["~> 3.7"]) s.add_runtime_dependency(%q<sass>.freeze, ["~> 3.5"]) -- s.add_runtime_dependency(%q<uglifier>.freeze, ["~> 4.2"]) -+ s.add_runtime_dependency(%q<uglifier>.freeze, [">= 4.1"]) + s.add_runtime_dependency(%q<uglifier>.freeze, ["~> 4.2"]) s.add_runtime_dependency(%q<sprockets-helpers>.freeze, ["~> 1.2"]) s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.2.9"]) - s.add_runtime_dependency(%q<therubyrhino>.freeze, ["~> 2.1.0"])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203302227.22UMR4IA068850>