4 files changed, 23 insertions, 27 deletions

diff --git a/www/rubygem-gollum-lib/Makefile b/www/rubygem-gollum-lib/Makefile
index 688146d75a09..0863c0017596 100644
--- a/www/rubygem-gollum-lib/Makefile
+++ b/www/rubygem-gollum-lib/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gollum-lib
-PORTVERSION=	3.0.0
-PORTREVISION=	2
+PORTVERSION=	4.0.3
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
@@ -11,11 +10,12 @@ MAINTAINER=	ruby@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>=1.1.0:${PORTSDIR}/textproc/rubygem-github-markup \
-		rubygem-gitlab-grit>=2.6.5:${PORTSDIR}/textproc/rubygem-gitlab-grit \
-		rubygem-nokogiri>=1.6.1:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-rouge>=1.3.3:${PORTSDIR}/textproc/rubygem-rouge \
+RUN_DEPENDS=	rubygem-github-markup>=1.3.3:${PORTSDIR}/textproc/rubygem-github-markup \
+		rubygem-gollum-grit_adapter>=1.0:${PORTSDIR}/www/rubygem-gollum-grit_adapter \
+		rubygem-nokogiri>=1.6.4:${PORTSDIR}/textproc/rubygem-nokogiri \
+		rubygem-rouge>=1.7.4:${PORTSDIR}/textproc/rubygem-rouge \
 		rubygem-sanitize>=2.1.0:${PORTSDIR}/textproc/rubygem-sanitize \
 		rubygem-stringex>=2.5.1:${PORTSDIR}/devel/rubygem-stringex
 
diff --git a/www/rubygem-gollum-lib/distinfo b/www/rubygem-gollum-lib/distinfo
index efa1aa813e1d..7d969ec6a224 100644
--- a/www/rubygem-gollum-lib/distinfo
+++ b/www/rubygem-gollum-lib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/gollum-lib-3.0.0.gem) = 7a0896cae6d443e42b19e1353f1f900684b63109844cfdb52c48d40f2824e7a1
-SIZE (rubygem/gollum-lib-3.0.0.gem) = 43008
+SHA256 (rubygem/gollum-lib-4.0.3.gem) = 7e7aa8ac271a201479b837d82a9812d36d1144c3f98c30fdf777b2a07eff12b9
+SIZE (rubygem/gollum-lib-4.0.3.gem) = 45568
diff --git a/www/rubygem-gollum-lib/files/patch-gemspec b/www/rubygem-gollum-lib/files/patch-gemspec
deleted file mode 100644
index 73d7d0b566e9..000000000000
--- a/www/rubygem-gollum-lib/files/patch-gemspec
+++ /dev/null
@@ -1,19 +0,0 @@
---- gollum-lib.gemspec.orig	2015-05-02 09:53:32 UTC
-+++ gollum-lib.gemspec
-@@ -25,12 +25,12 @@ 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>, ["~> 2.6.5"])
--      s.add_runtime_dependency(%q<rouge>, ["~> 1.3.3"])
-+      s.add_runtime_dependency(%q<gitlab-grit>, [">= 2.6.5"])
-+      s.add_runtime_dependency(%q<rouge>, [">= 1.3.3"])
-       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.6.1"])
-       s.add_runtime_dependency(%q<stringex>, ["~> 2.5.1"])
--      s.add_runtime_dependency(%q<sanitize>, ["~> 2.1.0"])
--      s.add_runtime_dependency(%q<github-markup>, ["~> 1.1.0"])
-+      s.add_runtime_dependency(%q<sanitize>, [">= 2.1.0"])
-+      s.add_runtime_dependency(%q<github-markup>, [">= 1.1.0"])
-       s.add_development_dependency(%q<org-ruby>, ["~> 0.9.3"])
-       s.add_development_dependency(%q<github-markdown>, ["~> 0.6.5"])
-       s.add_development_dependency(%q<RedCloth>, ["~> 4.2.9"])
diff --git a/www/rubygem-gollum-lib/files/patch-gollum-lib.gemspec b/www/rubygem-gollum-lib/files/patch-gollum-lib.gemspec
new file mode 100644
index 000000000000..d975f6a1b858
--- /dev/null
+++ b/www/rubygem-gollum-lib/files/patch-gollum-lib.gemspec
@@ -0,0 +1,15 @@
+--- gollum-lib.gemspec.orig	2015-05-22 13:15:19 UTC
++++ gollum-lib.gemspec
+@@ -26,10 +26,10 @@ Gem::Specification.new do |s|
+ 
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_runtime_dependency(%q<gollum-grit_adapter>, ["~> 1.0"])
+-      s.add_runtime_dependency(%q<rouge>, ["~> 1.7.4"])
++      s.add_runtime_dependency(%q<rouge>, [">= 1.7.4"])
+       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.6.4"])
+       s.add_runtime_dependency(%q<stringex>, ["~> 2.5.1"])
+-      s.add_runtime_dependency(%q<sanitize>, ["~> 2.1.0"])
++      s.add_runtime_dependency(%q<sanitize>, [">= 2.1.0"])
+       s.add_runtime_dependency(%q<github-markup>, ["~> 1.3.3"])
+       s.add_development_dependency(%q<org-ruby>, ["~> 0.9.9"])
+       s.add_development_dependency(%q<kramdown>, ["~> 1.6.0"])