5 files changed, 51 insertions, 159 deletions

diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index 5a9c44232b05..10b7afc46fa1 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -2,28 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	tdiary
-PORTVERSION=	3.2.2
+PORTVERSION=	4.0.0
 CATEGORIES?=	www ruby
 MASTER_SITES=	http://www.tdiary.org/download/
-DISTNAME=	${PORTNAME}-full-${PORTVERSION}
+DISTNAME=	${PORTNAME}-full-v${PORTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Web-based diary system (like weblog) written in Ruby
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	hikidoc:${PORTSDIR}/textproc/ruby-hikidoc \
-		rubygem-imagesize>=0.1.1:${PORTSDIR}/graphics/rubygem-imagesize \
-		rubygem-json_pure>=1.7.7:${PORTSDIR}/devel/rubygem-json_pure
+RUN_DEPENDS=	rubygem-fastimage>=1.5.0:${PORTSDIR}/graphics/rubygem-fastimage \
+		hikidoc:${PORTSDIR}/textproc/ruby-hikidoc \
+		rubygem-multi_json>=1.7.7:${PORTSDIR}/devel/rubygem-multi_json \
+		rubygem-rack>=0:${PORTSDIR}/www/rubygem-rack
 
 NO_BUILD=	yes
 USE_RUBY=	yes
-RUBY_REQUIRE=	Ruby >= 185
+RUBY_REQUIRE=	Ruby >= 193
 
 RUBY_SHEBANG_FILES=	index.fcgi \
 			index.rb \
 			update.fcgi \
 			update.rb \
+			bin/tdiary \
 			misc/convert2.rb \
 			misc/migrate.rb \
 			misc/plugin/amazon/amazonimg.rb \
@@ -43,7 +45,7 @@ PORTDOCS=	ChangeLog doc.css ${HTML} ${MD}
 SUB_FILES=	pkg-message tdiaryinst.rb
 SUB_LIST+=	TDIARY_LANG=${TDIARY_LANG} \
 		TDIARY_SCRIPT=${TDIARY_SCRIPT}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-v${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 WWWDIR=		${PREFIX}/www/${UNIQUENAME}
 
@@ -56,36 +58,43 @@ TDIARY_LANG=	en
 
 REINPLACE_ARGS=	-i ''
 
-OPTIONS_DEFINE=	DOCS NORA
-OPTIONS_DEFAULT=	NORA
+OPTIONS_DEFINE=	DOCS
 
-NORA_DESC=	Use Nora
+.include <bsd.port.pre.mk>
+
+.if ${RUBY_VER} == 1.9
+.if !defined(RUBY_PROVIDED)
+IGNORE=	requires Ruby 1.9.3 or later
+.endif
+.endif
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+.if ${RUBY_VER} == 1.8
+.if !defined(RUBY_PROVIDED)
+IGNORE=	requires Ruby 1.9.3 or later
+.endif
+.endif
 
 pre-patch:
 	@${RM} ${WRKSRC}/.coveralls.yml
 	@${RM} ${WRKSRC}/.gitignore
 	@${RM} ${WRKSRC}/.travis.yml
-	@${RM} ${WRKSRC}/Capfile
 	@${RM} ${WRKSRC}/Gemfile
 	@${RM} ${WRKSRC}/Gemfile.lock
 	@${RM} ${WRKSRC}/LICENSE
 	@${RM} ${WRKSRC}/Procfile
 	@${RM} ${WRKSRC}/Rakefile
 	@${RM} ${WRKSRC}/config.ru
+	@${RM} -r ${WRKSRC}/.bundle
+	@${RM} -r ${WRKSRC}/misc/lib/bundler-1.3.5
 	@${RM} -r ${WRKSRC}/public
 	@${RM} -r ${WRKSRC}/spec
 	@${RM} -r ${WRKSRC}/test
-	@${RM} -r ${WRKSRC}/vendor/hikidoc-0.0.6
-	@${RM} -r ${WRKSRC}/vendor/imagesize-0.1.1/*
-	@${RM} -r ${WRKSRC}/vendor/json_pure-1.7.7
+	@${RM} -r ${WRKSRC}/vendor
 	@${MV} ${WRKSRC}/ChangeLog ${WRKSRC}/doc
 	@${MV} ${WRKSRC}/README.md ${WRKSRC}/doc
 
 post-patch:
-	@${RUBY} -i -pe "sub %r|((\s*)require 'json')|, %Q|\\\2require 'rubygems'\n\\\1|" ${WRKSRC}/tdiary.rb
+	@${RUBY} -i -pe "sub %r|(.*< ::Rack::Request)|, %Q|\trequire 'rack'\n\\\1|" ${WRKSRC}/tdiary/request.rb
 
 pre-install:
 	@${SED} -e 's,#!/usr/bin/env ruby,#!${RUBY},' \
@@ -94,18 +103,17 @@ pre-install:
 	@${REINPLACE_CMD} '/#!\/usr\/bin\/env ruby/d' ${WRKSRC}/misc/migrate.rb
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/${TDIARY_SCRIPT} ${PREFIX}/bin
-	@-${MKDIR} ${WWWDIR}
-	@${TAR} --exclude "doc" -C ${WRKSRC} -cf - . | ${TAR} --unlink -C ${WWWDIR} -xf -
-	@${LN} -sf ${LOCALBASE}/lib/ruby/gems/${RUBY_VER}/gems/imagesize-0.1.1/lib ${WWWDIR}/vendor/imagesize-0.1.1/lib
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	@${INSTALL_SCRIPT} ${WRKDIR}/${TDIARY_SCRIPT} ${STAGEDIR}${PREFIX}/bin
+	@-${MKDIR} ${STAGEDIR}${WWWDIR}
+	@${TAR} --exclude "doc" -C ${WRKSRC} -cf - . | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf -
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
 
 post-install:
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' >> ${TMPPLIST}
 	@${ECHO_CMD} bin/${TDIARY_SCRIPT} >> ${TMPPLIST}
 .if ${PORT_OPTIONS:MDOCS}
-	@${INSTALL} -d ${DOCSDIR}
-	@cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
@@ -113,22 +121,4 @@ x-generate-plist:
 	${FIND} ${WWWDIR} -type f -o -type l | ${SORT} | ${SED} -e 's,${WWWDIR},%%WWWDIR%%,g' > pkg-plist.new
 	${FIND} ${WWWDIR} -type d -depth | ${SORT} -r | ${SED} -e 's,${WWWDIR},@dirrm %%WWWDIR%%,g' >> pkg-plist.new
 
-.include <bsd.port.pre.mk>
-
-.if ${RUBY_VER} == 1.9
-.if !defined(RUBY_PROVIDED)
-IGNORE=	requires Ruby 1.9.1 or later
-.endif
-.endif
-
-.if ${RUBY_VER} == 1.8
-.if !defined(RUBY_PROVIDED)
-IGNORE=	requires Ruby 1.8.5 or later
-.endif
-RUN_DEPENDS+=	${DEPEND_RUBY_ICONV}
-.if ${PORT_OPTIONS:MNORA}
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora
-.endif
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/www/tdiary/distinfo b/www/tdiary/distinfo
index cf80547684ac..e80a6ae122e9 100644
--- a/www/tdiary/distinfo
+++ b/www/tdiary/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tdiary-full-3.2.2.tar.gz) = 79be696ff6374c810761859fec72efc52253b89f6feb96e847bb233e41815831
-SIZE (tdiary-full-3.2.2.tar.gz) = 4750171
+SHA256 (tdiary-full-v4.0.0.tar.gz) = 3fc15f36c87b2e3302361be1400e9d044815d05fdd01bcd8e4d456907e296be4
+SIZE (tdiary-full-v4.0.0.tar.gz) = 15120531
diff --git a/www/tdiary/files/tdiaryinst.rb.in b/www/tdiary/files/tdiaryinst.rb.in
index bec3f7216ed5..e2b38be89095 100644
--- a/www/tdiary/files/tdiaryinst.rb.in
+++ b/www/tdiary/files/tdiaryinst.rb.in
@@ -231,7 +231,7 @@ class TdiaryInstall
 
   def tdiaryConfReplace(filename)
     s = ''
-    File.open(filename) { |fp|
+    File.open(filename, "r:UTF-8") { |fp|
       fp.each { |line|
         line = "@data_path = '#{@passwd.dir}/#{@diarydir}'\n" if line =~ /^\@data_path\s/
         line = "@author_name = '#{@author_name}'\n" if line =~ /^\@author_name\s/
diff --git a/www/tdiary/pkg-descr b/www/tdiary/pkg-descr
index 70e3096fd581..719c71dfd6c4 100644
--- a/www/tdiary/pkg-descr
+++ b/www/tdiary/pkg-descr
@@ -1,8 +1,8 @@
 tDiary is a Web-based interface system that works as a personal diary.
 It is possible for diary readers to add comments to your diary.
 
-     -  require Ruby 1.8.2 or later
-     -  currently supported: Japanese, English, Traditional-Chinese
+     -  require Ruby 1.9.3 or later
+     -  currently supported: Japanese and English
 
     tDiary is developed on http://github.com/tdiary .
     See URL for more information.
diff --git a/www/tdiary/pkg-plist b/www/tdiary/pkg-plist
index 86ddad82c1f7..3269e04e711e 100644
--- a/www/tdiary/pkg-plist
+++ b/www/tdiary/pkg-plist
@@ -1,3 +1,4 @@
+%%WWWDIR%%/bin/tdiary
 %%WWWDIR%%/data/.htaccess
 %%WWWDIR%%/dot.htaccess
 %%WWWDIR%%/index.fcgi
@@ -12,6 +13,7 @@
 %%WWWDIR%%/js/category.js
 %%WWWDIR%%/js/category_autocomplete.js
 %%WWWDIR%%/js/comment_ajax.js
+%%WWWDIR%%/js/comment_emoji_autocomplete.js
 %%WWWDIR%%/js/draft.js
 %%WWWDIR%%/js/highlight.js
 %%WWWDIR%%/js/image.js
@@ -22,8 +24,6 @@
 %%WWWDIR%%/misc/filter/plugin/antispamservice.rb
 %%WWWDIR%%/misc/filter/plugin/en/antispamservice.rb
 %%WWWDIR%%/misc/filter/plugin/ja/antispamservice.rb
-%%WWWDIR%%/misc/gemfiles/ruby18.gemfile
-%%WWWDIR%%/misc/gemfiles/ruby18.gemfile.lock
 %%WWWDIR%%/misc/lib/README
 %%WWWDIR%%/misc/lib/compatible.rb
 %%WWWDIR%%/misc/lib/fcgi_patch.rb
@@ -55,6 +55,7 @@
 %%WWWDIR%%/misc/plugin/category.rb
 %%WWWDIR%%/misc/plugin/category_autocomplete.rb
 %%WWWDIR%%/misc/plugin/comment_ajax.rb
+%%WWWDIR%%/misc/plugin/comment_emoji_autocomplete.rb
 %%WWWDIR%%/misc/plugin/comment_mail-qmail.rb
 %%WWWDIR%%/misc/plugin/comment_mail-sendmail.rb
 %%WWWDIR%%/misc/plugin/comment_mail-smtp.rb
@@ -224,17 +225,20 @@
 %%WWWDIR%%/tdiary.conf.beginner
 %%WWWDIR%%/tdiary.conf.sample
 %%WWWDIR%%/tdiary.conf.sample-en
+%%WWWDIR%%/tdiary.gemspec
 %%WWWDIR%%/tdiary.rb
 %%WWWDIR%%/tdiary/admin.rb
 %%WWWDIR%%/tdiary/application.rb
+%%WWWDIR%%/tdiary/application/configuration.rb
+%%WWWDIR%%/tdiary/application/extensions/omniauth.rb
 %%WWWDIR%%/tdiary/author_only_base.rb
 %%WWWDIR%%/tdiary/base.rb
+%%WWWDIR%%/tdiary/cli.rb
 %%WWWDIR%%/tdiary/comment.rb
 %%WWWDIR%%/tdiary/comment_manager.rb
 %%WWWDIR%%/tdiary/compatible.rb
 %%WWWDIR%%/tdiary/config.rb
 %%WWWDIR%%/tdiary/core_ext.rb
-%%WWWDIR%%/tdiary/deploy.rb
 %%WWWDIR%%/tdiary/dispatcher.rb
 %%WWWDIR%%/tdiary/dispatcher/index_main.rb
 %%WWWDIR%%/tdiary/dispatcher/update_main.rb
@@ -252,10 +256,12 @@
 %%WWWDIR%%/tdiary/lang/en.rb
 %%WWWDIR%%/tdiary/lang/ja.rb
 %%WWWDIR%%/tdiary/plugin.rb
+%%WWWDIR%%/tdiary/rack.rb
 %%WWWDIR%%/tdiary/rack/assets/precompile.rb
 %%WWWDIR%%/tdiary/rack/auth/basic.rb
 %%WWWDIR%%/tdiary/rack/auth/omniauth.rb
 %%WWWDIR%%/tdiary/rack/html_anchor.rb
+%%WWWDIR%%/tdiary/rack/static.rb
 %%WWWDIR%%/tdiary/rack/valid_request_path.rb
 %%WWWDIR%%/tdiary/referer_manager.rb
 %%WWWDIR%%/tdiary/request.rb
@@ -264,6 +270,7 @@
 %%WWWDIR%%/tdiary/style.rb
 %%WWWDIR%%/tdiary/style/tdiary_style.rb
 %%WWWDIR%%/tdiary/style/wiki_style.rb
+%%WWWDIR%%/tdiary/tasks.rb
 %%WWWDIR%%/tdiary/tasks/assets.rake
 %%WWWDIR%%/tdiary/tasks/auth.rake
 %%WWWDIR%%/tdiary/tasks/db.rake
@@ -275,6 +282,7 @@
 %%WWWDIR%%/tdiary/tasks/rspec.rake
 %%WWWDIR%%/tdiary/tasks/server.rake
 %%WWWDIR%%/tdiary/tasks/test.rake
+%%WWWDIR%%/tdiary/version.rb
 %%WWWDIR%%/tdiary/view.rb
 %%WWWDIR%%/tdiary/view_helper.rb
 %%WWWDIR%%/theme/3minutes/3minutes.css
@@ -1889,114 +1897,6 @@
 %%WWWDIR%%/theme/zef/zef.css
 %%WWWDIR%%/update.fcgi
 %%WWWDIR%%/update.rb
-%%WWWDIR%%/vendor/imagesize-0.1.1/lib
-%%WWWDIR%%/vendor/jasmine-jquery-1.4.2/jasmine-jquery.js
-%%WWWDIR%%/vendor/jquery-1.8/jquery.js
-%%WWWDIR%%/vendor/rdtool-0.6.38/COPYING.txt
-%%WWWDIR%%/vendor/rdtool-0.6.38/Gemfile
-%%WWWDIR%%/vendor/rdtool-0.6.38/HISTORY
-%%WWWDIR%%/vendor/rdtool-0.6.38/LGPL-2.1
-%%WWWDIR%%/vendor/rdtool-0.6.38/LICENSE.txt
-%%WWWDIR%%/vendor/rdtool-0.6.38/README.html
-%%WWWDIR%%/vendor/rdtool-0.6.38/README.ja.html
-%%WWWDIR%%/vendor/rdtool-0.6.38/README.rd
-%%WWWDIR%%/vendor/rdtool-0.6.38/README.rd.ja
-%%WWWDIR%%/vendor/rdtool-0.6.38/Rakefile
-%%WWWDIR%%/vendor/rdtool-0.6.38/TODO
-%%WWWDIR%%/vendor/rdtool-0.6.38/bin/rd2
-%%WWWDIR%%/vendor/rdtool-0.6.38/bin/rdswap.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/block-element.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/complex-list-item.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/desclist.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/document-struct.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/dot.rd2rc
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/element.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/filter.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/head-filter.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/inline-element.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/labeled-element.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/list.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/loose-struct.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/methodlist.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/output-format-visitor.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/package.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/parser-util.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/post-install
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/pre-setup.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rbl-file.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rbl-suite.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rd-struct.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rd2html-ext-lib.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rd2html-ext-opt.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rd2html-lib.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rd2html-opt.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rd2man-lib.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rd2rdo-lib.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rd2rmi-lib.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rdblockparser.ry
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rdblockparser.tab.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rdfmt.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rdinlineparser.ry
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rdinlineparser.tab.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/rdvisitor.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/reference-resolver.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/search-file.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/tree.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/version.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd/visitor.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/rdtool.gemspec
-%%WWWDIR%%/vendor/rdtool-0.6.38/setup.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/data/includee1.html
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/data/includee2.html
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/data/includee3.nothtml
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/data/includee4.xhtml
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/data/label.rbl
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/data/label2.rbl
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/data/sub/includee2.html
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/data/sub/includee4.html
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/dummy-observer.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/dummy.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/temp-dir.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-block-parser.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-desclist-item.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-document-element.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-document-struct.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-element.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-headline.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-inline-parser.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-list-item.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-list.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-methodlist-item.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-nonterminal-element.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-nonterminal-inline.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-output-format-visitor.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-parser-util.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-rbl-file.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-rbl-suite.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-rd2html-lib.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-rdtree.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-rdvisitor.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-reference-resolver.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-reference.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-search-file.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-terminal-inline.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-textblock.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-tree.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-version.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/test/test-visitor.rb
-%%WWWDIR%%/vendor/rdtool-0.6.38/utils/rd-mode.el
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.38/utils
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.38/test/data/sub
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.38/test/data
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.38/test
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.38/lib/rd
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.38/lib
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.38/bin
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.38
-@dirrm %%WWWDIR%%/vendor/jquery-1.8
-@dirrm %%WWWDIR%%/vendor/jasmine-jquery-1.4.2
-@dirrm %%WWWDIR%%/vendor/imagesize-0.1.1
-@dirrm %%WWWDIR%%/vendor
 @dirrm %%WWWDIR%%/theme/zef
 @dirrm %%WWWDIR%%/theme/yukon
 @dirrm %%WWWDIR%%/theme/ymck
@@ -2353,6 +2253,8 @@
 @dirrm %%WWWDIR%%/tdiary/io
 @dirrm %%WWWDIR%%/tdiary/filter
 @dirrm %%WWWDIR%%/tdiary/dispatcher
+@dirrm %%WWWDIR%%/tdiary/application/extensions
+@dirrm %%WWWDIR%%/tdiary/application
 @dirrm %%WWWDIR%%/tdiary
 @dirrm %%WWWDIR%%/skel
 @dirrm %%WWWDIR%%/plugin/ja
@@ -2375,7 +2277,6 @@
 @dirrm %%WWWDIR%%/misc/paas/cloudfoundry
 @dirrm %%WWWDIR%%/misc/paas
 @dirrm %%WWWDIR%%/misc/lib
-@dirrm %%WWWDIR%%/misc/gemfiles
 @dirrm %%WWWDIR%%/misc/filter/plugin/ja
 @dirrm %%WWWDIR%%/misc/filter/plugin/en
 @dirrm %%WWWDIR%%/misc/filter/plugin
@@ -2383,4 +2284,5 @@
 @dirrm %%WWWDIR%%/misc
 @dirrm %%WWWDIR%%/js
 @dirrm %%WWWDIR%%/data
+@dirrm %%WWWDIR%%/bin
 @dirrm %%WWWDIR%%