git: ade0a9c31a9f - main - games/hyperrogue: update 12.0f → 12.0m
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 30 Mar 2022 20:20:34 UTC
The branch main has been updated by amdmi3:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ade0a9c31a9f5585299888fe4dc26274bf4a3e6a
commit ade0a9c31a9f5585299888fe4dc26274bf4a3e6a
Author: Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-03-30 17:26:02 +0000
Commit: Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-03-30 20:19:45 +0000
games/hyperrogue: update 12.0f → 12.0m
---
games/hyperrogue/Makefile | 9 +++------
games/hyperrogue/distinfo | 6 +++---
games/hyperrogue/files/patch-Makefile | 14 ++++++++------
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile
index 2f08d97f75eb..b2a36c6bf4b3 100644
--- a/games/hyperrogue/Makefile
+++ b/games/hyperrogue/Makefile
@@ -1,5 +1,5 @@
PORTNAME= hyperrogue
-PORTVERSION= 12.0f
+PORTVERSION= 12.0m
DISTVERSIONPREFIX= v
CATEGORIES= games
@@ -38,11 +38,8 @@ 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}
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,4 +1,4 @@
---- 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.
@@ -16,7 +16,7 @@
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
@@ -35,6 +35,7 @@
- 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)
@@ -42,18 +43,19 @@
- 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 $@
@@ -71,8 +73,8 @@
+ $(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