jj-fzf: make some progress, note new error

[Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Apr 17 22:50:29 2026 +0200
Changeset:	5f6f6eae7b0149e490f653fc8f455753bcf5c502

Modified Files:
	jj-fzf/Makefile
	jj-fzf/PLIST
	jj-fzf/TODO

Log Message:
jj-fzf: make some progress, note new error

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5f6f6eae7b0149e490f653fc8f455753bcf5c502

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 jj-fzf/Makefile | 31 ++++++++++++++++++++++++++++---
 jj-fzf/PLIST    | 15 +++++++++++++++
 jj-fzf/TODO     |  4 ++--
 3 files changed, 45 insertions(+), 5 deletions(-)

diffs:
diff --git a/jj-fzf/Makefile b/jj-fzf/Makefile
index 066199b66c..174f23ad5c 100644
--- a/jj-fzf/Makefile
+++ b/jj-fzf/Makefile
@@ -15,18 +15,43 @@ DEPENDS+=	jj-[0-9]*:../../devel/jj
 DEPENDS+=	fzf-[0-9]*:../../sysutils/fzf
 
 USE_LANGUAGES=	# none
-USE_TOOLS+=	gmake bash:run
+USE_TOOLS+=	gmake bash:run gsed:run
 MAKE_FLAGS+=	SHELL=${BASH}
 
 REPLACE_BASH+=	jj-fzf
+REPLACE_BASH+=	*.sh
+REPLACE_BASH+=	*/*.sh
 
-INSTALLATION_DIRS+=	bin share/doc/jj-fzf
+SUBST_CLASSES+=		python
+SUBST_SED.python+=	-e s",python3,${PYTHONBIN},"
+SUBST_FILES.python+=	preflight.sh
+SUBST_STAGE.python=	pre-build
+SUBST_MESSAGE.python=	Fixing path to Python interpreter.
+
+SUBST_CLASSES+=		mktemp
+SUBST_SED.mktemp+=	-e "s,mktemp --tmpdir,mktemp -t /tmp,"
+SUBST_FILES.mktemp+=	contrib/jj-am.sh
+SUBST_FILES.mktemp+=	lib/setup.sh
+SUBST_FILES.mktemp+=	screencasts/prepare.sh
+SUBST_FILES.mktemp+=	tests/utils.sh
+SUBST_STAGE.mktemp=	pre-build
+SUBST_MESSAGE.mktemp=	Using more portable mktemp flags.
+
+REPLACE_PYTHON+=	lib/gen-message.py
+
+INSTALLATION_DIRS+=	bin libexec/lib share/doc/jj-fzf
 
 # https://github.com/tim-janik/jj-fzf/issues/7
 do-build:
+	echo '#!/bin/sh' > ${WRKDIR}/jj-fzf
+	echo '${PREFIX}/libexec/jj-fzf "$$@"' > ${WRKDIR}/jj-fzf
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/jj-fzf ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/jj-fzf ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/jj-fzf ${DESTDIR}${PREFIX}/libexec
+	${INSTALL_SCRIPT} ${WRKSRC}/*.sh ${DESTDIR}${PREFIX}/libexec
+	${INSTALL_SCRIPT} ${WRKSRC}/lib/*.sh ${DESTDIR}${PREFIX}/libexec/lib
 	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/jj-fzf
 
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/jj-fzf/PLIST b/jj-fzf/PLIST
index 6702d96ba1..1dad9b0ae1 100644
--- a/jj-fzf/PLIST
+++ b/jj-fzf/PLIST
@@ -1,3 +1,18 @@
 @comment $NetBSD$
 bin/jj-fzf
+libexec/jj-fzf
+libexec/lib/bookmarks.sh
+libexec/lib/check-unfinished.sh
+libexec/lib/draft.sh
+libexec/lib/editor.sh
+libexec/lib/evolog.sh
+libexec/lib/exectool.sh
+libexec/lib/oplog.sh
+libexec/lib/popfile.sh
+libexec/lib/rebase.sh
+libexec/lib/reparent.sh
+libexec/lib/setup.sh
+libexec/preflight.sh
+libexec/sfx.sh
+libexec/version.sh
 share/doc/jj-fzf/README.md
diff --git a/jj-fzf/TODO b/jj-fzf/TODO
index 646a5d56f2..bbe886d5c5 100644
--- a/jj-fzf/TODO
+++ b/jj-fzf/TODO
@@ -1,3 +1,3 @@
-This crashes on startup with:
+This exits on startup with:
 
-/usr/pkg/bin/jj-fzf: line 8: /usr/pkg/bin/lib/setup.sh: no such file or directory
+/usr/pkg/libexec/jj-fzf: line 26: $JJFZF_TEMPD/preview.env: ambiguous redirect