diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile
index 3c058a69a159..59b810e36bb9 100644
--- a/games/hyperrogue/Makefile
+++ b/games/hyperrogue/Makefile
@@ -1,57 +1,55 @@
 PORTNAME=	hyperrogue
-PORTVERSION=	13.0o
+PORTVERSION=	13.0s
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Roguelike in a non-euclidean world
 WWW=		https://roguetemple.com/z/hyper/ \
 		https://github.com/zenorogue/hyperrogue
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		compiler:c++14-lang gl gmake localbase:ldflags sdl xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	zenorogue
 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=	*
 PLIST_FILES=	bin/hyperrogue share/pixmaps/hyperrogue.ico
 
 DESKTOP_ENTRIES="HyperRogue" \
 		"" \
 		"${PREFIX}/share/pixmaps/${PORTNAME}.ico" \
 		"${PORTNAME}" \
 		"Game;RolePlaying;" \
 		""
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc
 USE_GCC=	yes
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hyperrogue ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/hr-icon.ico ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} "*.ttf hyperrogue-music.txt sounds music" \
 		${STAGEDIR}${DATADIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
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
@@ -1,55 +1,55 @@
 --- Makefile.orig	2022-07-05 12:02:51 UTC
 +++ Makefile
 @@ -42,7 +42,6 @@ endif
  ## Begin customization points for each OS and TOOLCHAIN we support.
  
  
 -ifeq (${OS},linux)
    CXXFLAGS_EARLY += -DLINUX
    EXE_EXTENSION :=
    LDFLAGS_GL := -lGL
 @@ -51,7 +50,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
 @@ -140,19 +138,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 $@
  
  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
  
  langen$(EXE_EXTENSION): langen.cpp language-??.cpp language-ptbr.cpp
 -	$(CXX) -O0 $(CXXFLAGS) $(langen_CXXFLAGS) langen.cpp $(LDFLAGS) -o $@
 +	$(CXX) $(CXXFLAGS) $(langen_CXXFLAGS) langen.cpp $(LDFLAGS) -o $@
  
  makeh$(EXE_EXTENSION): makeh.cpp
 -	$(CXX) -O2 makeh.cpp -o $@
 +	$(CXX) $(CXXFLAGS) makeh.cpp $(LDFLAGS) -o $@
  
  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 multigame.cpp *.cpp > autohdr.h
 @@ -161,10 +159,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