Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Mar 2022 22:26:50 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: 8a386a3ae78b - main - www/rubygem-gollum-lib: Fix 644d2ef109a340cdf0d19561117db3d9e63b52f7
Message-ID:  <202203302226.22UMQoRx068550@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=8a386a3ae78ba534aa18512b44f699c2f5ca50c8

commit 8a386a3ae78ba534aa18512b44f699c2f5ca50c8
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-03-30 22:17:28 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-03-30 22:21:50 +0000

    www/rubygem-gollum-lib: Fix 644d2ef109a340cdf0d19561117db3d9e63b52f7
    
    - Fix RUN_DEPENDS: Remove duplicate graphics/rubygem-gemojione and textproc/rubygem-github-markup
    - Update version requirement of RUN_DEPENDS to match upstream
    - Sort RUN_DEPENDS
    - Update patch-gemspec: Update octicons after rubygem-octicons 17.0.0 update
    - Rename gemspec patch to patch-gemspec
    - Bump PORTREVISION for dependency and package change
    
    PR:             260207
---
 www/rubygem-gollum-lib/Makefile                        | 18 ++++++++----------
 .../files/{patch-gollum-lib.gemspec => patch-gemspec}  |  4 ++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/www/rubygem-gollum-lib/Makefile b/www/rubygem-gollum-lib/Makefile
index e5182f54485d..29aa17d440ed 100644
--- a/www/rubygem-gollum-lib/Makefile
+++ b/www/rubygem-gollum-lib/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gollum-lib
 PORTVERSION=	5.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
@@ -12,16 +12,14 @@ COMMENT=	Simple, Git-powered wiki with a sweet API and local frontend
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-gemojione>=4.1:graphics/rubygem-gemojione \
-		rubygem-github-markup>=1.6:textproc/rubygem-github-markup \
-		rubygem-gollum-rugged_adapter>=1.0<2.0:www/rubygem-gollum-rugged_adapter \
-		rubygem-nokogiri>=1.8.0<2.0:textproc/rubygem-nokogiri \
+RUN_DEPENDS=	rubygem-gemojione>=4.1<5:graphics/rubygem-gemojione \
+		rubygem-github-markup>=4.0<5:textproc/rubygem-github-markup \
+		rubygem-gollum-rugged_adapter>=1.0<2:www/rubygem-gollum-rugged_adapter \
+		rubygem-loofah>=2.3<3:textproc/rubygem-loofah \
+		rubygem-nokogiri>=1.8<2:textproc/rubygem-nokogiri \
+		rubygem-octicons>=12.0:misc/rubygem-octicons \
 		rubygem-rouge>=3.1<4:textproc/rubygem-rouge \
-		rubygem-twitter-text1=1.14.7:textproc/rubygem-twitter-text1 \
-		rubygem-loofah>=2.12.0:textproc/rubygem-loofah \
-		rubygem-github-markup>=4.0.0<5.0:textproc/rubygem-github-markup \
-		rubygem-gemojione>=3.3.0:graphics/rubygem-gemojione \
-		rubygem-octicons>=12.0.0:misc/rubygem-octicons
+		rubygem-twitter-text1>=1.14.7<1.14.8:textproc/rubygem-twitter-text1
 
 USES=		gem
 USE_RUBY=	yes
diff --git a/www/rubygem-gollum-lib/files/patch-gollum-lib.gemspec b/www/rubygem-gollum-lib/files/patch-gemspec
similarity index 82%
rename from www/rubygem-gollum-lib/files/patch-gollum-lib.gemspec
rename to www/rubygem-gollum-lib/files/patch-gemspec
index f11101c0cd73..4c4f6e68ccad 100644
--- a/www/rubygem-gollum-lib/files/patch-gollum-lib.gemspec
+++ b/www/rubygem-gollum-lib/files/patch-gemspec
@@ -1,11 +1,11 @@
---- gollum-lib.gemspec.orig	2022-02-17 14:26:52 UTC
+--- gollum-lib.gemspec.orig	2022-03-30 16:05:41 UTC
 +++ gollum-lib.gemspec
 @@ -31,7 +31,7 @@ Gem::Specification.new do |s|
      s.add_runtime_dependency(%q<loofah>.freeze, ["~> 2.3"])
      s.add_runtime_dependency(%q<github-markup>.freeze, ["~> 4.0"])
      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<twitter-text>.freeze, ["= 1.14.7"])
      s.add_development_dependency(%q<org-ruby>.freeze, ["~> 0.9.9"])
      s.add_development_dependency(%q<kramdown>.freeze, ["~> 2.3.0"])



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203302226.22UMQoRx068550>