From: Kirill A. Korinsky Subject: editors/helix: drop current_exe() workaround To: Laurent Cheylus Cc: OpenBSD ports Date: Sat, 05 Sep 2026 17:43:38 +0200 Laurent, rust in ports contains a patch to use getexecpath() for current_exe() that makes this workaround outdate. Ok to drop it? Index: Makefile =================================================================== RCS file: /home/cvs/ports/editors/helix/Makefile,v diff -u -p -r1.14 Makefile --- Makefile 20 Jul 2025 14:09:22 -0000 1.14 +++ Makefile 5 Sep 2026 15:29:44 -0000 @@ -1,6 +1,7 @@ COMMENT = modal text editor VER = 25.07.1 +REVISION = 0 DISTNAME = helix-${VER} CATEGORIES = editors @@ -32,10 +33,6 @@ SEPARATE_BUILD = Yes pre-extract: @mkdir -p ${WRKDIST} - -pre-configure: - grep -F -Rls '%%DATADIR%%' ${WRKSRC} | xargs sed -i \ - 's,%%DATADIR%%,${PREFIX}/share/helix,' do-install: ${INSTALL_PROGRAM} ${MODCARGO_TARGET_DIR}/release/hx ${PREFIX}/bin/ Index: patches/patch-helix-loader_src_lib_rs =================================================================== RCS file: patches/patch-helix-loader_src_lib_rs diff -N patches/patch-helix-loader_src_lib_rs --- patches/patch-helix-loader_src_lib_rs 13 Apr 2024 13:03:29 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -Index: helix-loader/src/lib.rs ---- helix-loader/src/lib.rs.orig -+++ helix-loader/src/lib.rs -@@ -67,11 +67,15 @@ fn prioritize_runtime_dirs() -> Vec { - - // fallback to location of the executable being run - // canonicalize the path in case the executable is symlinked -+ #[cfg(not(target_os = "openbsd"))] - let exe_rt_dir = std::env::current_exe() - .ok() - .and_then(|path| std::fs::canonicalize(path).ok()) - .and_then(|path| path.parent().map(|path| path.to_path_buf().join(RT_DIR))) - .unwrap(); -+ #[cfg(target_os = "openbsd")] -+ let exe_rt_dir = std::path::PathBuf::from("%%DATADIR%%").join(RT_DIR); -+ - rt_dirs.push(exe_rt_dir); - rt_dirs - } -- wbr, Kirill