From: Solene Rapenne <solene@perso.pw>
Subject: update games/hyperrogue
To: ports@openbsd.org, Brian Callahan <bcallah@openbsd.org>
Date: Wed, 15 May 2024 12:59:02 +0200

a new hyperrogue release, bug fix

https://github.com/zenorogue/hyperrogue/releases/tag/v13.0i

I propose to drop the hunk in the Makefile about the CXXFLAGS,
it compiles fine without on amd64 (clang), the one with gcc
seems good too, and it seems to be a moving area that I had
to manually fix it twice in a row.

ok?

diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile
index 3b211a563a9..43713b359db 100644
--- a/games/hyperrogue/Makefile
+++ b/games/hyperrogue/Makefile
@@ -1,4 +1,4 @@
-V =		13.0d
+V =		13.0i
 COMMENT =	roguelike game in a non-Euclidean world
 CATEGORIES =	games x11
 
diff --git a/games/hyperrogue/distinfo b/games/hyperrogue/distinfo
index fe08e61d88c..f35d0857fbc 100644
--- a/games/hyperrogue/distinfo
+++ b/games/hyperrogue/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hyperrogue-13.0d.tar.gz) = 4ApHLRReh9u3dzH+FXCHyB2N5b0rBfogkbyQGFMIDoo=
-SIZE (hyperrogue-13.0d.tar.gz) = 87765129
+SHA256 (hyperrogue-13.0i.tar.gz) = JrkL+648RBYT6Gy+AmH1wDchja+3IioP2cfTAcb/Ulg=
+SIZE (hyperrogue-13.0i.tar.gz) = 87772760
diff --git a/games/hyperrogue/patches/patch-Makefile b/games/hyperrogue/patches/patch-Makefile
index 6d4afc867d8..aa395e2eb62 100644
--- a/games/hyperrogue/patches/patch-Makefile
+++ b/games/hyperrogue/patches/patch-Makefile
@@ -4,7 +4,7 @@ flag set for clang and ports-gcc
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -42,7 +42,6 @@ endif
+@@ -50,7 +50,6 @@ endif
  ## Begin customization points for each OS and TOOLCHAIN we support.
  
  
@@ -12,50 +12,15 @@ Index: Makefile
    CXXFLAGS_EARLY += -DLINUX
    EXE_EXTENSION :=
    LDFLAGS_GL := -lGL
-@@ -51,7 +50,6 @@ ifeq (${OS},linux)
+@@ -59,7 +58,6 @@ ifeq (${OS},linux)
    LDFLAGS_SDL := -lSDL -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpthread -lz
    OBJ_EXTENSION := .o
    hyper_RES :=
 -endif
  
  ifeq (${OS},mingw)
-   CXXFLAGS_EARLY += -DWINDOWS -mwindows -D_A_VOLID=8
-@@ -79,29 +77,12 @@ ifeq (${OS},osx)
-   hyper_RES :=
- endif
- 
--ifeq (${TOOLCHAIN},clang)
--  CXXFLAGS_STD = -std=c++11
--  CXXFLAGS_EARLY += -fPIC
--  CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -pedantic
--  CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized -Wno-char-subscripts -Wno-unknown-warning-option
--  CXXFLAGS_EARLY += -Wno-invalid-offsetof
--endif
-+CXXFLAGS_STD = -std=c++11
-+CXXFLAGS_EARLY += -fPIC
-+CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -pedantic
-+CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized -Wno-unknown-warning-option
-+CXXFLAGS_EARLY += -Wno-invalid-offsetof
- 
--ifeq (${TOOLCHAIN},gcc)
--  CXXFLAGS_STD = -std=c++11
--  CXXFLAGS_EARLY += -fPIC
--  CXXFLAGS_EARLY += -W -Wall -Wextra -pedantic
--  CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
--  CXXFLAGS_EARLY += -Wno-invalid-offsetof
--endif
--
--ifeq (${TOOLCHAIN},mingw)
--  CXXFLAGS_STD = -std=c++11
--  CXXFLAGS_EARLY += -W -Wall -Wextra
--  CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
--  CXXFLAGS_EARLY += -Wno-invalid-offsetof
--endif
--
- ifeq (${FONTCONFIG},1)
-   CXXFLAGS_EARLY += -DFONTCONFIG `pkg-config --cflags fontconfig`
-   LDFLAGS_EARLY += `pkg-config --libs fontconfig`
-@@ -144,19 +125,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY)
+   CXXFLAGS_EARLY += -DWINDOWS -mwindows -D_A_VOLID=8 -I/ucrt64/include/SDL
+@@ -153,19 +151,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY)
  override LDFLAGS := $(LDFLAGS_EARLY) $(LDFLAGS) ${EXTRA_LDFLAGS}
  
  hyperrogue$(EXE_EXTENSION): $(hyper_OBJS) $(hyper_RES)
@@ -79,7 +44,7 @@ Index: Makefile
  
  autohdr.h: makeh$(EXE_EXTENSION) language-data.cpp *.cpp
  	./makeh classes.cpp locations.cpp colors.cpp hyperpoint.cpp geometry.cpp embeddings.cpp goldberg.cpp init.cpp floorshapes.cpp cell.cpp multi.cpp shmup.cpp pattern2.cpp mapeditor.cpp graph.cpp textures.cpp hprint.cpp language.cpp util.cpp complex.cpp multigame.cpp arbitrile.cpp rulegen.cpp *.cpp > autohdr.h
-@@ -165,10 +146,10 @@ language-data.cpp: langen$(EXE_EXTENSION)
+@@ -174,10 +172,10 @@ language-data.cpp: langen$(EXE_EXTENSION)
  	./langen > language-data.cpp
  
  savepng$(OBJ_EXTENSION): savepng.cpp