From: Ryan Freeman <ryan@slipgate.org>
Subject: Re: UPDATE: games/chocolate-doom
To: ports@openbsd.org
Date: Sun, 8 Sep 2024 14:01:02 -0700

On Mon, Sep 02, 2024 at 10:57:31AM -0700, Ryan Freeman wrote:
> On Sat, Aug 17, 2024 at 11:54:14PM -0700, Ryan Freeman wrote:
> > On Sat, Aug 17, 2024 at 07:58:16PM -0700, Ryan Freeman wrote:
> > > Hello,
> > > 
> > > Update to chocolate-doom-3.1.0.  It has been a long time since 3.0.1, so
> > > this mostly rolls forward tons of little fixes over the years.
> > > Fluidsynth is used now.  No more release tarball on HOMEPAGE, so github
> > > is used.
> > > 
> > > Tested on amd64 machine, Doom, Heretic, Hexen, Strife executables all
> > > function, as well as their respective setup tools.
> > > 
> > > Full changelog here: https://github.com/chocolate-doom/chocolate-doom/releases/tag/chocolate-doom-3.1.0
> > > 
> > > - patches/patch-src_hexen_mn_menu_c no-longer needed
> > > - WANTLIB regen
> > > - LIB_DEPENDS added audio/fluidsynth, sorted.  matches games/crispy-doom ** 
> > > - DIST_TUPLE used, this makes a funny distfile name, used PKGNAME per template
> > >   recommendation.
> > > - PLIST regen
> > > - gtk-update-icon-cache used now, added x11/gtk+4,-guic RUN_DEPENDS
> > > - pass portcheck, port-lib-depends-check
> > > 
> > > ** crispy-doom being based off chocolate-doom post-3.0.1
> > > 
> > > There is also a new crispy-doom release, will be sending a patch for that
> > > after chocolate-doom is good.
> > 
> > Updated diff attached, restored ${V} so only have to update version in
> > one spot again.  Also change to autoconf 2.71 and automake 1.16, thanks
> > Brad for the hint. 
> > 
> > Everything still configures and builds fine.
> 
> Ping
>

Ping

 
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
diff -u -p -r1.33 Makefile
--- Makefile	6 May 2024 12:23:33 -0000	1.33
+++ Makefile	18 Aug 2024 06:47:21 -0000
@@ -1,8 +1,8 @@
 COMMENT =	portable release of Doom, Heretic, Hexen, and Strife
-V =		3.0.1
-DISTNAME =	chocolate-doom-${V}
+V =		3.1.0
+DIST_TUPLE =	github chocolate-doom chocolate-doom chocolate-doom-${V} .
+PKGNAME =	chocolate-doom-${V}
 CATEGORIES =	games x11
-REVISION =	2
 
 HOMEPAGE =	https://www.chocolate-doom.org/
 
@@ -11,25 +11,26 @@ MAINTAINER =	Ryan Freeman <ryan@slipgate
 # GPLv2+
 PERMIT_PACKAGE =		Yes
 
-WANTLIB += SDL2 SDL2_mixer SDL2_net c m png samplerate z
+WANTLIB += SDL2 SDL2_mixer SDL2_net c fluidsynth m png pthread
+WANTLIB += samplerate
 
-LIB_DEPENDS =	devel/sdl2-mixer \
-		devel/sdl2-net \
+LIB_DEPENDS =	audio/fluidsynth \
 		audio/libsamplerate \
+		devel/sdl2-mixer \
+		devel/sdl2-net \
 		graphics/png
 
-SITES =		https://www.chocolate-doom.org/downloads/${V}/
-
 MODULES =	lang/python
 
 MODPY_RUNDEP =		No
 MODPY_ADJ_FILES =	man/{docgen,simplecpp}
 
-RUN_DEPENDS =	devel/desktop-file-utils
+RUN_DEPENDS =	devel/desktop-file-utils \
+		x11/gtk+4,-guic
 
 CONFIGURE_STYLE =	autoreconf
-AUTOMAKE_VERSION =	1.15
-AUTOCONF_VERSION =	2.69
+AUTOMAKE_VERSION =	1.16
+AUTOCONF_VERSION =	2.71
 CONFIGURE_ARGS +=	--mandir="${LOCALBASE}/man"
 
 post-extract:
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
diff -u -p -r1.10 distinfo
--- distinfo	10 Aug 2020 14:36:39 -0000	1.10
+++ distinfo	18 Aug 2024 06:47:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (chocolate-doom-3.0.1.tar.gz) = 1DXWF3QjSR1gvnBtqfB9OrT6vz4HfsKj/CFuOU/PyMc=
-SIZE (chocolate-doom-3.0.1.tar.gz) = 2514985
+SHA256 (chocolate-doom-chocolate-doom-chocolate-doom-3.1.0.tar.gz) = 8sZIQ9zsMSAysYDDsvNLTLJsTc2qc3WhYBo7HfEe+E0=
+SIZE (chocolate-doom-chocolate-doom-chocolate-doom-3.1.0.tar.gz) = 2256537
Index: patches/patch-src_hexen_mn_menu_c
===================================================================
RCS file: patches/patch-src_hexen_mn_menu_c
diff -N patches/patch-src_hexen_mn_menu_c
--- patches/patch-src_hexen_mn_menu_c	11 Mar 2022 19:04:11 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Remove redundant demoextend definition
-a8fd4b1f563d24d4296c3e8225c8404e2724d4c2
-
-Index: src/hexen/mn_menu.c
---- src/hexen/mn_menu.c.orig
-+++ src/hexen/mn_menu.c
-@@ -131,7 +131,6 @@ boolean MenuActive;
- int InfoType;
- int messageson = true;
- boolean mn_SuicideConsole;
--boolean demoextend; // from h2def.h
- 
- // PRIVATE DATA DEFINITIONS ------------------------------------------------
- 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/pkg/PLIST,v
diff -u -p -r1.11 PLIST
--- pkg/PLIST	11 Mar 2022 19:04:11 -0000	1.11
+++ pkg/PLIST	18 Aug 2024 06:47:21 -0000
@@ -7,69 +7,38 @@
 @bin bin/chocolate-server
 @bin bin/chocolate-strife
 @bin bin/chocolate-strife-setup
-@man man/man5/chocolate-doom.cfg.5
-@man man/man5/chocolate-heretic.cfg.5
-@man man/man5/chocolate-hexen.cfg.5
-@man man/man5/chocolate-strife.cfg.5
-@man man/man5/default.cfg.5
-@man man/man5/heretic.cfg.5
-@man man/man5/hexen.cfg.5
-@man man/man5/strife.cfg.5
-@man man/man6/chocolate-doom-setup.6
-@man man/man6/chocolate-doom.6
-@man man/man6/chocolate-heretic-setup.6
-@man man/man6/chocolate-heretic.6
-@man man/man6/chocolate-hexen-setup.6
-@man man/man6/chocolate-hexen.6
-@man man/man6/chocolate-server.6
-@man man/man6/chocolate-setup.6
-@man man/man6/chocolate-strife-setup.6
-@man man/man6/chocolate-strife.6
-share/appdata/
-share/appdata/chocolate-doom.appdata.xml
-share/appdata/chocolate-heretic.appdata.xml
-share/appdata/chocolate-hexen.appdata.xml
-share/appdata/chocolate-strife.appdata.xml
-share/applications/chocolate-doom.desktop
-share/applications/chocolate-heretic.desktop
-share/applications/chocolate-hexen.desktop
-share/applications/chocolate-setup.desktop
-share/applications/chocolate-strife.desktop
+share/applications/org.chocolate_doom.Doom.desktop
+share/applications/org.chocolate_doom.Heretic.desktop
+share/applications/org.chocolate_doom.Hexen.desktop
+share/applications/org.chocolate_doom.Setup.desktop
+share/applications/org.chocolate_doom.Strife.desktop
 share/applications/screensavers/
-share/applications/screensavers/chocolate-doom-screensaver.desktop
-share/bash-completion/completions/chocolate-doom
-share/bash-completion/completions/chocolate-heretic
-share/bash-completion/completions/chocolate-hexen
-share/bash-completion/completions/chocolate-strife
+share/applications/screensavers/org.chocolate_doom.Doom_Screensaver.desktop
 share/doc/chocolate-doom/
-share/doc/chocolate-doom/CMDLINE.doom
+share/doc/chocolate-doom/COPYING.md
 share/doc/chocolate-doom/ChangeLog
-share/doc/chocolate-doom/INSTALL.doom
 share/doc/chocolate-doom/NEWS.md
 share/doc/chocolate-doom/NOT-BUGS.md
 share/doc/chocolate-doom/PHILOSOPHY.md
 share/doc/chocolate-doom/README.Music.md
 share/doc/chocolate-doom/README.md
 share/doc/chocolate-heretic/
-share/doc/chocolate-heretic/CMDLINE.heretic
+share/doc/chocolate-heretic/COPYING.md
 share/doc/chocolate-heretic/ChangeLog
-share/doc/chocolate-heretic/INSTALL.heretic
 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
 share/doc/chocolate-hexen/
-share/doc/chocolate-hexen/CMDLINE.hexen
+share/doc/chocolate-hexen/COPYING.md
 share/doc/chocolate-hexen/ChangeLog
-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
 share/doc/chocolate-strife/
-share/doc/chocolate-strife/CMDLINE.strife
+share/doc/chocolate-strife/COPYING.md
 share/doc/chocolate-strife/ChangeLog
-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
@@ -77,7 +46,15 @@ share/doc/chocolate-strife/README.Strife
 share/doc/chocolate-strife/README.md
 share/doc/pkg-readmes/${PKGSTEM}
 share/doom/
-share/icons/
-share/icons/chocolate-doom.png
-share/icons/chocolate-setup.png
 @tag update-desktop-database
+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
+share/metainfo/
+share/metainfo/org.chocolate_doom.Doom.metainfo.xml
+share/metainfo/org.chocolate_doom.Heretic.metainfo.xml
+share/metainfo/org.chocolate_doom.Hexen.metainfo.xml
+share/metainfo/org.chocolate_doom.Strife.metainfo.xml
+@tag gtk-update-icon-cache %D/share/icons/hicolor