- Update RUN_DEPENDS

- Add the patch to fix the mikutter issue 1130
- Make portlint happy

Submitted by:	Koichiro IWAO <meta+ports_AT_vmeta_DOT_jp>
PR:		224923
MFH:		2018Q1

2 files changed, 16 insertions, 5 deletions

diff --git a/net-im/mikutter/Makefile b/net-im/mikutter/Makefile
index fd65fbf76755..81e7b911c1d3 100644
--- a/net-im/mikutter/Makefile
+++ b/net-im/mikutter/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-gtk2>=3.1.8:x11-toolkits/rubygem-gtk2 \
 		rubygem-cairo>=1.12.9:graphics/rubygem-cairo \
-		rubygem-addressable>=2.5.1:www/rubygem-addressable \
+		rubygem-addressable>=2.5.2:www/rubygem-addressable \
 		rubygem-delayer>=0.0.2:devel/rubygem-delayer \
 		rubygem-delayer-deferred>=1.0.4:devel/rubygem-delayer-deferred \
 		rubygem-gettext>=3.0.9:devel/rubygem-gettext \
@@ -24,25 +24,25 @@ RUN_DEPENDS=	rubygem-gtk2>=3.1.8:x11-toolkits/rubygem-gtk2 \
 		rubygem-httpclient>=2.7.1:www/rubygem-httpclient \
 		rubygem-instance_storage>=1.0.0:devel/rubygem-instance_storage \
 		rubygem-json_pure1>=1.8.6:devel/rubygem-json_pure1 \
-		rubygem-locale>=2.1.1:devel/rubygem-locale \
+		rubygem-locale>=2.1.2:devel/rubygem-locale \
 		rubygem-memoist>=0.16.0:devel/rubygem-memoist \
 		rubygem-moneta>=0.7:devel/rubygem-moneta \
 		rubygem-nokogiri>=1.6.7:textproc/rubygem-nokogiri \
 		rubygem-oauth>=0.5.3:net/rubygem-oauth \
 		rubygem-pluggaloid>=1.1.1:devel/rubygem-pluggaloid \
-		rubygem-public_suffix>=2.0.5:dns/rubygem-public_suffix \
+		rubygem-public_suffix>=3.0.0:dns/rubygem-public_suffix \
 		rubygem-ruby-hmac>=0.4.0:security/rubygem-ruby-hmac \
 		rubygem-text>=1.3.1:textproc/rubygem-text \
 		rubygem-totoridipjp>=0.1.0:www/rubygem-totoridipjp \
-		rubygem-twitter-text>=1.14.5:textproc/rubygem-twitter-text \
+		rubygem-twitter-text>=2.1.0:textproc/rubygem-twitter-text \
 		rubygem-typed-array>=0.1.2:devel/rubygem-typed-array \
 		rubygem-unf>=0.1.4:textproc/rubygem-unf
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
 NO_ARCH=	yes
+USES=		shebangfix
 USE_RUBY=	yes
-USES=	shebangfix
 NO_BUILD=	yes
 
 SHEBANG_FILES=	mikutter.rb \
diff --git a/net-im/mikutter/files/patch-core_mui_gtk__postbox.rb b/net-im/mikutter/files/patch-core_mui_gtk__postbox.rb
new file mode 100644
index 000000000000..65e97c0859d7
--- /dev/null
+++ b/net-im/mikutter/files/patch-core_mui_gtk__postbox.rb
@@ -0,0 +1,11 @@
+--- core/mui/gtk_postbox.rb.orig	2017-10-08 12:29:16 UTC
++++ core/mui/gtk_postbox.rb
+@@ -290,7 +290,7 @@ module Gtk
+     def remain_charcount
+       if not widget_post.destroyed?
+         text = trim_hidden_regions(widget_post.buffer.text + UserConfig[:footer])
+-        Twitter::Extractor.extract_urls(text).map{|url|
++        Twitter::TwitterText::Extractor.extract_urls(text).map{|url|
+           if url.length < posted_url_length(url)
+             -(posted_url_length(url) - url.length)
+           else