CVS commit: pkgsrc/www/ruby-jekyll

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Dec 12 13:40:34 UTC 2021

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

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

4.2.1 (2021-09-27)

Bug Fixes

* Backport #8620 for v4.2.x: Revert #7253: "Don't reset site.url to
  localhost:4000 by default" (#8808)
* Backport #8756 for v4.2.x: Respect collections_dir config within include
  tag (#8794)
* Backport #8786 for v4.2.x: Fix regression in Convertible module from
  v4.2.0 (#8793)


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/www/ruby-jekyll/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/ruby-jekyll/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    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.40 pkgsrc/www/ruby-jekyll/Makefile:1.41
--- pkgsrc/www/ruby-jekyll/Makefile:1.40        Mon Jan 18 14:53:38 2021
+++ pkgsrc/www/ruby-jekyll/Makefile     Sun Dec 12 13:40:33 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2021/01/18 14:53:38 taca Exp $
+# $NetBSD: Makefile,v 1.41 2021/12/12 13:40:33 taca Exp $
 
-DISTNAME=      jekyll-4.2.0
+DISTNAME=      jekyll-4.2.1
 CATEGORIES=    www
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -17,7 +17,7 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-jekyll-watch
 DEPENDS+=      ${RUBY_PKGPREFIX}-kramdown>=2.3<3:../../textproc/ruby-kramdown
 DEPENDS+=      ${RUBY_PKGPREFIX}-kramdown-parser-gfm>=1.0.1<2:../../textproc/ruby-kramdown-parser-gfm
 DEPENDS+=      ${RUBY_PKGPREFIX}-liquid>=4.0<5:../../www/ruby-liquid
-DEPENDS+=      ${RUBY_PKGPREFIX}-mercenary>=0.4.0:../../devel/ruby-mercenary
+DEPENDS+=      ${RUBY_PKGPREFIX}-mercenary>=0.4.0<0.5:../../devel/ruby-mercenary
 DEPENDS+=      ${RUBY_PKGPREFIX}-pathutil>=0.9<1:../../devel/ruby-pathutil
 DEPENDS+=      ${RUBY_PKGPREFIX}-rouge>=3.0<4:../../www/ruby-rouge
 DEPENDS+=      ${RUBY_PKGPREFIX}-safe_yaml>=1.0<2:../../textproc/ruby-safe_yaml

Index: pkgsrc/www/ruby-jekyll/distinfo
diff -u pkgsrc/www/ruby-jekyll/distinfo:1.25 pkgsrc/www/ruby-jekyll/distinfo:1.26
--- pkgsrc/www/ruby-jekyll/distinfo:1.25        Tue Oct 26 11:30:59 2021
+++ pkgsrc/www/ruby-jekyll/distinfo     Sun Dec 12 13:40:33 2021
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.25 2021/10/26 11:30:59 nia Exp $
+$NetBSD: distinfo,v 1.26 2021/12/12 13:40:33 taca Exp $
 
-BLAKE2s (jekyll-4.2.0.gem) = 2cc3045f4e12a58caf745029a777618ddf97404a55b0d945521dbf9bd28a9258
-SHA512 (jekyll-4.2.0.gem) = bef32d360ca2d6c8bd226f9485f4ed24348cb0f8747e5a230dea42417c8fa821e009a7e92c1f454cb5dd7759011db145e505658feb3e0266910afbe63754cabe
-Size (jekyll-4.2.0.gem) = 124928 bytes
-SHA1 (patch-lib_jekyll_commands_new.rb) = 928f4542aae30671efeaa99f59d61034aa5e38a7
+BLAKE2s (jekyll-4.2.1.gem) = ac5914abf1b97205e0c15e2228fac9692b5fa543521012cdb885e88b396a1856
+SHA512 (jekyll-4.2.1.gem) = 7526ee78faea3ee61617f0ab501c3b3d88df762f8db1a27def161226a25c60f555bc7332f45478063b28ea1ef9aeb05aed50957bf8168188924daae79e773295
+Size (jekyll-4.2.1.gem) = 125440 bytes
+SHA1 (patch-lib_jekyll_commands_new.rb) = 78e78814225ffbd3000b3643718cf5ce085bf6df

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.2 pkgsrc/www/ruby-jekyll/patches/patch-lib_jekyll_commands_new.rb:1.3
--- pkgsrc/www/ruby-jekyll/patches/patch-lib_jekyll_commands_new.rb:1.2 Tue Mar 13 17:49:49 2018
+++ pkgsrc/www/ruby-jekyll/patches/patch-lib_jekyll_commands_new.rb     Sun Dec 12 13:40:34 2021
@@ -1,34 +1,33 @@
-$NetBSD: patch-lib_jekyll_commands_new.rb,v 1.2 2018/03/13 17:49:49 taca Exp $
+$NetBSD: patch-lib_jekyll_commands_new.rb,v 1.3 2021/12/12 13:40:34 taca Exp $
 
 Do not use bundle unless specify --execute-bundle option.
 
---- lib/jekyll/commands/new.rb.orig    2017-10-15 15:52:10.000000000 +0000
+--- lib/jekyll/commands/new.rb.orig    2021-10-25 13:37:13.511954374 +0000
 +++ lib/jekyll/commands/new.rb
-@@ -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'"
- 
-+            c.option "execute-bundle", "--execute-bundle", "Use 'bundle install'"
-+
-             c.action do |args, options|
-               Jekyll::Commands::New.process(args, options)
-             end
-@@ -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)
-             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"] || (not execute_bundle)
-         end
- 
-         def bundle_install(path)
+@@ -14,6 +14,7 @@ module Jekyll
+             c.option "force", "--force", "Force creation even if PATH already exists"
+             c.option "blank", "--blank", "Creates scaffolding but with empty files"
+             c.option "skip-bundle", "--skip-bundle", "Skip 'bundle install'"
++            c.option "execute-bundle", "--execute-bundle", "Use 'bundle install'"
+ 
+             c.action do |args, options|
+               Jekyll::Commands::New.process(args, options)
+@@ -137,7 +138,8 @@ module Jekyll
+         # 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)
+             begin
+               require "bundler"
+               bundle_install path
+@@ -147,7 +149,7 @@ module Jekyll
+           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"] || (not execute_bundle)
+         end
+ 
+         def bundle_install(path)