- Update to 0.2.0.1064

Feature safe:	yes

4 files changed, 33 insertions, 15 deletions

diff --git a/net-im/mikutter/Makefile b/net-im/mikutter/Makefile
index 5e0046abf23d..b0af5cc25ea5 100644
--- a/net-im/mikutter/Makefile
+++ b/net-im/mikutter/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mikutter
-PORTVERSION=	0.2.0.1054
+PORTVERSION=	0.2.0.1064
 CATEGORIES=	net-im ruby
 MASTER_SITES=	http://mikutter.hachune.net/bin/ \
 		LOCAL
@@ -18,11 +18,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 INSTALL_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
 		${RUBY_SITEARCHLIBDIR}/cairo.so:${PORTSDIR}/graphics/ruby-cairo \
+		rubygem-addressable>=2.2.7:${PORTSDIR}/www/rubygem-addressable \
 		${RUBY_PKGNAMEPREFIX}hmac>=0.4.0:${PORTSDIR}/security/ruby-hmac \
 		rubygem-json_pure>=0:${PORTSDIR}/devel/rubygem-json_pure \
 		${RUBY_SITELIBDIR}/memoize.rb:${PORTSDIR}/devel/ruby-memoize \
 		rubygem-oauth>=0:${PORTSDIR}/net/rubygem-oauth \
-		${RUBY_SITELIBDIR}/bsearch.rb:${PORTSDIR}/devel/ruby-bsearch
+		${RUBY_SITELIBDIR}/bsearch.rb:${PORTSDIR}/devel/ruby-bsearch \
+		rubygem-typed-array>=0.1.2:${PORTSDIR}/devel/rubygem-typed-array
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
@@ -65,7 +67,7 @@ RUN_DEPENDS+=	notify-send:${PORTSDIR}/devel/libnotify
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|chdir\(.*\)|chdir\('${RUBY_SITELIBDIR}/mikutter/core'\)|" \
+	@${REINPLACE_CMD} -i '' -e "s|%%RUBY_SITELIBDIR%%|${RUBY_SITELIBDIR}|" \
 		${WRKSRC}/mikutter.rb
 	@${REINPLACE_CMD} -i '' -e "s|miquire :lib, 'ruby-bsearch-1.5/bsearch'|require 'bsearch'|" \
 		${WRKSRC}/core/mui/cairo_inner_tl.rb
@@ -74,12 +76,20 @@ post-patch:
 	@${RM} -rf ${WRKSRC}/core/lib/memoize.rb
 	@${RM} -rf ${WRKSRC}/core/lib/oauth*
 	@${RM} -rf ${WRKSRC}/core/lib/ruby-bsearch-1.5
+	@${RM} -rf ${WRKSRC}/vendor/addressable
+	@${RM} -rf ${WRKSRC}/vendor/hmac*
+	@${RM} -rf ${WRKSRC}/vendor/json*
+	@${RM} -rf ${WRKSRC}/vendor/memoize.rb
+	@${RM} -rf ${WRKSRC}/vendor/oauth*
+	@${RM} -rf ${WRKSRC}/vendor/ruby-bsearch-1.5
+	@${RM} -rf ${WRKSRC}/vendor/typed-array*
 
 do-install:
 	@${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/mikutter.rb ${PREFIX}/bin/mikutter
 	@cd ${INSTALL_WRKSRC} \
 		&& ${COPYTREE_SHARE} core ${RUBY_SITELIBDIR}/mikutter \
-		&& ${COPYTREE_SHARE} plugin ${RUBY_SITELIBDIR}/mikutter
+		&& ${COPYTREE_SHARE} plugin ${RUBY_SITELIBDIR}/mikutter \
+		&& ${COPYTREE_SHARE} vendor ${RUBY_SITELIBDIR}/mikutter
 	@${MKDIR} ${PREFIX}/share/applications
 	@${INSTALL_DATA} ${WRKDIR}/${SUB_FILES} ${PREFIX}/share/applications/
 .if !defined(NOPORTDOCS)
diff --git a/net-im/mikutter/distinfo b/net-im/mikutter/distinfo
index cdeb16f4ad79..37b12d5553a3 100644
--- a/net-im/mikutter/distinfo
+++ b/net-im/mikutter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mikutter.0.2.0.1054.tar.gz) = e99ac7ae78ebe35673cb13e2fbca5fabb5c68b31038410c44c2d574a74484fa7
-SIZE (mikutter.0.2.0.1054.tar.gz) = 2236006
+SHA256 (mikutter.0.2.0.1064.tar.gz) = 04d3986264166696e61cf27b503a71657933e15da30892fb0515cb8585c75034
+SIZE (mikutter.0.2.0.1064.tar.gz) = 2236182
diff --git a/net-im/mikutter/files/patch-mikutter.rb b/net-im/mikutter/files/patch-mikutter.rb
new file mode 100644
index 000000000000..02ca8016696a
--- /dev/null
+++ b/net-im/mikutter/files/patch-mikutter.rb
@@ -0,0 +1,15 @@
+--- mikutter.rb.orig	2012-10-23 09:12:05.000000000 +0900
++++ mikutter.rb	2012-12-02 09:51:43.000000000 +0900
+@@ -12,11 +12,7 @@
+ 
+ =end
+ 
+-if File.symlink?($0)
+-  Dir.chdir(File.join(File.dirname(File.readlink($0)), 'core'))
+-else
+-  Dir.chdir(File.join(File.dirname($0), 'core'))
+-end
++Dir.chdir('%%RUBY_SITELIBDIR%%/mikutter/core')
+ 
+ Thread.abort_on_exception = true
+ ENV['LIBOVERLAY_SCROLLBAR'] = '0'
diff --git a/net-im/mikutter/pkg-plist b/net-im/mikutter/pkg-plist
index 847f7abd6f85..54d00b8948a8 100644
--- a/net-im/mikutter/pkg-plist
+++ b/net-im/mikutter/pkg-plist
@@ -13,17 +13,10 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/environment.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/image.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/initialize.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/addressable/idna.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/addressable/idna/native.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/addressable/idna/pure.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/addressable/template.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/addressable/uri.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/addressable/version.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/escape.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
@@ -67,8 +60,6 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/timelimitedqueue.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/timelimitedqueue/test/test_timelimitedqueue.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/timelimitedqueue/timelimitedqueue.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/typed-array.rb
-%%RUBY_SITELIBDIR%%/mikutter/core/lib/typed-array/functions.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/uithreadonly.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/lib/weakstorage.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/message.rb
@@ -297,8 +288,10 @@ bin/mikutter
 %%RUBY_SITELIBDIR%%/mikutter/core/userlist.rb
 %%RUBY_SITELIBDIR%%/mikutter/core/utils.rb
 %%RUBY_SITELIBDIR%%/mikutter/plugin/WHATSTHIS
+%%RUBY_SITELIBDIR%%/mikutter/vendor/escape.rb
 share/applications/mikutter.desktop
 @dirrmtry share/applications
+@dirrm %%RUBY_SITELIBDIR%%/mikutter/vendor
 @dirrm %%RUBY_SITELIBDIR%%/mikutter/plugin
 @dirrm %%RUBY_SITELIBDIR%%/mikutter/core/test
 @dirrm %%RUBY_SITELIBDIR%%/mikutter/core/skin/data/sounds/sources/retweeted_data/e00/d00