Stefmorino <[email protected]> wrote:

> Updates to the next major release of Cataclysm: Dark Days Ahead.
> 
> I moved the packaged Terminus font and its license to the no-no_x11
> package fragment, since they're not needed by the no_x11 flavor.
> 
> patch-test_Makefile is needed or catch/catch.hpp isn't included
> properly when building pch tests (clang & gcc inconsistency?)
> 
> Port also attached as tgz.
> 
> Thoughts/Tests/OK? @trondd
> 

I can't get one of the patches to apply.

|Index: patches/patch-Makefile
|===================================================================
|RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v
|retrieving revision 1.10
|diff -u -p -r1.10 patch-Makefile
|--- patches/patch-Makefile     25 Jun 2021 17:42:59 -0000      1.10
|+++ patches/patch-Makefile     5 Jul 2021 18:33:59 -0000
--------------------------
Patching file patches/patch-Makefile using Plan A...
Hunk #1 succeeded at 3.
Hunk #2 failed at 12.
Hunk #3 succeeded at 29 with fuzz 2.
Hunk #4 failed at 39.
Hunk #5 succeeded at 84.
Hunk #6 failed at 95.
3 out of 6 hunks failed--saving rejects to patches/patch-Makefile.rej

Tim.

Reply via email to