Update mikutter to 0.2.0.1089.

pkgsrc changes:
 - customized escape.rb is no longer necessary
 - catch up directory reorganaization
 - update COMMENT and LICENSE per newer distribution files

Upstream changes:

0.2.0.1089:
 - workaround bugs in several Twitter's APIs that cause auth dialogs and
   prevent initial authentication

0.2.0.1080:
 - add auto scroll support in activity tab
 - fix problems when access token is canceled
 - workaround invalid response from Twitter that causes hourly auth dialog
 - fix crash problem when profile command is invoked without selected tweet

0.2.0.1064
 - same fix in 0.1.1.1063
 - reorganize directories
 - fix a problem that can't remove abstruct tab
 - fix several bugs in setting windows
 - add support preview of tumblr and hatena photolife

0.2.0.1054:
 - fix open conversation tab commant without focused tweet
 - stop sending a bug report without useful trace

0.2 major updates:
 - reorganize UI APIs
 - support multipain officially
 - replace settings tab with window
 - renew profile plugin
 - add many mikutter commands for keyboard operation
 - misc secret features

4 files changed, 161 insertions, 81 deletions

diff --git a/net/mikutter/Makefile b/net/mikutter/Makefile
index e93bb9f972c..35d841c47dc 100644
--- a/net/mikutter/Makefile
+++ b/net/mikutter/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.54 2012/12/14 11:57:44 obache Exp $
+# $NetBSD: Makefile,v 1.55 2012/12/17 17:44:20 tsutsui Exp $
 #
 
-DISTNAME=	mikutter.0.1.1.1063
+DISTNAME=	mikutter.0.2.0.1089
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/./-/}
 CATEGORIES=	net
 MASTER_SITES=	http://mikutter.hachune.net/bin/
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://mikutter.hachune.net/
-COMMENT=	Simply, powerfully, and moefully twitter client
-LICENSE=	gnu-gpl-v3
+COMMENT=	Simple, powerful, and moeful twitter client
+LICENSE=	gnu-gpl-v3 AND cc-by-sa-v3.0
 
 RUBY_VERSION_SUPPORTED=	193
 
@@ -19,8 +19,6 @@ DEPENDS+=	xdg-utils-[0-9]*:../../misc/xdg-utils
 DEPENDS+=	${RUBY_PKGPREFIX}-hmac>=0.4.0:../../security/ruby-hmac
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk>=1.0.0:../../x11/ruby-gnome2-gtk
 DEPENDS+=	${RUBY_PKGPREFIX}-oauth>=0.4.6:../../security/ruby-oauth
-# need included escape.rb
-#DEPENDS+=	${RUBY_PKGPREFIX}-escape-[0-9]*:../../textproc/ruby-escape
 DEPENDS+=	${RUBY_PKGPREFIX}-memoize>=1.3.1:../../devel/ruby-memoize
 DEPENDS+=	${RUBY_PKGPREFIX}-bsearch>=1.5:../../devel/ruby-bsearch
 DEPENDS+=	${RUBY_PKGPREFIX}-httpclient-[0-9]*:../../www/ruby-httpclient
@@ -33,21 +31,25 @@ WRKSRC=		${WRKDIR}/mikutter
 USE_LANGUAGES=	# none
 USE_TOOLS+=	pax
 
-REPLACE_RUBY=	mikutter.rb
+REPLACE_RUBY=	mikutter.rb devel/makechi.rb
 REPLACE_RUBY_DIRS=	core
 .include "../../lang/ruby/replace.mk"
 
 INSTALLATION_DIRS+=	bin share/doc/mikutter share/applications share/mikutter
 
 do-build:
+	cd ${WRKSRC}/devel && \
+		${RM} -rf debian
 	cd ${WRKSRC}/core/lib && \
-		${RM} -rf json* hmac*.rb memoize.rb oauth* ruby-bsearch-* addressable && \
+		${RM} -rf addressable json oauth ruby-bsearch-1.5 typed-array
+	cd ${WRKSRC}/vendor && \
+		${RM} -rf addressable bsearch* hmac*.rb json* memoize.rb oauth* ruby-bsearch-1.5
 	${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/desktop.in > ${WRKDIR}/desktop
 	${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/mikutter.sh.in > ${WRKDIR}/mikutter.sh
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/mikutter.rb ${DESTDIR}${PREFIX}/share/mikutter
-	cd ${WRKSRC} && pax -rwpp -s '/.*\.orig//' core plugin ${DESTDIR}${PREFIX}/share/mikutter
+	cd ${WRKSRC} && pax -rwpp -s '/.*\.orig//' core devel plugin vendor ${DESTDIR}${PREFIX}/share/mikutter
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mikutter
 	${INSTALL_SCRIPT} ${WRKDIR}/mikutter.sh ${DESTDIR}${PREFIX}/bin/mikutter
 	${INSTALL_DATA} ${WRKDIR}/desktop ${DESTDIR}${PREFIX}/share/applications/mikutter.desktop
diff --git a/net/mikutter/PLIST b/net/mikutter/PLIST
index 5118f653d82..74c1c913bba 100644
--- a/net/mikutter/PLIST
+++ b/net/mikutter/PLIST
@@ -1,60 +1,13 @@
-@comment $NetBSD: PLIST,v 1.17 2012/05/13 14:21:55 obache Exp $
+@comment $NetBSD: PLIST,v 1.18 2012/12/17 17:44:20 tsutsui Exp $
 bin/mikutter
 share/applications/mikutter.desktop
 share/doc/mikutter/README
-share/mikutter/core/addon/activity/activity.rb
-share/mikutter/core/addon/addon.rb
-share/mikutter/core/addon/alsa/alsa.rb
-share/mikutter/core/addon/api_request_file_cache.rb
-share/mikutter/core/addon/aspectframe/aspectframe.rb
-share/mikutter/core/addon/bitly/bitly.rb
-share/mikutter/core/addon/bitly/test.bitly.rb
-share/mikutter/core/addon/bugreport.rb
-share/mikutter/core/addon/change_account.rb
-share/mikutter/core/addon/contextmenu.rb
-share/mikutter/core/addon/directmessage/directmessage.rb
-share/mikutter/core/addon/directmessage/dmlistview.rb
-share/mikutter/core/addon/directmessage/sender.rb
-share/mikutter/core/addon/directmessage/userlist.rb
-share/mikutter/core/addon/extract.rb
-share/mikutter/core/addon/followingcontrol.rb
-share/mikutter/core/addon/friend_timeline.rb
-share/mikutter/core/addon/image_file_cache/image_file_cache.rb
-share/mikutter/core/addon/libnotify/libnotify.rb
-share/mikutter/core/addon/libnotify/notify-send.rb
-share/mikutter/core/addon/libnotify/rnotify.rb
-share/mikutter/core/addon/list/list.rb
-share/mikutter/core/addon/list/liststream.rb
-share/mikutter/core/addon/mentions.rb
-share/mikutter/core/addon/notify.rb
-share/mikutter/core/addon/openimg/openimg.rb
-share/mikutter/core/addon/openimg/pattern_file.json
-share/mikutter/core/addon/profile.rb
-share/mikutter/core/addon/proxy/proxy.rb
-share/mikutter/core/addon/rest/rest.rb
-share/mikutter/core/addon/search.rb
-share/mikutter/core/addon/set_input.rb
-share/mikutter/core/addon/set_view.rb
-share/mikutter/core/addon/settings/basic_settings.rb
-share/mikutter/core/addon/settings/builder.rb
-share/mikutter/core/addon/settings/listener.rb
-share/mikutter/core/addon/settings/multiselect.rb
-share/mikutter/core/addon/settings/select.rb
-share/mikutter/core/addon/settings/settings.rb
-share/mikutter/core/addon/settings/test_listener.rb
-share/mikutter/core/addon/shortcutkey.rb
-share/mikutter/core/addon/smartthread.rb
-share/mikutter/core/addon/streaming/filter.rb
-share/mikutter/core/addon/streaming/parma_streamer.rb
-share/mikutter/core/addon/streaming/streamer.rb
-share/mikutter/core/addon/streaming/streamer_error.rb
-share/mikutter/core/addon/streaming/streaming.rb
-share/mikutter/core/addon/tco/tco.rb
-share/mikutter/core/addon/tco/test_tco.rb
 share/mikutter/core/autotag.rb
 share/mikutter/core/boot/check_config_permission.rb
 share/mikutter/core/boot/load_plugin.rb
 share/mikutter/core/boot/option.rb
+share/mikutter/core/boot/shell/generate.rb
+share/mikutter/core/boot/shell/spec.rb
 share/mikutter/core/chi.rb
 share/mikutter/core/config.rb
 share/mikutter/core/configloader.rb
@@ -67,7 +20,6 @@ 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/escape.rb
 share/mikutter/core/lib/lazy.rb
 share/mikutter/core/lib/mikutwitter.rb
 share/mikutter/core/lib/mikutwitter/api_call_support.rb
@@ -168,13 +120,119 @@ share/mikutter/core/mui/gtk_web_image_loader_image_cache_raw.rb
 share/mikutter/core/mui/gtk_webicon.rb
 share/mikutter/core/plugin.rb
 share/mikutter/core/plugin/ChangeLog
+share/mikutter/core/plugin/activity/activity.rb
+share/mikutter/core/plugin/activity/spec
+share/mikutter/core/plugin/alsa/alsa.rb
+share/mikutter/core/plugin/alsa/spec
+share/mikutter/core/plugin/api_request_file_cache.rb
+share/mikutter/core/plugin/aspectframe/aspectframe.rb
+share/mikutter/core/plugin/aspectframe/spec
+share/mikutter/core/plugin/bitly/bitly.rb
+share/mikutter/core/plugin/bitly/spec
+share/mikutter/core/plugin/bitly/test.bitly.rb
+share/mikutter/core/plugin/bugreport.rb
+share/mikutter/core/plugin/change_account.rb
+share/mikutter/core/plugin/command/command.rb
+share/mikutter/core/plugin/command/conditions.rb
+share/mikutter/core/plugin/command/spec
+share/mikutter/core/plugin/console/console.rb
+share/mikutter/core/plugin/console/console_control.rb
+share/mikutter/core/plugin/console/spec
 share/mikutter/core/plugin/core.rb
-share/mikutter/core/plugin/gui.rb
+share/mikutter/core/plugin/direct_message/direct_message.rb
+share/mikutter/core/plugin/direct_message/dmlistview.rb
+share/mikutter/core/plugin/direct_message/sender.rb
+share/mikutter/core/plugin/direct_message/spec
+share/mikutter/core/plugin/direct_message/userlist.rb
+share/mikutter/core/plugin/extract/extract.rb
+share/mikutter/core/plugin/extract/spec
+share/mikutter/core/plugin/followingcontrol/followingcontrol.rb
+share/mikutter/core/plugin/followingcontrol/spec
+share/mikutter/core/plugin/gtk/delayer.rb
+share/mikutter/core/plugin/gtk/gtk.rb
+share/mikutter/core/plugin/gtk/mikutter_window.rb
+share/mikutter/core/plugin/gtk/spec
+share/mikutter/core/plugin/gtk/tab_container.rb
+share/mikutter/core/plugin/gui/command.rb
+share/mikutter/core/plugin/gui/cuscadable.rb
+share/mikutter/core/plugin/gui/dsl.rb
+share/mikutter/core/plugin/gui/gui.rb
+share/mikutter/core/plugin/gui/hierarchy_child.rb
+share/mikutter/core/plugin/gui/hierarchy_parent.rb
+share/mikutter/core/plugin/gui/pane.rb
+share/mikutter/core/plugin/gui/postbox.rb
+share/mikutter/core/plugin/gui/profile.rb
+share/mikutter/core/plugin/gui/profiletab.rb
+share/mikutter/core/plugin/gui/spec
+share/mikutter/core/plugin/gui/tab.rb
+share/mikutter/core/plugin/gui/tab_child_widget.rb
+share/mikutter/core/plugin/gui/tablike.rb
+share/mikutter/core/plugin/gui/test/test_cuscadable.rb
+share/mikutter/core/plugin/gui/test/test_dsl.rb
+share/mikutter/core/plugin/gui/test/test_hierarchy_parent.rb
+share/mikutter/core/plugin/gui/test/test_widget.rb
+share/mikutter/core/plugin/gui/timeline.rb
+share/mikutter/core/plugin/gui/widget.rb
+share/mikutter/core/plugin/gui/window.rb
+share/mikutter/core/plugin/home_timeline/home_timeline.rb
+share/mikutter/core/plugin/home_timeline/spec
+share/mikutter/core/plugin/image_file_cache/image_file_cache.rb
+share/mikutter/core/plugin/image_file_cache/spec
+share/mikutter/core/plugin/libnotify/libnotify.rb
+share/mikutter/core/plugin/libnotify/notify-send.rb
+share/mikutter/core/plugin/libnotify/rnotify.rb
+share/mikutter/core/plugin/libnotify/spec
+share/mikutter/core/plugin/list/list.rb
+share/mikutter/core/plugin/list/spec
+share/mikutter/core/plugin/mentions/mentions.rb
+share/mikutter/core/plugin/mentions/spec
+share/mikutter/core/plugin/notify.rb
+share/mikutter/core/plugin/openimg/openimg.rb
+share/mikutter/core/plugin/openimg/pattern_file.json
+share/mikutter/core/plugin/openimg/spec
+share/mikutter/core/plugin/profile/profile.rb
+share/mikutter/core/plugin/profile/spec
+share/mikutter/core/plugin/proxy/proxy.rb
+share/mikutter/core/plugin/proxy/spec
+share/mikutter/core/plugin/rest/rest.rb
+share/mikutter/core/plugin/rest/spec
+share/mikutter/core/plugin/saved_search/saved_search.rb
+share/mikutter/core/plugin/saved_search/spec
+share/mikutter/core/plugin/search/search.rb
+share/mikutter/core/plugin/search/spec
+share/mikutter/core/plugin/set_input.rb
+share/mikutter/core/plugin/set_view.rb
+share/mikutter/core/plugin/settings/basic_settings.rb
+share/mikutter/core/plugin/settings/builder.rb
+share/mikutter/core/plugin/settings/listener.rb
+share/mikutter/core/plugin/settings/multiselect.rb
+share/mikutter/core/plugin/settings/select.rb
+share/mikutter/core/plugin/settings/settings.rb
+share/mikutter/core/plugin/settings/spec
+share/mikutter/core/plugin/settings/test_listener.rb
+share/mikutter/core/plugin/shortcutkey/shortcutkey.rb
+share/mikutter/core/plugin/shortcutkey/spec
+share/mikutter/core/plugin/smartthread/smartthread.rb
+share/mikutter/core/plugin/smartthread/spec
+share/mikutter/core/plugin/streaming/filter.rb
+share/mikutter/core/plugin/streaming/parma_streamer.rb
+share/mikutter/core/plugin/streaming/spec
+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/tco/spec
+share/mikutter/core/plugin/tco/tco.rb
+share/mikutter/core/plugin/tco/test_tco.rb
 share/mikutter/core/plugin/template
 share/mikutter/core/retriever.rb
 share/mikutter/core/serialthread.rb
 share/mikutter/core/service.rb
+share/mikutter/core/skin/data/arrow_followed.png
+share/mikutter/core/skin/data/arrow_following.png
+share/mikutter/core/skin/data/arrow_notfollowed.png
+share/mikutter/core/skin/data/arrow_notfollowing.png
 share/mikutter/core/skin/data/close.png
+share/mikutter/core/skin/data/console.png
 share/mikutter/core/skin/data/directmessage.png
 share/mikutter/core/skin/data/etc.png
 share/mikutter/core/skin/data/fav.png
@@ -225,11 +283,47 @@ share/mikutter/core/test/test_message.rb
 share/mikutter/core/test/test_messageconverters.rb
 share/mikutter/core/test/test_miquire.rb
 share/mikutter/core/test/test_retriever.rb
+share/mikutter/core/test/test_userlist.rb
 share/mikutter/core/test/test_utils.rb
 share/mikutter/core/test/test_web_image_loader.rb
 share/mikutter/core/user.rb
 share/mikutter/core/userconfig.rb
 share/mikutter/core/userlist.rb
 share/mikutter/core/utils.rb
+share/mikutter/devel/ABOUTCHI
+share/mikutter/devel/chiskel/core/config.rb
+share/mikutter/devel/chiskel/core/lib/graph.rb
+share/mikutter/devel/chiskel/core/lib/sensor.rb
+share/mikutter/devel/chiskel/core/plugin/ChangeLog
+share/mikutter/devel/chiskel/core/plugin/auth.rb
+share/mikutter/devel/chiskel/core/plugin/bitly.rb
+share/mikutter/devel/chiskel/core/plugin/diskobserver.rb
+share/mikutter/devel/chiskel/core/plugin/kiriban.rb
+share/mikutter/devel/chiskel/core/plugin/loadaverage.rb
+share/mikutter/devel/chiskel/core/plugin/ping.rb
+share/mikutter/devel/chiskel/core/plugin/plugin.rb
+share/mikutter/devel/chiskel/core/plugin/plugin_class.rb
+share/mikutter/devel/chiskel/core/plugin/streaming.rb
+share/mikutter/devel/chiskel/core/plugin/temperature.rb
+share/mikutter/devel/chiskel/core/plugin/template
+share/mikutter/devel/chiskel/core/plugin/uptime.rb
+share/mikutter/devel/makechi.rb
 share/mikutter/mikutter.rb
 share/mikutter/plugin/WHATSTHIS
+share/mikutter/vendor/typed-array.rb
+share/mikutter/vendor/typed-array/functions.rb
+@pkgdir share/mikutter/core/plugin/directmessage
+@pkgdir share/mikutter/core/addon/tco
+@pkgdir share/mikutter/core/addon/streaming
+@pkgdir share/mikutter/core/addon/settings
+@pkgdir share/mikutter/core/addon/rest
+@pkgdir share/mikutter/core/addon/proxy
+@pkgdir share/mikutter/core/addon/openimg
+@pkgdir share/mikutter/core/addon/list
+@pkgdir share/mikutter/core/addon/libnotify
+@pkgdir share/mikutter/core/addon/image_file_cache
+@pkgdir share/mikutter/core/addon/directmessage
+@pkgdir share/mikutter/core/addon/bitly
+@pkgdir share/mikutter/core/addon/aspectframe
+@pkgdir share/mikutter/core/addon/alsa
+@pkgdir share/mikutter/core/addon/activity
diff --git a/net/mikutter/distinfo b/net/mikutter/distinfo
index dd3168912cb..2be11ec6eb3 100644
--- a/net/mikutter/distinfo
+++ b/net/mikutter/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.47 2012/12/14 11:57:44 obache Exp $
+$NetBSD: distinfo,v 1.48 2012/12/17 17:44:20 tsutsui Exp $
 
-SHA1 (mikutter.0.1.1.1063.tar.gz) = 9d6075796d316a077e467c4bd77aae3364108145
-RMD160 (mikutter.0.1.1.1063.tar.gz) = 5a1c6bbf2ba3f8c7afd9df0936c0de23b1a34027
-Size (mikutter.0.1.1.1063.tar.gz) = 2242310 bytes
-SHA1 (patch-core_mui_cairo__inner__tl.rb) = a91ddfc1c2ba0a86d4b05d4e18acc9034c800f57
+SHA1 (mikutter.0.2.0.1089.tar.gz) = 51a107fd070cf83f43a7fec3aab21072e1f56cf7
+RMD160 (mikutter.0.2.0.1089.tar.gz) = a8027530a9e27a2f03a148d73fc5be5377d5902a
+Size (mikutter.0.2.0.1089.tar.gz) = 2219213 bytes
diff --git a/net/mikutter/patches/patch-core_mui_cairo__inner__tl.rb b/net/mikutter/patches/patch-core_mui_cairo__inner__tl.rb
deleted file mode 100644
index 291a70ad8f9..00000000000
--- a/net/mikutter/patches/patch-core_mui_cairo__inner__tl.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-core_mui_cairo__inner__tl.rb,v 1.4 2012/03/02 06:34:35 obache Exp $
-
-* use system bseach library instead of included one.
-
---- core/mui/cairo_inner_tl.rb.orig	2012-02-13 14:45:50.000000000 +0000
-+++ core/mui/cairo_inner_tl.rb
-@@ -1,7 +1,7 @@
- # -*- coding: utf-8 -*-
- 
- miquire :mui, 'timeline'
--miquire :lib, 'ruby-bsearch-1.5/bsearch'
-+miquire :lib, 'bsearch'
- miquire :lib, 'uithreadonly'
- require 'gtk2'
-