Update www/rubygem-gitlab-gollum-lib to 4.2.7.5 required for gitlab 10.8.x.

Reviewed by:	mat, swills (mentor)
Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D15951

4 files changed, 26 insertions, 32 deletions

diff --git a/www/rubygem-gitlab-gollum-lib/Makefile b/www/rubygem-gitlab-gollum-lib/Makefile
index 806e2aac0563..8128c5fb74d3 100644
--- a/www/rubygem-gitlab-gollum-lib/Makefile
+++ b/www/rubygem-gitlab-gollum-lib/Makefile
@@ -1,25 +1,27 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-gollum-lib
-PORTVERSION=	1.1.0
-PORTREVISION=	4
+PORTVERSION=	4.2.7.5
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
+MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Simple, Git-powered wiki with a sweet API and local frontend
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-github-markup>=0.7.5:textproc/rubygem-github-markup \
-		rubygem-gitlab-grit>=2.6.1:textproc/rubygem-gitlab-grit \
-		rubygem-nokogiri>=1.5.9:textproc/rubygem-nokogiri \
-		rubygem-sanitize>=2.0.3:textproc/rubygem-sanitize \
-		rubygem-stringex>=1.5.1:devel/rubygem-stringex
+RUN_DEPENDS=	rubygem-gemojione32>=3.2:graphics/rubygem-gemojione32 \
+		rubygem-gitlab-markup>=1.6:textproc/rubygem-gitlab-markup \
+		rubygem-gollum-grit_adapter10>=1.0:www/rubygem-gollum-grit_adapter10 \
+		rubygem-nokogiri>=1.6.1:textproc/rubygem-nokogiri \
+		rubygem-rouge>=3.1:textproc/rubygem-rouge \
+		rubygem-sanitize>=4.6.4:textproc/rubygem-sanitize \
+		rubygem-stringex>=2.6:devel/rubygem-stringex
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-gitlab-gollum-lib/distinfo b/www/rubygem-gitlab-gollum-lib/distinfo
index 39c804162dbc..092af3d25b8f 100644
--- a/www/rubygem-gitlab-gollum-lib/distinfo
+++ b/www/rubygem-gitlab-gollum-lib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/gitlab-gollum-lib-1.1.0.gem) = 7759898473e48249ed02c0daf1e946607a58102c4a0a56551fa565ae4f0a5ea8
-SIZE (rubygem/gitlab-gollum-lib-1.1.0.gem) = 41472
+TIMESTAMP = 1529480313
+SHA256 (rubygem/gitlab-gollum-lib-4.2.7.5.gem) = 76027e55c980e04eb14858ed3f55a2815a2a2a5b54c256da31a94ea7e9510696
+SIZE (rubygem/gitlab-gollum-lib-4.2.7.5.gem) = 49152
diff --git a/www/rubygem-gitlab-gollum-lib/files/patch-gemspec b/www/rubygem-gitlab-gollum-lib/files/patch-gemspec
deleted file mode 100644
index ec44b458b170..000000000000
--- a/www/rubygem-gitlab-gollum-lib/files/patch-gemspec
+++ /dev/null
@@ -1,20 +0,0 @@
---- gitlab-gollum-lib.gemspec.orig	2017-03-16 12:14:01 UTC
-+++ gitlab-gollum-lib.gemspec
-@@ -24,12 +24,11 @@ Gem::Specification.new do |s|
-     s.specification_version = 2
- 
-     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
--      s.add_runtime_dependency(%q<gitlab-grit>.freeze, ["~> 2.6.1"])
--      s.add_runtime_dependency(%q<github-markup>.freeze, ["< 1.0.0", ">= 0.7.5"])
--      s.add_runtime_dependency(%q<github-markdown>.freeze, ["~> 0.5.3"])
--      s.add_runtime_dependency(%q<sanitize>.freeze, ["~> 2.0.3"])
--      s.add_runtime_dependency(%q<nokogiri>.freeze, ["~> 1.5.9"])
--      s.add_runtime_dependency(%q<stringex>.freeze, ["~> 1.5.1"])
-+      s.add_runtime_dependency(%q<gitlab-grit>.freeze, [">= 2.6.1"])
-+      s.add_runtime_dependency(%q<github-markup>.freeze, [">= 0.7.5"])
-+      s.add_runtime_dependency(%q<sanitize>.freeze, [">= 2.0.3"])
-+      s.add_runtime_dependency(%q<nokogiri>.freeze, [">= 1.5.9"])
-+      s.add_runtime_dependency(%q<stringex>.freeze, [">= 1.5.1"])
-       s.add_development_dependency(%q<RedCloth>.freeze, ["~> 4.2.9"])
-       s.add_development_dependency(%q<mocha>.freeze, ["~> 0.13.2"])
-       s.add_development_dependency(%q<org-ruby>.freeze, ["~> 0.8.1"])
diff --git a/www/rubygem-gitlab-gollum-lib/files/patch-gitlab-gollum-lib.gemspec b/www/rubygem-gitlab-gollum-lib/files/patch-gitlab-gollum-lib.gemspec
new file mode 100644
index 000000000000..b769a29a3d17
--- /dev/null
+++ b/www/rubygem-gitlab-gollum-lib/files/patch-gitlab-gollum-lib.gemspec
@@ -0,0 +1,11 @@
+--- gitlab-gollum-lib.gemspec.orig	2018-06-20 08:51:37 UTC
++++ gitlab-gollum-lib.gemspec
+@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
+       s.add_runtime_dependency(%q<nokogiri>.freeze, ["< 2.0", ">= 1.6.1"])
+       s.add_runtime_dependency(%q<stringex>.freeze, ["~> 2.6"])
+       s.add_runtime_dependency(%q<sanitize>.freeze, ["~> 4.6.4"])
+-      s.add_runtime_dependency(%q<github-markup>.freeze, ["~> 1.6"])
++      s.add_runtime_dependency(%q<gitlab-markup>.freeze, ["~> 1.6"])
+       s.add_runtime_dependency(%q<gemojione>.freeze, ["~> 3.2"])
+       s.add_development_dependency(%q<org-ruby>.freeze, ["~> 0.9.9"])
+       s.add_development_dependency(%q<kramdown>.freeze, ["~> 1.6.0"])