diff --git a/games/crispy-doom/Makefile b/games/crispy-doom/Makefile index 180c4c9ce756..49984bc2abef 100644 --- a/games/crispy-doom/Makefile +++ b/games/crispy-doom/Makefile @@ -1,34 +1,34 @@ PORTNAME= crispy-doom -PORTVERSION= 5.10.3 +PORTVERSION= 5.12.0 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= games MAINTAINER= danilo@FreeBSD.org COMMENT= Enhanced-resolution Doom source port based on Chocolate Doom WWW= https://github.com/fabiangreffrath/crispy-doom LICENSE= GPLv2 LIB_DEPENDS= libsamplerate.so:audio/libsamplerate \ libpng.so:graphics/png CONFLICTS_INSTALL= chocolate-doom USES= autoreconf pkgconfig python:build sdl shebangfix USE_CSTD= c99 USE_SDL= mixer2 net2 sdl2 GNU_CONFIGURE= yes SHEBANG_FILES= man/docgen man/simplecpp OPTIONS_DEFINE= DOCS USE_GITHUB= yes GH_ACCOUNT= fabiangreffrath post-patch: ${REINPLACE_CMD} "s|python3|${PYTHON_VERSION}|" ${WRKSRC}/configure.ac post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/crispy-* .include diff --git a/games/crispy-doom/distinfo b/games/crispy-doom/distinfo index a61e5956241e..a11e6e8ae4d5 100644 --- a/games/crispy-doom/distinfo +++ b/games/crispy-doom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629652076 -SHA256 (fabiangreffrath-crispy-doom-crispy-doom-5.10.3_GH0.tar.gz) = eef8dc26e8952b23717be3b20239fda4ee59842511328387766d1c8fe8252f6b -SIZE (fabiangreffrath-crispy-doom-crispy-doom-5.10.3_GH0.tar.gz) = 2648144 +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 diff --git a/games/crispy-doom/files/patch-man_Makefile.am b/games/crispy-doom/files/patch-man_Makefile.am index 14dfa5a22f1e..5e284eaa4d4d 100644 --- a/games/crispy-doom/files/patch-man_Makefile.am +++ b/games/crispy-doom/files/patch-man_Makefile.am @@ -1,55 +1,45 @@ ---- man/Makefile.am.orig 2020-08-17 10:10:46 UTC +--- man/Makefile.am.orig 2022-09-01 07:06:29 UTC +++ man/Makefile.am -@@ -23,28 +23,28 @@ GENERATED_MAN_PAGES = \ - @PROGRAM_PREFIX@doom.cfg.5 \ - @PROGRAM_PREFIX@heretic.6 \ - heretic.cfg.5 \ -- @PROGRAM_PREFIX@heretic.cfg.5 --# @PROGRAM_PREFIX@hexen.6 \ --# hexen.cfg.5 \ --# @PROGRAM_PREFIX@hexen.cfg.5 \ +@@ -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@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@heretic-setup.6 \ +- @PROGRAM_PREFIX@hexen-setup.6 -# @PROGRAM_PREFIX@strife-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 + hexendocs_DATA = INSTALL.hexen CMDLINE.hexen -#strifedocs_DATA = INSTALL.strife CMDLINE.strife -+hexendocs_DATA = INSTALL.hexen CMDLINE.hexen +strifedocs_DATA = INSTALL.strife CMDLINE.strife if HAVE_WINDRES -@@ -52,8 +52,8 @@ WIN32=-D_WIN32 - +@@ -53,7 +53,7 @@ hexendocs_DATA += CMDLINE.hexen.md doomdocs_DATA += CMDLINE.doom.md hereticdocs_DATA += CMDLINE.heretic.md --#hexendocs_DATA += CMDLINE.hexen.md + hexendocs_DATA += CMDLINE.hexen.md -#strifedocs_DATA += CMDLINE.strife.md -+hexendocs_DATA += CMDLINE.hexen.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 index 2d0eb4cf0355..f0294eceb760 100644 --- a/games/crispy-doom/files/patch-src_Makefile.am +++ b/games/crispy-doom/files/patch-src_Makefile.am @@ -1,50 +1,44 @@ ---- src/Makefile.am.orig 2020-05-02 15:07:41 UTC +--- src/Makefile.am.orig 2022-10-22 10:47:02 UTC +++ src/Makefile.am -@@ -5,16 +5,16 @@ execgamesdir = ${bindir} - +@@ -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@hexen \ +-EXTRA_PROGRAMS = @PROGRAM_PREFIX@strife + @PROGRAM_PREFIX@server \ -+ @PROGRAM_PREFIX@hexen \ - @PROGRAM_PREFIX@strife ++ @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@heretic-setup$(EXEEXT) \ +- @PROGRAM_PREFIX@hexen-setup$(EXEEXT) -# @PROGRAM_PREFIX@strife-setup$(EXEEXT) -+ @PROGRAM_PREFIX@heretic-setup$(EXEEXT) \ + @PROGRAM_PREFIX@hexen-setup$(EXEEXT) \ + @PROGRAM_PREFIX@strife-setup$(EXEEXT) execgames_SCRIPTS = $(SETUP_BINARIES) -@@ -225,9 +225,9 @@ EXTRA_DIST = \ - metainfodir = $(prefix)/share/metainfo +@@ -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@.Heretic.metainfo.xml \ +- @PACKAGE_RDNS@.Hexen.metainfo.xml -# @PACKAGE_RDNS@.Strife.metainfo.xml -+ @PACKAGE_RDNS@.Heretic.metainfo.xml \ + @PACKAGE_RDNS@.Hexen.metainfo.xml \ + @PACKAGE_RDNS@.Strife.metainfo.xml @PACKAGE_RDNS@.Doom.metainfo.xml : Doom.metainfo.xml cp Doom.metainfo.xml $@ -@@ -244,9 +244,9 @@ metainfo_DATA = \ - appdir = $(prefix)/share/applications +@@ -257,8 +257,8 @@ app_DATA = \ app_DATA = \ @PACKAGE_RDNS@.Doom.desktop \ -- @PACKAGE_RDNS@.Heretic.desktop --# @PACKAGE_RDNS@.Hexen.desktop \ + @PACKAGE_RDNS@.Heretic.desktop \ +- @PACKAGE_RDNS@.Hexen.desktop -# @PACKAGE_RDNS@.Strife.desktop -+ @PACKAGE_RDNS@.Heretic.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 82fce8b2e01c..102be90ffd86 100644 --- a/games/crispy-doom/pkg-plist +++ b/games/crispy-doom/pkg-plist @@ -1,55 +1,59 @@ bin/crispy-doom bin/crispy-doom-setup bin/crispy-heretic bin/crispy-heretic-setup bin/crispy-hexen bin/crispy-hexen-setup bin/crispy-server bin/crispy-strife bin/crispy-strife-setup man/man5/crispy-doom.cfg.5.gz man/man5/crispy-heretic.cfg.5.gz man/man5/crispy-hexen.cfg.5.gz man/man5/crispy-strife.cfg.5.gz man/man5/default.cfg.5.gz man/man5/heretic.cfg.5.gz man/man5/hexen.cfg.5.gz man/man5/strife.cfg.5.gz man/man6/crispy-doom-setup.6.gz man/man6/crispy-doom.6.gz man/man6/crispy-heretic-setup.6.gz man/man6/crispy-heretic.6.gz man/man6/crispy-hexen-setup.6.gz man/man6/crispy-hexen.6.gz man/man6/crispy-server.6.gz man/man6/crispy-strife-setup.6.gz man/man6/crispy-strife.6.gz share/applications/io.github.fabiangreffrath.Doom.desktop share/applications/io.github.fabiangreffrath.Heretic.desktop share/applications/io.github.fabiangreffrath.Hexen.desktop share/applications/io.github.fabiangreffrath.Setup.desktop share/applications/io.github.fabiangreffrath.Strife.desktop share/applications/screensavers/io.github.fabiangreffrath.Doom_Screensaver.desktop share/bash-completion/completions/crispy-doom share/bash-completion/completions/crispy-heretic +share/bash-completion/completions/crispy-hexen %%PORTDOCS%%%%DOCSDIR%%/CMDLINE.doom %%PORTDOCS%%%%DOCSDIR%%/COPYING.md %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/INSTALL.doom %%PORTDOCS%%%%DOCSDIR%%/NEWS.md %%PORTDOCS%%%%DOCSDIR%%/NOT-BUGS.md %%PORTDOCS%%%%DOCSDIR%%/PHILOSOPHY.md %%PORTDOCS%%%%DOCSDIR%%/README.Music.md %%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%share/doc/crispy-heretic/CMDLINE.heretic %%PORTDOCS%%share/doc/crispy-heretic/INSTALL.heretic %%PORTDOCS%%share/doc/crispy-hexen/CMDLINE.hexen %%PORTDOCS%%share/doc/crispy-hexen/INSTALL.hexen %%PORTDOCS%%share/doc/crispy-strife/CMDLINE.strife %%PORTDOCS%%share/doc/crispy-strife/INSTALL.strife share/icons/hicolor/128x128/apps/crispy-doom.png +share/icons/hicolor/128x128/apps/crispy-heretic.png +share/icons/hicolor/128x128/apps/crispy-hexen.png share/icons/hicolor/128x128/apps/crispy-setup.png +share/icons/hicolor/128x128/apps/crispy-strife.png share/metainfo/io.github.fabiangreffrath.Doom.metainfo.xml share/metainfo/io.github.fabiangreffrath.Heretic.metainfo.xml share/metainfo/io.github.fabiangreffrath.Hexen.metainfo.xml share/metainfo/io.github.fabiangreffrath.Strife.metainfo.xml