git: a961bb0d5f45 - main - games/hyperrogue: update to 12.0f

[Dmitry Marakasov]

The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a961bb0d5f45bf002e006c2061ac2c469e65016b

commit a961bb0d5f45bf002e006c2061ac2c469e65016b
Author:     Dmitry Marakasov <amdmi3 at FreeBSD.org>
AuthorDate: 2021-08-17 14:28:11 +0000
Commit:     Dmitry Marakasov <amdmi3 at FreeBSD.org>
CommitDate: 2021-08-18 13:17:17 +0000

    games/hyperrogue: update to 12.0f
---
 games/hyperrogue/Makefile             |  2 +-
 games/hyperrogue/distinfo             |  6 +++---
 games/hyperrogue/files/patch-Makefile | 36 +++++++++++++++++++++++------------
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile
index 578b370f58a2..c5445b0e5249 100644
--- a/games/hyperrogue/Makefile
+++ b/games/hyperrogue/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	hyperrogue
-PORTVERSION=	12.0c
+PORTVERSION=	12.0f
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
diff --git a/games/hyperrogue/distinfo b/games/hyperrogue/distinfo
index 48f647daa66b..713d4522fa7e 100644
--- a/games/hyperrogue/distinfo
+++ b/games/hyperrogue/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625661416
-SHA256 (zenorogue-hyperrogue-v12.0c_GH0.tar.gz) = c6888b6500afbf866721a5c69d309679b7e318d5dc6dfe4a1980d850ffce5109
-SIZE (zenorogue-hyperrogue-v12.0c_GH0.tar.gz) = 79897733
+TIMESTAMP = 1629196951
+SHA256 (zenorogue-hyperrogue-v12.0f_GH0.tar.gz) = 44e78e93ed1d31983debcd04791d7ffcfcfbdc40697e709a0f6ca2d38c30203e
+SIZE (zenorogue-hyperrogue-v12.0f_GH0.tar.gz) = 79946099
diff --git a/games/hyperrogue/files/patch-Makefile b/games/hyperrogue/files/patch-Makefile
index 7863e55d9405..7dd21ffc71f0 100644
--- a/games/hyperrogue/files/patch-Makefile
+++ b/games/hyperrogue/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2021-06-06 09:27:52 UTC
+--- Makefile.orig	2021-08-05 11:49:41 UTC
 +++ Makefile
 @@ -42,7 +42,6 @@ endif
  ## Begin customization points for each OS and TOOLCHAIN we support.
@@ -16,20 +16,19 @@
  
  ifeq (${OS},mingw)
    CXXFLAGS_EARLY += -DWINDOWS -mwindows -D_A_VOLID=8
-@@ -79,28 +77,11 @@ ifeq (${OS},osx)
+@@ -79,29 +77,13 @@ ifeq (${OS},osx)
    hyper_RES :=
  endif
  
 -ifeq (${TOOLCHAIN},clang)
--  CXXFLAGS_STD = -std=c++11
+   CXXFLAGS_STD = -std=c++11
 -  CXXFLAGS_EARLY += -march=native -fPIC
--  CXXFLAGS_EARLY += -W -Wall -Wextra -Werror -pedantic
--  CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized -Wno-unknown-warning-option
+-  CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -Werror -pedantic
++  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
 -endif
-+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 -Wno-unknown-warning-option
  
 -ifeq (${TOOLCHAIN},gcc)
 -  CXXFLAGS_STD = -std=c++11
@@ -37,7 +36,7 @@
 -  CXXFLAGS_EARLY += -W -Wall -Wextra -Werror -pedantic
 -  CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
 -endif
--
+ 
 -ifeq (${TOOLCHAIN},mingw)
 -  CXXFLAGS_STD = -std=c++11
 -  CXXFLAGS_EARLY += -march=native
@@ -49,12 +48,12 @@
  ## We have now finished OS-specific and TOOLCHAIN-specific computations.
  ## Begin customization points for user-specifiable HYPERROGUE_USE_XXX macros.
  
-@@ -138,19 +119,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY)
+@@ -139,19 +121,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY)
  override LDFLAGS := $(LDFLAGS_EARLY) $(LDFLAGS) ${EXTRA_LDFLAGS}
  
  hyperrogue$(EXE_EXTENSION): $(hyper_OBJS) $(hyper_RES)
 -	$(CXX) $(CXXFLAGS) $(hyper_OBJS) $(hyper_RES) $(LDFLAGS) $(hyper_LDFLAGS) -o $@
-+	$(CXX) $(hyper_OBJS) $(hyper_RES) $(LDFLAGS) $(hyper_LDFLAGS) -o $@
++	$(CXX) $(hyper_OBJS) $(hyper_RES) $(LDFLAGS) $(hyper_LDFLAGS) $(LDFLAGS) -o $@
  
  hyper$(OBJ_EXTENSION): *.cpp language-data.cpp autohdr.h
 -	$(CXX) -O2 $(CXXFLAGS) $(hyper_CXXFLAGS) -c hyper.cpp -o $@
@@ -73,3 +72,16 @@
  
  autohdr.h: makeh$(EXE_EXTENSION) language-data.cpp *.cpp
  	./makeh classes.cpp locations.cpp colors.cpp hyperpoint.cpp geometry.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 *.cpp > autohdr.h
+@@ -160,10 +142,10 @@ language-data.cpp: langen$(EXE_EXTENSION)
+ 	./langen > language-data.cpp
+ 
+ savepng$(OBJ_EXTENSION): savepng.cpp
+-	$(CXX) -O2 $(CXXFLAGS) -c savepng.cpp -o $@
++	$(CXX) $(CXXFLAGS) -c savepng.cpp -o $@
+ 
+ mymake$(EXE_EXTENSION): mymake.cpp
+-	$(CXX) -O2 $(CXXFLAGS) mymake.cpp -pthread -o $@
++	$(CXX) $(CXXFLAGS) mymake.cpp $(LDFLAGS) -pthread -o $@
+ 
+ emscripten: hyper.html
+