Update to 4.2.3

- Use static patch-gemspec with one-line REINPLACE_CMD instead of 2 EXTRA_PATCHES

Changes:	https://github.com/gollum/gollum-lib/blob/master/HISTORY.md
		https://github.com/gollum/gollum-lib/commits/master

4 files changed, 13 insertions, 34 deletions

diff --git a/www/rubygem-gollum-lib/Makefile b/www/rubygem-gollum-lib/Makefile
index bde15a51684c..e9c34507d1ff 100644
--- a/www/rubygem-gollum-lib/Makefile
+++ b/www/rubygem-gollum-lib/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gollum-lib
-PORTVERSION=	4.2.2
-PORTREVISION=	3
+PORTVERSION=	4.2.3
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
@@ -28,14 +27,15 @@ MARKUP_DESC=	Markup Selection
 GITHUB_DESC=	Use rubygem-github-markup (default)
 GITLAB_DESC=	Use rubygem-gitlab-markup instead
 
-GITHUB_RUN_DEPENDS=	rubygem-github-markup>=1.4:textproc/rubygem-github-markup
+GITHUB_RUN_DEPENDS=	rubygem-github-markup>=1.6:textproc/rubygem-github-markup
 GITLAB_RUN_DEPENDS=	rubygem-gitlab-markup>=1.5:textproc/rubygem-gitlab-markup
 
-GITHUB_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-github-gemspec
-GITLAB_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-gitlab-gemspec
-
 NO_ARCH=	yes
 USE_RUBY=	yes
 USES=		gem
 
+post-patch-GITLAB-on:
+# change runtime dependency from "github-markup ~> 1.6" to "gitlab-markup ~> 1.5"
+	@${REINPLACE_CMD} -e '/s.add_runtime_dependency/ s|github-markup\(.*\)1.6|gitlab-markup\11.5|' ${WRKSRC}/${GEMSPEC}
+
 .include <bsd.port.mk>
diff --git a/www/rubygem-gollum-lib/distinfo b/www/rubygem-gollum-lib/distinfo
index b8d2940053e9..5dff7dfcb6ab 100644
--- a/www/rubygem-gollum-lib/distinfo
+++ b/www/rubygem-gollum-lib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480760185
-SHA256 (rubygem/gollum-lib-4.2.2.gem) = 44529ee6079b139c3d57eeec8b20d999893c774cabff9b6134dbee7382df0f1b
-SIZE (rubygem/gollum-lib-4.2.2.gem) = 49152
+TIMESTAMP = 1491396497
+SHA256 (rubygem/gollum-lib-4.2.3.gem) = f7f23d3074faf91348365dcbd54caf542eba87db8e79fb5e08b3a79c31ee5c4a
+SIZE (rubygem/gollum-lib-4.2.3.gem) = 49152
diff --git a/www/rubygem-gollum-lib/files/extra-patch-gitlab-gemspec b/www/rubygem-gollum-lib/files/extra-patch-gitlab-gemspec
deleted file mode 100644
index e0ecf06bf92a..000000000000
--- a/www/rubygem-gollum-lib/files/extra-patch-gitlab-gemspec
+++ /dev/null
@@ -1,21 +0,0 @@
---- gollum-lib.gemspec.orig	2017-02-02 12:04:29 UTC
-+++ gollum-lib.gemspec
-@@ -25,13 +25,13 @@ 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<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"])
-       s.add_runtime_dependency(%q<stringex>.freeze, ["~> 2.6"])
--      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<sanitize>.freeze, [">= 2.1"])
-+      s.add_runtime_dependency(%q<gitlab-markup>.freeze, ["~> 1.5"])
-+      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"])
diff --git a/www/rubygem-gollum-lib/files/extra-patch-github-gemspec b/www/rubygem-gollum-lib/files/patch-gemspec
index 30eba8c67b1e..5899c3f85e3c 100644
--- a/www/rubygem-gollum-lib/files/extra-patch-github-gemspec
+++ b/www/rubygem-gollum-lib/files/patch-gemspec
@@ -1,6 +1,6 @@
---- 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 @@
+--- gollum-lib.gemspec.orig	2017-04-05 13:01:50 UTC
++++ gollum-lib.gemspec
+@@ -25,13 +25,13 @@ Gem::Specification.new do |s|
      s.specification_version = 2
  
      if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -12,7 +12,7 @@
        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<github-markup>.freeze, ["~> 1.6"])
 -      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"])