Re: Update darcs to 2.18.5, no longer needs patches

On Fri Dec 26, 2025 at 10:26 PM PST, Greg Steuck wrote:
> I don't know if anybody uses it, but not carrying patches which are
> availble in the newest upstream sounds good.
> Test? OK?

I use darcs daily, thanks for the patch. However, I can't get this 002 patch to apply cleanly to latest snapshot. I probably ran the patch incorrectly.

patch < 0002-Update-darcs-to-2.18.5-on-longer-needs-patches.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|From 24a8d7c7c94db52938ef277f2994c9b2a8a76b36 Mon Sep 17 00:00:00 2001
|From: Greg Steuck <greg@xxx.cx>
|Date: Fri, 26 Dec 2025 22:03:32 -0800
|Subject: [PATCH 2/2] Update darcs to 2.18.5, on longer needs patches
|
|---
| devel/darcs/Makefile | 200 +++----
| devel/darcs/distinfo | 554 +++++++++---------
| devel/darcs/patches/patch-darcs_cabal | 30 -
| .../patches/patch-src_Darcs_Patch_Annotate_hs | 13 -
| .../patch-src_Darcs_Patch_Index_Monad_hs | 11 -
| .../patch-src_Darcs_UI_Commands_Log_hs | 11 -
| .../patches/patch-src_Darcs_Util_Compat_hs | 23 -
| .../patch-src_Darcs_Util_Tree_Hashed_hs | 13 -
| .../patch-src_Darcs_Util_Tree_Monad_hs | 11 -
| 9 files changed, 367 insertions(+), 499 deletions(-)
| delete mode 100644 devel/darcs/patches/patch-darcs_cabal
| delete mode 100644 devel/darcs/patches/patch-src_Darcs_Patch_Annotate_hs
| delete mode 100644 devel/darcs/patches/patch-src_Darcs_Patch_Index_Monad_hs
| delete mode 100644 devel/darcs/patches/patch-src_Darcs_UI_Commands_Log_hs
| delete mode 100644 devel/darcs/patches/patch-src_Darcs_Util_Compat_hs
| delete mode 100644 devel/darcs/patches/patch-src_Darcs_Util_Tree_Hashed_hs
| delete mode 100644 devel/darcs/patches/patch-src_Darcs_Util_Tree_Monad_hs
|
|diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
|index e18f65c5efa..059df798e11 100644
|--- a/devel/darcs/Makefile
|+++ b/devel/darcs/Makefile
--------------------------
Patching file Makefile using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 succeeded at 10.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/devel/darcs/distinfo b/devel/darcs/distinfo
|index e0a820dfe34..aa2719d5daf 100644
|--- a/devel/darcs/distinfo
|+++ b/devel/darcs/distinfo
--------------------------
Patching file distinfo using Plan A...
Hunk #1 succeeded at 1.
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/devel/darcs/patches/patch-darcs_cabal b/devel/darcs/patches/patch-darcs_cabal
|deleted file mode 100644
|index 68c6a99212f..00000000000
|--- a/devel/darcs/patches/patch-darcs_cabal
|+++ /dev/null
--------------------------
File to patch:

Re: update lang/mruby: 3.3.0 -> 3.4.0

Doesn't build for me (current 3.3.0p2 does buid):

YACC  mrbgems/mruby-compiler/core/parse.y -> mrbgems/mruby-compiler/core/y.tab.c
ruby /usr/obj/ports/mruby-3.4.0/mruby-3.4.0/tools/lrama/exe/lrama -o "/usr/obj/ports/mruby-3.4.0/mruby-3.4.0/mrbgems/mruby-compiler/core/y.tab.c" "/usr/obj/ports/mruby-3.4.0/mruby-3.4.0/mrbgems/mruby-compiler/core/parse.y"
sh: ruby: not found
rake aborted!
Command failed with status (127): [ruby /usr/obj/ports/mruby-3.4.0/mruby-3.4.0/tools/lrama/exe/lrama -o "/usr/obj/ports/mruby-3.4.0/mruby-3.4.0/mrbgems/mruby-compiler/core/y.tab.c" "/usr/obj/ports/mruby-3.4.0/mruby-3.4.0/mrbgems/mruby-compiler/core/parse.y"]
/usr/obj/ports/mruby-3.4.0/mruby-3.4.0/lib/mruby/build/command.rb:33:in 'MRuby::Command#_run'
/usr/obj/ports/mruby-3.4.0/mruby-3.4.0/lib/mruby/build/command.rb:259:in 'MRuby::Command::Yacc#run'
/usr/obj/ports/mruby-3.4.0/mruby-3.4.0/mrbgems/mruby-compiler/mrbgem.rake:23:in 'block in <top (required)>'
/usr/local/bin/rake34:25:in 'Kernel#load'
/usr/local/bin/rake34:25:in '<main>'
Tasks: TOP => default => all => gensym => /usr/obj/ports/mruby-3.4.0/mruby-3.4.0/build/host/presym => /usr/obj/ports/mruby-3.4.0/mruby-3.4.0/build/host/mrbgems/mruby-compiler/core/y.tab.pi => /usr/obj/ports/mruby-3.4.0/mruby-3.4.0/mrbgems/mruby-compiler/core/y.tab.c

Do you have `ruby` in the PATH on the machine you were using for testing? If so, remove it, fix the build issues, and resubmit.

Best,

Jeremy

On Thu, Jan 1, 2026 at 10:30 AM Miguel Landaeta <miguel@miguel.cc> wrote:

Simple update to 3.4.0.

Changelog: https://mruby.org/releases/2025/04/20/mruby-3.4.0-released.html

Tested on amd64. ok?