git: 14a03240db5a - main - www/rubygem-gollum: remove incorrect dependency

From: Dan Langille <dvl_at_FreeBSD.org>
Date: Mon, 14 Feb 2022 20:46:14 UTC
The branch main has been updated by dvl:

URL: https://cgit.FreeBSD.org/ports/commit/?id=14a03240db5afd2841d11f349481175901395a41

commit 14a03240db5afd2841d11f349481175901395a41
Author:     Dan Langille <dvl@FreeBSD.org>
AuthorDate: 2022-02-14 20:34:39 +0000
Commit:     Dan Langille <dvl@FreeBSD.org>
CommitDate: 2022-02-14 20:46:00 +0000

    www/rubygem-gollum: remove incorrect dependency
    
    www/rubygem-gollum-lib: add missing dependency
    
    www/rubygem-gollum was depending up on www/rubygem-gollum-rugged_adapter
    which should instead be a dependency of www/rubygem-gollum-lib
    
    Also, remove the patch-gemspec.rb patch on www/rubygem-gollum-lib
    
    PR:             261637
    Reported by:    Sir l33tname <sirl33tname@gmail.com>
    Approved by:    ruby@ (zi)
---
 www/rubygem-gollum-lib/Makefile               |  4 +++-
 www/rubygem-gollum-lib/files/patch-gemspec.rb | 11 -----------
 www/rubygem-gollum/Makefile                   |  2 +-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/www/rubygem-gollum-lib/Makefile b/www/rubygem-gollum-lib/Makefile
index e4be5bec7018..e5182f54485d 100644
--- a/www/rubygem-gollum-lib/Makefile
+++ b/www/rubygem-gollum-lib/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gollum-lib
 PORTVERSION=	5.1.3
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
@@ -13,11 +14,12 @@ 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 \
 		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-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
 
diff --git a/www/rubygem-gollum-lib/files/patch-gemspec.rb b/www/rubygem-gollum-lib/files/patch-gemspec.rb
deleted file mode 100644
index 256181928017..000000000000
--- a/www/rubygem-gollum-lib/files/patch-gemspec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- gemspec.rb.orig	2021-12-04 10:42:00 UTC
-+++ gemspec.rb
-@@ -31,7 +31,7 @@ def specification(version, default_adapter, platform =
-     s.add_dependency 'loofah', '~> 2.3'
-     s.add_dependency 'github-markup', '~> 4.0'
-     s.add_dependency 'gemojione', '~> 4.1'
--    s.add_dependency 'octicons', '~> 12.0'
-+    s.add_dependency 'octicons', '~> 16.0'
-     s.add_dependency 'twitter-text', '1.14.7'
- 
-     s.add_development_dependency 'org-ruby', '~> 0.9.9'
diff --git a/www/rubygem-gollum/Makefile b/www/rubygem-gollum/Makefile
index ee00269ec45e..dc8f0840a88b 100644
--- a/www/rubygem-gollum/Makefile
+++ b/www/rubygem-gollum/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gollum
 PORTVERSION=	5.2.3
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
@@ -14,7 +15,6 @@ 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-gollum-rugged_adapter>=1.0:www/rubygem-gollum-rugged_adapter \
 		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 \