diff --git a/astro/mepo/Makefile b/astro/mepo/Makefile index f30d1753c510..220ebb807866 100644 --- a/astro/mepo/Makefile +++ b/astro/mepo/Makefile @@ -1,48 +1,48 @@ PORTNAME= mepo DISTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 1 CATEGORIES= astro geography wayland MASTER_SITES= https://git.sr.ht/~mil/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/ MAINTAINER= jbeich@FreeBSD.org COMMENT= Fast, simple, and hackable OSM map viewer WWW= https://sr.ht/~mil/Mepo/ LICENSE= GPLv3+ OFL11 LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= zig>=0.9.0:lang/zig LIB_DEPENDS= libcurl.so:ftp/curl RUN_DEPENDS= jq:textproc/jq USES= pkgconfig sdl shebangfix USE_SDL= gfx2 image2 ttf2 SHEBANG_FILES= scripts/* SHEBANG_LANG= sh sh_CMD= /bin/sh MAKE_ENV= DESTDIR="${STAGEDIR}" CONFIGURE_ARGS= --prefix "${PREFIX}" \ ${WITH_DEBUG:D:U-Drelease-fast} \ -Dcpu=${CPUTYPE:Ubaseline} \ --verbose NO_INSTALL= yes # strip(1) breaks runtime post-patch: @${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \ ${WRKSRC}/scripts/mepo_ui_menu_user_pin_updater.sh @${REINPLACE_CMD} -e 's/pidof/pgrep/' \ -e 's/busctl/basuctl/' \ ${WRKSRC}/scripts/mepo_ui_helper_menu.sh do-build: @(cd ${WRKSRC} && ${MAKE_ENV} zig build ${CONFIGURE_ARGS}) post-install: @${STAGEDIR}${PREFIX}/bin/${PORTNAME} -docman \ >${STAGEDIR}${PREFIX}/share/man/man1/${PORTNAME}.1 do-test: @(cd ${WRKSRC} && ${TEST_ENV} zig build test ${CONFIGURE_ARGS}) .include diff --git a/astro/mepo/files/patch-src_api_bind__signal.zig b/astro/mepo/files/patch-src_api_bind__signal.zig deleted file mode 100644 index 378d281adc74..000000000000 --- a/astro/mepo/files/patch-src_api_bind__signal.zig +++ /dev/null @@ -1,25 +0,0 @@ -https://lists.sr.ht/~mil/mepo-devel/patches/38775 - ---- src/api/bind_signal.zig.orig 2023-02-01 03:43:08 UTC -+++ src/api/bind_signal.zig -@@ -39,13 +39,14 @@ fn bind_signal(mepo: *Mepo, signo_str: [:0]const u8, expression: []const u8) !vo - } - - // Register generic signal handler -- if (0 != std.os.linux.sigaction(signal_name, &.{ -+ const signal_action = std.os.Sigaction{ - .handler = .{ .handler = utilsdl.sdl_push_event_signal }, -- .mask = [_]u32{0} ** 32, -- .flags = @as(c_uint, 0), -- }, null)) { -- return error.FailedToSetupSighandler; -- } -+ .mask = std.os.empty_sigset, -+ .flags = 0, -+ }; -+ -+ std.os.sigaction(signal_name, &signal_action, null) -+ catch return error.FailedToSetupSighandler; - - if (mepo.table_signals.get(signal_name)) |heap_str| { - mepo.allocator.free(heap_str);