git: 0ad5676a980f - main - games/chocolate-doom: Update 3.0.1 → 3.1.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 21 Sep 2024 23:23:25 UTC
The branch main has been updated by vvd:
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 +-
games/chocolate-doom/files/patch-src_d__iwad.c | 11 ---
.../files/patch-src_hexen_mn__menu.c | 11 ---
games/chocolate-doom/pkg-message | 6 ++
games/chocolate-doom/pkg-plist | 80 ++++++++++++----------
6 files changed, 77 insertions(+), 80 deletions(-)
diff --git a/games/chocolate-doom/Makefile b/games/chocolate-doom/Makefile
index eee3b307ce02..74b0a228df4d 100644
--- a/games/chocolate-doom/Makefile
+++ b/games/chocolate-doom/Makefile
@@ -1,36 +1,43 @@
PORTNAME= chocolate-doom
-PORTVERSION= 3.0.1
-PORTREVISION= 2
+DISTVERSION= 3.1.0
CATEGORIES= games
-MASTER_SITES= http://www.chocolate-doom.org/downloads/${PORTVERSION}/
MAINTAINER= jakub_lach@mailplus.pl
COMMENT= Doom/Heretic/Hexen/Strife engine port compatible with the originals
-WWW= https://chocolate-doom.org
+WWW= https://www.chocolate-doom.org/
LICENSE= GPLv2
-LIB_DEPENDS= libpng.so:graphics/png
-
-USES= gmake pkgconfig python:build sdl
+USES= autoreconf gmake pkgconfig python:build sdl
+USE_GITHUB= yes
+GH_TAGNAME= ${PORTNAME}-${DISTVERSION}
+USE_RC_SUBR= chocolate-server
USE_SDL= mixer2 net2 sdl2
+
GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-BINARY_ALIAS= python=${PYTHON_CMD}
-PORTDOCS= CMDLINE.doom ChangeLog INSTALL.doom NEWS.md NOT-BUGS.md PHILOSOPHY.md \
- README.md README.Music.md
+BINARY_ALIAS= python3=${PYTHON_CMD}
-OPTIONS_DEFINE= DOCS
-USE_RC_SUBR= chocolate-server
+PORTDOCS= CMDLINE.doom ChangeLog INSTALL.doom NEWS.md NOT-BUGS.md \
+ PHILOSOPHY.md README.md README.Music.md
+
+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
.include "${.CURDIR}/../doom-data/Makefile.include"
-post-patch:
- ${REINPLACE_CMD} -e 's|gamesdir = $${exec_prefix}/games|gamesdir = $${exec_prefix}/bin|' \
- ${WRKSRC}/src/Makefile.in
- ${REINPLACE_CMD} -e 's|gamesdir = $$(prefix)/games|gamesdir = $$(prefix)/bin|' \
- ${WRKSRC}/src/setup/Makefile.in
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chocolate-*
diff --git a/games/chocolate-doom/distinfo b/games/chocolate-doom/distinfo
index 5ea8c266cc34..cd121cefdd8b 100644
--- a/games/chocolate-doom/distinfo
+++ b/games/chocolate-doom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611306702
-SHA256 (chocolate-doom-3.0.1.tar.gz) = d435d6177423491d60be706da9f07d3ab4fabf3e077ec2a3fc216e394fcfc8c7
-SIZE (chocolate-doom-3.0.1.tar.gz) = 2514985
+TIMESTAMP = 1726929127
+SHA256 (chocolate-doom-chocolate-doom-3.1.0-chocolate-doom-3.1.0_GH0.tar.gz) = f2c64843dcec312032b180c3b2f34b4cb26c4dcdaa7375a1601a3b1df11ef84d
+SIZE (chocolate-doom-chocolate-doom-3.1.0-chocolate-doom-3.1.0_GH0.tar.gz) = 2256537
diff --git a/games/chocolate-doom/files/patch-src_d__iwad.c b/games/chocolate-doom/files/patch-src_d__iwad.c
deleted file mode 100644
index 905684bd272b..000000000000
--- a/games/chocolate-doom/files/patch-src_d__iwad.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/d_iwad.c.orig 2017-12-30 16:20:28.000000000 -0500
-+++ src/d_iwad.c 2018-01-25 09:43:00.567417000 -0500
-@@ -658,7 +658,7 @@
- // The "standard" location for IWADs on Unix that is supported by most
- // source ports is /usr/share/games/doom - we support this through the
- // XDG_DATA_DIRS mechanism, through which it can be overridden.
-- AddIWADPath(env, "/games/doom");
-+ AddIWADPath(env, "/doom");
-
- // The convention set by RBDOOM-3-BFG is to install Doom 3: BFG
- // Edition into this directory, under which includes the Doom
diff --git a/games/chocolate-doom/files/patch-src_hexen_mn__menu.c b/games/chocolate-doom/files/patch-src_hexen_mn__menu.c
deleted file mode 100644
index 4674a2e73c1c..000000000000
--- a/games/chocolate-doom/files/patch-src_hexen_mn__menu.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hexen/mn_menu.c.orig 2020-08-28 17:00:20 UTC
-+++ src/hexen/mn_menu.c
-@@ -131,7 +131,7 @@ boolean MenuActive;
- int InfoType;
- int messageson = true;
- boolean mn_SuicideConsole;
--boolean demoextend; // from h2def.h
-+extern boolean demoextend; // from h2def.h
-
- // PRIVATE DATA DEFINITIONS ------------------------------------------------
-
diff --git a/games/chocolate-doom/pkg-message b/games/chocolate-doom/pkg-message
index b89c2b8a8e87..03b27d919ad1 100644
--- a/games/chocolate-doom/pkg-message
+++ b/games/chocolate-doom/pkg-message
@@ -38,6 +38,12 @@ Examples:
/usr/local/share/timidity/timidity.cfg-guspat
+If you have installed audio/fluidsynth you can also
+use samples in the SF2 format.
+
+Alternatively, you can substitute MIDI files with
+music packs in .flac or .ogg format.
+
If you choose either Gravis Ultrasound emulation or
native MIDI and provide no path, there will be no
music.
diff --git a/games/chocolate-doom/pkg-plist b/games/chocolate-doom/pkg-plist
index 1127f8c36a6b..788cd4a23f8b 100644
--- a/games/chocolate-doom/pkg-plist
+++ b/games/chocolate-doom/pkg-plist
@@ -7,59 +7,65 @@ bin/chocolate-hexen-setup
bin/chocolate-server
bin/chocolate-strife
bin/chocolate-strife-setup
-share/man/man5/chocolate-doom.cfg.5.gz
-share/man/man5/chocolate-heretic.cfg.5.gz
-share/man/man5/chocolate-hexen.cfg.5.gz
-share/man/man5/chocolate-strife.cfg.5.gz
-share/man/man5/default.cfg.5.gz
-share/man/man5/heretic.cfg.5.gz
-share/man/man5/hexen.cfg.5.gz
-share/man/man5/strife.cfg.5.gz
-share/man/man6/chocolate-doom-setup.6.gz
-share/man/man6/chocolate-doom.6.gz
-share/man/man6/chocolate-heretic-setup.6.gz
-share/man/man6/chocolate-heretic.6.gz
-share/man/man6/chocolate-hexen-setup.6.gz
-share/man/man6/chocolate-hexen.6.gz
-share/man/man6/chocolate-server.6.gz
-share/man/man6/chocolate-setup.6.gz
-share/man/man6/chocolate-strife-setup.6.gz
-share/man/man6/chocolate-strife.6.gz
-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/screensavers/chocolate-doom-screensaver.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/org.chocolate_doom.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/doc/chocolate-heretic/CMDLINE.heretic
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.md
+%%DOCS%%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
+%%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
-share/doc/chocolate-hexen/CMDLINE.hexen
+%%DOCS%%share/doc/chocolate-hexen/CMDLINE.hexen
+share/doc/chocolate-hexen/COPYING.md
share/doc/chocolate-hexen/ChangeLog
-share/doc/chocolate-hexen/INSTALL.hexen
+%%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
-share/doc/chocolate-strife/CMDLINE.strife
+%%DOCS%%share/doc/chocolate-strife/CMDLINE.strife
+share/doc/chocolate-strife/COPYING.md
share/doc/chocolate-strife/ChangeLog
-share/doc/chocolate-strife/INSTALL.strife
+%%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/chocolate-doom.png
-share/icons/chocolate-setup.png
+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
+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