- Make use of devel/rubygem-json_pure which had not been updated to 1.6.5 yet

  when this port was updated to 3.1.2 instead of bundle json_pure library
- Do not install LICENSE file
- Bump PORTREVISION

2 files changed, 8 insertions, 162 deletions

diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index 07f3bb53f742..40c4abda11b7 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tdiary
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES?=	www ruby
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/ \
 		http://www.tdiary.org/download/
@@ -20,6 +21,7 @@ LICENSE_FILE=	${WRKDIR}/doc/LICENSE
 
 RUN_DEPENDS=	hikidoc:${PORTSDIR}/textproc/ruby-hikidoc \
 		rubygem-imagesize>=0.1.1:${PORTSDIR}/graphics/rubygem-imagesize \
+		rubygem-json_pure>=1.6.5:${PORTSDIR}/devel/rubygem-json_pure \
 		rd2:${PORTSDIR}/textproc/ruby-rdtool
 
 NO_BUILD=	yes
@@ -40,7 +42,7 @@ RUBY_SHEBANG_FILES=	index.fcgi \
 PORTDOCS=	ChangeLog HOWTO-make-io.rd HOWTO-make-plugin.html \
 		HOWTO-make-theme.html HOWTO-use-plugin.html \
 		HOWTO-write-tDiary.en.html HOWTO-write-tDiary.html INSTALL.html \
-		LICENSE README.en.html README.html README.md UPGRADE doc.css
+		README.en.html README.html README.md UPGRADE doc.css
 
 SUB_FILES=	pkg-message tdiaryinst.rb
 SUB_LIST+=	TDIARY_LANG=${TDIARY_LANG} \
@@ -90,11 +92,15 @@ post-extract:
 	@${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.6.5
 	@${RM} -r ${WRKSRC}/vendor/rdtool-0.6.29
 	@${MV} ${WRKSRC}/ChangeLog ${WRKSRC}/doc
 	@${MV} ${WRKSRC}/LICENSE ${WRKSRC}/doc
 	@${MV} ${WRKSRC}/README.md ${WRKSRC}/doc
-	@cd ${WRKSRC} && ${MV} doc ${WRKDIR}
+	@${MV} ${WRKSRC}/doc ${WRKDIR}
+
+post-patch:
+	@${RUBY} -i -pe "sub %r|((\s*)require 'json')|, %Q|\\\2require 'rubygems'\n\\\1|" ${WRKSRC}/tdiary.rb
 
 pre-install:
 	@${SED} -e 's,#!/usr/bin/env ruby,#!${RUBY},' \
diff --git a/www/tdiary/pkg-plist b/www/tdiary/pkg-plist
index e10f8bd3219d..12658bc2afeb 100644
--- a/www/tdiary/pkg-plist
+++ b/www/tdiary/pkg-plist
@@ -1832,166 +1832,6 @@
 %%WWWDIR%%/update.fcgi
 %%WWWDIR%%/update.rb
 %%WWWDIR%%/vendor/imagesize-0.1.1/lib
-%%WWWDIR%%/vendor/json_pure-1.6.5/.gitignore
-%%WWWDIR%%/vendor/json_pure-1.6.5/.travis.yml
-%%WWWDIR%%/vendor/json_pure-1.6.5/CHANGES
-%%WWWDIR%%/vendor/json_pure-1.6.5/COPYING
-%%WWWDIR%%/vendor/json_pure-1.6.5/COPYING-json-jruby
-%%WWWDIR%%/vendor/json_pure-1.6.5/GPL
-%%WWWDIR%%/vendor/json_pure-1.6.5/Gemfile
-%%WWWDIR%%/vendor/json_pure-1.6.5/README-json-jruby.markdown
-%%WWWDIR%%/vendor/json_pure-1.6.5/README.rdoc
-%%WWWDIR%%/vendor/json_pure-1.6.5/Rakefile
-%%WWWDIR%%/vendor/json_pure-1.6.5/TODO
-%%WWWDIR%%/vendor/json_pure-1.6.5/VERSION
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/.keep
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/generator2_benchmark.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/generator_benchmark.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/ohai.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/ohai.ruby
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/parser2_benchmark.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/parser_benchmark.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/diagrams/.keep
-%%WWWDIR%%/vendor/json_pure-1.6.5/ext/json/ext/fbuffer/fbuffer.h
-%%WWWDIR%%/vendor/json_pure-1.6.5/ext/json/ext/generator/extconf.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/ext/json/ext/generator/generator.c
-%%WWWDIR%%/vendor/json_pure-1.6.5/ext/json/ext/generator/generator.h
-%%WWWDIR%%/vendor/json_pure-1.6.5/ext/json/ext/parser/extconf.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/ext/json/ext/parser/parser.c
-%%WWWDIR%%/vendor/json_pure-1.6.5/ext/json/ext/parser/parser.h
-%%WWWDIR%%/vendor/json_pure-1.6.5/ext/json/ext/parser/parser.rl
-%%WWWDIR%%/vendor/json_pure-1.6.5/install.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json/ext/ByteListTranscoder.java
-%%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json/ext/Generator.java
-%%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json/ext/GeneratorMethods.java
-%%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json/ext/GeneratorService.java
-%%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json/ext/GeneratorState.java
-%%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json/ext/OptionsReader.java
-%%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json/ext/Parser.java
-%%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json/ext/Parser.rl
-%%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json/ext/ParserService.java
-%%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json/ext/RuntimeInfo.java
-%%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json/ext/StringDecoder.java
-%%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json/ext/StringEncoder.java
-%%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json/ext/Utils.java
-%%WWWDIR%%/vendor/json_pure-1.6.5/json-java.gemspec
-%%WWWDIR%%/vendor/json_pure-1.6.5/json.gemspec
-%%WWWDIR%%/vendor/json_pure-1.6.5/json_pure.gemspec
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/add/bigdecimal.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/add/complex.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/add/core.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/add/date.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/add/date_time.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/add/exception.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/add/ostruct.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/add/range.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/add/rational.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/add/regexp.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/add/struct.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/add/symbol.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/add/time.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/common.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/ext.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/ext/.keep
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/pure.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/pure/generator.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/pure/parser.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/version.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail1.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail10.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail11.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail12.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail13.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail14.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail18.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail19.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail2.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail20.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail21.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail22.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail23.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail24.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail25.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail27.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail28.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail3.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail4.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail5.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail6.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail7.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail8.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/fail9.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/pass1.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/pass15.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/pass16.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/pass17.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/pass2.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/pass26.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures/pass3.json
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/setup_variant.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/test_json.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/test_json_addition.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/test_json_encoding.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/test_json_fixtures.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/test_json_generate.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/test_json_string_matching.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/tests/test_json_unicode.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/tools/fuzz.rb
-%%WWWDIR%%/vendor/json_pure-1.6.5/tools/server.rb
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/tools
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/tests/fixtures
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/tests
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/pure
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/ext
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/lib/json/add
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/lib/json
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/lib
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json/ext
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/java/src/json
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/java/src
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/java
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/ext/json/ext/parser
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/ext/json/ext/generator
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/ext/json/ext/fbuffer
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/ext/json/ext
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/ext/json
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/ext
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/diagrams
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks/data-p4-3GHz-ruby18
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5/benchmarks
-@dirrm %%WWWDIR%%/vendor/json_pure-1.6.5
 @dirrm %%WWWDIR%%/vendor/imagesize-0.1.1
 @dirrm %%WWWDIR%%/vendor
 @dirrm %%WWWDIR%%/theme/zef