3 files changed, 35 insertions, 22 deletions

diff --git a/net-im/mikutter/Makefile b/net-im/mikutter/Makefile
index 28d07bdf7db3..de97957c1839 100644
--- a/net-im/mikutter/Makefile
+++ b/net-im/mikutter/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mikutter
-PORTVERSION=	3.2.7
+PORTVERSION=	3.3.5
 CATEGORIES=	net-im ruby
 MASTER_SITES=	http://mikutter.hachune.net/bin/ \
 		LOCAL/tota/${PORTNAME}
@@ -14,19 +14,24 @@ COMMENT=	Simple, powerful, and moeful Twitter client
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-gtk2>=2.2.5:${PORTSDIR}/x11-toolkits/rubygem-gtk2 \
+RUN_DEPENDS=	rubygem-gtk2>=3.0.7:${PORTSDIR}/x11-toolkits/rubygem-gtk2 \
 		rubygem-cairo>=1.12.9:${PORTSDIR}/graphics/rubygem-cairo \
 		rubygem-addressable>=2.3.8:${PORTSDIR}/www/rubygem-addressable \
-		rubygem-ruby-hmac>=0.4.0:${PORTSDIR}/security/rubygem-ruby-hmac \
-		rubygem-json_pure>=1.8.2:${PORTSDIR}/devel/rubygem-json_pure \
-		rubygem-memoize>=1.3.1:${PORTSDIR}/devel/rubygem-memoize \
+		rubygem-delayer>=0.0.2:${PORTSDIR}/devel/rubygem-delayer \
+		rubygem-delayer-deferred>=1.0.3:${PORTSDIR}/devel/rubygem-delayer-deferred \
+		rubygem-gettext>=3.0.9:${PORTSDIR}/devel/rubygem-gettext \
+		rubygem-instance_storage>=1.0.0:${PORTSDIR}/devel/rubygem-instance_storage \
+		rubygem-json_pure>=1.8.3:${PORTSDIR}/devel/rubygem-json_pure \
+		rubygem-locale>=2.1.1:${PORTSDIR}/devel/rubygem-locale \
+		rubygem-memoist>=0.14.0:${PORTSDIR}/devel/rubygem-memoist \
 		rubygem-oauth>=0.4.7:${PORTSDIR}/net/rubygem-oauth \
+		rubygem-pluggaloid>=1.0.2:${PORTSDIR}/devel/rubygem-pluggaloid \
+		rubygem-ruby-hmac>=0.4.0:${PORTSDIR}/security/rubygem-ruby-hmac \
+		rubygem-text>=1.3.1:${PORTSDIR}/textproc/rubygem-text \
+		rubygem-totoridipjp>=0.1.0:${PORTSDIR}/www/rubygem-totoridipjp \
+		rubygem-twitter-text>=1.13.0:${PORTSDIR}/textproc/rubygem-twitter-text \
 		rubygem-typed-array>=0.1.2:${PORTSDIR}/devel/rubygem-typed-array \
-		rubygem-delayer>=0.0.2:${PORTSDIR}/devel/rubygem-delayer \
-		rubygem-gettext>=2.3.1:${PORTSDIR}/devel/rubygem-gettext \
-		rubygem-moneta>=0.7:${PORTSDIR}/devel/rubygem-moneta \
-		rubygem-nokogiri>=1.6.3.1:${PORTSDIR}/textproc/rubygem-nokogiri \
-		rubygem-httpclient>=0:${PORTSDIR}/www/rubygem-httpclient
+		rubygem-unf>=0.1.4:${PORTSDIR}/textproc/rubygem-unf
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
diff --git a/net-im/mikutter/distinfo b/net-im/mikutter/distinfo
index fc3d3ec810cd..b30fde7760ee 100644
--- a/net-im/mikutter/distinfo
+++ b/net-im/mikutter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mikutter.3.2.7.tar.gz) = 61108ff4c39073c5fb797cde072c48bc45f89fdb90c269815695fd31b1da89b6
-SIZE (mikutter.3.2.7.tar.gz) = 2576878
+SHA256 (mikutter.3.3.5.tar.gz) = 464a3adc2a75020d2cdc6ed52bea8e9445e8fe0f8cfb0e0d8acc914f78e0bf1a
+SIZE (mikutter.3.3.5.tar.gz) = 2789919
diff --git a/net-im/mikutter/pkg-plist b/net-im/mikutter/pkg-plist
index 85be6d52a18f..a97c0612d336 100644
--- a/net-im/mikutter/pkg-plist
+++ b/net-im/mikutter/pkg-plist
@@ -4,6 +4,7 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/boot/load_plugin.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/boot/mainloop.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/boot/option.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/boot/shell/account.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/boot/shell/generate.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/boot/shell/makepot.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/boot/shell/spec.rb
@@ -11,14 +12,6 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/configloader.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/entity.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/environment.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/event.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/event_filter.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/event_listener.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/deferred.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/deferred/deferred.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/deferred/deferredable.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/deferred/test.deferred.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/instance_storage.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/lazy.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/mikutwitter/api_call_support.rb
@@ -91,8 +84,10 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/mui/cairo_miracle_painter.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/mui/cairo_pseudo_message_widget.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/mui/cairo_replyviewer.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/mui/cairo_special_edge.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/mui/cairo_sub_parts_favorite.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/mui/cairo_sub_parts_helper.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/mui/cairo_sub_parts_quote.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/mui/cairo_sub_parts_retweet.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/mui/cairo_sub_parts_voter.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/mui/cairo_textselector.rb
@@ -222,7 +217,9 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/console/po/zh/console.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/console/po/zh_CN/console.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/console/po/zh_TW/console.po
-%%RUBY_SITELIBDIR%%/mikutter/core/plugin/core.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/core/.mikutter.yml
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/core/configuration.json
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/core/core.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/direct_message/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/direct_message/direct_message.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/direct_message/dmlistview.rb
@@ -381,6 +378,8 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/mentions/po/zh/mentions.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/mentions/po/zh_CN/mentions.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/mentions/po/zh_TW/mentions.po
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/notification/.mikutter.yml
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/notification/notification.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/notify/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/notify/notify.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/notify/po/ar/notify.po
@@ -445,6 +444,8 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/proxy/po/zh_CN/proxy.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/proxy/po/zh_TW/proxy.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/proxy/proxy.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/quoted_message/.mikutter.yml
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/quoted_message/quoted_message.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/ratelimit/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/ratelimit/po/ar/ratelimit.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/ratelimit/po/de/ratelimit.po
@@ -593,7 +594,7 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/sound/sound.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming/filter.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming/parma_streamer.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming/perma_streamer.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming/po/ar/streaming.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming/po/de/streaming.po
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming/po/el/streaming.po
@@ -610,6 +611,8 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming/streamer.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming/streamer_error.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming/streaming.rb
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming_connection_status/.mikutter.yml
+%%RUBY_SITELIBDIR%%/mikutter/core/plugin/streaming_connection_status/streaming_connection_status.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/tco/.mikutter.yml
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/tco/tco.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/plugin/template
@@ -634,6 +637,7 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/copy.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/copy_all.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/directmessage.png
+%%RUBY_SITELIBDIR%%/mikutter/core/skin/data/dont_like.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/etc.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/fav.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/followers.png
@@ -641,12 +645,15 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/forward.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/icon.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/icon_alternative.png
+%%RUBY_SITELIBDIR%%/mikutter/core/skin/data/like.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/list.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/loading.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/notfound.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/overbutton.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/overbutton_mouseover.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/post.png
+%%RUBY_SITELIBDIR%%/mikutter/core/skin/data/protected.png
+%%RUBY_SITELIBDIR%%/mikutter/core/skin/data/quote.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/reply.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/retweet.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/retweet_cancel.png
@@ -677,6 +684,7 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/timeline.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/underconstruction.png
 %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/unfav.png
+%%RUBY_SITELIBDIR%%/mikutter/core/skin/data/verified.png
 %%RUBY_SITELIBDIR%%/mikutter/core/user.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/userconfig.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/userlist.rb