diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2022-10-27 06:28:11 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2022-10-27 06:28:11 +0000 |
| commit | 0f7bcb992ea84f8f0d45abfeb9792b85787a6a1d (patch) | |
| tree | 8c0080e837a92ecd86f820d40f4532586cbd0617 | |
| parent | 117da6078b440b3137288feef542b30b7a9ee5b9 (diff) | |
| download | pkgsrc-0f7bcb992ea84f8f0d45abfeb9792b85787a6a1d.tar.gz | |
Pullup ticket #6691 - requested by taca
www/ruby-jekyll: critical bugfix
Revisions pulled up:
- www/ruby-jekyll/Makefile 1.43
- www/ruby-jekyll/distinfo 1.28
- www/ruby-jekyll/patches/patch-lib_jekyll_commands_serve.rb 1.1
---
Module Name: pkgsrc
Committed By: taca
Date: Sun Oct 16 04:17:23 UTC 2022
Modified Files:
pkgsrc/www/ruby-jekyll: Makefile distinfo
Added Files:
pkgsrc/www/ruby-jekyll/patches: patch-lib_jekyll_commands_serve.rb
Log Message:
www/ruby-jekyll: fix "jekyll server"
Fix "jekyll server".
* Require ruby-webrick on Ruby 3.0 and lator.
* Explicitly require webrick".
Bump PKGREVISION.
| -rw-r--r-- | www/ruby-jekyll/Makefile | 9 | ||||
| -rw-r--r-- | www/ruby-jekyll/distinfo | 3 | ||||
| -rw-r--r-- | www/ruby-jekyll/patches/patch-lib_jekyll_commands_serve.rb | 14 |
3 files changed, 24 insertions, 2 deletions
diff --git a/www/ruby-jekyll/Makefile b/www/ruby-jekyll/Makefile index aa301d231b8..be2f93e8fe3 100644 --- a/www/ruby-jekyll/Makefile +++ b/www/ruby-jekyll/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.42 2022/09/01 14:53:14 taca Exp $ +# $NetBSD: Makefile,v 1.42.2.1 2022/10/27 06:28:11 bsiegert Exp $ DISTNAME= jekyll-4.2.2 +PKGREVISION= 1 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org @@ -30,5 +31,11 @@ USE_LANGUAGES= # empty RUBYGEM_OPTIONS+= --format-executable +.include "../../lang/ruby/rubyversion.mk" + +.if ${RUBY_VER} >= 30 +DEPENDS+= ${RUBY_PKGPREFIX}-webrick>=1.6.0:../../www/ruby-webrick +.endif + .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ruby-jekyll/distinfo b/www/ruby-jekyll/distinfo index bd81f13d18b..37824b56db7 100644 --- a/www/ruby-jekyll/distinfo +++ b/www/ruby-jekyll/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.27 2022/09/01 14:53:14 taca Exp $ +$NetBSD: distinfo,v 1.27.2.1 2022/10/27 06:28:11 bsiegert Exp $ BLAKE2s (jekyll-4.2.2.gem) = 83b28534052835db7b6f0674b7a2c769eb1d9452d5c56b1d5588f9f75d0530f0 SHA512 (jekyll-4.2.2.gem) = c49692d12905915021c5d5b18da4a808c09da04e7338995e7385ecb4b48c39e6cd019378457dc97ee5f16fdfe403e8db53ca151e181e6853f2e3adbb19ac16be Size (jekyll-4.2.2.gem) = 124928 bytes SHA1 (patch-lib_jekyll_commands_new.rb) = 5a58a44fe851fb95d03a86a9df4f5671f2b73502 +SHA1 (patch-lib_jekyll_commands_serve.rb) = ac115a7a8f85487105b62a44d0746912892dd8b5 diff --git a/www/ruby-jekyll/patches/patch-lib_jekyll_commands_serve.rb b/www/ruby-jekyll/patches/patch-lib_jekyll_commands_serve.rb new file mode 100644 index 00000000000..c56c83d5def --- /dev/null +++ b/www/ruby-jekyll/patches/patch-lib_jekyll_commands_serve.rb @@ -0,0 +1,14 @@ +$NetBSD: patch-lib_jekyll_commands_serve.rb,v 1.1.2.2 2022/10/27 06:28:12 bsiegert Exp $ + +* "jekyll serve" require webrick. + +--- lib/jekyll/commands/serve.rb.orig 2022-10-16 04:11:09.565369814 +0000 ++++ lib/jekyll/commands/serve.rb +@@ -1,5 +1,7 @@ + # frozen_string_literal: true + ++require 'webrick' ++ + module Jekyll + module Commands + class Serve < Command |