Update ruby-jekyll to 2.5.3.

* pkgsrc change: add support for pkg_alternatives.

Now ruby-jekyll are consits of sub packages.  And changes are too many to
write here.

4 files changed, 47 insertions, 197 deletions

diff --git a/www/ruby-jekyll/ALTERNATIVES b/www/ruby-jekyll/ALTERNATIVES
new file mode 100644
index 00000000000..5df66f34616
--- /dev/null
+++ b/www/ruby-jekyll/ALTERNATIVES
@@ -0,0 +1 @@
+bin/jekyll @PREFIX@/bin/jekyll${RUBY_SUFFIX}
diff --git a/www/ruby-jekyll/Makefile b/www/ruby-jekyll/Makefile
index 325f822b369..1213288a8d3 100644
--- a/www/ruby-jekyll/Makefile
+++ b/www/ruby-jekyll/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2015/02/02 12:35:11 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2015/03/13 16:53:12 taca Exp $
 
-DISTNAME=	jekyll-1.2.0
-PKGREVISION=	1
+DISTNAME=	jekyll-2.5.3
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -9,20 +8,23 @@ HOMEPAGE=	https://github.com/mojombo/jekyll
 COMMENT=	Blog-aware, static site generator in Ruby
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-liquid>=2.5.1<2.6:../../www/ruby-liquid
-DEPENDS+=	${RUBY_PKGPREFIX}-classifier>=1.3.2<2:../../textproc/ruby-classifier
-DEPENDS+=	${RUBY_PKGPREFIX}-directory-watcher>=1.5.1:../../sysutils/ruby-directory-watcher
-DEPENDS+=	${RUBY_PKGPREFIX}-maruku>=0.5<1:../../textproc/ruby-maruku
-DEPENDS+=	${RUBY_PKGPREFIX}-kramdown>=0.14<1:../../textproc/ruby-kramdown
-DEPENDS+=	${RUBY_PKGPREFIX}-pygments.rb>=0.5<0.6:../../www/ruby-pygments.rb
-DEPENDS+=	${RUBY_PKGPREFIX}-commander>=4.1.3<4.2:../../misc/ruby-commander
-DEPENDS+=	${RUBY_PKGPREFIX}-safe_yaml>=0.7.0:../../textproc/ruby-safe_yaml
+DEPENDS+=	${RUBY_PKGPREFIX}-liquid>=2.6.1<2.7:../../www/ruby-liquid
+DEPENDS+=	${RUBY_PKGPREFIX}-kramdown>=1.3<2:../../textproc/ruby-kramdown
+DEPENDS+=	${RUBY_PKGPREFIX}-mercenary>=0.3.3<0.4:../../devel/ruby-mercenary
+DEPENDS+=	${RUBY_PKGPREFIX}-safe_yaml>=1.0<2:../../textproc/ruby-safe_yaml
 DEPENDS+=	${RUBY_PKGPREFIX}-colorator>=0.1<1:../../misc/ruby-colorator
-DEPENDS+=	${RUBY_PKGPREFIX}-redcarpet>=3.0.0:../../textproc/ruby-redcarpet
+DEPENDS+=	${RUBY_PKGPREFIX}-pygments.rb>=0.6.0<0.7:../../www/ruby-pygments.rb
+DEPENDS+=	${RUBY_PKGPREFIX}-redcarpet>=3.1<4:../../textproc/ruby-redcarpet
+DEPENDS+=	${RUBY_PKGPREFIX}-toml>=0.1.0<0.2:../../textproc/ruby-toml
+DEPENDS+=	${RUBY_PKGPREFIX}-jekyll-paginate>=1.0<2:../../www/ruby-jekyll-paginate
+DEPENDS+=	${RUBY_PKGPREFIX}-jekyll-gist>=1.0<2:../../www/ruby-jekyll-gist
+DEPENDS+=	${RUBY_PKGPREFIX}-jekyll-coffeescript>=1.0<2:../../www/ruby-jekyll-coffeescript
+DEPENDS+=	${RUBY_PKGPREFIX}-jekyll-sass-converter>=1.0<2:../../www/ruby-jekyll-sass-converter
+DEPENDS+=	${RUBY_PKGPREFIX}-jekyll-watch>=1.1<2:../../www/ruby-jekyll-watch
+DEPENDS+=	${RUBY_PKGPREFIX}-classifier-reborn>=2.0<3:../../textproc/ruby-classifier-reborn
 
 RUBY_VERSION_SUPPORTED=	200 193 21
-
-OVERRIDE_GEMSPEC= directory_watcher>=1.5.1 safe_yaml>=0.9.5 redcarpet>=3.0.0
+RUBYGEM_OPTIONS+=	--format-executable
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-jekyll/PLIST b/www/ruby-jekyll/PLIST
index 5dfe4fe16a9..9b849042f45 100644
--- a/www/ruby-jekyll/PLIST
+++ b/www/ruby-jekyll/PLIST
@@ -1,33 +1,17 @@
-@comment $NetBSD: PLIST,v 1.5 2013/09/15 17:20:24 taca Exp $
-bin/jekyll
+@comment $NetBSD: PLIST,v 1.6 2015/03/13 16:53:12 taca Exp $
+bin/jekyll${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
-${GEM_LIBDIR}/CONTRIBUTING.markdown
-${GEM_LIBDIR}/Gemfile
-${GEM_LIBDIR}/History.markdown
 ${GEM_LIBDIR}/LICENSE
 ${GEM_LIBDIR}/README.markdown
-${GEM_LIBDIR}/Rakefile
 ${GEM_LIBDIR}/bin/jekyll
-${GEM_LIBDIR}/cucumber.yml
-${GEM_LIBDIR}/features/create_sites.feature
-${GEM_LIBDIR}/features/drafts.feature
-${GEM_LIBDIR}/features/embed_filters.feature
-${GEM_LIBDIR}/features/include_tag.feature
-${GEM_LIBDIR}/features/markdown.feature
-${GEM_LIBDIR}/features/pagination.feature
-${GEM_LIBDIR}/features/permalinks.feature
-${GEM_LIBDIR}/features/post_data.feature
-${GEM_LIBDIR}/features/post_excerpts.feature
-${GEM_LIBDIR}/features/site_configuration.feature
-${GEM_LIBDIR}/features/site_data.feature
-${GEM_LIBDIR}/features/step_definitions/jekyll_steps.rb
-${GEM_LIBDIR}/features/support/env.rb
-${GEM_LIBDIR}/jekyll.gemspec
 ${GEM_LIBDIR}/lib/jekyll.rb
 ${GEM_LIBDIR}/lib/jekyll/cleaner.rb
+${GEM_LIBDIR}/lib/jekyll/collection.rb
 ${GEM_LIBDIR}/lib/jekyll/command.rb
 ${GEM_LIBDIR}/lib/jekyll/commands/build.rb
+${GEM_LIBDIR}/lib/jekyll/commands/docs.rb
 ${GEM_LIBDIR}/lib/jekyll/commands/doctor.rb
+${GEM_LIBDIR}/lib/jekyll/commands/help.rb
 ${GEM_LIBDIR}/lib/jekyll/commands/new.rb
 ${GEM_LIBDIR}/lib/jekyll/commands/serve.rb
 ${GEM_LIBDIR}/lib/jekyll/configuration.rb
@@ -40,187 +24,50 @@ ${GEM_LIBDIR}/lib/jekyll/converters/markdown/rdiscount_parser.rb
 ${GEM_LIBDIR}/lib/jekyll/converters/markdown/redcarpet_parser.rb
 ${GEM_LIBDIR}/lib/jekyll/converters/textile.rb
 ${GEM_LIBDIR}/lib/jekyll/convertible.rb
-${GEM_LIBDIR}/lib/jekyll/core_ext.rb
 ${GEM_LIBDIR}/lib/jekyll/deprecator.rb
+${GEM_LIBDIR}/lib/jekyll/document.rb
 ${GEM_LIBDIR}/lib/jekyll/draft.rb
+${GEM_LIBDIR}/lib/jekyll/entry_filter.rb
 ${GEM_LIBDIR}/lib/jekyll/errors.rb
 ${GEM_LIBDIR}/lib/jekyll/excerpt.rb
 ${GEM_LIBDIR}/lib/jekyll/filters.rb
+${GEM_LIBDIR}/lib/jekyll/frontmatter_defaults.rb
 ${GEM_LIBDIR}/lib/jekyll/generator.rb
-${GEM_LIBDIR}/lib/jekyll/generators/pagination.rb
 ${GEM_LIBDIR}/lib/jekyll/layout.rb
+${GEM_LIBDIR}/lib/jekyll/layout_reader.rb
+${GEM_LIBDIR}/lib/jekyll/liquid_extensions.rb
+${GEM_LIBDIR}/lib/jekyll/log_adapter.rb
 ${GEM_LIBDIR}/lib/jekyll/mime.types
 ${GEM_LIBDIR}/lib/jekyll/page.rb
 ${GEM_LIBDIR}/lib/jekyll/plugin.rb
+${GEM_LIBDIR}/lib/jekyll/plugin_manager.rb
 ${GEM_LIBDIR}/lib/jekyll/post.rb
+${GEM_LIBDIR}/lib/jekyll/publisher.rb
 ${GEM_LIBDIR}/lib/jekyll/related_posts.rb
+${GEM_LIBDIR}/lib/jekyll/renderer.rb
 ${GEM_LIBDIR}/lib/jekyll/site.rb
 ${GEM_LIBDIR}/lib/jekyll/static_file.rb
 ${GEM_LIBDIR}/lib/jekyll/stevenson.rb
-${GEM_LIBDIR}/lib/jekyll/tags/gist.rb
 ${GEM_LIBDIR}/lib/jekyll/tags/highlight.rb
 ${GEM_LIBDIR}/lib/jekyll/tags/include.rb
 ${GEM_LIBDIR}/lib/jekyll/tags/post_url.rb
 ${GEM_LIBDIR}/lib/jekyll/url.rb
+${GEM_LIBDIR}/lib/jekyll/utils.rb
+${GEM_LIBDIR}/lib/jekyll/version.rb
 ${GEM_LIBDIR}/lib/site_template/.gitignore
 ${GEM_LIBDIR}/lib/site_template/_config.yml
+${GEM_LIBDIR}/lib/site_template/_includes/footer.html
+${GEM_LIBDIR}/lib/site_template/_includes/head.html
+${GEM_LIBDIR}/lib/site_template/_includes/header.html
 ${GEM_LIBDIR}/lib/site_template/_layouts/default.html
+${GEM_LIBDIR}/lib/site_template/_layouts/page.html
 ${GEM_LIBDIR}/lib/site_template/_layouts/post.html
 ${GEM_LIBDIR}/lib/site_template/_posts/0000-00-00-welcome-to-jekyll.markdown.erb
-${GEM_LIBDIR}/lib/site_template/css/main.css
-${GEM_LIBDIR}/lib/site_template/css/syntax.css
+${GEM_LIBDIR}/lib/site_template/_sass/_base.scss
+${GEM_LIBDIR}/lib/site_template/_sass/_layout.scss
+${GEM_LIBDIR}/lib/site_template/_sass/_syntax-highlighting.scss
+${GEM_LIBDIR}/lib/site_template/about.md
+${GEM_LIBDIR}/lib/site_template/css/main.scss
+${GEM_LIBDIR}/lib/site_template/feed.xml
 ${GEM_LIBDIR}/lib/site_template/index.html
-${GEM_LIBDIR}/script/bootstrap
-${GEM_LIBDIR}/site/.gitignore
-${GEM_LIBDIR}/site/CNAME
-${GEM_LIBDIR}/site/README
-${GEM_LIBDIR}/site/_config.yml
-${GEM_LIBDIR}/site/_includes/analytics.html
-${GEM_LIBDIR}/site/_includes/docs_contents.html
-${GEM_LIBDIR}/site/_includes/docs_contents_mobile.html
-${GEM_LIBDIR}/site/_includes/footer.html
-${GEM_LIBDIR}/site/_includes/header.html
-${GEM_LIBDIR}/site/_includes/news_contents.html
-${GEM_LIBDIR}/site/_includes/news_contents_mobile.html
-${GEM_LIBDIR}/site/_includes/news_item.html
-${GEM_LIBDIR}/site/_includes/primary-nav-items.html
-${GEM_LIBDIR}/site/_includes/section_nav.html
-${GEM_LIBDIR}/site/_includes/top.html
-${GEM_LIBDIR}/site/_layouts/default.html
-${GEM_LIBDIR}/site/_layouts/docs.html
-${GEM_LIBDIR}/site/_layouts/news.html
-${GEM_LIBDIR}/site/_layouts/news_item.html
-${GEM_LIBDIR}/site/_posts/2013-05-06-jekyll-1-0-0-released.markdown
-${GEM_LIBDIR}/site/_posts/2013-05-08-jekyll-1-0-1-released.markdown
-${GEM_LIBDIR}/site/_posts/2013-05-12-jekyll-1-0-2-released.markdown
-${GEM_LIBDIR}/site/_posts/2013-06-07-jekyll-1-0-3-released.markdown
-${GEM_LIBDIR}/site/_posts/2013-07-14-jekyll-1-1-0-released.markdown
-${GEM_LIBDIR}/site/_posts/2013-07-24-jekyll-1-1-1-released.markdown
-${GEM_LIBDIR}/site/_posts/2013-07-25-jekyll-1-0-4-released.markdown
-${GEM_LIBDIR}/site/_posts/2013-07-25-jekyll-1-1-2-released.markdown
-${GEM_LIBDIR}/site/_posts/2013-09-06-jekyll-1-2-0-released.markdown
-${GEM_LIBDIR}/site/css/gridism.css
-${GEM_LIBDIR}/site/css/normalize.css
-${GEM_LIBDIR}/site/css/pygments.css
-${GEM_LIBDIR}/site/css/style.css
-${GEM_LIBDIR}/site/docs/configuration.md
-${GEM_LIBDIR}/site/docs/contributing.md
-${GEM_LIBDIR}/site/docs/deployment-methods.md
-${GEM_LIBDIR}/site/docs/drafts.md
-${GEM_LIBDIR}/site/docs/extras.md
-${GEM_LIBDIR}/site/docs/frontmatter.md
-${GEM_LIBDIR}/site/docs/github-pages.md
-${GEM_LIBDIR}/site/docs/heroku.md
-${GEM_LIBDIR}/site/docs/history.md
-${GEM_LIBDIR}/site/docs/index.md
-${GEM_LIBDIR}/site/docs/installation.md
-${GEM_LIBDIR}/site/docs/migrations.md
-${GEM_LIBDIR}/site/docs/pages.md
-${GEM_LIBDIR}/site/docs/pagination.md
-${GEM_LIBDIR}/site/docs/permalinks.md
-${GEM_LIBDIR}/site/docs/plugins.md
-${GEM_LIBDIR}/site/docs/posts.md
-${GEM_LIBDIR}/site/docs/quickstart.md
-${GEM_LIBDIR}/site/docs/resources.md
-${GEM_LIBDIR}/site/docs/sites.md
-${GEM_LIBDIR}/site/docs/structure.md
-${GEM_LIBDIR}/site/docs/templates.md
-${GEM_LIBDIR}/site/docs/troubleshooting.md
-${GEM_LIBDIR}/site/docs/upgrading.md
-${GEM_LIBDIR}/site/docs/usage.md
-${GEM_LIBDIR}/site/docs/variables.md
-${GEM_LIBDIR}/site/favicon.png
-${GEM_LIBDIR}/site/feed.xml
-${GEM_LIBDIR}/site/freenode.txt
-${GEM_LIBDIR}/site/img/article-footer.png
-${GEM_LIBDIR}/site/img/footer-arrow.png
-${GEM_LIBDIR}/site/img/footer-logo.png
-${GEM_LIBDIR}/site/img/logo-2x.png
-${GEM_LIBDIR}/site/img/octojekyll.png
-${GEM_LIBDIR}/site/img/tube.png
-${GEM_LIBDIR}/site/img/tube1x.png
-${GEM_LIBDIR}/site/index.html
-${GEM_LIBDIR}/site/js/modernizr-2.5.3.min.js
-${GEM_LIBDIR}/site/news/index.md
-${GEM_LIBDIR}/site/news/releases/index.md
-${GEM_LIBDIR}/test/fixtures/broken_front_matter1.erb
-${GEM_LIBDIR}/test/fixtures/broken_front_matter2.erb
-${GEM_LIBDIR}/test/fixtures/broken_front_matter3.erb
-${GEM_LIBDIR}/test/fixtures/exploit_front_matter.erb
-${GEM_LIBDIR}/test/fixtures/front_matter.erb
-${GEM_LIBDIR}/test/helper.rb
-${GEM_LIBDIR}/test/source/+/foo.md
-${GEM_LIBDIR}/test/source/.htaccess
-${GEM_LIBDIR}/test/source/_includes/params.html
-${GEM_LIBDIR}/test/source/_includes/sig.markdown
-${GEM_LIBDIR}/test/source/_layouts/default.html
-${GEM_LIBDIR}/test/source/_layouts/simple.html
-${GEM_LIBDIR}/test/source/_plugins/dummy.rb
-${GEM_LIBDIR}/test/source/_posts/2008-02-02-not-published.textile
-${GEM_LIBDIR}/test/source/_posts/2008-02-02-published.textile
-${GEM_LIBDIR}/test/source/_posts/2008-10-18-foo-bar.textile
-${GEM_LIBDIR}/test/source/_posts/2008-11-21-complex.textile
-${GEM_LIBDIR}/test/source/_posts/2008-12-03-permalinked-post.textile
-${GEM_LIBDIR}/test/source/_posts/2008-12-13-include.markdown
-${GEM_LIBDIR}/test/source/_posts/2009-01-27-array-categories.textile
-${GEM_LIBDIR}/test/source/_posts/2009-01-27-categories.textile
-${GEM_LIBDIR}/test/source/_posts/2009-01-27-category.textile
-${GEM_LIBDIR}/test/source/_posts/2009-01-27-empty-categories.textile
-${GEM_LIBDIR}/test/source/_posts/2009-01-27-empty-category.textile
-${GEM_LIBDIR}/test/source/_posts/2009-03-12-hash-#1.markdown
-${GEM_LIBDIR}/test/source/_posts/2009-05-18-empty-tag.textile
-${GEM_LIBDIR}/test/source/_posts/2009-05-18-empty-tags.textile
-${GEM_LIBDIR}/test/source/_posts/2009-05-18-tag.textile
-${GEM_LIBDIR}/test/source/_posts/2009-05-18-tags.textile
-${GEM_LIBDIR}/test/source/_posts/2009-06-22-empty-yaml.textile
-${GEM_LIBDIR}/test/source/_posts/2009-06-22-no-yaml.textile
-${GEM_LIBDIR}/test/source/_posts/2010-01-08-triple-dash.markdown
-${GEM_LIBDIR}/test/source/_posts/2010-01-09-date-override.textile
-${GEM_LIBDIR}/test/source/_posts/2010-01-09-time-override.textile
-${GEM_LIBDIR}/test/source/_posts/2010-01-09-timezone-override.textile
-${GEM_LIBDIR}/test/source/_posts/2010-01-16-override-data.textile
-${GEM_LIBDIR}/test/source/_posts/2011-04-12-md-extension.md
-${GEM_LIBDIR}/test/source/_posts/2011-04-12-text-extension.text
-${GEM_LIBDIR}/test/source/_posts/2013-01-02-post-excerpt.markdown
-${GEM_LIBDIR}/test/source/_posts/2013-01-12-nil-layout.textile
-${GEM_LIBDIR}/test/source/_posts/2013-01-12-no-layout.textile
-${GEM_LIBDIR}/test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep
-${GEM_LIBDIR}/test/source/_posts/2013-04-11-custom-excerpt.markdown
-${GEM_LIBDIR}/test/source/_posts/2013-05-10-number-category.textile
-${GEM_LIBDIR}/test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown
-${GEM_LIBDIR}/test/source/_posts/2013-08-01-mkdn-extension.mkdn
-${GEM_LIBDIR}/test/source/_posts/es/2008-11-21-nested.textile
-${GEM_LIBDIR}/test/source/about.html
-${GEM_LIBDIR}/test/source/category/_posts/2008-9-23-categories.textile
-${GEM_LIBDIR}/test/source/contacts.html
-${GEM_LIBDIR}/test/source/contacts/bar.html
-${GEM_LIBDIR}/test/source/contacts/index.html
-${GEM_LIBDIR}/test/source/css/screen.css
-${GEM_LIBDIR}/test/source/deal.with.dots.html
-${GEM_LIBDIR}/test/source/foo/_posts/bar/2008-12-12-topical-post.textile
-${GEM_LIBDIR}/test/source/index.html
-${GEM_LIBDIR}/test/source/sitemap.xml
-${GEM_LIBDIR}/test/source/symlink-test/symlinked-file
-${GEM_LIBDIR}/test/source/win/_posts/2009-05-24-yaml-linebreak.markdown
-${GEM_LIBDIR}/test/source/z_category/_posts/2008-9-23-categories.textile
-${GEM_LIBDIR}/test/suite.rb
-${GEM_LIBDIR}/test/test_command.rb
-${GEM_LIBDIR}/test/test_configuration.rb
-${GEM_LIBDIR}/test/test_convertible.rb
-${GEM_LIBDIR}/test/test_core_ext.rb
-${GEM_LIBDIR}/test/test_excerpt.rb
-${GEM_LIBDIR}/test/test_filters.rb
-${GEM_LIBDIR}/test/test_generated_site.rb
-${GEM_LIBDIR}/test/test_kramdown.rb
-${GEM_LIBDIR}/test/test_new_command.rb
-${GEM_LIBDIR}/test/test_page.rb
-${GEM_LIBDIR}/test/test_pager.rb
-${GEM_LIBDIR}/test/test_post.rb
-${GEM_LIBDIR}/test/test_rdiscount.rb
-${GEM_LIBDIR}/test/test_redcarpet.rb
-${GEM_LIBDIR}/test/test_redcloth.rb
-${GEM_LIBDIR}/test/test_related_posts.rb
-${GEM_LIBDIR}/test/test_site.rb
-${GEM_LIBDIR}/test/test_tags.rb
-${GEM_LIBDIR}/test/test_url.rb
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/www/ruby-jekyll/distinfo b/www/ruby-jekyll/distinfo
index 680a0ffe746..ef0111b565d 100644
--- a/www/ruby-jekyll/distinfo
+++ b/www/ruby-jekyll/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2013/09/15 17:20:24 taca Exp $
+$NetBSD: distinfo,v 1.6 2015/03/13 16:53:12 taca Exp $
 
-SHA1 (jekyll-1.2.0.gem) = 105be8c3c8af96590fe9e6a419a7946754216089
-RMD160 (jekyll-1.2.0.gem) = c61e9864b0a962ef9d6316229738bb0d487c7a1b
-Size (jekyll-1.2.0.gem) = 250880 bytes
+SHA1 (jekyll-2.5.3.gem) = 1ebc5ca2af01b3741d5eba375320fe45c6c105d6
+RMD160 (jekyll-2.5.3.gem) = fade997d621ba5c2a58939cfa1273c401d5ad511
+Size (jekyll-2.5.3.gem) = 58368 bytes