3 files changed, 51 insertions, 124 deletions

diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index f801c9b71cfc..e76a5a5e4ac3 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tdiary
-PORTVERSION=	3.0.2
+PORTVERSION=	3.1.0
 CATEGORIES?=	www ruby
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/ \
 		http://www.tdiary.org/download/
@@ -18,6 +18,10 @@ COMMENT=	A Web-based diary system (like weblog) written in Ruby
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/doc/COPYING
 
+RUN_DEPENDS=	hikidoc:${PORTSDIR}/textproc/ruby-hikidoc \
+		rubygem-imagesize>=0.1.1:${PORTSDIR}/graphics/rubygem-imagesize \
+		rd2:${PORTSDIR}/textproc/ruby-rdtool
+
 NO_BUILD=	yes
 USE_RUBY=	yes
 RUBY_REQUIRE=	Ruby >= 185
@@ -71,18 +75,22 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora
 .endif
 
 post-extract:
-	${RM} ${WRKSRC}/.gitignore
-	${RM} ${WRKSRC}/.rspec
-	${RM} ${WRKSRC}/Capfile
-	${RM} ${WRKSRC}/Gemfile
-	${RM} ${WRKSRC}/Gemfile.lock
-	${RM} ${WRKSRC}/Rakefile
-	${RM} ${WRKSRC}/config.ru
-	${RM} -r ${WRKSRC}/public
-	${RM} -r ${WRKSRC}/spec
-	${MV} ${WRKSRC}/ChangeLog ${WRKSRC}/doc
-	${MV} ${WRKSRC}/README.md ${WRKSRC}/doc
-	cd ${WRKSRC} && ${MV} doc ${WRKDIR}
+	@${RM} ${WRKSRC}/.gitignore
+	@${RM} ${WRKSRC}/.rspec
+	@${RM} ${WRKSRC}/.travis.yml
+	@${RM} ${WRKSRC}/Capfile
+	@${RM} ${WRKSRC}/Gemfile
+	@${RM} ${WRKSRC}/Gemfile.lock
+	@${RM} ${WRKSRC}/Rakefile
+	@${RM} ${WRKSRC}/config.ru
+	@${RM} -r ${WRKSRC}/public
+	@${RM} -r ${WRKSRC}/spec
+	@${RM} -r ${WRKSRC}/vendor/hikidoc-0.0.6
+	@${RM} -r ${WRKSRC}/vendor/imagesize-0.1.1/*
+	@${RM} -r ${WRKSRC}/vendor/rdtool-0.6.22
+	@${MV} ${WRKSRC}/ChangeLog ${WRKSRC}/doc
+	@${MV} ${WRKSRC}/README.md ${WRKSRC}/doc
+	@cd ${WRKSRC} && ${MV} doc ${WRKDIR}
 
 pre-install:
 	@${SED} -e 's,#!/usr/bin/env ruby,#!${RUBY},' \
@@ -94,6 +102,7 @@ do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/${TDIARY_SCRIPT} ${PREFIX}/bin
 	@-${MKDIR} ${WWWDIR}
 	@${CP} -pR ${WRKSRC}/ ${WWWDIR}
+	@${LN} -s ${LOCALBASE}/lib/ruby/gems/${RUBY_VER}/gems/imagesize-0.1.1/lib ${WWWDIR}/vendor/imagesize-0.1.1/lib
 	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 
 post-install:
@@ -106,7 +115,7 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 
 x-generate-plist:
-	${FIND} ${WWWDIR} -type f | ${SORT} | ${SED} -e 's,${WWWDIR},%%WWWDIR%%,g' > pkg-plist.new
+	${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.post.mk>
diff --git a/www/tdiary/distinfo b/www/tdiary/distinfo
index c40faa30e325..b859f7b63c28 100644
--- a/www/tdiary/distinfo
+++ b/www/tdiary/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tdiary-full-3.0.2.tar.gz) = 9ea1d26cc1ba9d2a8455a8327ebdc882d20b8ad6faefb6d07cb22d26b792edd3
-SIZE (tdiary-full-3.0.2.tar.gz) = 4218232
+SHA256 (tdiary-full-3.1.0.tar.gz) = 3d16e319d53b0fe0f672e1ba00efcdd73dd08bb49cfa333243a0655bab29ea8e
+SIZE (tdiary-full-3.1.0.tar.gz) = 4429369
diff --git a/www/tdiary/pkg-plist b/www/tdiary/pkg-plist
index 08b9616be9d9..5b36e07d9c65 100644
--- a/www/tdiary/pkg-plist
+++ b/www/tdiary/pkg-plist
@@ -2,6 +2,11 @@
 %%WWWDIR%%/index.fcgi
 %%WWWDIR%%/index.rb
 %%WWWDIR%%/js/00default.js
+%%WWWDIR%%/js/01conf.js
+%%WWWDIR%%/js/amazon.js
+%%WWWDIR%%/js/category.js
+%%WWWDIR%%/js/highlight.js
+%%WWWDIR%%/js/image.js
 %%WWWDIR%%/misc/convert2.rb
 %%WWWDIR%%/misc/filter/antispamservice.rb
 %%WWWDIR%%/misc/filter/limitdays.rb
@@ -11,7 +16,7 @@
 %%WWWDIR%%/misc/filter/plugin/ja/antispamservice.rb
 %%WWWDIR%%/misc/filter/plugin/zh/antispamservice.rb
 %%WWWDIR%%/misc/lib/README
-%%WWWDIR%%/misc/lib/complatible.rb
+%%WWWDIR%%/misc/lib/compatible.rb
 %%WWWDIR%%/misc/migrate.rb
 %%WWWDIR%%/misc/plugin/ChangeLog.DO_NOT_UPDATE
 %%WWWDIR%%/misc/plugin/a.rb
@@ -237,17 +242,27 @@
 %%WWWDIR%%/tdiary.conf.beginner
 %%WWWDIR%%/tdiary.conf.sample
 %%WWWDIR%%/tdiary.rb
+%%WWWDIR%%/tdiary/comment.rb
+%%WWWDIR%%/tdiary/comment_manager.rb
 %%WWWDIR%%/tdiary/compatible.rb
-%%WWWDIR%%/tdiary/defaultio.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
 %%WWWDIR%%/tdiary/environment.rb
+%%WWWDIR%%/tdiary/filter.rb
 %%WWWDIR%%/tdiary/filter/default.rb
 %%WWWDIR%%/tdiary/filter/spam.rb
+%%WWWDIR%%/tdiary/io/base.rb
+%%WWWDIR%%/tdiary/io/default.rb
+%%WWWDIR%%/tdiary/io/pstore.rb
 %%WWWDIR%%/tdiary/lang/en.rb
 %%WWWDIR%%/tdiary/lang/ja.rb
 %%WWWDIR%%/tdiary/lang/zh.rb
-%%WWWDIR%%/tdiary/pstoreio.rb
+%%WWWDIR%%/tdiary/plugin.rb
+%%WWWDIR%%/tdiary/referer_manager.rb
 %%WWWDIR%%/tdiary/tdiary_application.rb
 %%WWWDIR%%/tdiary/tdiary_response.rb
 %%WWWDIR%%/tdiary/tdiary_style.rb
@@ -565,6 +580,7 @@
 %%WWWDIR%%/theme/deepblue/README
 %%WWWDIR%%/theme/deepblue/deepblue.css
 %%WWWDIR%%/theme/default/README
+%%WWWDIR%%/theme/default/body.png
 %%WWWDIR%%/theme/default/default.css
 %%WWWDIR%%/theme/delta/README
 %%WWWDIR%%/theme/delta/blockquote.gif
@@ -1692,6 +1708,8 @@
 %%WWWDIR%%/theme/tag/tag.css
 %%WWWDIR%%/theme/tdiary1/README
 %%WWWDIR%%/theme/tdiary1/tdiary1.css
+%%WWWDIR%%/theme/tdiary2/README
+%%WWWDIR%%/theme/tdiary2/tdiary2.css
 %%WWWDIR%%/theme/tdiarynet/README
 %%WWWDIR%%/theme/tdiarynet/h1.png
 %%WWWDIR%%/theme/tdiarynet/tdiarynet.css
@@ -1846,111 +1864,8 @@
 %%WWWDIR%%/theme/zef/st_eye.png
 %%WWWDIR%%/theme/zef/zef.css
 %%WWWDIR%%/update.rb
-%%WWWDIR%%/vendor/hikidoc-0.0.6/COPYING
-%%WWWDIR%%/vendor/hikidoc-0.0.6/NEWS
-%%WWWDIR%%/vendor/hikidoc-0.0.6/NEWS.ja
-%%WWWDIR%%/vendor/hikidoc-0.0.6/README
-%%WWWDIR%%/vendor/hikidoc-0.0.6/README.ja
-%%WWWDIR%%/vendor/hikidoc-0.0.6/Rakefile
-%%WWWDIR%%/vendor/hikidoc-0.0.6/TextFormattingRules
-%%WWWDIR%%/vendor/hikidoc-0.0.6/TextFormattingRules.ja
-%%WWWDIR%%/vendor/hikidoc-0.0.6/bin/hikidoc
-%%WWWDIR%%/vendor/hikidoc-0.0.6/lib/hikidoc.rb
-%%WWWDIR%%/vendor/hikidoc-0.0.6/setup.rb
-%%WWWDIR%%/vendor/hikidoc-0.0.6/test/run-test.rb
-%%WWWDIR%%/vendor/hikidoc-0.0.6/test/test_hikidoc.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/HISTORY
-%%WWWDIR%%/vendor/rdtool-0.6.22/MANIFEST
-%%WWWDIR%%/vendor/rdtool-0.6.22/README.html
-%%WWWDIR%%/vendor/rdtool-0.6.22/README.ja.html
-%%WWWDIR%%/vendor/rdtool-0.6.22/README.rd
-%%WWWDIR%%/vendor/rdtool-0.6.22/README.rd.ja
-%%WWWDIR%%/vendor/rdtool-0.6.22/bin/rd2
-%%WWWDIR%%/vendor/rdtool-0.6.22/bin/rdswap.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/doc/rd-draft.html
-%%WWWDIR%%/vendor/rdtool-0.6.22/doc/rd-draft.ja.html
-%%WWWDIR%%/vendor/rdtool-0.6.22/doc/rd-draft.rd
-%%WWWDIR%%/vendor/rdtool-0.6.22/doc/rd-draft.rd.ja
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/block-element.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/complex-list-item.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/desclist.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/document-struct.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/dot.rd2rc
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/element.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/filter.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/inline-element.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/labeled-element.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/list.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/loose-struct.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/methodlist.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/output-format-visitor.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/package.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/parser-util.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/post-install
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/rbl-file.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/rbl-suite.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/rd-struct.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/rd2html-lib.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/rd2html-opt.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/rd2man-lib.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/rd2rdo-lib.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/rd2rmi-lib.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/rdblockparser.ry
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/rdblockparser.tab.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/rdfmt.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/rdinlineparser.ry
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/rdinlineparser.tab.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/rdvisitor.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/reference-resolver.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/search-file.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/tree.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/version.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd/visitor.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/makerdtool.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/setup.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/dummy-observer.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/dummy.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/temp-dir.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-block-parser.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-desclist-item.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-document-element.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-document-struct.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-element.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-headline.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-inline-parser.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-list-item.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-list.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-methodlist-item.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-nonterminal-element.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-nonterminal-inline.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-output-format-visitor.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-parser-util.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-rbl-file.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-rbl-suite.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-rd2html-lib.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-rdtree.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-rdvisitor.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-reference-resolver.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-reference.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-search-file.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-terminal-inline.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-textblock.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-tree.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-version.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/test/test-visitor.rb
-%%WWWDIR%%/vendor/rdtool-0.6.22/utils/rd-mode.el
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.22/utils
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.22/test
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.22/lib/rd
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.22/lib
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.22/doc
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.22/bin
-@dirrm %%WWWDIR%%/vendor/rdtool-0.6.22
-@dirrm %%WWWDIR%%/vendor/hikidoc-0.0.6/test
-@dirrm %%WWWDIR%%/vendor/hikidoc-0.0.6/lib
-@dirrm %%WWWDIR%%/vendor/hikidoc-0.0.6/bin
-@dirrm %%WWWDIR%%/vendor/hikidoc-0.0.6
+%%WWWDIR%%/vendor/imagesize-0.1.1/lib
+@dirrm %%WWWDIR%%/vendor/imagesize-0.1.1
 @dirrm %%WWWDIR%%/vendor
 @dirrm %%WWWDIR%%/theme/zef
 @dirrm %%WWWDIR%%/theme/yukon
@@ -1988,6 +1903,7 @@
 @dirrm %%WWWDIR%%/theme/teacup
 @dirrm %%WWWDIR%%/theme/te
 @dirrm %%WWWDIR%%/theme/tdiarynet
+@dirrm %%WWWDIR%%/theme/tdiary2
 @dirrm %%WWWDIR%%/theme/tdiary1
 @dirrm %%WWWDIR%%/theme/tag
 @dirrm %%WWWDIR%%/theme/sunset
@@ -2293,7 +2209,9 @@
 @dirrm %%WWWDIR%%/theme/3minutes
 @dirrm %%WWWDIR%%/theme
 @dirrm %%WWWDIR%%/tdiary/lang
+@dirrm %%WWWDIR%%/tdiary/io
 @dirrm %%WWWDIR%%/tdiary/filter
+@dirrm %%WWWDIR%%/tdiary/dispatcher
 @dirrm %%WWWDIR%%/tdiary
 @dirrm %%WWWDIR%%/skel
 @dirrm %%WWWDIR%%/plugin/zh