Update mikutter to 3.3.3.

#mikutter 3.3.3

* update language po files
* fix of "crash on click of setting button" was missed

#mikutter 3.3.2

* Happy new year
* several crash issue
* crash on click of setting button on certain condition
* avoid use of lacacy methods deprecated by Ruby 2.3

#mikutter 3.3.1

* crash on UserStream process in some case
* crash on adding list

#mikutter 3.3.0

* use external libraries
 * Delayer-Deferred
 * Pluggaloid
* retweeted retweet
* liked retweet
* retweet with comments
* show icons for protected accounts
* add settings to show icons for verified accounts
* change method of counting a number of chars, to reflect URL conversion
* improvements of daemon mode
* notice function
* imrovements of support of some image services

5 files changed, 75 insertions, 19 deletions

diff --git a/net/mikutter/Makefile b/net/mikutter/Makefile
index 3987a569234..ba881d53f08 100644
--- a/net/mikutter/Makefile
+++ b/net/mikutter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.109 2015/12/30 04:22:59 taca Exp $
+# $NetBSD: Makefile,v 1.110 2016/01/09 19:36:12 tsutsui Exp $
 #
 
-DISTNAME=	mikutter.3.2.12
+DISTNAME=	mikutter.3.3.3
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/./-/}
 CATEGORIES=	net
 MASTER_SITES=	http://mikutter.hachune.net/bin/
@@ -13,17 +13,20 @@ LICENSE=	mit AND cc-by-sa-v3.0
 
 .include "../../lang/ruby/rubyversion.mk"
 
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk>=2.2.5:../../x11/ruby-gnome2-gtk
+DEPENDS+=	${RUBY_PKGPREFIX}-pluggaloid-[0-9]*:../../net/ruby-pluggaloid
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk>=3.0.7:../../x11/ruby-gnome2-gtk
 DEPENDS+=	${RUBY_PKGPREFIX}-gettext>=3.0.1:../../devel/ruby-gettext
 DEPENDS+=	${RUBY_PKGPREFIX}-oauth>=0.4:../../security/ruby-oauth
 DEPENDS+=	${RUBY_PKGPREFIX}-addressable>=2.3:../../net/ruby-addressable
-DEPENDS+=	${RUBY_PKGPREFIX}-memoize>=1.3:../../devel/ruby-memoize
+DEPENDS+=	${RUBY_PKGPREFIX}-memoist-[0-9]*:../../devel/ruby-memoist
 DEPENDS+=	${RUBY_PKGPREFIX}-hmac>=0.4:../../security/ruby-hmac
 DEPENDS+=	${RUBY_PKGPREFIX}-typed-array>=0.1:../../misc/ruby-typed-array
 DEPENDS+=	${RUBY_PKGPREFIX}-delayer-[0-9]*:../../devel/ruby-delayer
+DEPENDS+=	${RUBY_PKGPREFIX}-delayer-deferred-[0-9]*:../../devel/ruby-delayer-deferred
 DEPENDS+=	${RUBY_PKGPREFIX}-nokogiri-[0-9]*:../../textproc/ruby-nokogiri
 DEPENDS+=	${RUBY_PKGPREFIX}-httpclient-[0-9]*:../../www/ruby-httpclient
 DEPENDS+=	${RUBY_PKGPREFIX}-moneta>=0.7:../../databases/ruby-moneta
+DEPENDS+=	${RUBY_PKGPREFIX}-twitter-text-[0-9]*:../../net/ruby-twitter-text
 
 WRKSRC=		${WRKDIR}/mikutter
 USE_LANGUAGES=	# none
diff --git a/net/mikutter/PLIST b/net/mikutter/PLIST
index b82da8c35db..11c99186fdb 100644
--- a/net/mikutter/PLIST
+++ b/net/mikutter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2015/12/19 11:32:45 tsutsui Exp $
+@comment $NetBSD: PLIST,v 1.33 2016/01/09 19:36:12 tsutsui Exp $
 bin/mikutter
 share/applications/mikutter.desktop
 share/doc/mikutter/README
@@ -8,6 +8,7 @@ share/mikutter/core/boot/delayer.rb
 share/mikutter/core/boot/load_plugin.rb
 share/mikutter/core/boot/mainloop.rb
 share/mikutter/core/boot/option.rb
+share/mikutter/core/boot/shell/account.rb
 share/mikutter/core/boot/shell/generate.rb
 share/mikutter/core/boot/shell/makepot.rb
 share/mikutter/core/boot/shell/spec.rb
@@ -15,14 +16,6 @@ share/mikutter/core/config.rb
 share/mikutter/core/configloader.rb
 share/mikutter/core/entity.rb
 share/mikutter/core/environment.rb
-share/mikutter/core/event.rb
-share/mikutter/core/event_filter.rb
-share/mikutter/core/event_listener.rb
-share/mikutter/core/lib/deferred.rb
-share/mikutter/core/lib/deferred/deferred.rb
-share/mikutter/core/lib/deferred/deferredable.rb
-share/mikutter/core/lib/deferred/test.deferred.rb
-share/mikutter/core/lib/instance_storage.rb
 share/mikutter/core/lib/lazy.rb
 share/mikutter/core/lib/mikutwitter.rb
 share/mikutter/core/lib/mikutwitter/api_call_support.rb
@@ -95,8 +88,10 @@ share/mikutter/core/mui/cairo_markup_generator.rb
 share/mikutter/core/mui/cairo_miracle_painter.rb
 share/mikutter/core/mui/cairo_pseudo_message_widget.rb
 share/mikutter/core/mui/cairo_replyviewer.rb
+share/mikutter/core/mui/cairo_special_edge.rb
 share/mikutter/core/mui/cairo_sub_parts_favorite.rb
 share/mikutter/core/mui/cairo_sub_parts_helper.rb
+share/mikutter/core/mui/cairo_sub_parts_quote.rb
 share/mikutter/core/mui/cairo_sub_parts_retweet.rb
 share/mikutter/core/mui/cairo_sub_parts_voter.rb
 share/mikutter/core/mui/cairo_textselector.rb
@@ -226,7 +221,9 @@ share/mikutter/core/plugin/console/po/vi/console.po
 share/mikutter/core/plugin/console/po/zh/console.po
 share/mikutter/core/plugin/console/po/zh_CN/console.po
 share/mikutter/core/plugin/console/po/zh_TW/console.po
-share/mikutter/core/plugin/core.rb
+share/mikutter/core/plugin/core/.mikutter.yml
+share/mikutter/core/plugin/core/configuration.json
+share/mikutter/core/plugin/core/core.rb
 share/mikutter/core/plugin/direct_message/.mikutter.yml
 share/mikutter/core/plugin/direct_message/direct_message.rb
 share/mikutter/core/plugin/direct_message/dmlistview.rb
@@ -385,6 +382,8 @@ share/mikutter/core/plugin/mentions/po/vi/mentions.po
 share/mikutter/core/plugin/mentions/po/zh/mentions.po
 share/mikutter/core/plugin/mentions/po/zh_CN/mentions.po
 share/mikutter/core/plugin/mentions/po/zh_TW/mentions.po
+share/mikutter/core/plugin/notification/.mikutter.yml
+share/mikutter/core/plugin/notification/notification.rb
 share/mikutter/core/plugin/notify/.mikutter.yml
 share/mikutter/core/plugin/notify/notify.rb
 share/mikutter/core/plugin/notify/po/ar/notify.po
@@ -449,6 +448,8 @@ share/mikutter/core/plugin/proxy/po/zh/proxy.po
 share/mikutter/core/plugin/proxy/po/zh_CN/proxy.po
 share/mikutter/core/plugin/proxy/po/zh_TW/proxy.po
 share/mikutter/core/plugin/proxy/proxy.rb
+share/mikutter/core/plugin/quoted_message/.mikutter.yml
+share/mikutter/core/plugin/quoted_message/quoted_message.rb
 share/mikutter/core/plugin/ratelimit/.mikutter.yml
 share/mikutter/core/plugin/ratelimit/po/ar/ratelimit.po
 share/mikutter/core/plugin/ratelimit/po/de/ratelimit.po
@@ -614,6 +615,8 @@ share/mikutter/core/plugin/streaming/po/zh_TW/streaming.po
 share/mikutter/core/plugin/streaming/streamer.rb
 share/mikutter/core/plugin/streaming/streamer_error.rb
 share/mikutter/core/plugin/streaming/streaming.rb
+share/mikutter/core/plugin/streaming_connection_status/.mikutter.yml
+share/mikutter/core/plugin/streaming_connection_status/streaming_connection_status.rb
 share/mikutter/core/plugin/tco/.mikutter.yml
 share/mikutter/core/plugin/tco/tco.rb
 share/mikutter/core/plugin/template
@@ -653,6 +656,8 @@ share/mikutter/core/skin/data/notfound.png
 share/mikutter/core/skin/data/overbutton.png
 share/mikutter/core/skin/data/overbutton_mouseover.png
 share/mikutter/core/skin/data/post.png
+share/mikutter/core/skin/data/protected.png
+share/mikutter/core/skin/data/quote.png
 share/mikutter/core/skin/data/reply.png
 share/mikutter/core/skin/data/retweet.png
 share/mikutter/core/skin/data/retweet_cancel.png
@@ -683,6 +688,7 @@ share/mikutter/core/skin/data/tab-bg.png
 share/mikutter/core/skin/data/timeline.png
 share/mikutter/core/skin/data/underconstruction.png
 share/mikutter/core/skin/data/unfav.png
+share/mikutter/core/skin/data/verified.png
 share/mikutter/core/user.rb
 share/mikutter/core/userconfig.rb
 share/mikutter/core/userlist.rb
diff --git a/net/mikutter/distinfo b/net/mikutter/distinfo
index 75c42c142f5..826f6fbbb37 100644
--- a/net/mikutter/distinfo
+++ b/net/mikutter/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.96 2015/12/22 16:34:05 tsutsui Exp $
+$NetBSD: distinfo,v 1.97 2016/01/09 19:36:12 tsutsui Exp $
 
-SHA1 (mikutter.3.2.12.tar.gz) = 0cddc78e00c867fc50a671aa765569bd95571780
-RMD160 (mikutter.3.2.12.tar.gz) = cf495f2da9e57f14d5bbc6b058a89e7e00c7d514
-SHA512 (mikutter.3.2.12.tar.gz) = 33b2b5376d2ddc7274aece5d87f6f70b6dcbef5c3f6d66275f4fb634bc368df622646100aa5237ef1a49360628702a03e9722b850c770faaf68f30efd38835d7
-Size (mikutter.3.2.12.tar.gz) = 2580239 bytes
+SHA1 (mikutter.3.3.3.tar.gz) = e0401269c6186c28e14662fa3c03a1113b0892a8
+RMD160 (mikutter.3.3.3.tar.gz) = 09fac4ae91b1c1e7100ee669eae22d85cead1d07
+SHA512 (mikutter.3.3.3.tar.gz) = 011c04f87990d6c98e7420ea9cd9b70e99bf748073e112de1bf225bc1bea1393d473d53533e87abe790fed9ac2b5795f5d40f74981a4b800dcd9e9dc30b3d8f4
+Size (mikutter.3.3.3.tar.gz) = 3049182 bytes
 SHA1 (patch-core_plugin_libnotify_rnotify.rb) = 0bb5630f4411d11ad188c722fb1d14e2d6748d17
+SHA1 (patch-core_plugin_photo__support_Gemfile) = 754b96024904e2e2f55c83e88fd3c763eecf723c
+SHA1 (patch-core_plugin_photo__support_photo__support.rb) = f8183a69ff36bd9c7da8c57d0b720ceade210ea3
diff --git a/net/mikutter/patches/patch-core_plugin_photo__support_Gemfile b/net/mikutter/patches/patch-core_plugin_photo__support_Gemfile
new file mode 100644
index 00000000000..fcb1df229a4
--- /dev/null
+++ b/net/mikutter/patches/patch-core_plugin_photo__support_Gemfile
@@ -0,0 +1,12 @@
+$NetBSD: patch-core_plugin_photo__support_Gemfile,v 1.1 2016/01/09 19:36:12 tsutsui Exp $
+
+- temporary workaround to skip totorijp gems (sorry, @toshi_a)
+
+--- core/plugin/photo_support/Gemfile.orig	2016-01-07 12:13:12.000000000 +0000
++++ core/plugin/photo_support/Gemfile
+@@ -2,4 +2,4 @@ source 'https://rubygems.org'
+ 
+ gem 'nokogiri'
+ gem 'httpclient'
+-gem 'totoridipjp'
++#gem 'totoridipjp'
diff --git a/net/mikutter/patches/patch-core_plugin_photo__support_photo__support.rb b/net/mikutter/patches/patch-core_plugin_photo__support_photo__support.rb
new file mode 100644
index 00000000000..12e83907271
--- /dev/null
+++ b/net/mikutter/patches/patch-core_plugin_photo__support_photo__support.rb
@@ -0,0 +1,33 @@
+$NetBSD: patch-core_plugin_photo__support_photo__support.rb,v 1.1 2016/01/09 19:36:12 tsutsui Exp $
+
+- temporary workaround to skip totorijp gems (sorry, @toshi_a)
+
+--- core/plugin/photo_support/photo_support.rb.orig	2015-12-27 21:42:08.000000000 +0000
++++ core/plugin/photo_support/photo_support.rb
+@@ -1,7 +1,7 @@
+ # coding: utf-8
+ require 'nokogiri'
+ require 'httpclient'
+-require 'totoridipjp'
++#require 'totoridipjp'
+ 
+ module Plugin::PhotoSupport
+   INSTAGRAM_PATTERN = %r{^https?://(?:instagr\.am|instagram\.com)/p/([a-zA-Z0-9_\-]+)}
+@@ -178,9 +178,14 @@ Plugin.create :photo_support do
+ 
+   # totori.dip.jp
+   defimageopener('totori.dip.jp', %r#\Ahttp://totori\.dip\.jp/?\Z#) do |display_url|
+-    iwashi = Totoridipjp.イワシがいっぱいだあ…ちょっとだけもらっていこうかな
+-    if iwashi.url
+-      open(iwashi.url) end
++#    iwashi = Totoridipjp.イワシがいっぱいだあ…ちょっとだけもらっていこうかな
++#    if iwashi.url
++#      open(iwashi.url) end
++    connection = HTTPClient.new
++    page = connection.get_content(display_url)
++    next nil if page.empty?
++    doc = Nokogiri::HTML(page)
++    open(doc.css('meta[property="og:image"]').first.attribute('content'))
+   end
+ 
+   # 600eur.gochiusa.net