Index: head/net-im/mikutter/Makefile
===================================================================
--- head/net-im/mikutter/Makefile	(revision 452136)
+++ head/net-im/mikutter/Makefile	(revision 452137)
@@ -1,87 +1,87 @@
 # Created by: TAKATSU Tomonari <tota@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mikutter
-PORTVERSION=	3.5.11
+PORTVERSION=	3.5.12
 CATEGORIES=	net-im ruby
 MASTER_SITES=	http://mikutter.hachune.net/bin/ \
 		LOCAL/tota/${PORTNAME}
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Simple, powerful, and moeful Twitter client
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-gtk2>=3.1.8:x11-toolkits/rubygem-gtk2 \
 		rubygem-cairo>=1.12.9:graphics/rubygem-cairo \
 		rubygem-addressable>=2.5.1:www/rubygem-addressable \
 		rubygem-delayer>=0.0.2:devel/rubygem-delayer \
 		rubygem-delayer-deferred>=1.0.4:devel/rubygem-delayer-deferred \
 		rubygem-gettext>=3.0.9:devel/rubygem-gettext \
 		rubygem-gio2>=3.1.0:devel/rubygem-gio2 \
 		rubygem-httpclient>=2.7.1:www/rubygem-httpclient \
 		rubygem-instance_storage>=1.0.0:devel/rubygem-instance_storage \
 		rubygem-json_pure1>=1.8.6:devel/rubygem-json_pure1 \
 		rubygem-locale>=2.1.1:devel/rubygem-locale \
 		rubygem-memoist>=0.16.0:devel/rubygem-memoist \
 		rubygem-moneta>=0.7:devel/rubygem-moneta \
 		rubygem-nokogiri>=1.6.7:textproc/rubygem-nokogiri \
 		rubygem-oauth>=0.5.3:net/rubygem-oauth \
 		rubygem-pluggaloid>=1.1.1:devel/rubygem-pluggaloid \
 		rubygem-public_suffix>=2.0.5:dns/rubygem-public_suffix \
 		rubygem-ruby-hmac>=0.4.0:security/rubygem-ruby-hmac \
 		rubygem-text>=1.3.1:textproc/rubygem-text \
 		rubygem-totoridipjp>=0.1.0:www/rubygem-totoridipjp \
 		rubygem-twitter-text>=1.14.5:textproc/rubygem-twitter-text \
 		rubygem-typed-array>=0.1.2:devel/rubygem-typed-array \
 		rubygem-unf>=0.1.4:textproc/rubygem-unf
 
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
 NO_ARCH=	yes
 USE_RUBY=	yes
 USES=	shebangfix
 NO_BUILD=	yes
 
 SHEBANG_FILES=	mikutter.rb \
 		core/miku/miku.rb \
 		core/lib/piapro.rb \
 		devel/makechi.rb
 
 PORTDOCS=	README
 SUB_FILES=	mikutter.desktop
 SUB_LIST=	RUBY_SITELIBDIR=${RUBY_SITELIBDIR}
 
 REINPLACE_ARGS=	-i ''
 
 OPTIONS_DEFINE=		DOCS NOTIFY
 NOTIFY_DESC=		notify-send support
 
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 .include <bsd.port.options.mk>
 
 NOTIFY_RUN_DEPENDS=	notify-send:devel/libnotify
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%RUBY_SITELIBDIR%%|${RUBY_SITELIBDIR}|" \
 		${WRKSRC}/mikutter.rb
 	@${RM} -r ${WRKSRC}/vendor
 
 do-install:
 	${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/mikutter.rb ${STAGEDIR}${PREFIX}/bin/mikutter
 	cd ${INSTALL_WRKSRC} \
 		&& ${COPYTREE_SHARE} core ${STAGEDIR}${RUBY_SITELIBDIR}/mikutter \
 		&& ${COPYTREE_SHARE} plugin ${STAGEDIR}${RUBY_SITELIBDIR}/mikutter
 	${INSTALL_DATA} ${WRKDIR}/${SUB_FILES} ${STAGEDIR}${PREFIX}/share/applications/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 x-generate-plist: stage
 	${ECHO} bin/mikutter > pkg-plist.new
 	${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/mikutter -type f | ${SORT} | ${SED} -e 's,${STAGEDIR}${RUBY_SITELIBDIR},%%RUBY_SITELIBDIR%%,' >> pkg-plist.new
 	${ECHO} share/applications/mikutter.desktop >> pkg-plist.new
 
 .include <bsd.port.mk>
Index: head/net-im/mikutter/distinfo
===================================================================
--- head/net-im/mikutter/distinfo	(revision 452136)
+++ head/net-im/mikutter/distinfo	(revision 452137)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504612178
-SHA256 (mikutter.3.5.11.tar.gz) = b90b09c400fe99092b1eaa4b4f39f78b90cff4335ed94d996cc2d4de08467550
-SIZE (mikutter.3.5.11.tar.gz) = 2733061
+TIMESTAMP = 1507544651
+SHA256 (mikutter.3.5.12.tar.gz) = a953a9445d27d2ba869ccf0912489803033cc2b243d7d1c36aef44426ee5ad27
+SIZE (mikutter.3.5.12.tar.gz) = 2859323
Index: head/net-im/mikutter/files/patch-mikutter.rb
===================================================================
--- head/net-im/mikutter/files/patch-mikutter.rb	(revision 452136)
+++ head/net-im/mikutter/files/patch-mikutter.rb	(revision 452137)
@@ -1,11 +1,20 @@
---- mikutter.rb.orig	2015-05-14 01:40:33 UTC
+--- mikutter.rb.orig	2017-10-08 12:29:16 UTC
 +++ mikutter.rb
-@@ -9,7 +9,7 @@ This software is released under the MIT 
+@@ -11,7 +11,7 @@ This software is released under the MIT 
  http://opensource.org/licenses/mit-license.php
  
  =end
--mikutter_directory = File.expand_path(File.dirname(__FILE__))
-+mikutter_directory = '%%RUBY_SITELIBDIR%%/mikutter'
+-require_relative 'core/boot/option'
++require_relative '%%RUBY_SITELIBDIR%%/mikutter/core/boot/option'
+ Mopt.parse exec_command: true
  
- unless ENV['DISABLE_BUNDLER_SETUP']
-   begin
+ if !ENV['DISABLE_BUNDLER_SETUP'] || ['', '0'].include?(ENV['DISABLE_BUNDLER_SETUP'].to_s)
+@@ -31,7 +31,7 @@ require 'webrick'
+ require 'thread'
+ require 'fileutils'
+ 
+-require_relative 'core/utils'
++require_relative '%%RUBY_SITELIBDIR%%/mikutter/core/utils'
+ 
+ miquire :boot, 'check_config_permission', 'mainloop', 'delayer'
+ miquire :core, 'service', 'environment'