Index: branches/2017Q1/www/rubygem-gollum-lib/Makefile
===================================================================
--- branches/2017Q1/www/rubygem-gollum-lib/Makefile	(revision 430514)
+++ branches/2017Q1/www/rubygem-gollum-lib/Makefile	(revision 430515)
@@ -1,28 +1,28 @@
 # Created by: Johannes Meixner <johannes@perceivon.net>
 # $FreeBSD$
 
 PORTNAME=	gollum-lib
 PORTVERSION=	4.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
 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-gemojione>=2.2:graphics/rubygem-gemojione \
 		rubygem-github-markup>=1.4:textproc/rubygem-github-markup \
 		rubygem-gollum-grit_adapter>=1.0:www/rubygem-gollum-grit_adapter \
 		rubygem-nokogiri>=1.6.4:textproc/rubygem-nokogiri \
 		rubygem-rouge>=2.0:textproc/rubygem-rouge \
 		rubygem-sanitize>=2.1:textproc/rubygem-sanitize \
 		rubygem-stringex>=2.6:devel/rubygem-stringex
 
 NO_ARCH=	yes
 USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
Index: branches/2017Q1/www/rubygem-gollum-lib/files/patch-gemspec
===================================================================
--- branches/2017Q1/www/rubygem-gollum-lib/files/patch-gemspec	(revision 430514)
+++ branches/2017Q1/www/rubygem-gollum-lib/files/patch-gemspec	(revision 430515)
@@ -1,19 +1,20 @@
---- gollum-lib.gemspec.orig	2016-12-04 18:03:16 UTC
-+++ gollum-lib.gemspec
-@@ -25,13 +25,13 @@ Gem::Specification.new do |s|
+--- gollum-lib.gemspec.orig	2017-01-03 13:59:10.693257000 -0500
++++ gollum-lib.gemspec	2017-01-03 13:59:26.688694000 -0500
+@@ -25,13 +25,13 @@
      s.specification_version = 2
  
      if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
 -      s.add_runtime_dependency(%q<gollum-grit_adapter>.freeze, ["~> 1.0"])
 +      s.add_runtime_dependency(%q<gollum-grit_adapter>.freeze, [">= 1.0"])
        s.add_runtime_dependency(%q<rouge>.freeze, ["~> 2.0"])
-       s.add_runtime_dependency(%q<nokogiri>.freeze, ["~> 1.6.4"])
+-      s.add_runtime_dependency(%q<nokogiri>.freeze, ["~> 1.6.4"])
++      s.add_runtime_dependency(%q<nokogiri>.freeze, ["~> 1.6"])
        s.add_runtime_dependency(%q<stringex>.freeze, ["~> 2.6"])
 -      s.add_runtime_dependency(%q<sanitize>.freeze, ["~> 2.1"])
 +      s.add_runtime_dependency(%q<sanitize>.freeze, [">= 2.1"])
        s.add_runtime_dependency(%q<github-markup>.freeze, ["~> 1.4"])
 -      s.add_runtime_dependency(%q<gemojione>.freeze, ["~> 2.2"])
 +      s.add_runtime_dependency(%q<gemojione>.freeze, [">= 2.2"])
        s.add_development_dependency(%q<org-ruby>.freeze, ["~> 0.9.9"])
        s.add_development_dependency(%q<kramdown>.freeze, ["~> 1.6.0"])
        s.add_development_dependency(%q<RedCloth>.freeze, ["~> 4.2.9"])
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 430514)
+++ branches/2017Q1	(revision 430515)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r430514