Re: REMOVE games/prboom-plus
On Sat, Sep 09, 2023 at 06:12:36AM -0300, Lucas de Sena wrote: > PrBoom+ development had long moved from SourceForge to Github[1][2], > so the ports include an old version of the source engine. > > The development, however has been discontinued in June this year; a > last maintainer version (v2.6.66) has been released; and the Github > repository has been archived:[3] Hey, $MAINTAINER here. This arose from me asking in an OpenBSD-relating gaming IRC channel if it was worth hanging on to prboom-plus anymore, as I couldn't find a reason. Lucas seemed to doublecheck everything and agree. Lucas, thanks for starting this thread. I am fine with moving this to the attic. Thanks, -Ryan > > > Hey people, > > > > I'd like to announce that I just tagged the PrBoom+ 2.6.66 release! > > > > https://github.com/coelckers/prboom-plus/releases/tag/v2.6.66 > > > > This is just a maintenance release to make the changes that have > > accumulated over the past 1.5 years available to all users who > > cannot build the sources themselves. Please do not mistake this > > as a sign of active development! > > > > Future development will continue to take place in DSDA-Doom [1]. > > Or, for those who like to stay closer to the original code base, > > check out JadingTsunami's PrBoomX [2]. > > > > [1] https://github.com/kraflab/dsda-doom > > [2] https://github.com/JadingTsunami/prboomX > > Quoting from the DoomWiki[4]: > > > The last update of active development was version 2.6.2, released on > > February 11, 2022. On June 20, 2023, maintenance version 2.6.66 was > > released which collects all changes committed after development > > discontinued. Three days later, the GitHub repository was archived. > > DSDA-Doom, a source engine based on PrBoom+ which has already been > ported to OpenBSD, is PrBoom+'s spiritual successor. Debian, for > example, changed prboom-plus into a transitional dummy package to > dsda-doom.[5] > > Therefore, since prboom-plus has been discontinued, should we remove > it from the ports? And recommend people to install dsda-doom instead? > > There is also PrBoomX[6], which is closer to the original code base, > although it seems to not have the new features dsda-doom adds on top > of PrBoom+. (I have never tried it, tho). > > [1]: https://www.doomworld.com/forum/topic/106866-prboom-2666-jun-20-2023/ > [2]: https://github.com/coelckers/prboom-plus > [3]: https://www.doomworld.com/forum/post/2662145 > [4]: https://doomwiki.org/wiki/PrBoom%2B > [5]: https://packages.debian.org/sid/games/prboom-plus > [6]: https://doomwiki.org/wiki/PrBoomX >
REMOVE games/prboom-plus
PrBoom+ development had long moved from SourceForge to Github[1][2], so the ports include an old version of the source engine. The development, however has been discontinued in June this year; a last maintainer version (v2.6.66) has been released; and the Github repository has been archived:[3] > Hey people, > > I'd like to announce that I just tagged the PrBoom+ 2.6.66 release! > > https://github.com/coelckers/prboom-plus/releases/tag/v2.6.66 > > This is just a maintenance release to make the changes that have > accumulated over the past 1.5 years available to all users who > cannot build the sources themselves. Please do not mistake this > as a sign of active development! > > Future development will continue to take place in DSDA-Doom [1]. > Or, for those who like to stay closer to the original code base, > check out JadingTsunami's PrBoomX [2]. > > [1] https://github.com/kraflab/dsda-doom > [2] https://github.com/JadingTsunami/prboomX Quoting from the DoomWiki[4]: > The last update of active development was version 2.6.2, released on > February 11, 2022. On June 20, 2023, maintenance version 2.6.66 was > released which collects all changes committed after development > discontinued. Three days later, the GitHub repository was archived. DSDA-Doom, a source engine based on PrBoom+ which has already been ported to OpenBSD, is PrBoom+'s spiritual successor. Debian, for example, changed prboom-plus into a transitional dummy package to dsda-doom.[5] Therefore, since prboom-plus has been discontinued, should we remove it from the ports? And recommend people to install dsda-doom instead? There is also PrBoomX[6], which is closer to the original code base, although it seems to not have the new features dsda-doom adds on top of PrBoom+. (I have never tried it, tho). [1]: https://www.doomworld.com/forum/topic/106866-prboom-2666-jun-20-2023/ [2]: https://github.com/coelckers/prboom-plus [3]: https://www.doomworld.com/forum/post/2662145 [4]: https://doomwiki.org/wiki/PrBoom%2B [5]: https://packages.debian.org/sid/games/prboom-plus [6]: https://doomwiki.org/wiki/PrBoomX
Re: REMOVE: games/prboom
On Sat, Feb 13, 2021 at 10:24:08PM +, Stuart Henderson wrote: > On 2021/02/13 23:15, Klemens Nanni wrote: > > On Sat, Feb 13, 2021 at 10:25:55PM +0100, Christian Weisgerber wrote: > > > Ryan Freeman: > > > > > > > > anything I've forgotten for removal? > > > > > > > > Thanks naddy, kn, edd for the hints on Quirks and the main category > > > > unhook. > > > > This more like it? > > > > > > devel/quirks needs a version bump when an entry is added. > > As any other package does whenever its content changes. > > quirks is special as it has @option always-update, so it _could_ be skipped, > but we haven't being doing that. > > > > Also... > > > > > > > --- devel/quirks/files/Quirks.pm10 Feb 2021 12:49:31 - > > > > 1.1173 > > > > +++ devel/quirks/files/Quirks.pm11 Feb 2021 22:50:06 - > > > > @@ -539,6 +539,7 @@ my $stem_extensions = { > > > > 'py-sphinx-intl' => 'py3-sphinx-intl', > > > > 'stegcracker' => 'stegseek', > > > > 'py-ldap3' => 'py3-ldap3', > > > > + 'prboom' => 'prboom-plus', > > > > }; > > > > > > > > my $obsolete_reason = { > > > > @@ -2077,6 +2078,7 @@ my $obsolete_reason = { > > > > 'icinga-web' => 38, > > > > 'icinga-cgi' => 38, > > > > 'icinga-idoutils' => 38, > > > > + 'prboom' => 3, > > > > }; > > > > > > > > # reasons for obsolete packages > > > > > > ... I think when a port is replaced ($stem_extenions), it doesn't > > > get another entry in $obsolete_reason. > > Correct, OK kn for the first hunk, the second hunk must not be there. > > > > +1 > Thanks for the hints everyone, I've updated my tree, reapplied this quirk only for stem_extensions and bumped version Index: Makefile === RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.1165 diff -u -p -r1.1165 Makefile --- Makefile14 Feb 2021 18:06:22 - 1.1165 +++ Makefile14 Feb 2021 20:26:33 - @@ -5,7 +5,7 @@ CATEGORIES =devel databases DISTFILES = # API.rev -PKGNAME = quirks-3.553 +PKGNAME = quirks-3.554 PKG_ARCH = * MAINTAINER = Marc Espie Index: files/Quirks.pm === RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.1181 diff -u -p -r1.1181 Quirks.pm --- files/Quirks.pm 14 Feb 2021 18:06:22 - 1.1181 +++ files/Quirks.pm 14 Feb 2021 20:26:33 - @@ -549,6 +549,7 @@ my $stem_extensions = { 'py-ripe.atlas.cousteau' => 'py3-ripe.atlas.cousteau', 'py-ripe.atlas.sagan' => 'py3-ripe.atlas.sagan', 'py-qtawesome' => 'py3-qtawesome', + 'prboom' => 'prboom-plus', }; my $obsolete_reason = {
Re: REMOVE: games/prboom
On 2021/02/13 23:15, Klemens Nanni wrote: > On Sat, Feb 13, 2021 at 10:25:55PM +0100, Christian Weisgerber wrote: > > Ryan Freeman: > > > > > > anything I've forgotten for removal? > > > > > > Thanks naddy, kn, edd for the hints on Quirks and the main category > > > unhook. > > > This more like it? > > > > devel/quirks needs a version bump when an entry is added. > As any other package does whenever its content changes. quirks is special as it has @option always-update, so it _could_ be skipped, but we haven't being doing that. > > Also... > > > > > --- devel/quirks/files/Quirks.pm 10 Feb 2021 12:49:31 - 1.1173 > > > +++ devel/quirks/files/Quirks.pm 11 Feb 2021 22:50:06 - > > > @@ -539,6 +539,7 @@ my $stem_extensions = { > > > 'py-sphinx-intl' => 'py3-sphinx-intl', > > > 'stegcracker' => 'stegseek', > > > 'py-ldap3' => 'py3-ldap3', > > > + 'prboom' => 'prboom-plus', > > > }; > > > > > > my $obsolete_reason = { > > > @@ -2077,6 +2078,7 @@ my $obsolete_reason = { > > > 'icinga-web' => 38, > > > 'icinga-cgi' => 38, > > > 'icinga-idoutils' => 38, > > > + 'prboom' => 3, > > > }; > > > > > > # reasons for obsolete packages > > > > ... I think when a port is replaced ($stem_extenions), it doesn't > > get another entry in $obsolete_reason. > Correct, OK kn for the first hunk, the second hunk must not be there. > +1
Re: REMOVE: games/prboom
On Sat, Feb 13, 2021 at 10:25:55PM +0100, Christian Weisgerber wrote: > Ryan Freeman: > > > > anything I've forgotten for removal? > > > > Thanks naddy, kn, edd for the hints on Quirks and the main category unhook. > > This more like it? > > devel/quirks needs a version bump when an entry is added. As any other package does whenever its content changes. > Also... > > > --- devel/quirks/files/Quirks.pm10 Feb 2021 12:49:31 - 1.1173 > > +++ devel/quirks/files/Quirks.pm11 Feb 2021 22:50:06 - > > @@ -539,6 +539,7 @@ my $stem_extensions = { > > 'py-sphinx-intl' => 'py3-sphinx-intl', > > 'stegcracker' => 'stegseek', > > 'py-ldap3' => 'py3-ldap3', > > + 'prboom' => 'prboom-plus', > > }; > > > > my $obsolete_reason = { > > @@ -2077,6 +2078,7 @@ my $obsolete_reason = { > > 'icinga-web' => 38, > > 'icinga-cgi' => 38, > > 'icinga-idoutils' => 38, > > + 'prboom' => 3, > > }; > > > > # reasons for obsolete packages > > ... I think when a port is replaced ($stem_extenions), it doesn't > get another entry in $obsolete_reason. Correct, OK kn for the first hunk, the second hunk must not be there.
Re: REMOVE: games/prboom
Ryan Freeman: > > anything I've forgotten for removal? > > Thanks naddy, kn, edd for the hints on Quirks and the main category unhook. > This more like it? devel/quirks needs a version bump when an entry is added. Also... > --- devel/quirks/files/Quirks.pm 10 Feb 2021 12:49:31 - 1.1173 > +++ devel/quirks/files/Quirks.pm 11 Feb 2021 22:50:06 - > @@ -539,6 +539,7 @@ my $stem_extensions = { > 'py-sphinx-intl' => 'py3-sphinx-intl', > 'stegcracker' => 'stegseek', > 'py-ldap3' => 'py3-ldap3', > + 'prboom' => 'prboom-plus', > }; > > my $obsolete_reason = { > @@ -2077,6 +2078,7 @@ my $obsolete_reason = { > 'icinga-web' => 38, > 'icinga-cgi' => 38, > 'icinga-idoutils' => 38, > + 'prboom' => 3, > }; > > # reasons for obsolete packages ... I think when a port is replaced ($stem_extenions), it doesn't get another entry in $obsolete_reason. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: REMOVE: games/prboom
On Thu, Feb 11, 2021 at 02:53:04PM -0800, Ryan Freeman wrote: > On Wed, Feb 10, 2021 at 05:46:28PM -0800, Ryan Freeman wrote: > > First time trying to remove something, here is a patch to move > > games/prboom to the attic. games/prboom-plus does everything it > > did and more with fixes. netgames can be played with: > > - games/chocolate-doom > > - games/odamex > > - games/gzdoom > > > > anything I've forgotten for removal? > > > > OK? > > -ryan > > Thanks naddy, kn, edd for the hints on Quirks and the main category unhook. > This more like it? and here is the unhook diff separately Index: Makefile === RCS file: /cvs/ports/games/Makefile,v retrieving revision 1.434 diff -u -p -r1.434 Makefile --- Makefile8 Feb 2021 20:33:31 - 1.434 +++ Makefile12 Feb 2021 17:26:23 - @@ -234,7 +234,6 @@ SUBDIR += pokerth SUBDIR += polymorphable SUBDIR += postal - SUBDIR += prboom SUBDIR += prboom-plus SUBDIR += pushover SUBDIR += puzzles
Re: REMOVE: games/prboom
On Thu, Feb 11, 2021 at 02:53:04PM -0800, Ryan Freeman wrote: > On Wed, Feb 10, 2021 at 05:46:28PM -0800, Ryan Freeman wrote: > > First time trying to remove something, here is a patch to move > > games/prboom to the attic. games/prboom-plus does everything it > > did and more with fixes. netgames can be played with: > > - games/chocolate-doom > > - games/odamex > > - games/gzdoom > > > > anything I've forgotten for removal? > > > > OK? > > -ryan > > Thanks naddy, kn, edd for the hints on Quirks and the main category unhook. > This more like it? Here is the quirks diff separately Index: files/Quirks.pm === RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.1173 diff -u -p -r1.1173 Quirks.pm --- files/Quirks.pm 10 Feb 2021 12:49:31 - 1.1173 +++ files/Quirks.pm 12 Feb 2021 17:25:55 - @@ -539,6 +539,7 @@ my $stem_extensions = { 'py-sphinx-intl' => 'py3-sphinx-intl', 'stegcracker' => 'stegseek', 'py-ldap3' => 'py3-ldap3', + 'prboom' => 'prboom-plus', }; my $obsolete_reason = { @@ -2077,6 +2078,7 @@ my $obsolete_reason = { 'icinga-web' => 38, 'icinga-cgi' => 38, 'icinga-idoutils' => 38, + 'prboom' => 3, }; # reasons for obsolete packages
Re: REMOVE: games/prboom
On Wed, Feb 10, 2021 at 05:46:28PM -0800, Ryan Freeman wrote: > First time trying to remove something, here is a patch to move > games/prboom to the attic. games/prboom-plus does everything it > did and more with fixes. netgames can be played with: > - games/chocolate-doom > - games/odamex > - games/gzdoom > > anything I've forgotten for removal? > > OK? > -ryan Thanks naddy, kn, edd for the hints on Quirks and the main category unhook. This more like it? Index: games/Makefile === RCS file: /cvs/ports/games/Makefile,v retrieving revision 1.434 diff -u -p -r1.434 Makefile --- games/Makefile 8 Feb 2021 20:33:31 - 1.434 +++ games/Makefile 11 Feb 2021 22:50:06 - @@ -234,7 +234,6 @@ SUBDIR += pokerth SUBDIR += polymorphable SUBDIR += postal - SUBDIR += prboom SUBDIR += prboom-plus SUBDIR += pushover SUBDIR += puzzles Index: devel/quirks/files/Quirks.pm === RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.1173 diff -u -p -r1.1173 Quirks.pm --- devel/quirks/files/Quirks.pm10 Feb 2021 12:49:31 - 1.1173 +++ devel/quirks/files/Quirks.pm11 Feb 2021 22:50:06 - @@ -539,6 +539,7 @@ my $stem_extensions = { 'py-sphinx-intl' => 'py3-sphinx-intl', 'stegcracker' => 'stegseek', 'py-ldap3' => 'py3-ldap3', + 'prboom' => 'prboom-plus', }; my $obsolete_reason = { @@ -2077,6 +2078,7 @@ my $obsolete_reason = { 'icinga-web' => 38, 'icinga-cgi' => 38, 'icinga-idoutils' => 38, + 'prboom' => 3, }; # reasons for obsolete packages Index: games/prboom/Makefile === RCS file: games/prboom/Makefile diff -N games/prboom/Makefile --- games/prboom/Makefile 10 Feb 2021 03:12:27 - 1.28 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,35 +0,0 @@ -# $OpenBSD: Makefile,v 1.28 2021/02/10 03:12:27 jeremy Exp $ - -COMMENT= enhanced clone of Id Software's Doom game; multiplayer#' -DISTNAME= prboom-2.5.0 -REVISION= 3 - -CATEGORIES=games x11 - -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prboom/} - -HOMEPAGE= http://prboom.sourceforge.net/ - -# GPLv2+ -PERMIT_PACKAGE=Yes - -WANTLIB = SDL c m pthread GL GLU SDL_mixer>=3 SDL_net>=1 png>=4 - -RUN_DEPENDS = audio/timidity - -LIB_DEPENDS = devel/sdl-mixer \ - devel/sdl-net \ - graphics/png - -CONFIGURE_STYLE=autoconf -AUTOCONF_VERSION=2.61 -CONFIGURE_ENV+=CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+=--disable-cpu-opt \ - --with-waddir=${TRUEPREFIX}/share/doom -MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools - -FAKE_FLAGS += gamesdir=${PREFIX}/bin \ - docdir=${PREFIX}/share/doc/prboom - -.include Index: games/prboom/distinfo === RCS file: games/prboom/distinfo diff -N games/prboom/distinfo --- games/prboom/distinfo 31 Mar 2013 21:09:32 - 1.10 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,2 +0,0 @@ -SHA256 (prboom-2.5.0.tar.gz) = ImwcRw+MyYMydTZAT0BaHQJs8KUYjGlKEkPMhjABS64= -SIZE (prboom-2.5.0.tar.gz) = 1049505 Index: games/prboom/patches/patch-autotools_ac_c_compile_flags_m4 === RCS file: games/prboom/patches/patch-autotools_ac_c_compile_flags_m4 diff -N games/prboom/patches/patch-autotools_ac_c_compile_flags_m4 --- games/prboom/patches/patch-autotools_ac_c_compile_flags_m4 28 Sep 2017 23:12:48 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,13 +0,0 @@ -$OpenBSD: patch-autotools_ac_c_compile_flags_m4,v 1.1 2017/09/28 23:12:48 naddy Exp $ - -Index: autotools/ac_c_compile_flags.m4 autotools/ac_c_compile_flags.m4.orig -+++ autotools/ac_c_compile_flags.m4 -@@ -5,7 +5,6 @@ do - AC_MSG_CHECKING(whether compiler supports $ac_flag) - CFLAGS="$NEW_CFLAGS $ac_flag" - AC_TRY_COMPILE(,[ -- void f() {}; - ],[ - NEW_CFLAGS="$CFLAGS" - AC_MSG_RESULT(yes) Index: games/prboom/patches/patch-configure_ac === RCS file: games/prboom/patches/patch-configure_ac diff -N games/prboom/patches/patch-configure_ac --- games/prboom/patches/patch-configure_ac 28 Sep 2017 23:12:48 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,17 +0,0 @@ -$OpenBSD: patch-configure_ac,v 1.1 2017/09/28 23:12:48 naddy Exp $ - -Index: configure.ac configure.ac.orig -+++ configure.ac -@@ -26,9 +26,9 @@ fi - AC_ARG_WITH(waddir,AC_HELP_STRING([--with-waddir],[Path to install prboom.wad and look for other WAD files]), - DOOMWADDIR="$withval", - if test "x$prefix" != xNONE; then -- DOOMWADDIR="$prefix/share/games/doom" -+
Re: REMOVE: games/prboom
On Wed, Feb 10, 2021 at 05:46:28PM -0800, Ryan Freeman wrote: > anything I've forgotten for removal? quirks as per naddy and you need to unhook the port from the category Makfile (/usr/ports/games/Makefile).
Re: REMOVE: games/prboom
Ryan Freeman: > First time trying to remove something, here is a patch to move > games/prboom to the attic. games/prboom-plus does everything it > did and more with fixes. > > anything I've forgotten for removal? Port removals need an entry in devel/quirks. -- Christian "naddy" Weisgerber na...@mips.inka.de
REMOVE: games/prboom
First time trying to remove something, here is a patch to move games/prboom to the attic. games/prboom-plus does everything it did and more with fixes. netgames can be played with: - games/chocolate-doom - games/odamex - games/gzdoom anything I've forgotten for removal? OK? -ryan ? prboom.diff Index: Makefile === RCS file: Makefile diff -N Makefile --- Makefile10 Feb 2021 03:12:27 - 1.28 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,35 +0,0 @@ -# $OpenBSD: Makefile,v 1.28 2021/02/10 03:12:27 jeremy Exp $ - -COMMENT= enhanced clone of Id Software's Doom game; multiplayer#' -DISTNAME= prboom-2.5.0 -REVISION= 3 - -CATEGORIES=games x11 - -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prboom/} - -HOMEPAGE= http://prboom.sourceforge.net/ - -# GPLv2+ -PERMIT_PACKAGE=Yes - -WANTLIB = SDL c m pthread GL GLU SDL_mixer>=3 SDL_net>=1 png>=4 - -RUN_DEPENDS = audio/timidity - -LIB_DEPENDS = devel/sdl-mixer \ - devel/sdl-net \ - graphics/png - -CONFIGURE_STYLE=autoconf -AUTOCONF_VERSION=2.61 -CONFIGURE_ENV+=CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+=--disable-cpu-opt \ - --with-waddir=${TRUEPREFIX}/share/doom -MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools - -FAKE_FLAGS += gamesdir=${PREFIX}/bin \ - docdir=${PREFIX}/share/doc/prboom - -.include Index: distinfo === RCS file: distinfo diff -N distinfo --- distinfo31 Mar 2013 21:09:32 - 1.10 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,2 +0,0 @@ -SHA256 (prboom-2.5.0.tar.gz) = ImwcRw+MyYMydTZAT0BaHQJs8KUYjGlKEkPMhjABS64= -SIZE (prboom-2.5.0.tar.gz) = 1049505 Index: patches/patch-autotools_ac_c_compile_flags_m4 === RCS file: patches/patch-autotools_ac_c_compile_flags_m4 diff -N patches/patch-autotools_ac_c_compile_flags_m4 --- patches/patch-autotools_ac_c_compile_flags_m4 28 Sep 2017 23:12:48 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,13 +0,0 @@ -$OpenBSD: patch-autotools_ac_c_compile_flags_m4,v 1.1 2017/09/28 23:12:48 naddy Exp $ - -Index: autotools/ac_c_compile_flags.m4 autotools/ac_c_compile_flags.m4.orig -+++ autotools/ac_c_compile_flags.m4 -@@ -5,7 +5,6 @@ do - AC_MSG_CHECKING(whether compiler supports $ac_flag) - CFLAGS="$NEW_CFLAGS $ac_flag" - AC_TRY_COMPILE(,[ -- void f() {}; - ],[ - NEW_CFLAGS="$CFLAGS" - AC_MSG_RESULT(yes) Index: patches/patch-configure_ac === RCS file: patches/patch-configure_ac diff -N patches/patch-configure_ac --- patches/patch-configure_ac 28 Sep 2017 23:12:48 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,17 +0,0 @@ -$OpenBSD: patch-configure_ac,v 1.1 2017/09/28 23:12:48 naddy Exp $ - -Index: configure.ac configure.ac.orig -+++ configure.ac -@@ -26,9 +26,9 @@ fi - AC_ARG_WITH(waddir,AC_HELP_STRING([--with-waddir],[Path to install prboom.wad and look for other WAD files]), - DOOMWADDIR="$withval", - if test "x$prefix" != xNONE; then -- DOOMWADDIR="$prefix/share/games/doom" -+ DOOMWADDIR="$prefix/share/prboom" - else -- DOOMWADDIR="$ac_default_prefix/share/games/doom" -+ DOOMWADDIR="$ac_default_prefix/share/prboom" - fi - ) - AC_DEFINE_UNQUOTED(DOOMWADDIR,"$DOOMWADDIR",[Define to be the path where Doom WADs are stored]) Index: patches/patch-src_SDL_i_sshot_c === RCS file: patches/patch-src_SDL_i_sshot_c diff -N patches/patch-src_SDL_i_sshot_c --- patches/patch-src_SDL_i_sshot_c 31 Mar 2013 21:09:33 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_SDL_i_sshot_c,v 1.1 2013/03/31 21:09:33 bentley Exp $ - -Fix build with png-1.5. - src/SDL/i_sshot.c.orig Wed Mar 27 00:17:06 2013 -+++ src/SDL/i_sshot.c Wed Mar 27 00:18:10 2013 -@@ -231,7 +231,7 @@ int I_ScreenShot (const char *fname) - if (fp) - { - png_struct *png_ptr = png_create_write_struct( --PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn); -+PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn); - - if (png_ptr) - { -@@ -279,7 +279,7 @@ int I_ScreenShot (const char *fname) - break; - } - } -- png_destroy_write_struct(_ptr, png_infopp_NULL); -+ png_destroy_write_struct(_ptr, NULL); - } - fclose(fp); - } Index: patches/patch-src_gl_intern_h === RCS file: patches/patch-src_gl_intern_h diff -N patches/patch-src_gl_intern_h --- patches/patch-src_gl_intern_h 10 Feb 2021 03:12:27 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_gl_intern_h,v