* Updated to 5.0.5

* Maintainer change tota --> Yasuhiro KIMURA <yasu@utahime.org> (maintainer timout 10 months)
* Moved Uses and USE_*(13.1.7) to start the section [1]

This port is not using USE_GITHUB due to increased complexity consisting of more sources and markdown to html converting. For a more details explanation, please check PR212792[2] or the differential.

Changelog:	https://github.com/tdiary/tdiary-core/releases/tag/v5.0.5

[1] https://www.freebsd.org/doc/en/books/porters-handbook/porting-samplem.html#porting-samplem-order
[2] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=212792

PR:		212792
Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>
Reviewed by:	lifanov (mentor), matthew (mentor)
Approved by:	lifanov (mentor), matthew (mentor), maintainer timeout (10 months)
Differential Revision:	https://reviews.freebsd.org/D11540

www/tdiary/Makefile

@@ -2,37 +2,38 @@
 # $FreeBSD$
 
 PORTNAME=	tdiary
-PORTVERSION=	4.2.1
+PORTVERSION=	5.0.5
-PORTREVISION=	1
 CATEGORIES?=	www ruby
-MASTER_SITES=	http://www.tdiary.org/download/
+MASTER_SITES=	https://github.com/tdiary/tdiary-core/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-full-v${PORTVERSION}
 
-MAINTAINER=	tota@FreeBSD.org
+MAINTAINER=	yasu@utahime.org
 COMMENT=	Web-based diary system (like weblog) written in Ruby
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-emot>=0.0.4:textproc/rubygem-emot \
+RUN_DEPENDS=	rubygem-bundler>=1.14.6:sysutils/rubygem-bundler \
-		rubygem-fastimage>=1.8.1:graphics/rubygem-fastimage \
+		rubygem-emot>=0.0.4:textproc/rubygem-emot \
+		rubygem-fastimage>=2.1.0:graphics/rubygem-fastimage \
 		rubygem-hikidoc>=0.1.0:textproc/rubygem-hikidoc \
-		rubygem-mail>=2.6.3:mail/rubygem-mail \
+		rubygem-mail>=2.6.6:mail/rubygem-mail \
-		rubygem-sprockets3>=3.5.2:devel/rubygem-sprockets3
+		rubygem-rack16>=1.6.8:www/rubygem-rack16 \
+		rubygem-rake>=12.0.0:devel/rubygem-rake
 
+USES=		shebangfix
+USE_RUBY=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
-USE_RUBY=	yes
-USES=		shebangfix
 
-SHEBANG_FILES=	index.fcgi \
+SHEBANG_FILES=	bin/tdiary \
+		index.fcgi \
 		index.rb \
+		misc/convert2.rb \
+		misc/migrate.rb \
+		misc/plugin/xmlrpc/xmlrpc.rb \
 		update.fcgi \
-		update.rb \
+		update.rb
-		bin/tdiary \
-		misc/plugin/amazon/amazonimg.rb \
-		misc/plugin/squeeze.rb \
-		misc/plugin/xmlrpc/xmlrpc.rb
 
 DOCFILES=	HOWTO-authenticate-in-rack HOWTO-make-io \
 		HOWTO-make-plugin HOWTO-make-theme \
@@ -67,9 +68,11 @@ OPTIONS_DEFINE=	DOCS
 
 pre-patch:
 	@${RM} ${WRKSRC}/.coveralls.yml
+	@${RM} ${WRKSRC}/.dockerignore
+	@${RM} ${WRKSRC}/.editorconfig
 	@${RM} ${WRKSRC}/.gitignore
 	@${RM} ${WRKSRC}/.travis.yml
-	@${RM} ${WRKSRC}/Gemfile
+	@${RM} ${WRKSRC}/Dockerfile
 	@${RM} ${WRKSRC}/Gemfile.lock
 	@${RM} ${WRKSRC}/Procfile
 	@${RM} ${WRKSRC}/Rakefile
@@ -77,7 +80,7 @@ pre-patch:
 	@${RM} ${WRKSRC}/tdiary.gemspec
 	@${RM} ${WRKSRC}/tmp/.gitkeep
 	@${RM} -r ${WRKSRC}/.bundle
-	@${RM} -r ${WRKSRC}/misc/lib/bundler-1.11.2
+	@${RM} -r ${WRKSRC}/misc/lib/bundler-1.14.6
 	@${RM} -r ${WRKSRC}/public
 	@${RM} -r ${WRKSRC}/spec
 	@${RM} -r ${WRKSRC}/test

www/tdiary/distinfo

@@ -1,2 +1,3 @@
-SHA256 (tdiary-full-v4.2.1.tar.gz) = 9b2d33927e1da7ea3758e15a09d83e2436087e89058076d6f62f5de077676b1f
+TIMESTAMP = 1498778330
-SIZE (tdiary-full-v4.2.1.tar.gz) = 8220040
+SHA256 (tdiary-full-v5.0.5.tar.gz) = 1609686003240e8bfa9ee20cc9a9bbbeb6799c274240c957a223a65f7390b0ab
+SIZE (tdiary-full-v5.0.5.tar.gz) = 7191300

www/tdiary/files/patch-Gemfile

@@ -0,0 +1,38 @@
+--- Gemfile.orig	2017-06-29 08:19:50 UTC
++++ Gemfile
+@@ -6,35 +6,3 @@ gem 'fastimage'
+ gem 'emot'
+ gem 'mail'
+ gem 'rake'
+-
+-group :rack do
+-  gem 'sprockets'
+-end
+-
+-group :development do
+-  gem 'pit', require: false
+-  gem 'racksh', require: false
+-  gem 'redcarpet'
+-  gem 'octokit'
+-
+-  group :test do
+-    gem 'pry-byebug', platforms: [:ruby_21, :ruby_22, :ruby_23, :ruby_24]
+-    gem 'test-unit'
+-    gem 'rspec'
+-    gem 'capybara', require: 'capybara/rspec'
+-    gem 'selenium-webdriver'
+-    gem 'launchy'
+-    gem 'sequel'
+-    gem 'sqlite3'
+-    gem 'jasmine'
+-    gem 'simplecov', require: false
+-    gem 'coveralls', '~> 0.7.12', require: false
+-  end
+-end
+-
+-# https://github.com/redmine/redmine/blob/master/Gemfile#L89
+-local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+-if File.exist?(local_gemfile)
+-  puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
+-  instance_eval File.read(local_gemfile)
+-end

www/tdiary/files/patch-lib_tdiary_request.rb

@@ -1,7 +1,6 @@
---- lib/tdiary/request.rb.orig	2016-01-16 10:16:46 UTC
+--- lib/tdiary/request.rb.orig	2017-06-29 08:19:50 UTC
 +++ lib/tdiary/request.rb
-@@ -1,6 +1,7 @@
+@@ -1,5 +1,6 @@
- # -*- coding: utf-8 -*-
  # stolen from okkez http://github.com/hiki/hiki/blob/rack/hiki/request.rb
  module TDiary
 +	require 'rack'

www/tdiary/files/patch-misc_convert2.rb

@@ -1,10 +0,0 @@
---- misc/convert2.rb.orig	2016-04-23 13:50:46 UTC
-+++ misc/convert2.rb
-@@ -1,5 +1,6 @@
-+#!%%LOCALBASE%%/bin/ruby
-+#
- # -*- coding: utf-8; -*-
--#!/usr/bin/env ruby
- #
- # convert2: convert diary data file format tDiary1 to tDiary2.
- #

www/tdiary/files/patch-misc_migrate.rb

@@ -1,10 +0,0 @@
---- misc/migrate.rb.orig	2016-04-23 13:50:46 UTC
-+++ misc/migrate.rb
-@@ -1,5 +1,6 @@
-+#!%%LOCALBASE%%/bin/ruby
-+#
- # -*- coding: utf-8; -*-
--#!/usr/bin/env ruby
- #
- # migrate.rb $Revision: 1.2 $
- #

www/tdiary/pkg-descr

@@ -1,7 +1,7 @@
 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.9.3 or later
+     -  require Ruby 2.2 or later
      -  currently supported: Japanese and English
 
     tDiary is developed on https://github.com/tdiary .

www/tdiary/pkg-plist

@@ -1,6 +1,10 @@
 bin/%%TDIARY_SCRIPT%%
 @owner %%WWWOWN%%
 @group %%WWWGRP%%
+%%WWWDIR%%/Gemfile
+%%WWWDIR%%/app.json
+%%WWWDIR%%/benchmark/benchmark_amazon_plugin.rb
+%%WWWDIR%%/benchmark/benchmark_io_default.rb
 %%WWWDIR%%/bin/tdiary
 %%WWWDIR%%/data/.htaccess
 %%WWWDIR%%/dot.htaccess
@@ -20,6 +24,7 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/js/draft.js
 %%WWWDIR%%/js/highlight.js
 %%WWWDIR%%/js/image.js
+%%WWWDIR%%/js/preview.js
 %%WWWDIR%%/lib/tdiary.rb
 %%WWWDIR%%/lib/tdiary/admin.rb
 %%WWWDIR%%/lib/tdiary/application.rb
@@ -88,6 +93,7 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/lib/tdiary/tasks/doc.rake
 %%WWWDIR%%/lib/tdiary/tasks/heroku.rake
 %%WWWDIR%%/lib/tdiary/tasks/jasmine.rake
+%%WWWDIR%%/lib/tdiary/tasks/mongodb.rake
 %%WWWDIR%%/lib/tdiary/tasks/rdoc.rake
 %%WWWDIR%%/lib/tdiary/tasks/release.rake
 %%WWWDIR%%/lib/tdiary/tasks/rspec.rake
@@ -111,9 +117,8 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/misc/paas/cloudfoundry/Gemfile.lock
 %%WWWDIR%%/misc/paas/cloudfoundry/tdiary.conf
 %%WWWDIR%%/misc/paas/heroku/Gemfile.local
-%%WWWDIR%%/misc/paas/heroku/app.json
+%%WWWDIR%%/misc/paas/heroku/Gemfile.lock
-%%WWWDIR%%/misc/paas/heroku/config.ru
+%%WWWDIR%%/misc/paas/heroku/misc/plugin/system_update.rb
-%%WWWDIR%%/misc/paas/heroku/tasks/mongodb.rake
 %%WWWDIR%%/misc/paas/heroku/tdiary.conf
 %%WWWDIR%%/misc/paas/sqale/Gemfile
 %%WWWDIR%%/misc/paas/sqale/Gemfile.lock
@@ -123,16 +128,12 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/misc/plugin/ChangeLog.DO_NOT_UPDATE
 %%WWWDIR%%/misc/plugin/a.rb
 %%WWWDIR%%/misc/plugin/amazon.rb
-%%WWWDIR%%/misc/plugin/amazon/README.en
+%%WWWDIR%%/misc/plugin/amp.rb
-%%WWWDIR%%/misc/plugin/amazon/README.ja
-%%WWWDIR%%/misc/plugin/amazon/amazonimg.rb
-%%WWWDIR%%/misc/plugin/amazon/large.png
-%%WWWDIR%%/misc/plugin/amazon/medium.png
-%%WWWDIR%%/misc/plugin/amazon/small.png
 %%WWWDIR%%/misc/plugin/append-css.rb
 %%WWWDIR%%/misc/plugin/bq.rb
 %%WWWDIR%%/misc/plugin/calendar2.rb
 %%WWWDIR%%/misc/plugin/calendar3.rb
+%%WWWDIR%%/misc/plugin/category-legacy.rb
 %%WWWDIR%%/misc/plugin/category.rb
 %%WWWDIR%%/misc/plugin/category_autocomplete.rb
 %%WWWDIR%%/misc/plugin/comment_ajax.rb
@@ -153,6 +154,7 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/misc/plugin/en/append-css.rb
 %%WWWDIR%%/misc/plugin/en/bq.rb
 %%WWWDIR%%/misc/plugin/en/calendar2.rb
+%%WWWDIR%%/misc/plugin/en/category-legacy.rb
 %%WWWDIR%%/misc/plugin/en/category.rb
 %%WWWDIR%%/misc/plugin/en/counter.rb
 %%WWWDIR%%/misc/plugin/en/daily_theme.rb
@@ -166,6 +168,7 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/misc/plugin/en/makerss.rb
 %%WWWDIR%%/misc/plugin/en/pb-show.rb
 %%WWWDIR%%/misc/plugin/en/ping.rb
+%%WWWDIR%%/misc/plugin/en/preview.rb
 %%WWWDIR%%/misc/plugin/en/recent_comment.rb
 %%WWWDIR%%/misc/plugin/en/recent_comment3.rb
 %%WWWDIR%%/misc/plugin/en/recent_rss.rb
@@ -187,6 +190,7 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/misc/plugin/ja/amazon.rb
 %%WWWDIR%%/misc/plugin/ja/bq.rb
 %%WWWDIR%%/misc/plugin/ja/calendar2.rb
+%%WWWDIR%%/misc/plugin/ja/category-legacy.rb
 %%WWWDIR%%/misc/plugin/ja/category.rb
 %%WWWDIR%%/misc/plugin/ja/daily_theme.rb
 %%WWWDIR%%/misc/plugin/ja/disp_referrer.rb
@@ -197,6 +201,7 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/misc/plugin/ja/my-sequel.rb
 %%WWWDIR%%/misc/plugin/ja/pb-show.rb
 %%WWWDIR%%/misc/plugin/ja/ping.rb
+%%WWWDIR%%/misc/plugin/ja/preview.rb
 %%WWWDIR%%/misc/plugin/ja/recent_comment.rb
 %%WWWDIR%%/misc/plugin/ja/recent_comment3.rb
 %%WWWDIR%%/misc/plugin/ja/recent_rss.rb
@@ -218,6 +223,7 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/misc/plugin/pb-show.rb
 %%WWWDIR%%/misc/plugin/ping.rb
 %%WWWDIR%%/misc/plugin/pre_wrap.rb
+%%WWWDIR%%/misc/plugin/preview.rb
 %%WWWDIR%%/misc/plugin/random_google.rb
 %%WWWDIR%%/misc/plugin/recent_comment.rb
 %%WWWDIR%%/misc/plugin/recent_comment3.rb
@@ -232,7 +238,6 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/misc/plugin/search_form.rb
 %%WWWDIR%%/misc/plugin/sn.rb
 %%WWWDIR%%/misc/plugin/speed_comment.rb
-%%WWWDIR%%/misc/plugin/squeeze.rb
 %%WWWDIR%%/misc/plugin/src.rb
 %%WWWDIR%%/misc/plugin/tb-show.rb
 %%WWWDIR%%/misc/plugin/theme_online.rb
@@ -246,9 +251,6 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/misc/plugin/xmlrpc/README
 %%WWWDIR%%/misc/plugin/xmlrpc/xmlrpc.rb
 %%WWWDIR%%/misc/templates/Gemfile.local.erb
-%%WWWDIR%%/misc/theme_convert/Readme.rd
-%%WWWDIR%%/misc/theme_convert/append.rcss
-%%WWWDIR%%/misc/theme_convert/theme_convert.rb
 %%WWWDIR%%/package.json
 %%WWWDIR%%/tdiary.conf.beginner
 %%WWWDIR%%/tdiary.conf.sample
@@ -403,6 +405,8 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/theme/blackbox/blackbox_backh2.png
 %%WWWDIR%%/theme/blackbox/blackbox_backpre.png
 %%WWWDIR%%/theme/blackbox/blackbox_smallanchorback.png
+%%WWWDIR%%/theme/blog/README
+%%WWWDIR%%/theme/blog/blog.css
 %%WWWDIR%%/theme/blue-border/README
 %%WWWDIR%%/theme/blue-border/blue-border.css
 %%WWWDIR%%/theme/blue-border/blue-border_bg.png
@@ -1663,6 +1667,20 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/theme/smoking_white/white.png
 %%WWWDIR%%/theme/snake/README
 %%WWWDIR%%/theme/snake/snake.css
+%%WWWDIR%%/theme/snest/README
+%%WWWDIR%%/theme/snest/gulpfile.js
+%%WWWDIR%%/theme/snest/h1back.jpg
+%%WWWDIR%%/theme/snest/package.json
+%%WWWDIR%%/theme/snest/scss/_base.scss
+%%WWWDIR%%/theme/snest/scss/_button.scss
+%%WWWDIR%%/theme/snest/scss/_form.scss
+%%WWWDIR%%/theme/snest/scss/_sanitize.scss
+%%WWWDIR%%/theme/snest/scss/_table.scss
+%%WWWDIR%%/theme/snest/scss/_typography.scss
+%%WWWDIR%%/theme/snest/scss/_variables.scss
+%%WWWDIR%%/theme/snest/scss/snest.scss
+%%WWWDIR%%/theme/snest/snest.css
+%%WWWDIR%%/theme/snest/snest.css.map
 %%WWWDIR%%/theme/snow_man/README
 %%WWWDIR%%/theme/snow_man/snow_man.css
 %%WWWDIR%%/theme/snow_man/snow_man.jpg
@@ -1874,6 +1892,7 @@ bin/%%TDIARY_SCRIPT%%
 %%WWWDIR%%/theme/zef/zef.css
 %%WWWDIR%%/update.fcgi
 %%WWWDIR%%/update.rb
+%%WWWDIR%%/views/amp.rhtml
 %%WWWDIR%%/views/category.rhtml
 %%WWWDIR%%/views/conf.rhtml
 %%WWWDIR%%/views/day.rhtml
@@ -1944,6 +1963,8 @@ bin/%%TDIARY_SCRIPT%%
 @dir %%WWWDIR%%/theme/soda
 @dir %%WWWDIR%%/theme/snowy
 @dir %%WWWDIR%%/theme/snow_man
+@dir %%WWWDIR%%/theme/snest
+@dir %%WWWDIR%%/theme/snest/scss
 @dir %%WWWDIR%%/theme/snake
 @dir %%WWWDIR%%/theme/smoking_white
 @dir %%WWWDIR%%/theme/smoking_gray
@@ -2211,6 +2232,7 @@ bin/%%TDIARY_SCRIPT%%
 @dir %%WWWDIR%%/theme/blue-feather
 @dir %%WWWDIR%%/theme/blue-dash
 @dir %%WWWDIR%%/theme/blue-border
+@dir %%WWWDIR%%/theme/blog
 @dir %%WWWDIR%%/theme/blackbox
 @dir %%WWWDIR%%/theme/blackboard
 @dir %%WWWDIR%%/theme/black_mamba
@@ -2241,16 +2263,15 @@ bin/%%TDIARY_SCRIPT%%
 @dir %%WWWDIR%%/theme/3pink
 @dir %%WWWDIR%%/theme/3minutes
 @dir %%WWWDIR%%/theme
-@dir %%WWWDIR%%/misc/theme_convert
 @dir %%WWWDIR%%/misc/templates
 @dir %%WWWDIR%%/misc/plugin/xmlrpc
 @dir %%WWWDIR%%/misc/plugin/ja
 @dir %%WWWDIR%%/misc/plugin/en
-@dir %%WWWDIR%%/misc/plugin/amazon
 @dir %%WWWDIR%%/misc/plugin
 @dir %%WWWDIR%%/misc/paas/sqale
-@dir %%WWWDIR%%/misc/paas/heroku/tasks
 @dir %%WWWDIR%%/misc/paas/heroku
+@dir %%WWWDIR%%/misc/paas/heroku/misc
+@dir %%WWWDIR%%/misc/paas/heroku/misc/plugin
 @dir %%WWWDIR%%/misc/paas/cloudfoundry
 @dir %%WWWDIR%%/misc/paas
 @dir %%WWWDIR%%/misc/lib
@@ -2278,6 +2299,7 @@ bin/%%TDIARY_SCRIPT%%
 @dir %%WWWDIR%%/js
 @dir %%WWWDIR%%/data
 @dir %%WWWDIR%%/bin
+@dir %%WWWDIR%%/benchmark
 @dir %%WWWDIR%%
 @owner
 @group