Date: Sat, 15 Apr 2023 15:34:51 GMT From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6b826a0bc430 - main - games/crispy-doom: Update to 6.0 Message-ID: <202304151534.33FFYprU009566@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danilo: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b826a0bc430f7025c875f464177de4ed6047822 commit 6b826a0bc430f7025c875f464177de4ed6047822 Author: Danilo Egea Gondolfo <danilo@FreeBSD.org> AuthorDate: 2023-04-15 15:17:19 +0000 Commit: Danilo Egea Gondolfo <danilo@FreeBSD.org> CommitDate: 2023-04-15 15:34:47 +0000 games/crispy-doom: Update to 6.0 - Add audio/fluidsynth to LIB_DEPENDS - Use install-strip as INSTALL_TARGET - Define USES earlier to make the linter happy - Drop obsolete patches --- games/crispy-doom/Makefile | 13 +++++--- games/crispy-doom/distinfo | 6 ++-- games/crispy-doom/files/patch-man_Makefile.am | 45 --------------------------- games/crispy-doom/files/patch-src_Makefile.am | 44 -------------------------- games/crispy-doom/pkg-plist | 1 + 5 files changed, 12 insertions(+), 97 deletions(-) diff --git a/games/crispy-doom/Makefile b/games/crispy-doom/Makefile index 49984bc2abef..2c5569591290 100644 --- a/games/crispy-doom/Makefile +++ b/games/crispy-doom/Makefile @@ -1,5 +1,5 @@ PORTNAME= crispy-doom -PORTVERSION= 5.12.0 +PORTVERSION= 6.0 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= games @@ -10,14 +10,17 @@ WWW= https://github.com/fabiangreffrath/crispy-doom LICENSE= GPLv2 LIB_DEPENDS= libsamplerate.so:audio/libsamplerate \ - libpng.so:graphics/png + libpng.so:graphics/png \ + libfluidsynth.so:audio/fluidsynth + +USES= autoreconf desktop-file-utils pkgconfig python:build sdl shebangfix CONFLICTS_INSTALL= chocolate-doom -USES= autoreconf pkgconfig python:build sdl shebangfix USE_CSTD= c99 USE_SDL= mixer2 net2 sdl2 GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip SHEBANG_FILES= man/docgen man/simplecpp OPTIONS_DEFINE= DOCS @@ -28,7 +31,7 @@ GH_ACCOUNT= fabiangreffrath post-patch: ${REINPLACE_CMD} "s|python3|${PYTHON_VERSION}|" ${WRKSRC}/configure.ac -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/crispy-* +post-stage: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/crispy-*-setup .include <bsd.port.mk> diff --git a/games/crispy-doom/distinfo b/games/crispy-doom/distinfo index a11e6e8ae4d5..81b7c620c746 100644 --- a/games/crispy-doom/distinfo +++ b/games/crispy-doom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666435112 -SHA256 (fabiangreffrath-crispy-doom-crispy-doom-5.12.0_GH0.tar.gz) = d85d6e76aa949385458b7702e6fb594996745b94032ffb13e1790376eeecb462 -SIZE (fabiangreffrath-crispy-doom-crispy-doom-5.12.0_GH0.tar.gz) = 2425206 +TIMESTAMP = 1681055793 +SHA256 (fabiangreffrath-crispy-doom-crispy-doom-6.0_GH0.tar.gz) = 2b85649c615efeac7573883370e9434255af301222b323120692cb9649b7f420 +SIZE (fabiangreffrath-crispy-doom-crispy-doom-6.0_GH0.tar.gz) = 2499918 diff --git a/games/crispy-doom/files/patch-man_Makefile.am b/games/crispy-doom/files/patch-man_Makefile.am deleted file mode 100644 index 5e284eaa4d4d..000000000000 --- a/games/crispy-doom/files/patch-man_Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ ---- man/Makefile.am.orig 2022-09-01 07:06:29 UTC -+++ man/Makefile.am -@@ -26,17 +26,17 @@ GENERATED_MAN_PAGES = \ - @PROGRAM_PREFIX@heretic.cfg.5 \ - @PROGRAM_PREFIX@hexen.6 \ - hexen.cfg.5 \ -- @PROGRAM_PREFIX@hexen.cfg.5 --# @PROGRAM_PREFIX@strife.6 \ --# strife.cfg.5 \ --# @PROGRAM_PREFIX@strife.cfg.5 \ --# @PROGRAM_PREFIX@server.6 -+ @PROGRAM_PREFIX@hexen.cfg.5 \ -+ @PROGRAM_PREFIX@strife.6 \ -+ strife.cfg.5 \ -+ @PROGRAM_PREFIX@strife.cfg.5 \ -+ @PROGRAM_PREFIX@server.6 - - SETUP_MAN_PAGES = \ - @PROGRAM_PREFIX@doom-setup.6 \ - @PROGRAM_PREFIX@heretic-setup.6 \ -- @PROGRAM_PREFIX@hexen-setup.6 --# @PROGRAM_PREFIX@strife-setup.6 -+ @PROGRAM_PREFIX@hexen-setup.6 \ -+ @PROGRAM_PREFIX@strife-setup.6 - - man_MANS = $(GENERATED_MAN_PAGES) \ - $(SETUP_MAN_PAGES) -@@ -44,7 +44,7 @@ hexendocs_DATA = INSTALL.hexen CMDLINE.hexen - doomdocs_DATA = INSTALL.doom CMDLINE.doom - hereticdocs_DATA = INSTALL.heretic CMDLINE.heretic - hexendocs_DATA = INSTALL.hexen CMDLINE.hexen --#strifedocs_DATA = INSTALL.strife CMDLINE.strife -+strifedocs_DATA = INSTALL.strife CMDLINE.strife - - if HAVE_WINDRES - -@@ -53,7 +53,7 @@ hexendocs_DATA += CMDLINE.hexen.md - doomdocs_DATA += CMDLINE.doom.md - hereticdocs_DATA += CMDLINE.heretic.md - hexendocs_DATA += CMDLINE.hexen.md --#strifedocs_DATA += CMDLINE.strife.md -+strifedocs_DATA += CMDLINE.strife.md - - endif - diff --git a/games/crispy-doom/files/patch-src_Makefile.am b/games/crispy-doom/files/patch-src_Makefile.am deleted file mode 100644 index f0294eceb760..000000000000 --- a/games/crispy-doom/files/patch-src_Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ ---- src/Makefile.am.orig 2022-10-22 10:47:02 UTC -+++ src/Makefile.am -@@ -6,15 +6,15 @@ execgames_PROGRAMS = @PROGRAM_PREFIX@doom \ - execgames_PROGRAMS = @PROGRAM_PREFIX@doom \ - @PROGRAM_PREFIX@heretic \ - @PROGRAM_PREFIX@hexen \ -- @PROGRAM_PREFIX@server --EXTRA_PROGRAMS = @PROGRAM_PREFIX@strife -+ @PROGRAM_PREFIX@server \ -+ @PROGRAM_PREFIX@strife - - noinst_PROGRAMS = @PROGRAM_PREFIX@setup - - SETUP_BINARIES = @PROGRAM_PREFIX@doom-setup$(EXEEXT) \ - @PROGRAM_PREFIX@heretic-setup$(EXEEXT) \ -- @PROGRAM_PREFIX@hexen-setup$(EXEEXT) --# @PROGRAM_PREFIX@strife-setup$(EXEEXT) -+ @PROGRAM_PREFIX@hexen-setup$(EXEEXT) \ -+ @PROGRAM_PREFIX@strife-setup$(EXEEXT) - - execgames_SCRIPTS = $(SETUP_BINARIES) - -@@ -238,8 +238,8 @@ metainfo_DATA = \ - metainfo_DATA = \ - @PACKAGE_RDNS@.Doom.metainfo.xml \ - @PACKAGE_RDNS@.Heretic.metainfo.xml \ -- @PACKAGE_RDNS@.Hexen.metainfo.xml --# @PACKAGE_RDNS@.Strife.metainfo.xml -+ @PACKAGE_RDNS@.Hexen.metainfo.xml \ -+ @PACKAGE_RDNS@.Strife.metainfo.xml - - @PACKAGE_RDNS@.Doom.metainfo.xml : Doom.metainfo.xml - cp Doom.metainfo.xml $@ -@@ -257,8 +257,8 @@ app_DATA = \ - app_DATA = \ - @PACKAGE_RDNS@.Doom.desktop \ - @PACKAGE_RDNS@.Heretic.desktop \ -- @PACKAGE_RDNS@.Hexen.desktop --# @PACKAGE_RDNS@.Strife.desktop -+ @PACKAGE_RDNS@.Hexen.desktop \ -+ @PACKAGE_RDNS@.Strife.desktop - - @PACKAGE_RDNS@.Doom.desktop : Doom.desktop - cp Doom.desktop $@ diff --git a/games/crispy-doom/pkg-plist b/games/crispy-doom/pkg-plist index 102be90ffd86..847ebe61dc2b 100644 --- a/games/crispy-doom/pkg-plist +++ b/games/crispy-doom/pkg-plist @@ -33,6 +33,7 @@ share/applications/screensavers/io.github.fabiangreffrath.Doom_Screensaver.deskt share/bash-completion/completions/crispy-doom share/bash-completion/completions/crispy-heretic share/bash-completion/completions/crispy-hexen +share/bash-completion/completions/crispy-strife %%PORTDOCS%%%%DOCSDIR%%/CMDLINE.doom %%PORTDOCS%%%%DOCSDIR%%/COPYING.md %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304151534.33FFYprU009566>