mrrl

commit bbedc952714713748cb079274bb968088225e71d
parent effd58c4883b909f1d4700953e8e16ca20dc4032
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue,  9 Dec 2025 23:18:42 +0000

nvi: apply patch to correcd directory

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

7 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/templates/pkg/nvi b/templates/pkg/nvi
@@ -1,6 +1,5 @@
 {%- set pkg_version="1.79" -%}
 {%- set pkg_source="tar.gz" -%}
-{%- set src_dir=shortname~"-"~pkg_version~"/build" -%}
 {% extends "autotools_static_mini" %}
 {% block package_deps -%}
 #+{{pkg_install_name("netbsd-curses")}}
@@ -9,6 +8,7 @@
 {%- block configure -%}
 build_env_static
 patch -p1 <../nvi-configure-implicit-return.patch
+cd build
 ./configure \
 	--prefix="$prefix" \
 	--build="$(${CC:-gcc} -dumpmachine)" \
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.f08b3bf6cc13ebba5a05184265b8d801a9249e041d341bceb42612ba62585219
+#+nvi.ba032d8f93d20c7b5549df48b889e4b5af21b5c59c266c259ae4bcf74159b98c
 #+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
 #+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
 #+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af
diff --git a/variants/ccx-x86_64/nvi b/variants/ccx-x86_64/nvi
@@ -84,10 +84,11 @@ check_static() {
 
 prefix=/home/ccx/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
-cd 'nvi-1.79/build'
+cd 'nvi-1.79'
 
 build_env_static
 patch -p1 <../nvi-configure-implicit-return.patch
+cd build
 ./configure \
 	--prefix="$prefix" \
 	--build="$(${CC:-gcc} -dumpmachine)" \
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.f08b3bf6cc13ebba5a05184265b8d801a9249e041d341bceb42612ba62585219
+#+nvi.ba032d8f93d20c7b5549df48b889e4b5af21b5c59c266c259ae4bcf74159b98c
 #+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.59466a4dd76829f0088db755cae76819e6422ce974891db378d6f8833f078aee
+#+nvi.9f7ba0c5a70d09a0117aa3bc3a8f8360fd1bb9923142dbf54d1bdb914c47f4c9
 #+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
 #+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
 #+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8
diff --git a/variants/root-x86_64/nvi b/variants/root-x86_64/nvi
@@ -84,10 +84,11 @@ check_static() {
 
 prefix=/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
-cd 'nvi-1.79/build'
+cd 'nvi-1.79'
 
 build_env_static
 patch -p1 <../nvi-configure-implicit-return.patch
+cd build
 ./configure \
 	--prefix="$prefix" \
 	--build="$(${CC:-gcc} -dumpmachine)" \
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.59466a4dd76829f0088db755cae76819e6422ce974891db378d6f8833f078aee
+#+nvi.9f7ba0c5a70d09a0117aa3bc3a8f8360fd1bb9923142dbf54d1bdb914c47f4c9
 #+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
 #+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
 #+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8 
\ No newline at end of file