diff --git a/games/pipewalker/Makefile b/games/pipewalker/Makefile index 5c441ea39f00..44c3ebb1fe88 100644 --- a/games/pipewalker/Makefile +++ b/games/pipewalker/Makefile @@ -1,26 +1,25 @@ PORTNAME= pipewalker DISTVERSIONPREFIX=v -DISTVERSION= 1.0 -PORTREVISION= 1 +DISTVERSION= 1.1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Clone of the NetWalk game WWW= https://github.com/artemsen/pipewalker LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= meson sdl pkgconfig USE_GITHUB= yes GH_ACCOUNT= artemsen MESON_ARGS= -Dversion=${DISTVERSION} USE_SDL= sdl2 image2 PORTDATA= * post-patch: @${REINPLACE_CMD} -e 's|/usr/share/games/pipewalker|${DATADIR}|' \ ${WRKSRC}/extra/pipewalker.6 .include diff --git a/games/pipewalker/distinfo b/games/pipewalker/distinfo index d3637d91f15a..b87185f32755 100644 --- a/games/pipewalker/distinfo +++ b/games/pipewalker/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712343984 -SHA256 (artemsen-pipewalker-v1.0_GH0.tar.gz) = 24232fdf71c7146f1621c461601b60bd6237d801e6403a5695be4d57419e1a21 -SIZE (artemsen-pipewalker-v1.0_GH0.tar.gz) = 878256 +TIMESTAMP = 1717169086 +SHA256 (artemsen-pipewalker-v1.1_GH0.tar.gz) = 59c4746a1b3c703fb498792e9b54d3295b73b24bbbcc39565d41b14e1daf6b18 +SIZE (artemsen-pipewalker-v1.1_GH0.tar.gz) = 882179 diff --git a/games/pipewalker/files/patch-meson.build b/games/pipewalker/files/patch-meson.build index c63adf2d8603..356fde5f1695 100644 --- a/games/pipewalker/files/patch-meson.build +++ b/games/pipewalker/files/patch-meson.build @@ -1,11 +1,11 @@ ---- meson.build.orig 2024-01-14 09:10:02 UTC +--- meson.build.orig 2024-05-31 04:47:31 UTC +++ meson.build -@@ -33,7 +33,7 @@ else - data_dir = join_paths(meson.current_source_dir(), 'data') +@@ -34,7 +34,7 @@ else + install_data_dir = install_bin_dir / 'data' else - data_dir = join_paths(get_option('prefix'), get_option('datadir'), -- 'games', meson.project_name()) -+ meson.project_name()) + install_bin_dir = get_option('bindir') +- install_data_dir = get_option('datadir') / 'games' / meson.project_name() ++ install_data_dir = get_option('datadir') / meson.project_name() endif # installation diff --git a/games/pipewalker/files/patch-src_layout.cpp b/games/pipewalker/files/patch-src_layout.cpp deleted file mode 100644 index 17689791fc11..000000000000 --- a/games/pipewalker/files/patch-src_layout.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/layout.cpp.orig 2024-01-14 09:10:02 UTC -+++ src/layout.cpp -@@ -43,7 +43,7 @@ void Layout::update(size_t width, size_t height) - level_height = height; - - // size of header and footer -- size_t header_h = std::min(64ul, static_cast(window.h) / 10); -+ size_t header_h = std::min((size_t)64, static_cast(window.h) / 10); - - // size of a single puzzle cell - const int max_wnd_w = window.w - padding * 2; diff --git a/games/pipewalker/files/patch-src_level.cpp b/games/pipewalker/files/patch-src_level.cpp deleted file mode 100644 index d915d86299dc..000000000000 --- a/games/pipewalker/files/patch-src_level.cpp +++ /dev/null @@ -1,33 +0,0 @@ ---- src/level.cpp.orig 2024-01-14 09:10:02 UTC -+++ src/level.cpp -@@ -15,8 +15,8 @@ void Level::generate() - std::fill(cells.begin(), cells.end(), Cell {}); - - // install sender (server) -- sender.x = mtrand::get(1ul, width - 1); -- sender.y = mtrand::get(1ul, height - 1); -+ sender.x = mtrand::get((size_t)1, width - 1); -+ sender.y = mtrand::get((size_t)1, height - 1); - get_cell(sender).object = Cell::Sender; - - const size_t max_recievers = cells.size() / 5; -@@ -146,7 +146,7 @@ void Level::add_reciever() - } - - // get random position -- const size_t free_index = mtrand::get(0ul, free_cells.size()); -+ const size_t free_index = mtrand::get((size_t)0, free_cells.size()); - const Position& reciever = free_cells[free_index]; - - // find path from receiver to sender -@@ -176,8 +176,8 @@ bool Level::find_path(const Position& from, std::set