Update termtter to 2.2.1.

== 2.2.1 / 2013-05-20

* Fix package problem (termtter requires termtter).

* Suppress the warning on ruby 1.9 with CentOS.


== 2.2.0 / 2013-04-20

* Using https to connect to api.twitter.com (important).

* Improvement testing (CI enabled).

* Using jeweler for packaging.

* Suppress the warning (on ruby 2.0).

* Change default stdout and colors.

* Added some plugins


== 2.1.1 / 2013-04-10

* Correspond to API 1.1

* Other fixes.


== 2.0.0 / 2013-04-07

* User own plugins loader.

  * If ~/.termtter/lib/plugins exist, load them.

* Improvement easy_post plugin.

  * Plug-in easy_post should operate only when above 15 characters.

* Improvement tests.

* "Failed to update :(" when updated with URL.

* use String#sub instead of String#[regexp]=.

* spec for expand_tco_url plugin.

* and fix other minor bugs.

3 files changed, 25 insertions, 18 deletions

diff --git a/www/termtter/Makefile b/www/termtter/Makefile
index 670aefe22da..1b9ff553405 100644
--- a/www/termtter/Makefile
+++ b/www/termtter/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2012/08/19 09:09:26 obache Exp $
+# $NetBSD: Makefile,v 1.12 2014/09/17 10:41:22 obache Exp $
 
-DISTNAME=	termtter-1.11.0
+DISTNAME=	termtter-2.2.1
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -11,13 +11,19 @@ LICENSE=	mit
 DEPENDS+=	${RUBY_PKGPREFIX}-highline>=1.5.0:../../devel/ruby-highline
 DEPENDS+=	${RUBY_PKGPREFIX}-readline-[0-9]*:../../devel/ruby-readline
 DEPENDS+=	${RUBY_PKGPREFIX}-termcolor>=1.0.0:../../devel/ruby-termcolor
-DEPENDS+=	${RUBY_PKGPREFIX}-rubytter>=0.11.0:../../net/ruby-rubytter
-DEPENDS+=	${RUBY_PKGPREFIX}-notify>=0.2.1:../../sysutils/ruby-notify
-DEPENDS+=	${RUBY_PKGPREFIX}-json-pure>=1.1.3:../../textproc/ruby-json-pure
+DEPENDS+=	${RUBY_PKGPREFIX}-rubytter>=1.5.1:../../net/ruby-rubytter
+DEPENDS+=	${RUBY_PKGPREFIX}-notify>=0.5.1:../../sysutils/ruby-notify
+
+OVERRIDE_GEMSPEC+=	highline>=1.5.0
+OVERRIDE_GEMSPEC+=	termcolor>=1.0.0
 
 CONFLICTS+=	ruby[1-9][0-9]-termtter-[0-9]* termtter-[0-9]*
 RUBY_JSON_REQD=	1.1.3
 RUBY_JSON_TYPE=	pure
 
+.include "../../lang/ruby/json.mk"
 .include "../../lang/ruby/gem.mk"
+.if ${RUBY_VER} != "18"
+DEPENDS+=	${RUBY_PKGPREFIX}-fiddle-[0-9]*:../../devel/ruby-fiddle
+.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/termtter/PLIST b/www/termtter/PLIST
index ce66a00700b..473d73cd655 100644
--- a/www/termtter/PLIST
+++ b/www/termtter/PLIST
@@ -1,15 +1,14 @@
-@comment $NetBSD: PLIST,v 1.5 2012/03/20 14:06:03 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/09/17 10:41:22 obache Exp $
 bin/termtter
+bin/termtter_frame
 ${GEM_HOME}/cache/${GEM_NAME}.gem
-${GEM_LIBDIR}/.gitignore
 ${GEM_LIBDIR}/ChangeLog
 ${GEM_LIBDIR}/Gemfile
 ${GEM_LIBDIR}/README.rdoc
 ${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/VERSION
 ${GEM_LIBDIR}/bin/termtter
 ${GEM_LIBDIR}/bin/termtter_frame
-${GEM_LIBDIR}/doc/Termtter-1.0-Release-Note-English.txt
-${GEM_LIBDIR}/doc/Termtter-1.0-Release-Note.txt
 ${GEM_LIBDIR}/lib/plugins/aa.rb
 ${GEM_LIBDIR}/lib/plugins/addspace.rb
 ${GEM_LIBDIR}/lib/plugins/another_prompt.rb
@@ -32,6 +31,7 @@ ${GEM_LIBDIR}/lib/plugins/copy.rb
 ${GEM_LIBDIR}/lib/plugins/countter.rb
 ${GEM_LIBDIR}/lib/plugins/crypt.rb
 ${GEM_LIBDIR}/lib/plugins/curry.rb
+${GEM_LIBDIR}/lib/plugins/custom_prompt.rb
 ${GEM_LIBDIR}/lib/plugins/db.rb
 ${GEM_LIBDIR}/lib/plugins/defaults.rb
 ${GEM_LIBDIR}/lib/plugins/defaults/alias.rb
@@ -67,7 +67,7 @@ ${GEM_LIBDIR}/lib/plugins/erb.rb
 ${GEM_LIBDIR}/lib/plugins/error_log.rb
 ${GEM_LIBDIR}/lib/plugins/event_invoked_at.rb
 ${GEM_LIBDIR}/lib/plugins/exec_and_update.rb
-${GEM_LIBDIR}/lib/plugins/expand-tinyurl.rb
+${GEM_LIBDIR}/lib/plugins/expand_url.rb
 ${GEM_LIBDIR}/lib/plugins/favotter.rb
 ${GEM_LIBDIR}/lib/plugins/fib_filter.rb
 ${GEM_LIBDIR}/lib/plugins/fibyou.rb
@@ -121,6 +121,7 @@ ${GEM_LIBDIR}/lib/plugins/list_switch.rb
 ${GEM_LIBDIR}/lib/plugins/list_with_opts.rb
 ${GEM_LIBDIR}/lib/plugins/log.rb
 ${GEM_LIBDIR}/lib/plugins/mark.rb
+${GEM_LIBDIR}/lib/plugins/mashimaro.rb
 ${GEM_LIBDIR}/lib/plugins/md5pass.rb
 ${GEM_LIBDIR}/lib/plugins/me.rb
 ${GEM_LIBDIR}/lib/plugins/mecab.rb
@@ -185,7 +186,6 @@ ${GEM_LIBDIR}/lib/plugins/switch_user.rb
 ${GEM_LIBDIR}/lib/plugins/system_status.rb
 ${GEM_LIBDIR}/lib/plugins/time_signal.rb
 ${GEM_LIBDIR}/lib/plugins/timer.rb
-${GEM_LIBDIR}/lib/plugins/tinyurl.rb
 ${GEM_LIBDIR}/lib/plugins/toppo.rb
 ${GEM_LIBDIR}/lib/plugins/train.rb
 ${GEM_LIBDIR}/lib/plugins/translate_tweet.rb
@@ -197,6 +197,7 @@ ${GEM_LIBDIR}/lib/plugins/typable_id.rb
 ${GEM_LIBDIR}/lib/plugins/update_editor.rb
 ${GEM_LIBDIR}/lib/plugins/uri-open.rb
 ${GEM_LIBDIR}/lib/plugins/url.rb
+${GEM_LIBDIR}/lib/plugins/url_shortener.rb
 ${GEM_LIBDIR}/lib/plugins/user_stream.rb
 ${GEM_LIBDIR}/lib/plugins/w3mimg.rb
 ${GEM_LIBDIR}/lib/plugins/wassr.rb
@@ -235,13 +236,14 @@ ${GEM_LIBDIR}/spec/plugins/capital_update_spec.rb
 ${GEM_LIBDIR}/spec/plugins/cool_spec.rb
 ${GEM_LIBDIR}/spec/plugins/curry_spec.rb
 ${GEM_LIBDIR}/spec/plugins/db_spec.rb
+${GEM_LIBDIR}/spec/plugins/defaults/expand_tco_url_spec.rb
 ${GEM_LIBDIR}/spec/plugins/defaults/hashtag_spec.rb
 ${GEM_LIBDIR}/spec/plugins/defaults/list_spec.rb
 ${GEM_LIBDIR}/spec/plugins/defaults/plugin_spec.rb
 ${GEM_LIBDIR}/spec/plugins/defaults/retweet_spec.rb
 ${GEM_LIBDIR}/spec/plugins/draft_spec.rb
 ${GEM_LIBDIR}/spec/plugins/english_spec_.rb
-${GEM_LIBDIR}/spec/plugins/expand-tinyurl_spec.rb
+${GEM_LIBDIR}/spec/plugins/expand_url_spec.rb
 ${GEM_LIBDIR}/spec/plugins/fib_spec.rb
 ${GEM_LIBDIR}/spec/plugins/filter_spec_.rb
 ${GEM_LIBDIR}/spec/plugins/footer_spec.rb
@@ -249,7 +251,6 @@ ${GEM_LIBDIR}/spec/plugins/gsub_spec.rb
 ${GEM_LIBDIR}/spec/plugins/haml_spec.rb
 ${GEM_LIBDIR}/spec/plugins/hi_spec.rb
 ${GEM_LIBDIR}/spec/plugins/md5pass_spec.rb
-${GEM_LIBDIR}/spec/plugins/pause_spec.rb
 ${GEM_LIBDIR}/spec/plugins/primes_spec_.rb
 ${GEM_LIBDIR}/spec/plugins/shell_spec.rb
 ${GEM_LIBDIR}/spec/plugins/sl_spec_.rb
@@ -257,8 +258,8 @@ ${GEM_LIBDIR}/spec/plugins/spam_spec.rb
 ${GEM_LIBDIR}/spec/plugins/standard_commands_spec.rb
 ${GEM_LIBDIR}/spec/plugins/storage/sqlite3_spec.rb
 ${GEM_LIBDIR}/spec/plugins/storage/status_spec_.rb
-${GEM_LIBDIR}/spec/plugins/tinyurl_spec.rb
 ${GEM_LIBDIR}/spec/plugins/truncate_spec.rb
+${GEM_LIBDIR}/spec/plugins/url_shortener_spec.rb
 ${GEM_LIBDIR}/spec/plugins/whois_spec_.rb
 ${GEM_LIBDIR}/spec/spec_helper.rb
 ${GEM_LIBDIR}/spec/termtter/active_rubytter_spec.rb
diff --git a/www/termtter/distinfo b/www/termtter/distinfo
index 84a571b3602..59d87ea39dd 100644
--- a/www/termtter/distinfo
+++ b/www/termtter/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2012/04/29 16:16:30 taca Exp $
+$NetBSD: distinfo,v 1.8 2014/09/17 10:41:22 obache Exp $
 
-SHA1 (termtter-1.11.0.gem) = ad0abba083d017c908b336ba5fb73e11ebb20091
-RMD160 (termtter-1.11.0.gem) = 0623aadc9f5590313b339d8ad869d2a2f4a2f6a7
-Size (termtter-1.11.0.gem) = 1504768 bytes
+SHA1 (termtter-2.2.1.gem) = 90b15a621cc4eae2cd923d10f44dd965678018cc
+RMD160 (termtter-2.2.1.gem) = e56faffb02402535affa23e3dc9b592825175273
+Size (termtter-2.2.1.gem) = 1505280 bytes