Bug 281630 - games/chocolate-doom: update to 3.1.0 WIP
Summary: games/chocolate-doom: update to 3.1.0 WIP
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Vladimir Druzenko
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-09-21 12:32 UTC by jakub_lach
Modified: 2024-09-22 01:48 UTC (History)
1 user (show)

See Also:


Attachments
choclate-doom 3.1.0 WIP (3.78 KB, patch)
2024-09-21 12:32 UTC, jakub_lach
no flags Details | Diff
v1 (8.23 KB, patch)
2024-09-21 15:31 UTC, Vladimir Druzenko
vvd: maintainer-approval?
Details | Diff
WWW, fluidsynth and pkg-message changes (8.62 KB, patch)
2024-09-21 21:31 UTC, jakub_lach
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description jakub_lach 2024-09-21 12:32:08 UTC
Created attachment 253718 [details]
choclate-doom 3.1.0 WIP

Hello, 

I've tried to update chocolate-doom to latest version, however at the staging I got hit by 

===>   Generating temporary packing list
ninja: error: unknown target 'install/strip'
*** Error code 1

could anybody lend me a hand here?

Attaching a patch which shows what I had to change to get to this stage.
Comment 1 Vladimir Druzenko freebsd_committer freebsd_triage 2024-09-21 14:24:43 UTC
You changed gmake to cmake, but keep GNU_CONFIGURE - is it correct?
Comment 2 Vladimir Druzenko freebsd_committer freebsd_triage 2024-09-21 15:31:01 UTC
Created attachment 253724 [details]
v1

Try this patch.
Without migrate from configure/gmake to cmake.
Comment 3 Vladimir Druzenko freebsd_committer freebsd_triage 2024-09-21 17:10:05 UTC
WWW=            https://www.chocolate-doom.org/
Comment 4 jakub_lach 2024-09-21 21:30:26 UTC
(In reply to Vladimir Druzenko from comment #2)

Thanks very much for help! I've updated the WWW and pkg-message in v2. I don't think we need to force fluidsynth.
Comment 5 jakub_lach 2024-09-21 21:31:08 UTC
Created attachment 253733 [details]
WWW, fluidsynth and pkg-message changes

WWW, fluidsynth and pkg-message changes
Comment 6 Vladimir Druzenko freebsd_committer freebsd_triage 2024-09-21 22:07:49 UTC
(In reply to jakub_lach from comment #4)
Port grab silently both fluidsynth and samplerate.

I added options:
OPTIONS_DEFINE=         DOCS FLUIDSYNTH PNG SAMPLERATE
OPTIONS_DEFAULT=        FLUIDSYNTH PNG SAMPLERATE
OPTIONS_SUB=            yes

DOCS_CONFIGURE_ENABLE=          doc

FLUIDSYNTH_LIB_DEPENDS=         libfluidsynth.so:audio/fluidsynth
FLUIDSYNTH_CONFIGURE_WITH=      fluidsynth

PNG_LIB_DEPENDS=                libpng.so:graphics/png
PNG_CONFIGURE_WITH=             libpng

SAMPLERATE_LIB_DEPENDS=         libsamplerate.so:audio/libsamplerate
SAMPLERATE_CONFIGURE_WITH=      libsamplerate

And remove mandatory:
LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth \
		libpng.so:graphics/png \
		libsamplerate.so:audio/libsamplerate

Also fixed pkg-plist around docs:
%%DOCS%%share/doc/chocolate-heretic/CMDLINE.heretic
share/doc/chocolate-heretic/COPYING.md
share/doc/chocolate-heretic/ChangeLog
%%DOCS%%share/doc/chocolate-heretic/INSTALL.heretic
%%DOCS%%share/doc/chocolate-heretic/NEWS.md
share/doc/chocolate-heretic/PHILOSOPHY.md
share/doc/chocolate-heretic/README.Music.md
share/doc/chocolate-heretic/README.md
%%DOCS%%share/doc/chocolate-hexen/CMDLINE.hexen
share/doc/chocolate-hexen/COPYING.md
share/doc/chocolate-hexen/ChangeLog
%%DOCS%%share/doc/chocolate-hexen/INSTALL.hexen
share/doc/chocolate-hexen/NEWS.md
share/doc/chocolate-hexen/PHILOSOPHY.md
share/doc/chocolate-hexen/README.Music.md
share/doc/chocolate-hexen/README.md
%%DOCS%%share/doc/chocolate-strife/CMDLINE.strife
share/doc/chocolate-strife/COPYING.md
share/doc/chocolate-strife/ChangeLog
%%DOCS%%share/doc/chocolate-strife/INSTALL.strife
share/doc/chocolate-strife/NEWS.md
share/doc/chocolate-strife/PHILOSOPHY.md
share/doc/chocolate-strife/README.Music.md
share/doc/chocolate-strife/README.Strife.md
share/doc/chocolate-strife/README.md
share/icons/hicolor/128x128/apps/chocolate-doom.png
share/icons/hicolor/128x128/apps/chocolate-heretic.png
share/icons/hicolor/128x128/apps/chocolate-hexen.png
share/icons/hicolor/128x128/apps/chocolate-setup.png
share/icons/hicolor/128x128/apps/chocolate-strife.png
%%DOCS%%share/man/man5/chocolate-doom.cfg.5.gz
%%DOCS%%share/man/man5/chocolate-heretic.cfg.5.gz
%%DOCS%%share/man/man5/chocolate-hexen.cfg.5.gz
%%DOCS%%share/man/man5/chocolate-strife.cfg.5.gz
%%DOCS%%share/man/man5/default.cfg.5.gz
%%DOCS%%share/man/man5/heretic.cfg.5.gz
%%DOCS%%share/man/man5/hexen.cfg.5.gz
%%DOCS%%share/man/man5/strife.cfg.5.gz
%%DOCS%%share/man/man6/chocolate-doom-setup.6.gz
%%DOCS%%share/man/man6/chocolate-doom.6.gz
%%DOCS%%share/man/man6/chocolate-heretic-setup.6.gz
%%DOCS%%share/man/man6/chocolate-heretic.6.gz
%%DOCS%%share/man/man6/chocolate-hexen-setup.6.gz
%%DOCS%%share/man/man6/chocolate-hexen.6.gz
%%DOCS%%share/man/man6/chocolate-server.6.gz
%%DOCS%%share/man/man6/chocolate-strife-setup.6.gz
%%DOCS%%share/man/man6/chocolate-strife.6.gz

fluidsynth is small dependency - I suggest to keep it on by default.
Comment 7 jakub_lach 2024-09-21 22:57:53 UTC
(In reply to Vladimir Druzenko from comment #6)

Ok, appreciated
Comment 8 commit-hook freebsd_committer freebsd_triage 2024-09-21 23:23:39 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0ad5676a980fc93d78bdf3053caf7ab40d47f97b

commit 0ad5676a980fc93d78bdf3053caf7ab40d47f97b
Author:     jakub_lach <jakub_lach@mailplus.pl>
AuthorDate: 2024-09-21 23:17:17 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-09-21 23:17:17 +0000

    games/chocolate-doom: Update 3.0.1 → 3.1.0

    Changelog:
    https://github.com/chocolate-doom/chocolate-doom/releases/tag/chocolate-doom-3.1.0

    Improve port:
    - Add default options FLUIDSYNTH PNG SAMPLERATE to prevent silent grab
    - Disabling option DOCS prevents installation of man pages and
      documentation that are built during port building
    - Remove GNU_CONFIGURE_MANPREFIX
    - Pet portclippy

    PR:     281630

 games/chocolate-doom/Makefile                      | 43 +++++++-----
 games/chocolate-doom/distinfo                      |  6 +-
 .../files/patch-src_d__iwad.c (gone)               | 11 ---
 .../files/patch-src_hexen_mn__menu.c (gone)        | 11 ---
 games/chocolate-doom/pkg-message                   |  6 ++
 games/chocolate-doom/pkg-plist                     | 80 ++++++++++++----------
 6 files changed, 77 insertions(+), 80 deletions(-)
Comment 9 Vladimir Druzenko freebsd_committer freebsd_triage 2024-09-21 23:27:02 UTC
Thanks.
Comment 10 jakub_lach 2024-09-22 01:48:43 UTC
(In reply to Vladimir Druzenko from comment #9)
Thank you!