diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile
index 2f08d97f75eb..b2a36c6bf4b3 100644
--- a/games/hyperrogue/Makefile
+++ b/games/hyperrogue/Makefile
@@ -1,51 +1,48 @@
 PORTNAME=	hyperrogue
-PORTVERSION=	12.0f
+PORTVERSION=	12.0m
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Roguelike in a non-euclidean world
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zenorogue
 
 USES=		compiler:c++11-lang gl gmake localbase:ldflags sdl xorg
 USE_SDL=	sdl mixer gfx ttf
 USE_GL=		gl glew
 ALL_TARGET=	hyperrogue
 
 # remove -O2, otherwise clang takes gigabytes of memory
 CXXFLAGS:=	${CXXFLAGS:C/-O[0-9]//} -DFHS -DHYPERPATH="\\\"${DATADIR}/\\\""
 
 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
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hyperrogue ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/hr-icon.ico ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico
-	@${MKDIR} ${STAGEDIR}${DATADIR}/sounds
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/hyperrogue-music.txt ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/sounds/* ${STAGEDIR}${DATADIR}/sounds
-	${INSTALL_DATA} ${WRKSRC}/music/* ${STAGEDIR}${DATADIR}
+	@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 713d4522fa7e..02e23d74e66e 100644
--- a/games/hyperrogue/distinfo
+++ b/games/hyperrogue/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629196951
-SHA256 (zenorogue-hyperrogue-v12.0f_GH0.tar.gz) = 44e78e93ed1d31983debcd04791d7ffcfcfbdc40697e709a0f6ca2d38c30203e
-SIZE (zenorogue-hyperrogue-v12.0f_GH0.tar.gz) = 79946099
+TIMESTAMP = 1648658613
+SHA256 (zenorogue-hyperrogue-v12.0m_GH0.tar.gz) = 39a9fc274c600acc4ef7f7143dda4ce2dd0411d539e750e375a042b488e1a504
+SIZE (zenorogue-hyperrogue-v12.0m_GH0.tar.gz) = 80012304
diff --git a/games/hyperrogue/files/patch-Makefile b/games/hyperrogue/files/patch-Makefile
index 7dd21ffc71f0..74c1b3083e50 100644
--- a/games/hyperrogue/files/patch-Makefile
+++ b/games/hyperrogue/files/patch-Makefile
@@ -1,87 +1,89 @@
---- Makefile.orig	2021-08-05 11:49:41 UTC
+--- Makefile.orig	2022-03-27 20:47: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
-@@ -79,29 +77,13 @@ ifeq (${OS},osx)
+@@ -79,31 +77,13 @@ ifeq (${OS},osx)
    hyper_RES :=
  endif
  
 -ifeq (${TOOLCHAIN},clang)
    CXXFLAGS_STD = -std=c++11
 -  CXXFLAGS_EARLY += -march=native -fPIC
 -  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
  
 -ifeq (${TOOLCHAIN},gcc)
 -  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
+-  CXXFLAGS_EARLY += -Wno-invalid-offsetof
 -endif
  
 -ifeq (${TOOLCHAIN},mingw)
 -  CXXFLAGS_STD = -std=c++11
 -  CXXFLAGS_EARLY += -march=native
 -  CXXFLAGS_EARLY += -W -Wall -Wextra -Werror
 -  CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
+-  CXXFLAGS_EARLY += -Wno-invalid-offsetof
 -endif
 -
 -
  ## We have now finished OS-specific and TOOLCHAIN-specific computations.
  ## Begin customization points for user-specifiable HYPERROGUE_USE_XXX macros.
  
-@@ -139,19 +121,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY)
+@@ -141,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) $(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 $@
  
  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 *.cpp > autohdr.h
-@@ -160,10 +142,10 @@ language-data.cpp: langen$(EXE_EXTENSION)
+ 	./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
+@@ -162,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