Comment 1 Daniel Engberg 2024-08-31 19:59:47 UTC

Patch fails to apply, please regenerate

Did you test it in Poudriere or using anything else?

Created attachment 253231 [details]
epic5-2.6.patch (corrected)

(In reply to Daniel Engberg from comment #1)

Ah, I see my mistake. I did build and test with poudriere, but I missed `testpatch`, my apologies. I've corrected the patch. I also double checked that I was able to apply the patch: 

root@ports01:/usr/local/poudriere/ports/HEAD/irc/epic5 # rm Makefile* distinfo* pkg-plist*
root@ports01:/usr/local/poudriere/ports/HEAD/irc/epic5 # git checkout origin/main -- Makefile distinfo pkg-plist
root@ports01:/usr/local/poudriere/ports/HEAD/irc/epic5 # cd ../../
root@ports01:/usr/local/poudriere/ports/HEAD # patch -p1 < epic5-2.6.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/irc/epic5/Makefile b/irc/epic5/Makefile
|index 0f332780a05a..3c0b8687abac 100644
|--- a/irc/epic5/Makefile
|+++ b/irc/epic5/Makefile
--------------------------
Patching file irc/epic5/Makefile using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 succeeded at 14.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/irc/epic5/distinfo b/irc/epic5/distinfo
|index 0d595552b6a9..87529576c75a 100644
|--- a/irc/epic5/distinfo
|+++ b/irc/epic5/distinfo
--------------------------
Patching file irc/epic5/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/irc/epic5/pkg-plist b/irc/epic5/pkg-plist
|index 31303f280cb3..75904d453711 100644
|--- a/irc/epic5/pkg-plist
|+++ b/irc/epic5/pkg-plist
--------------------------
Patching file irc/epic5/pkg-plist using Plan A...
Hunk #1 succeeded at 20.
Hunk #2 succeeded at 49.
Hunk #3 succeeded at 61.
Hunk #4 succeeded at 114.
done

Comment 4 Vladimir Druzenko 2024-09-01 11:10:21 UTC

BTW, time to remove GNU_CONFIGURE_MANPREFIX.

Comment 5 Daniel Engberg 2024-09-01 11:31:50 UTC

Created attachment 253240 [details]
Patch for epic5

Some minor style changes and GNU_CONFIGURE_MANPREFIX removed as Vladimir point out. Does this look ok to your?

Passes Poudriere on all supported versions

Comment on attachment 253240 [details]
Patch for epic5

Tested and looks good to me, thank you.

Created attachment 253364 [details]
epic5-3.0.patch

Update to epic5-3.0. Additional updates:

   * Fix a bug in converting binary data to hex string
   * Celebrating 30 years of EPIC with ceremonial 3.0 release

Comment 8 Daniel Engberg 2024-09-08 07:04:38 UTC

Hi,

Thanks for the review, your latest patch fails to apply

Best regards,
Daniel

Created attachment 253417 [details]
epic5-3.0.patch (as file)

Trying again uploading as a file instead of pasting text. It applied cleaning for me:

root@ports01:/usr/local/poudriere/ports/HEAD # rm -rf irc/epic5; git checkout origin/main -- irc/epic5
root@ports01:/usr/local/poudriere/ports/HEAD # patch -p1 < epic5-3.0.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/irc/epic5/Makefile b/irc/epic5/Makefile
|index 0f332780a05a..3ac8c66ef24d 100644
|--- a/irc/epic5/Makefile
|+++ b/irc/epic5/Makefile
--------------------------
Patching file irc/epic5/Makefile using Plan A...
Hunk #1 succeeded at 1.
Hunk #2 succeeded at 13.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/irc/epic5/distinfo b/irc/epic5/distinfo
|index 0d595552b6a9..ed69a0ad20e1 100644
|--- a/irc/epic5/distinfo
|+++ b/irc/epic5/distinfo
--------------------------
Patching file irc/epic5/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/irc/epic5/pkg-plist b/irc/epic5/pkg-plist
|index 31303f280cb3..75904d453711 100644
|--- a/irc/epic5/pkg-plist
|+++ b/irc/epic5/pkg-plist
--------------------------
Patching file irc/epic5/pkg-plist using Plan A...
Hunk #1 succeeded at 20.
Hunk #2 succeeded at 49.
Hunk #3 succeeded at 61.
Hunk #4 succeeded at 114.
done

Comment 10 commit-hook 2024-09-08 17:33:29 UTC

A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=50aa17f3b6998b6ec5a6ed686f19d7c18b251d72

commit 50aa17f3b6998b6ec5a6ed686f19d7c18b251d72
Author:     epic <epic@dsllsn.net>
AuthorDate: 2024-09-08 17:29:20 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2024-09-08 17:31:50 +0000

    irc/epic5: Update to 3.0

    Changelog:

    From the UPDATES file:
        * Random numbers source from BYTES_random() exclusively
        * SOCKS4 and SOCKS5 support retired
        * Flood control support retired
        * RGB 24-bit color support!
        * Status sub-expandos now protect from expansion
        * New $hex(<digits> <number>) hex-to-decimal converter function
        * Improvements to the reconnect script
        * /WINDOW LISTER can now work on a list of window refnums
        * Configurable blank line indicator
        * Can now output the value of a builtin variable when it was initialized
        * New /on PING, triggered by server pings
        * Basic CAP support
        * New server SSL client certificate description field
        * Window clear point tracking
        * CTCP cloaking
        * Control active/inactive CTCPs
        * EPIC5-2.6 (2137 - Sedulous) released here

    PR:             281169

 irc/epic5/Makefile  | 13 +++++++------
 irc/epic5/distinfo  |  6 +++---
 irc/epic5/pkg-plist |  6 +++++-
 3 files changed, 15 insertions(+), 10 deletions(-)

Comment 11 Daniel Engberg 2024-09-08 17:34:21 UTC

Committed, thanks!