git: e85cd011c15c - main - games/hyperrogue: update 13.0o → 13.0s

From: Dmitry Marakasov <amdmi3_at_FreeBSD.org>
Date: Mon, 22 Jul 2024 22:42:20 UTC
The branch main has been updated by amdmi3:

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

commit e85cd011c15cca6d4ff32544aa78cbdf594f5f39
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2024-07-10 14:15:22 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2024-07-22 22:38:00 +0000

    games/hyperrogue: update 13.0o → 13.0s
    
    - Tweak the way -O is overridden
    - Enable png (textures) and glew support which was lost after
      upstream dropped autotools
---
 games/hyperrogue/Makefile             | 8 +++-----
 games/hyperrogue/distinfo             | 6 +++---
 games/hyperrogue/files/patch-Makefile | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile
index 3c058a69a159..59b810e36bb9 100644
--- a/games/hyperrogue/Makefile
+++ b/games/hyperrogue/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	hyperrogue
-PORTVERSION=	13.0o
+PORTVERSION=	13.0s
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
@@ -20,10 +20,8 @@ USE_SDL=	sdl mixer gfx ttf
 USE_GL=		gl glew
 ALL_TARGET=	hyperrogue
 
-PORTSCOUT=	skipv:12.1  # https://github.com/freebsd/portscout/issues/18
-
-# remove -O2, otherwise clang takes gigabytes of memory
-CXXFLAGS:=	${CXXFLAGS:C/-O[0-9]//} -DFHS -DHYPERPATH="\\\"${DATADIR}/\\\""
+CXXFLAGS+=	-DFHS -DHYPERPATH="\\\"${DATADIR}/\\\""
+MAKE_ENV=	HYPERROGUE_USE_PNG=1 HYPERROGUE_USE_GLEW=1
 
 PORTDOCS=	README.md
 PORTDATA=	*
diff --git a/games/hyperrogue/distinfo b/games/hyperrogue/distinfo
index ff565634ea7c..01015d65b054 100644
--- a/games/hyperrogue/distinfo
+++ b/games/hyperrogue/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718022306
-SHA256 (zenorogue-hyperrogue-v13.0o_GH0.tar.gz) = 7797843290b55dcabb37ad845b7b136f7ca5d92699bfb91781aa16f92ef0474e
-SIZE (zenorogue-hyperrogue-v13.0o_GH0.tar.gz) = 87780073
+TIMESTAMP = 1720618968
+SHA256 (zenorogue-hyperrogue-v13.0s_GH0.tar.gz) = eeb7a6b37ea4e081202da5038e4fe66a23cfdc705b36f0b6db766f2a1974a0fb
+SIZE (zenorogue-hyperrogue-v13.0s_GH0.tar.gz) = 88629525
diff --git a/games/hyperrogue/files/patch-Makefile b/games/hyperrogue/files/patch-Makefile
index 048a2c0ed9ce..67d04332dad2 100644
--- a/games/hyperrogue/files/patch-Makefile
+++ b/games/hyperrogue/files/patch-Makefile
@@ -25,7 +25,7 @@
  
  hyper$(OBJ_EXTENSION): *.cpp language-data.cpp autohdr.h
 -	$(CXX) -O2 $(CXXFLAGS) $(hyper_CXXFLAGS) -c hyper.cpp -o $@
-+	$(CXX) $(CXXFLAGS) $(hyper_CXXFLAGS) -c hyper.cpp -o $@
++	$(CXX) $(CXXFLAGS) -O0 $(hyper_CXXFLAGS) -c hyper.cpp -o $@  # without O0 clang takes gigabytes of memory
  
  hyper.res: hyper.rc hr-icon.ico
  	windres hyper.rc -O coff -o hyper.res