mrrl

commit 60901e3d4f257ee689dc9329e8b3b5e8ce4edc43
parent b242bbd0e123fa840a1995f06a4361a0a33c26a2
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue,  9 Dec 2025 20:51:44 +0000

inline ./configure for nvi

Diffstat:
M
templates/pkg/nvi
 | 
20
++++++++++++++++++--
M
variants/ccx-x86_64/default.environment
 | 
2
+-
M
variants/ccx-x86_64/nvi
 | 
20
++++++++++++++++----
M
variants/ccx-x86_64/userspace.environment
 | 
2
+-
M
variants/root-x86_64/default.environment
 | 
2
+-
M
variants/root-x86_64/nvi
 | 
20
++++++++++++++++----
M
variants/root-x86_64/userspace.environment
 | 
2
+-

7 files changed, 54 insertions(+), 14 deletions(-)
diff --git a/templates/pkg/nvi b/templates/pkg/nvi
@@ -5,10 +5,26 @@
 {% block package_deps -%}
 #+{{pkg_install_name("netbsd-curses")}}
 {% endblock package_deps %}
-{%- block configure_args -%}
+{%- block configure -%}
+build_env_static
+./configure \
+	--prefix="$prefix" \
+	--build="$(${CC:-gcc} -dumpmachine)" \
+	--bindir="$prefix/{{bindir}}" \
+	--sbindir="$prefix/{{sbindir}}" \
+	--infodir="$prefix/{{infodir}}" \
+	--localedir="$prefix/{{localedir}}" \
+	--mandir="$prefix/{{mandir}}" \
+	--libdir="$prefix/{{libdir}}" \
+	--docdir="$prefix/{{docdir}}/{{shortname}}" \
+	--datadir="$prefix/{{datadir}}" \
+	--datarootdir="$prefix/{{datarootdir}}" \
+	--localstatedir='{{var_dir}}' \
+	--enable-static \
+	--disable-shared \
 	--disable-nls \
 	--disable-curses  # use system curses
-{%- endblock configure_args %}
+{%- endblock configure %}
 {%- block build -%}
 make V=1 -j$MAKE_THREADS
 {% endblock build %}
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -83,7 +83,7 @@
 #+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5
 #+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b
 #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007
-#+nvi.a79eb200608c44c323094d6b3913c75374f2b242970e2803930ceeeebffd5357
+#+nvi.e6106dcde9d33fd81db647dc5445dbfbf148a5eb7c891843431e2d00d69da20b
 #+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
 #+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
 #+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af
diff --git a/variants/ccx-x86_64/nvi b/variants/ccx-x86_64/nvi
@@ -85,12 +85,24 @@ prefix=/home/ccx/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
 cd 'nvi-1.79/build'
 
-
 build_env_static
-autotools_config_static --disable-nls \
+./configure \
+	--prefix="$prefix" \
+	--build="$(${CC:-gcc} -dumpmachine)" \
+	--bindir="$prefix/command" \
+	--sbindir="$prefix/command" \
+	--infodir="$prefix/info" \
+	--localedir="$prefix/locale" \
+	--mandir="$prefix/man" \
+	--libdir="$prefix/library" \
+	--docdir="$prefix/doc/nvi" \
+	--datadir="$prefix/data" \
+	--datarootdir="$prefix/data" \
+	--localstatedir='/var/pthbs' \
+	--enable-static \
+	--disable-shared \
+	--disable-nls \
 	--disable-curses  # use system curses
- 
-
 make V=1 -j$MAKE_THREADS
 # make install is broken
 install -Dm755 nvi "$dest/command/nvi"
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -83,7 +83,7 @@
 #+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5
 #+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b
 #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007
-#+nvi.a79eb200608c44c323094d6b3913c75374f2b242970e2803930ceeeebffd5357
+#+nvi.e6106dcde9d33fd81db647dc5445dbfbf148a5eb7c891843431e2d00d69da20b
 #+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
 #+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
 #+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af 
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -83,7 +83,7 @@
 #+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2
 #+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b
 #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d
-#+nvi.c873733051e894b4b1de17d3400abbd930cd094bd98ee660f1989c1e2dff0756
+#+nvi.167dab0a23b48113e12b1e8bc15d40cb367db4350747caba7813b8e1096ba382
 #+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
 #+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
 #+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8
diff --git a/variants/root-x86_64/nvi b/variants/root-x86_64/nvi
@@ -85,12 +85,24 @@ prefix=/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
 cd 'nvi-1.79/build'
 
-
 build_env_static
-autotools_config_static --disable-nls \
+./configure \
+	--prefix="$prefix" \
+	--build="$(${CC:-gcc} -dumpmachine)" \
+	--bindir="$prefix/command" \
+	--sbindir="$prefix/command" \
+	--infodir="$prefix/info" \
+	--localedir="$prefix/locale" \
+	--mandir="$prefix/man" \
+	--libdir="$prefix/library" \
+	--docdir="$prefix/doc/nvi" \
+	--datadir="$prefix/data" \
+	--datarootdir="$prefix/data" \
+	--localstatedir='/var/pthbs' \
+	--enable-static \
+	--disable-shared \
+	--disable-nls \
 	--disable-curses  # use system curses
- 
-
 make V=1 -j$MAKE_THREADS
 # make install is broken
 install -Dm755 nvi "$dest/command/nvi"
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -83,7 +83,7 @@
 #+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2
 #+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b
 #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d
-#+nvi.c873733051e894b4b1de17d3400abbd930cd094bd98ee660f1989c1e2dff0756
+#+nvi.167dab0a23b48113e12b1e8bc15d40cb367db4350747caba7813b8e1096ba382
 #+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
 #+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
 #+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8 
\ No newline at end of file