CVS commit: pkgsrc/www/ruby-jekyll

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue Mar 13 17:49:49 UTC 2018

Modified Files:
        pkgsrc/www/ruby-jekyll: Makefile PLIST distinfo
        pkgsrc/www/ruby-jekyll/patches: patch-lib_jekyll_commands_new.rb

Log Message:
www/ruby-jekyll: update to 3.7.3

Changes from 3.5.2 is too many to write here, please refer release page:
<https://github.com/jekyll/jekyll/releases> or history:
<https://github.com/jekyll/jekyll/blob/master/History.markdown>.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/www/ruby-jekyll/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/ruby-jekyll/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/ruby-jekyll/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/ruby-jekyll/patches/patch-lib_jekyll_commands_new.rb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/ruby-jekyll/Makefile
diff -u pkgsrc/www/ruby-jekyll/Makefile:1.28 pkgsrc/www/ruby-jekyll/Makefile:1.29
--- pkgsrc/www/ruby-jekyll/Makefile:1.28        Fri Oct 13 16:52:46 2017
+++ pkgsrc/www/ruby-jekyll/Makefile     Tue Mar 13 17:49:48 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2017/10/13 16:52:46 taca Exp $
+# $NetBSD: Makefile,v 1.29 2018/03/13 17:49:48 taca Exp $
 
-DISTNAME=      jekyll-3.5.2
-PKGREVISION=   1
+DISTNAME=      jekyll-3.7.3
 CATEGORIES=    www
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -11,20 +10,25 @@ LICENSE=    mit
 
 DEPENDS+=      ${RUBY_PKGPREFIX}-addressable>=2.4<3:../../net/ruby-addressable
 DEPENDS+=      ${RUBY_PKGPREFIX}-colorator>=1.0<2:../../misc/ruby-colorator
+DEPENDS+=      ${RUBY_PKGPREFIX}-em-websocket>=0.5<1:../../www/ruby-em-websocket
+DEPENDS+=      ${RUBY_PKGPREFIX}-i18n>=0.7:../../devel/ruby-i18n
 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}-kramdown>=1.3<2:../../textproc/ruby-kramdown
+DEPENDS+=      ${RUBY_PKGPREFIX}-jekyll-watch>=2.0<3:../../www/ruby-jekyll-watch
+DEPENDS+=      ${RUBY_PKGPREFIX}-kramdown>=1.14<2:../../textproc/ruby-kramdown
 DEPENDS+=      ${RUBY_PKGPREFIX}-liquid>=4.0<5:../../www/ruby-liquid
 DEPENDS+=      ${RUBY_PKGPREFIX}-mercenary>=0.3.3<0.4:../../devel/ruby-mercenary
 DEPENDS+=      ${RUBY_PKGPREFIX}-pathutil>=0.9<1:../../devel/ruby-pathutil
-DEPENDS+=      ${RUBY_PKGPREFIX}-rouge>=1.7<2:../../www/ruby-rouge
+DEPENDS+=      ${RUBY_PKGPREFIX}-rouge>=1.7<4:../../www/ruby-rouge
 
 DEPENDS+=      ${RUBY_PKGPREFIX}-safe_yaml>=1.0<2:../../textproc/ruby-safe_yaml
+# below packages are not listed in gemspec
 DEPENDS+=      ${RUBY_PKGPREFIX}-jekyll-minima>=2.1.1:../../www/ruby-jekyll-minima
 DEPENDS+=      ${RUBY_PKGPREFIX}-jekyll-feed>=0.9.2:../../www/ruby-jekyll-feed
 DEPENDS+=       ${RUBY_PKGPREFIX}-bundler>=1.7:../../misc/ruby-bundler
 
 RUBYGEM_OPTIONS+=      --format-executable
 
+OVERRIDE_GEMSPEC+=     i18n>=0.7
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/ruby-jekyll/PLIST
diff -u pkgsrc/www/ruby-jekyll/PLIST:1.11 pkgsrc/www/ruby-jekyll/PLIST:1.12
--- pkgsrc/www/ruby-jekyll/PLIST:1.11   Wed Jun 21 13:52:09 2017
+++ pkgsrc/www/ruby-jekyll/PLIST        Tue Mar 13 17:49:48 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2017/06/21 13:52:09 taca Exp $
+@comment $NetBSD: PLIST,v 1.12 2018/03/13 17:49:48 taca Exp $
 bin/jekyll${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/.rubocop.yml
@@ -16,7 +16,10 @@ ${GEM_LIBDIR}/lib/jekyll/commands/help.r
 ${GEM_LIBDIR}/lib/jekyll/commands/new.rb
 ${GEM_LIBDIR}/lib/jekyll/commands/new_theme.rb
 ${GEM_LIBDIR}/lib/jekyll/commands/serve.rb
+${GEM_LIBDIR}/lib/jekyll/commands/serve/live_reload_reactor.rb
+${GEM_LIBDIR}/lib/jekyll/commands/serve/livereload_assets/livereload.js
 ${GEM_LIBDIR}/lib/jekyll/commands/serve/servlet.rb
+${GEM_LIBDIR}/lib/jekyll/commands/serve/websockets.rb
 ${GEM_LIBDIR}/lib/jekyll/configuration.rb
 ${GEM_LIBDIR}/lib/jekyll/converter.rb
 ${GEM_LIBDIR}/lib/jekyll/converters/identity.rb
@@ -55,6 +58,7 @@ ${GEM_LIBDIR}/lib/jekyll/liquid_renderer
 ${GEM_LIBDIR}/lib/jekyll/log_adapter.rb
 ${GEM_LIBDIR}/lib/jekyll/mime.types
 ${GEM_LIBDIR}/lib/jekyll/page.rb
+${GEM_LIBDIR}/lib/jekyll/page_without_a_file.rb
 ${GEM_LIBDIR}/lib/jekyll/plugin.rb
 ${GEM_LIBDIR}/lib/jekyll/plugin_manager.rb
 ${GEM_LIBDIR}/lib/jekyll/publisher.rb
@@ -82,7 +86,10 @@ ${GEM_LIBDIR}/lib/jekyll/url.rb
 ${GEM_LIBDIR}/lib/jekyll/utils.rb
 ${GEM_LIBDIR}/lib/jekyll/utils/ansi.rb
 ${GEM_LIBDIR}/lib/jekyll/utils/exec.rb
+${GEM_LIBDIR}/lib/jekyll/utils/internet.rb
 ${GEM_LIBDIR}/lib/jekyll/utils/platforms.rb
+${GEM_LIBDIR}/lib/jekyll/utils/rouge.rb
+${GEM_LIBDIR}/lib/jekyll/utils/thread_event.rb
 ${GEM_LIBDIR}/lib/jekyll/utils/win_tz.rb
 ${GEM_LIBDIR}/lib/jekyll/version.rb
 ${GEM_LIBDIR}/lib/site_template/.gitignore
@@ -104,4 +111,7 @@ ${GEM_LIBDIR}/lib/theme_template/example
 ${GEM_LIBDIR}/lib/theme_template/example/style.scss
 ${GEM_LIBDIR}/lib/theme_template/gitignore.erb
 ${GEM_LIBDIR}/lib/theme_template/theme.gemspec.erb
+${GEM_LIBDIR}/rubocop/jekyll.rb
+${GEM_LIBDIR}/rubocop/jekyll/no_p_allowed.rb
+${GEM_LIBDIR}/rubocop/jekyll/no_puts_allowed.rb
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec

Index: pkgsrc/www/ruby-jekyll/distinfo
diff -u pkgsrc/www/ruby-jekyll/distinfo:1.14 pkgsrc/www/ruby-jekyll/distinfo:1.15
--- pkgsrc/www/ruby-jekyll/distinfo:1.14        Mon Sep 11 16:02:12 2017
+++ pkgsrc/www/ruby-jekyll/distinfo     Tue Mar 13 17:49:48 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2017/09/11 16:02:12 taca Exp $
+$NetBSD: distinfo,v 1.15 2018/03/13 17:49:48 taca Exp $
 
-SHA1 (jekyll-3.5.2.gem) = 102044f3f3fad5ec87360c45f24bd3bec38833ff
-RMD160 (jekyll-3.5.2.gem) = 3de16f599e9463a5eb7f4282e7273cb829bdf6ee
-SHA512 (jekyll-3.5.2.gem) = e1695811c1bba737c3e07776c140da82a48156d8d590152deeeb52fc585486de04eed4e3184a577e1dcf34f68badbdc9ba887bc162d95a82a24e95a23d54f80d
-Size (jekyll-3.5.2.gem) = 92672 bytes
-SHA1 (patch-lib_jekyll_commands_new.rb) = eed3af934584debec177a58b916464ff536b7178
+SHA1 (jekyll-3.7.3.gem) = f315dbf1e495acbb5734cf3c0637aa7049c76d52
+RMD160 (jekyll-3.7.3.gem) = 133bdcda58e49eacf6b73cf5406b21ad5ab0a430
+SHA512 (jekyll-3.7.3.gem) = 66794a42feeb3a444099d7c262220470e6724b84846eea78e7598e0b2891f4cfc88f57f6d1699edb02b8d5e80671b03c51f06ef466eb9ec92ffb20c7d175d855
+Size (jekyll-3.7.3.gem) = 110592 bytes
+SHA1 (patch-lib_jekyll_commands_new.rb) = 928f4542aae30671efeaa99f59d61034aa5e38a7

Index: pkgsrc/www/ruby-jekyll/patches/patch-lib_jekyll_commands_new.rb
diff -u pkgsrc/www/ruby-jekyll/patches/patch-lib_jekyll_commands_new.rb:1.1 pkgsrc/www/ruby-jekyll/patches/patch-lib_jekyll_commands_new.rb:1.2
--- pkgsrc/www/ruby-jekyll/patches/patch-lib_jekyll_commands_new.rb:1.1 Sat Apr 22 17:13:48 2017
+++ pkgsrc/www/ruby-jekyll/patches/patch-lib_jekyll_commands_new.rb     Tue Mar 13 17:49:49 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_jekyll_commands_new.rb,v 1.1 2017/04/22 17:13:48 taca Exp $
+$NetBSD: patch-lib_jekyll_commands_new.rb,v 1.2 2018/03/13 17:49:49 taca Exp $
 
 Do not use bundle unless specify --execute-bundle option.
 
---- lib/jekyll/commands/new.rb.orig    2017-04-22 08:36:18.000000000 +0000
+--- lib/jekyll/commands/new.rb.orig    2017-10-15 15:52:10.000000000 +0000
 +++ lib/jekyll/commands/new.rb
-@@ -13,6 +13,8 @@ module Jekyll
+@@ -15,6 +15,8 @@ module Jekyll
              c.option "blank", "--blank", "Creates scaffolding but with empty files"
              c.option "skip-bundle", "--skip-bundle", "Skip 'bundle install'"
  
@@ -13,19 +13,22 @@ Do not use bundle unless specify --execu
              c.action do |args, options|
                Jekyll::Commands::New.process(args, options)
              end
-@@ -125,12 +127,13 @@ RUBY
+@@ -127,7 +129,8 @@ RUBY
          # unless the user opts to generate a blank blog or skip 'bundle install'.
  
          def after_install(path, options = {})
 -          unless options["blank"] || options["skip-bundle"]
 +          execute_bundle = options["execute-bundle"]
 +          unless options["blank"] || options["skip-bundle"] || (not execute_bundle)
-             bundle_install path
+             begin
+               require "bundler"
+               bundle_install path
+@@ -137,7 +140,7 @@ RUBY
            end
  
            Jekyll.logger.info "New jekyll site installed in #{path.cyan}."
 -          Jekyll.logger.info "Bundle install skipped." if options["skip-bundle"]
-+          Jekyll.logger.info "Bundle install skipped." if options["skip-bundle"] or (not execute_bundle)
++          Jekyll.logger.info "Bundle install skipped." if options["skip-bundle"] || (not execute_bundle)
          end
  
          def bundle_install(path)