Update to mikutter to 0.0.4.571.

switch to new unstable branch.

7 files changed, 47 insertions, 28 deletions

diff --git a/net/mikutter/Makefile b/net/mikutter/Makefile
index 0c52eee536d..ba2133ec05b 100644
--- a/net/mikutter/Makefile
+++ b/net/mikutter/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2011/10/23 13:32:27 obache Exp $
+# $NetBSD: Makefile,v 1.27 2011/11/06 07:49:38 obache Exp $
 #
 
-DISTNAME=	mikutter.0.0.3.556
+DISTNAME=	mikutter.0.0.4.571
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/./-/}
 CATEGORIES=	net
 MASTER_SITES=	http://mikutter.hachune.net/bin/
@@ -18,14 +18,14 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DEPENDS+=	xdg-utils-[0-9]*:../../misc/xdg-utils
 DEPENDS+=	${RUBY_PKGPREFIX}-json>=1.5.1:../../textproc/ruby-json
 DEPENDS+=	${RUBY_PKGPREFIX}-hmac>=0.4.0:../../security/ruby-hmac
-DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk-[0-9]*:../../x11/ruby-gnome2-gtk
+DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-gtk>=1.0.0:../../x11/ruby-gnome2-gtk
 DEPENDS+=	${RUBY_PKGPREFIX}-oauth>=0.3.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
-DEPENDS+=	${RUBY_PKGPREFIX}-addressable>=2.2.6:../../net/ruby-addressable
+DEPENDS+=	${RUBY_PKGPREFIX}-addressable>=2.2.6nb1:../../net/ruby-addressable
 # notif-send
 DEPENDS+=	libnotify-[0-9]*:../../sysutils/libnotify
 
diff --git a/net/mikutter/PLIST b/net/mikutter/PLIST
index 95abceb3c24..1e7e227038c 100644
--- a/net/mikutter/PLIST
+++ b/net/mikutter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2011/07/30 02:00:44 obache Exp $
+@comment $NetBSD: PLIST,v 1.11 2011/11/06 07:49:38 obache Exp $
 bin/mikutter
 share/applications/mikutter.desktop
 share/doc/mikutter/README
@@ -9,23 +9,36 @@ 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/libnotify/libnotify.rb
-share/mikutter/core/addon/list.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.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/search.rb
 share/mikutter/core/addon/set_input.rb
 share/mikutter/core/addon/set_view.rb
-share/mikutter/core/addon/settings.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/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.rb
+share/mikutter/core/addon/tco/tco.rb
+share/mikutter/core/addon/tco/test_tco.rb
 share/mikutter/core/autotag.rb
 share/mikutter/core/chi.rb
 share/mikutter/core/config.rb
@@ -38,9 +51,12 @@ share/mikutter/core/initialize.rb
 share/mikutter/core/lib/lazy.rb
 share/mikutter/core/lib/miku/escape.rb
 share/mikutter/core/lib/piapro.rb
+share/mikutter/core/lib/reserver.rb
+share/mikutter/core/lib/test_unit_extensions.rb
 share/mikutter/core/lib/timelimitedqueue.rb
 share/mikutter/core/lib/timelimitedqueue/test/test_timelimitedqueue.rb
 share/mikutter/core/lib/timelimitedqueue/timelimitedqueue.rb
+share/mikutter/core/lib/uithreadonly.rb
 share/mikutter/core/lib/weakstorage.rb
 share/mikutter/core/message.rb
 share/mikutter/core/messageconverters.rb
@@ -60,6 +76,7 @@ share/mikutter/core/miku/primitive.rb
 share/mikutter/core/miku/symbol.rb
 share/mikutter/core/miku/symboltable.rb
 share/mikutter/core/miku/yamlisp.rb
+share/mikutter/core/miquire.rb
 share/mikutter/core/mui/cairo_cell_renderer_message.rb
 share/mikutter/core/mui/cairo_coordinate_module.rb
 share/mikutter/core/mui/cairo_icon_over_button.rb
@@ -89,9 +106,9 @@ share/mikutter/core/mui/gtk_skin.rb
 share/mikutter/core/mui/gtk_timeline_utils.rb
 share/mikutter/core/mui/gtk_userlist.rb
 share/mikutter/core/mui/gtk_webicon.rb
+share/mikutter/core/plugin.rb
 share/mikutter/core/plugin/ChangeLog
 share/mikutter/core/plugin/gui.rb
-share/mikutter/core/plugin/plugin.rb
 share/mikutter/core/plugin/template
 share/mikutter/core/post.rb
 share/mikutter/core/retriever.rb
@@ -135,12 +152,15 @@ share/mikutter/core/skin/data/sounds/sources/retweeted_data/e00/d00/e0000496.au
 share/mikutter/core/skin/data/sounds/sources/retweeted_data/e00/d00/e00008c6.au
 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/test/test_cairo_textselector.rb
 share/mikutter/core/test/test_entity.rb
 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_plugin.rb
+share/mikutter/core/test/test_post.rb
 share/mikutter/core/test/test_retriever.rb
 share/mikutter/core/test/test_user.rb
 share/mikutter/core/test/test_utils.rb
@@ -153,4 +173,3 @@ share/mikutter/core/utils.rb
 share/mikutter/core/watch.rb
 share/mikutter/mikutter.rb
 share/mikutter/plugin/WHATSTHIS
-@pkgdir share/mikutter/core/hatsunelisp
diff --git a/net/mikutter/distinfo b/net/mikutter/distinfo
index dd3efb197fe..55e71534cbd 100644
--- a/net/mikutter/distinfo
+++ b/net/mikutter/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.25 2011/10/23 13:32:27 obache Exp $
+$NetBSD: distinfo,v 1.26 2011/11/06 07:49:38 obache Exp $
 
-SHA1 (mikutter.0.0.3.556.tar.gz) = cc768567e399990f030355b2ed558249c5e3384a
-RMD160 (mikutter.0.0.3.556.tar.gz) = 550891ecfc5f7261f49d485a17efbd70c9ca2e20
-Size (mikutter.0.0.3.556.tar.gz) = 2077504 bytes
-SHA1 (patch-core_mui_cairo__inner__tl.rb) = 5a6d46874f5cc48e19f4289c8475e9eb5ccc2d98
-SHA1 (patch-core_utils.rb) = ef027320f9217264cc0e8ec0b2de87bf7b829db0
+SHA1 (mikutter.0.0.4.571.tar.gz) = 9820fbc3420e3f1e089719d2cd95afc926e24924
+RMD160 (mikutter.0.0.4.571.tar.gz) = da45f8d435e8288793ac505a78efffde1629e737
+Size (mikutter.0.0.4.571.tar.gz) = 2114492 bytes
+SHA1 (patch-core_mui_cairo__inner__tl.rb) = 58a55b857e35db0da3b5e72ede7dc9b1829efb6b
+SHA1 (patch-core_utils.rb) = f993f18a7e0f0cc8c4eb8e1ce380a94f78bc2e81
diff --git a/net/mikutter/files/desktop.in b/net/mikutter/files/desktop.in
index 198ce776110..c7d895fd45d 100644
--- a/net/mikutter/files/desktop.in
+++ b/net/mikutter/files/desktop.in
@@ -3,8 +3,8 @@ Encoding=UTF-8
 Name=Mikutter
 GenericName=Twitter Client
 GenericName[ja]=ツイッター・クライアント
-Comment=Simple, powerful and moeful twitter client.
-Comment[ja]=全てのミク廃、そしてTwitter中毒者へ贈る、至高のTwitter Clientを目指すTwitter Client。
+Comment=A moest twitter client
+Comment[ja]=全てのついったー中毒クラスタに贈る 至高のクライアント
 Exec=@PREFIX@/share/mikutter/mikutter.rb %u
 Icon=@PREFIX@/share/mikutter/core/skin/data/icon.png
 StartupNotify=false
diff --git a/net/mikutter/files/mikutter.sh.in b/net/mikutter/files/mikutter.sh.in
index fa64726a040..758be875ae1 100644
--- a/net/mikutter/files/mikutter.sh.in
+++ b/net/mikutter/files/mikutter.sh.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: mikutter.sh.in,v 1.1.1.1 2011/04/05 11:47:16 obache Exp $
+# $NetBSD: mikutter.sh.in,v 1.2 2011/11/06 07:49:38 obache Exp $
 #
 
 exec @PREFIX@/share/mikutter/mikutter.rb "$@"
diff --git a/net/mikutter/patches/patch-core_mui_cairo__inner__tl.rb b/net/mikutter/patches/patch-core_mui_cairo__inner__tl.rb
index ee567c78395..c387cabc556 100644
--- a/net/mikutter/patches/patch-core_mui_cairo__inner__tl.rb
+++ b/net/mikutter/patches/patch-core_mui_cairo__inner__tl.rb
@@ -1,8 +1,8 @@
-$NetBSD: patch-core_mui_cairo__inner__tl.rb,v 1.2 2011/06/19 04:19:56 obache Exp $
+$NetBSD: patch-core_mui_cairo__inner__tl.rb,v 1.3 2011/11/06 07:49:38 obache Exp $
 
 * use system bseach library instead of included one.
 
---- core/mui/cairo_inner_tl.rb.orig	2011-06-15 17:42:27.000000000 +0000
+--- core/mui/cairo_inner_tl.rb.orig	2011-09-03 16:58:10.000000000 +0000
 +++ core/mui/cairo_inner_tl.rb
 @@ -1,7 +1,7 @@
  # -*- coding: utf-8 -*-
@@ -10,6 +10,6 @@ $NetBSD: patch-core_mui_cairo__inner__tl.rb,v 1.2 2011/06/19 04:19:56 obache Exp
  miquire :mui, 'timeline'
 -miquire :lib, 'ruby-bsearch-1.5/bsearch'
 +miquire :lib, 'bsearch'
+ miquire :lib, 'uithreadonly'
  
  class Gtk::TimeLine::InnerTL < Gtk::CRUD
-   attr_accessor :postbox, :hp
diff --git a/net/mikutter/patches/patch-core_utils.rb b/net/mikutter/patches/patch-core_utils.rb
index a8f3b796e89..be43e1c0c3c 100644
--- a/net/mikutter/patches/patch-core_utils.rb
+++ b/net/mikutter/patches/patch-core_utils.rb
@@ -1,13 +1,13 @@
-$NetBSD: patch-core_utils.rb,v 1.1 2011/06/19 04:19:56 obache Exp $
+$NetBSD: patch-core_utils.rb,v 1.2 2011/11/06 07:49:38 obache Exp $
 
 * use included escape library instead of system one.
 
---- core/utils.rb.orig	2011-06-12 14:01:26.000000000 +0000
+--- core/utils.rb.orig	2011-10-02 11:08:04.000000000 +0000
 +++ core/utils.rb
-@@ -83,7 +83,7 @@ def file_or_directory_require(rb)
-     require rb end end
- 
- Dir::chdir(File::dirname(__FILE__))
+@@ -35,7 +35,7 @@ if RUBY_VERSION >= '1.9.2'
+     $LOAD_PATH.push(File.expand_path(File.join(Dir.pwd, path)))
+   }
+ end
 -miquire :lib, 'escape'
 +miquire :lib, 'miku/escape'
  miquire :lib, 'lazy'