Re: [update] gzdoom-4.2.4

On Fri, Dec 06, 2019 at 12:45:21PM +0200, Timo Myyrä wrote:
> Stuart Henderson <stu@spacehopper.org> writes:
>
> > On 2019/12/06 10:02, Timo Myyrä wrote:
> >
> >> -V = 4.1.2
> >> +V = 4.2.4
> >> PKGNAME = gzdoom-${V}
> >> -DISTNAME = gzdoom-src-g${V}
> >> -REVISION = 0
> >> +
> >> +GH_ACCOUNT = coelckers
> >> +GH_PROJECT = gzdoom
> >> +GH_TAGNAME = ${V}
> >
> > I wondered why it fetched at all when the release is tagged as g4.2.4 -
> > it seems there is also a branch named 4.2.4 which is what you're
> > fetching from here (which I think is likely to go away at some point in
> > the future, they don't keep other old branches around).
> >
> > Could you replace all the above lines with this please and make clean=dist /
> > make makesum? Contents of the source code files inside the tar at the
> > same but the path is different as it has 'g' in the directory name.
> >
> > GH_ACCOUNT = coelckers
> > GH_PROJECT = gzdoom
> > GH_TAGNAME = g4.2.4
> > DISTNAME = gzdoom-${GH_TAGNAME:S/g//}
>
> Ah, good catch. The port has been sitting in my tree for a while. Already had
> forgotten why even switched to github. I focused recently on getting the port to
> compile and rework the patches.
>
> But here's revised diff, only compile tested:
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/gzdoom/Makefile,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 Makefile
> --- Makefile 12 Jul 2019 20:46:19 -0000 1.9
> +++ Makefile 6 Dec 2019 10:41:57 -0000
> @@ -8,10 +8,13 @@ ONLY_FOR_ARCHS = i386 amd64
>
> COMMENT = OpenGL engine for idTech 1 games like doom,hexen,heretic...
>
> -V = 4.1.2
> +V = 4.2.4
> PKGNAME = gzdoom-${V}
> -DISTNAME = gzdoom-src-g${V}
> -REVISION = 0
> +
> +GH_ACCOUNT = coelckers
> +GH_PROJECT = gzdoom
> +GH_TAGNAME = g4.2.4
> +DISTNAME = gzdoom-${GH_TAGNAME:S/g//}
>
> CATEGORIES= games
>
> @@ -19,9 +22,6 @@ HOMEPAGE = https://zdoom.org
>
> MAINTAINER = Timo Myyra <timo.myyra@bittivirhe.fi>
>
> -MASTER_SITES = https://zdoom.org/files/gzdoom/src/
> -EXTRACT_SUFX = .zip
> -
> # GPLv3
> PERMIT_PACKAGE = Yes
>
> @@ -35,6 +35,7 @@ MODULES = devel/cmake
> CONFIGURE_ARGS += -DNO_GTK=ON
> CONFIGURE_ARGS += -DDYN_OPENAL=NO -DDYN_MPG123=NO -DDYN_SNDFILE=NO
> CONFIGURE_ARGS += -DFLUIDSYNTHLIB1="libfluidsynth.so"
> +CONFIGURE_ARGS += -DHAVE_STDINT_H=1
>
> LIB_DEPENDS = audio/mpg123 \
> audio/openal \
> @@ -44,7 +45,5 @@ LIB_DEPENDS = audio/mpg123 \
> devel/sdl2
>
> NO_TEST = Yes
> -
> -WRKDIST = ${WRKDIR}/gzdoom-g${V}
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/gzdoom/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- distinfo 26 Jun 2019 07:12:04 -0000 1.3
> +++ distinfo 6 Dec 2019 10:41:57 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (gzdoom-src-g4.1.2.zip) = PlpypHGf8jEBwTGL+dSlZ0rWgj9s4GfDC/J/nuS1uPY=
> -SIZE (gzdoom-src-g4.1.2.zip) = 15297100
> +SHA256 (gzdoom-4.2.4.tar.gz) = DVtEH+f8RJ65NLh9kgwvdlKcMxdH60/myxzfGFRlxRw=
> +SIZE (gzdoom-4.2.4.tar.gz) = 13683768
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: patches/patch-CMakeLists_txt
> diff -N patches/patch-CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-CMakeLists_txt 6 Dec 2019 10:41:57 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
> ++++ CMakeLists.txt
> +@@ -271,7 +271,7 @@ else()
> +
> + if ( UNIX )
> + include(CheckSymbolExists)
> +- check_symbol_exists( "fts_set" "fts.h" HAVE_FTS )
> ++ check_symbol_exists( "fts_set" "sys/types.h;sys/stat.h;fts.h" HAVE_FTS )
> + if ( NOT HAVE_FTS )
> + include ( FindPkgConfig )
> + pkg_check_modules( MUSL_FTS musl-fts )
> Index: patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h
> ===================================================================
> RCS file: patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h
> diff -N patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-libraries_wildmidi_wildmidi_wildmidi_lib_h 6 Dec 2019 10:41:57 -0000
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +
> +Index: libraries/wildmidi/wildmidi/wildmidi_lib.h
> +--- libraries/wildmidi/wildmidi/wildmidi_lib.h.orig
> ++++ libraries/wildmidi/wildmidi/wildmidi_lib.h
> +@@ -28,6 +28,7 @@
> + #define WILDMIDI_LIB_H
> +
> + #include "../../music_common/fileio.h"
> ++#include <stdarg.h>
> +
> + namespace WildMidi
> + {
> Index: patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
> ===================================================================
> RCS file: patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
> diff -N patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-libraries_zmusic_mididevices_music_fluidsynth_mididevice_cpp 6 Dec 2019 10:41:57 -0000
> @@ -0,0 +1,18 @@
> +$OpenBSD$
> +
> +Index: libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp
> +--- libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp.orig
> ++++ libraries/zmusic/mididevices/music_fluidsynth_mididevice.cpp
> +@@ -140,8 +140,12 @@ class FluidSynthMIDIDevice : public SoftSynthMIDIDevic
> + #define FLUIDSYNTHLIB1 "libfluidsynth.1.dylib"
> + #define FLUIDSYNTHLIB2 "libfluidsynth.2.dylib"
> + #else // !__APPLE__
> ++#ifndef FLUIDSYNTHLIB1
> + #define FLUIDSYNTHLIB1 "libfluidsynth.so.1"
> ++