4 files changed, 15 insertions, 29 deletions
diff --git a/www/ruby-jekyll/Makefile b/www/ruby-jekyll/Makefile
index 095c3a79d01..a83d8bf5775 100644
--- a/www/ruby-jekyll/Makefile
+++ b/www/ruby-jekyll/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2019/10/17 16:13:17 taca Exp $
+# $NetBSD: Makefile,v 1.38 2020/06/07 15:29:48 taca Exp $
 
-DISTNAME=	jekyll-4.0.0
-PKGREVISION=	1
+DISTNAME=	jekyll-4.1.0
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -18,7 +17,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-jekyll-watch>=2.0<3:../../www/ruby-jekyll-watch
 DEPENDS+=	${RUBY_PKGPREFIX}-kramdown>=2.1<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.3.3<0.4:../../devel/ruby-mercenary
+DEPENDS+=	${RUBY_PKGPREFIX}-mercenary>=0.4.0:../../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
@@ -31,8 +30,7 @@ USE_LANGUAGES=	# empty
 
 RUBYGEM_OPTIONS+=	--format-executable
 
+OVERRIDE_GEMSPEC+=	mercenary>=0.3.6
+
 .include "../../lang/ruby/gem.mk"
-.if ${RUBY_VER} != 26
-DEPENDS+=	${RUBY_PKGPREFIX}-bundler>=1.7:../../misc/ruby-bundler
-.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-jekyll/PLIST b/www/ruby-jekyll/PLIST
index a605f898f9a..1120416d873 100644
--- a/www/ruby-jekyll/PLIST
+++ b/www/ruby-jekyll/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2019/10/05 05:10:12 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.15 2020/06/07 15:29:48 taca Exp $
 bin/jekyll${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/.rubocop.yml
@@ -40,6 +40,7 @@ ${GEM_LIBDIR}/lib/jekyll/drops/document_drop.rb
 ${GEM_LIBDIR}/lib/jekyll/drops/drop.rb
 ${GEM_LIBDIR}/lib/jekyll/drops/excerpt_drop.rb
 ${GEM_LIBDIR}/lib/jekyll/drops/jekyll_drop.rb
+${GEM_LIBDIR}/lib/jekyll/drops/page_drop.rb
 ${GEM_LIBDIR}/lib/jekyll/drops/site_drop.rb
 ${GEM_LIBDIR}/lib/jekyll/drops/static_file_drop.rb
 ${GEM_LIBDIR}/lib/jekyll/drops/unified_payload_drop.rb
@@ -55,6 +56,7 @@ ${GEM_LIBDIR}/lib/jekyll/filters/url_filters.rb
 ${GEM_LIBDIR}/lib/jekyll/frontmatter_defaults.rb
 ${GEM_LIBDIR}/lib/jekyll/generator.rb
 ${GEM_LIBDIR}/lib/jekyll/hooks.rb
+${GEM_LIBDIR}/lib/jekyll/inclusion.rb
 ${GEM_LIBDIR}/lib/jekyll/layout.rb
 ${GEM_LIBDIR}/lib/jekyll/liquid_extensions.rb
 ${GEM_LIBDIR}/lib/jekyll/liquid_renderer.rb
@@ -63,10 +65,12 @@ ${GEM_LIBDIR}/lib/jekyll/liquid_renderer/table.rb
 ${GEM_LIBDIR}/lib/jekyll/log_adapter.rb
 ${GEM_LIBDIR}/lib/jekyll/mime.types
 ${GEM_LIBDIR}/lib/jekyll/page.rb
+${GEM_LIBDIR}/lib/jekyll/page_excerpt.rb
 ${GEM_LIBDIR}/lib/jekyll/page_without_a_file.rb
 ${GEM_LIBDIR}/lib/jekyll/path_manager.rb
 ${GEM_LIBDIR}/lib/jekyll/plugin.rb
 ${GEM_LIBDIR}/lib/jekyll/plugin_manager.rb
+${GEM_LIBDIR}/lib/jekyll/profiler.rb
 ${GEM_LIBDIR}/lib/jekyll/publisher.rb
 ${GEM_LIBDIR}/lib/jekyll/reader.rb
 ${GEM_LIBDIR}/lib/jekyll/readers/collection_reader.rb
diff --git a/www/ruby-jekyll/distinfo b/www/ruby-jekyll/distinfo
index e1665da78fe..e32004ed7ea 100644
--- a/www/ruby-jekyll/distinfo
+++ b/www/ruby-jekyll/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.20 2019/10/17 16:13:17 taca Exp $
+$NetBSD: distinfo,v 1.21 2020/06/07 15:29:48 taca Exp $
 
-SHA1 (jekyll-4.0.0.gem) = 52e202e75b0d8abeeab2da31e0e97765148b5603
-RMD160 (jekyll-4.0.0.gem) = 855207891ecd3972f4fcc381e307ac45462fcd28
-SHA512 (jekyll-4.0.0.gem) = eef8d1a5d7aa019394dff8ac5a4a6133a046afedb3605b480e6c699155274cd2a9deaff72e26984ee1dd4a5bfd6f0c81a39e468eb1566dbf57245fdbf6bc0c97
-Size (jekyll-4.0.0.gem) = 119808 bytes
-SHA1 (patch-.._jekyll-4.0.0.gemspec) = 6aff1a06d4e417160a7464e0f16e3834be9b813e
+SHA1 (jekyll-4.1.0.gem) = a68f34db83126d418cddd7013c2763e58b6c64f6
+RMD160 (jekyll-4.1.0.gem) = 17c91245d6b908692e83f8f1badb5be0a8de6a14
+SHA512 (jekyll-4.1.0.gem) = e4daba3c5100e05a9cc1c0841ea975eabf8ab64210bb4a523482d69c6b600b3e0497143858d5ad1f337be581c7fe3b72ea4c5f4fc0d912d9d3b65c0cf1d3a727
+Size (jekyll-4.1.0.gem) = 123392 bytes
 SHA1 (patch-lib_jekyll_commands_new.rb) = 928f4542aae30671efeaa99f59d61034aa5e38a7
diff --git a/www/ruby-jekyll/patches/patch-.._jekyll-4.0.0.gemspec b/www/ruby-jekyll/patches/patch-.._jekyll-4.0.0.gemspec
deleted file mode 100644
index 3090c86cd25..00000000000
--- a/www/ruby-jekyll/patches/patch-.._jekyll-4.0.0.gemspec
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-.._jekyll-4.0.0.gemspec,v 1.1 2019/10/17 16:13:17 taca Exp $
-
-Allow lower rubygems, Ruby 2.4.
-
---- ../jekyll-4.0.0.gemspec.orig	2019-10-16 16:07:46.095067718 +0000
-+++ ../jekyll-4.0.0.gemspec
-@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
-   s.name = "jekyll".freeze
-   s.version = "4.0.0"
- 
--  s.required_rubygems_version = Gem::Requirement.new(">= 2.7.0".freeze) if s.respond_to? :required_rubygems_version=
-+  s.required_rubygems_version = Gem::Requirement.new(">= 2.6.0".freeze) if s.respond_to? :required_rubygems_version=
-   s.metadata = { "bug_tracker_uri" => "https://github.com/jekyll/jekyll/issues", "changelog_uri" => "https://github.com/jekyll/jekyll/releases", "homepage_uri" => "https://jekyllrb.com", "source_code_uri" => "https://github.com/jekyll/jekyll" } if s.respond_to? :metadata=
-   s.require_paths = ["lib".freeze]
-   s.authors = ["Tom Preston-Werner".freeze, "Parker Moore".freeze, "Matt Rogers".freeze]