diff --git a/testing/openvi/APKBUILD b/testing/openvi/APKBUILD
index 464cd7c807f..e29aa7e7bdc 100644
--- a/testing/openvi/APKBUILD
+++ b/testing/openvi/APKBUILD
@@ -2,17 +2,17 @@
 # Maintainer: Jason Swank <jswank@scalene.net>
 pkgname=openvi
 pkgver=7.3.22
-pkgrel=0
+pkgrel=1
 pkgdesc="OpenVi is a fork of vi / ex editor included with OpenBSD"
 url="https://github.com/johnsonjh/OpenVi"
 arch="all"
 license="BSD-3-Clause"
-# ex, view
-depends="!vim !gvim"
 makedepends="ncurses-dev"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/johnsonjh/OpenVi/archive/refs/tags/$pkgver.tar.gz
-	unbreak-install.patch
+	rm-recover.patch
+	fix-symlinks.patch
+	add-destdir.patch
 	"
 builddir="$srcdir/OpenVi-$pkgver"
 options="!check" # no tests
@@ -22,10 +22,12 @@ build() {
 }
 
 package() {
-	make BINPREFIX="" PREFIX="$pkgdir/usr" install
+	make BINPREFIX="o" DESTDIR="$pkgdir" PREFIX="/usr" install
 }
 
 sha512sums="
 a1f7af6eef55bfcf5b2a7be7909dc6151937927aebbcc98ec1f99f3b6e72e6777a76249f8bda28fcd852c2ecbf4d05d11ffba7959d1d4a5b62b2d8ba58e6c5dc  openvi-7.3.22.tar.gz
-261aed30781123abf38c6a7f28b132e5777a6ed7cf63cc170e82e4ce096198c81033bc444fe7ba234939d23d09de4f26ab5efe1ae55519802a156ef44313c81f  unbreak-install.patch
+4569e78d0fa0f5fb17e1577d0fe7c2f5ebaa811413d1836b21e95ad83064a7c59fb0f29a1579fc43bc38ef220b7b28ab0863c7de458310051bbe1342e60090e1  rm-recover.patch
+e2ad4231d95d25122c054e1681a84bfc9918b21e18fa3a9ad3a8e4c46b9377ef7807699ca860d9b0ab9589fcce26b134a1b46ff0ba59cd8cdae80b0c7a91d8ec  fix-symlinks.patch
+50b2a2aad5d0412afc5bd902ea33d127b68ae46b6ca85d839e1420992f11fdc02f85fe7cac3f76b56ff736ef0418190f430f0693a569025251f32d463a33d0da  add-destdir.patch
 "
diff --git a/testing/openvi/add-destdir.patch b/testing/openvi/add-destdir.patch
new file mode 100644
index 00000000000..f7981718018
--- /dev/null
+++ b/testing/openvi/add-destdir.patch
@@ -0,0 +1,189 @@
+Handle DESTDIR and PREFIX idiomatically for the install target.
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -166,2 +166,3 @@
+ PREFIX      ?= /usr/local
++DESTDIR     ?=
+ 
+@@ -584,67 +585,67 @@
+ ifndef DEBUG
+-	-@$(PRINTF) "\r\t%s\t%42s\n" "mkdir:" "$(PREFIX)/bin"
++	-@$(PRINTF) "\r\t%s\t%42s\n" "mkdir:" "$(DESTDIR)$(PREFIX)/bin"
+ endif # DEBUG
+-	@$(VERBOSE); $(TEST) -d "$(PREFIX)/bin" || \
+-            $(MKDIR) "$(PREFIX)/bin"
++	@$(VERBOSE); $(TEST) -d "$(DESTDIR)$(PREFIX)/bin" || \
++            $(MKDIR) "$(DESTDIR)$(PREFIX)/bin"
+ ifndef DEBUG
+-	-@$(PRINTF) "\r\t%s\t%42s\n" "mkdir:" "$(PREFIX)/libexec"
++	-@$(PRINTF) "\r\t%s\t%42s\n" "mkdir:" "$(DESTDIR)$(PREFIX)/libexec"
+ endif # DEBUG
+-	@$(VERBOSE); $(TEST) -d "$(PREFIX)/libexec" || \
+-            $(MKDIR) "$(PREFIX)/libexec"
++	@$(VERBOSE); $(TEST) -d "$(DESTDIR)$(PREFIX)/libexec" || \
++            $(MKDIR) "$(DESTDIR)$(PREFIX)/libexec"
+ ifndef DEBUG
+-	-@$(PRINTF) "\r\t%s\t%42s\n" "mkdir:" "$(PREFIX)/share/man/man1"
++	-@$(PRINTF) "\r\t%s\t%42s\n" "mkdir:" "$(DESTDIR)$(PREFIX)/share/man/man1"
+ endif # DEBUG
+-	@$(VERBOSE); $(TEST) -d "$(PREFIX)/share/man/man1" || \
+-            $(MKDIR) "$(PREFIX)/share/man/man1"
++	@$(VERBOSE); $(TEST) -d "$(DESTDIR)$(PREFIX)/share/man/man1" || \
++            $(MKDIR) "$(DESTDIR)$(PREFIX)/share/man/man1"
+ ifndef DEBUG
+-	-@$(PRINTF) "\r\t%s\t%42s\n" "mkdir:" "$(PREFIX)/share/man/man8"
++	-@$(PRINTF) "\r\t%s\t%42s\n" "mkdir:" "$(DESTDIR)$(PREFIX)/share/man/man8"
+ endif # DEBUG
+-	@$(VERBOSE); $(TEST) -d "$(PREFIX)/share/man/man8" || \
+-            $(MKDIR) "$(PREFIX)/share/man/man8"
++	@$(VERBOSE); $(TEST) -d "$(DESTDIR)$(PREFIX)/share/man/man8" || \
++            $(MKDIR) "$(DESTDIR)$(PREFIX)/share/man/man8"
+ ifndef DEBUG
+ 	-@$(PRINTF) "\r\t%s\t%42s\n" \
+-        "cp:" "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"
++        "cp:" "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"
+ endif # DEBUG
+-	@$(VERBOSE); $(CP) ./bin/vi                                        \
+-            "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" &&                  \
+-        $(CHOWN) "$(IUSGR)" "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" &&  \
+-        $(CHMOD) "$(IPERM)" "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"
++	@$(VERBOSE); $(CP) ./bin/vi                                                  \
++            "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" &&                  \
++        $(CHOWN) "$(IUSGR)" "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" &&  \
++        $(CHMOD) "$(IPERM)" "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"
+ ifndef DEBUG
+ 	-@$(PRINTF) "\r\t%s\t%42s\n" \
+-        "ln:" "$(PREFIX)/bin/$(BINPREFIX)ex$(BINSUFFIX)"
++        "ln:" "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)ex$(BINSUFFIX)"
+ endif # DEBUG
+-	@$(VERBOSE); $(TEST) -x "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" && \
+-        $(LNS) "$(BINPREFIX)vi$(BINSUFFIX)"                                   \
+-            "$(PREFIX)/bin/$(BINPREFIX)ex$(BINSUFFIX)"
++	@$(VERBOSE); $(TEST) -x "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" && \
++        $(LNS) "$(BINPREFIX)vi$(BINSUFFIX)"                                             \
++            "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)ex$(BINSUFFIX)"
+ ifndef DEBUG
+ 	-@$(PRINTF) "\r\t%s\t%42s\n" \
+-        "ln:" "$(PREFIX)/bin/$(BINPREFIX)view$(BINSUFFIX)"
++        "ln:" "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)view$(BINSUFFIX)"
+ endif # DEBUG
+-	@$(VERBOSE); $(TEST) -x "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" && \
+-        $(LNS) "$(BINPREFIX)vi$(BINSUFFIX)"                                   \
+-            "$(PREFIX)/bin/$(BINPREFIX)view$(BINSUFFIX)"
++	@$(VERBOSE); $(TEST) -x "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" && \
++        $(LNS) "$(BINPREFIX)vi$(BINSUFFIX)"                                             \
++            "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)view$(BINSUFFIX)"
+ ifndef DEBUG
+ 	-@$(PRINTF) "\r\t%s\t%42s\n" \
+-        "cp:" "$(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)"
++        "cp:" "$(DESTDIR)$(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)"
+ endif # DEBUG
+-	@$(VERBOSE); $(CP) "./scripts/virecover"                       \
+-            "$(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)" &&  \
+-        $(CHMOD) "$(IPERM)"                                            \
+-            "$(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)"
++	@$(VERBOSE); $(CP) "./scripts/virecover"                                 \
++            "$(DESTDIR)$(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)" &&  \
++        $(CHMOD) "$(IPERM)"                                                      \
++            "$(DESTDIR)$(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)"
+ ifndef DEBUG
+ 	-@$(PRINTF) "\r\t%s\t%42s\n" \
+-        "cp:" "$(PREFIX)/share/man/man1/$(BINPREFIX){vi,ex,view}$(BINSUFFIX).1"
++        "cp:" "$(DESTDIR)$(PREFIX)/share/man/man1/$(BINPREFIX){vi,ex,view}$(BINSUFFIX).1"
+ endif # DEBUG
+-	@$(VERBOSE); $(CP) "docs/USD.doc/vi.man/vi.1"                     \
+-            "$(PREFIX)/share/man/man1/$(BINPREFIX)vi$(BINSUFFIX).1" &&    \
+-        $(LNS) "$(PREFIX)/share/man/man1/$(BINPREFIX)vi$(BINSUFFIX).1"    \
+-            "$(PREFIX)/share/man/man1/$(BINPREFIX)view$(BINSUFFIX).1" &&  \
+-        $(LNS) "$(PREFIX)/share/man/man1/$(BINPREFIX)vi$(BINSUFFIX).1"    \
+-            "$(PREFIX)/share/man/man1/$(BINPREFIX)ex$(BINSUFFIX).1"
++	@$(VERBOSE); $(CP) "docs/USD.doc/vi.man/vi.1"                               \
++            "$(DESTDIR)$(PREFIX)/share/man/man1/$(BINPREFIX)vi$(BINSUFFIX).1" &&    \
++        $(LNS) "$(DESTDIR)$(PREFIX)/share/man/man1/$(BINPREFIX)vi$(BINSUFFIX).1"    \
++            "$(DESTDIR)$(PREFIX)/share/man/man1/$(BINPREFIX)view$(BINSUFFIX).1" &&  \
++        $(LNS) "$(DESTDIR)$(PREFIX)/share/man/man1/$(BINPREFIX)vi$(BINSUFFIX).1"    \
++            "$(DESTDIR)$(PREFIX)/share/man/man1/$(BINPREFIX)ex$(BINSUFFIX).1"
+ ifndef DEBUG
+ 	-@$(PRINTF) "\r\t%s\t%42s\n" \
+-          "cp:" "$(PREFIX)/share/man/man8/$(BINPREFIX)vi.recover$(BINSUFFIX).8"
++          "cp:" "$(DESTDIR)$(PREFIX)/share/man/man8/$(BINPREFIX)vi.recover$(BINSUFFIX).8"
+ endif # DEBUG
+ 	@$(VERBOSE); $(CP) "scripts/virecover.8" \
+-          "$(PREFIX)/share/man/man8/$(BINPREFIX)vi.recover$(BINSUFFIX).8"
++          "$(DESTDIR)$(PREFIX)/share/man/man8/$(BINPREFIX)vi.recover$(BINSUFFIX).8"
+ 
+@@ -659,6 +660,6 @@
+ 	-@$(PRINTF) "\r\t$(STRIP):\t%42s\n" \
+-            "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"
++            "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"
+ endif # DEBUG
+ 	-@$(VERBOSE); $(PENV) OBJECT_MODE=$(MAIXBITS)              \
+-            $(STRIP) "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" || \
++            $(STRIP) "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" || \
+               $(TRUE)
+@@ -763,48 +764,48 @@
+ 	-@$(PRINTF) "\r\trm:\t%42s\n" \
+-            "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"
++            "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"
+ endif # DEBUG
+ 	-@$(VERBOSE); $(RMF) \
+-            "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"
++            "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"
+ ifndef DEBUG
+ 	-@$(PRINTF) "\r\trm:\t%42s\n" \
+-            "$(PREFIX)/bin/$(BINPREFIX)ex$(BINSUFFIX)"
++            "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)ex$(BINSUFFIX)"
+ endif # DEBUG
+ 	-@$(VERBOSE); $(RMF) \
+-            "$(PREFIX)/bin/$(BINPREFIX)ex$(BINSUFFIX)"
++            "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)ex$(BINSUFFIX)"
+ ifndef DEBUG
+ 	-@$(PRINTF) "\r\trm:\t%42s\n" \
+-            "$(PREFIX)/bin/$(BINPREFIX)view$(BINSUFFIX)"
++            "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)view$(BINSUFFIX)"
+ endif # DEBUG
+ 	-@$(VERBOSE); $(RMF) \
+-            "$(PREFIX)/bin/$(BINPREFIX)view$(BINSUFFIX)"
++            "$(DESTDIR)$(PREFIX)/bin/$(BINPREFIX)view$(BINSUFFIX)"
+ ifndef DEBUG
+ 	-@$(PRINTF) "\r\trm:\t%42s\n" \
+-            "$(PREFIX)/share/man/man1/$(BINPREFIX)vi$(BINSUFFIX).1"
++            "$(DESTDIR)$(PREFIX)/share/man/man1/$(BINPREFIX)vi$(BINSUFFIX).1"
+ endif # DEBUG
+ 	-@$(VERBOSE); $(RMF) \
+-            "$(PREFIX)/share/man/man1/$(BINPREFIX)vi$(BINSUFFIX).1"
++            "$(DESTDIR)$(PREFIX)/share/man/man1/$(BINPREFIX)vi$(BINSUFFIX).1"
+ ifndef DEBUG
+ 	-@$(PRINTF) "\r\trm:\t%42s\n" \
+-            "$(PREFIX)/share/man/man1/$(BINPREFIX)ex$(BINSUFFIX).1"
++            "$(DESTDIR)$(PREFIX)/share/man/man1/$(BINPREFIX)ex$(BINSUFFIX).1"
+ endif # DEBUG
+ 	-@$(VERBOSE); $(RMF) \
+-            "$(PREFIX)/share/man/man1/$(BINPREFIX)ex$(BINSUFFIX).1"
++            "$(DESTDIR)$(PREFIX)/share/man/man1/$(BINPREFIX)ex$(BINSUFFIX).1"
+ ifndef DEBUG
+ 	-@$(PRINTF) "\r\trm:\t%42s\n" \
+-            "$(PREFIX)/share/man/man1/$(BINPREFIX)view$(BINSUFFIX).1"
++            "$(DESTDIR)$(PREFIX)/share/man/man1/$(BINPREFIX)view$(BINSUFFIX).1"
+ endif # DEBUG
+ 	-@$(VERBOSE); $(RMF) \
+-            "$(PREFIX)/share/man/man1/$(BINPREFIX)view$(BINSUFFIX).1"
++            "$(DESTDIR)$(PREFIX)/share/man/man1/$(BINPREFIX)view$(BINSUFFIX).1"
+ ifndef DEBUG
+ 	-@$(PRINTF) "\r\trm:\t%42s\n" \
+-            "$(PREFIX)/share/man/man8/$(BINPREFIX)vi.recover$(BINSUFFIX).8"
++            "$(DESTDIR)$(PREFIX)/share/man/man8/$(BINPREFIX)vi.recover$(BINSUFFIX).8"
+ endif # DEBUG
+ 	-@$(VERBOSE); $(RMF) \
+-            "$(PREFIX)/share/man/man8/$(BINPREFIX)vi.recover$(BINSUFFIX).8"
++            "$(DESTDIR)$(PREFIX)/share/man/man8/$(BINPREFIX)vi.recover$(BINSUFFIX).8"
+ ifndef DEBUG
+ 	-@$(PRINTF) "\r\trm:\t%42s\n" \
+-            "$(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)"
++            "$(DESTDIR)$(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)"
+ endif # DEBUG
+ 	-@$(VERBOSE); $(RMF) \
+-            "$(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)"
++            "$(DESTDIR)$(PREFIX)/libexec/$(BINPREFIX)vi.recover$(BINSUFFIX)"
+ 
diff --git a/testing/openvi/fix-symlinks.patch b/testing/openvi/fix-symlinks.patch
new file mode 100644
index 00000000000..9f28f22226d
--- /dev/null
+++ b/testing/openvi/fix-symlinks.patch
@@ -0,0 +1,22 @@
+Use relative symlinks for view, ex
+
+Create symlinks like:
+  /usr/bin/ex -> vi
+  /usr/bin/view -> vi
+
+rather than:
+  /usr/bin/ex -> /usr/bin/vi
+  /usr/bin/view -> /usr/bin/vi
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -616,3 +616,3 @@
+ 	@$(VERBOSE); $(TEST) -x "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" && \
+-        $(LNS) "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"                     \
++        $(LNS) "$(BINPREFIX)vi$(BINSUFFIX)"                                   \
+             "$(PREFIX)/bin/$(BINPREFIX)ex$(BINSUFFIX)"
+@@ -623,3 +623,3 @@
+ 	@$(VERBOSE); $(TEST) -x "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)" && \
+-        $(LNS) "$(PREFIX)/bin/$(BINPREFIX)vi$(BINSUFFIX)"                     \
++        $(LNS) "$(BINPREFIX)vi$(BINSUFFIX)"                                   \
+             "$(PREFIX)/bin/$(BINPREFIX)view$(BINSUFFIX)"
diff --git a/testing/openvi/rm-recover.patch b/testing/openvi/rm-recover.patch
new file mode 100644
index 00000000000..0cd1456985e
--- /dev/null
+++ b/testing/openvi/rm-recover.patch
@@ -0,0 +1,25 @@
+Remove the /var/tmp/vi.recover directory from the package.
+
+The /var/tmp/vi.recover directory is not required for operation. If
+desired for an installation, the included vi.recover script can be
+used to create it.
+
+The relationship between APK packages and files/directories in /var/tmp is
+clouded.  Avoiding the sitation seems the best approach given the above.
+https://gitlab.alpinelinux.org/alpine/aports/-/issues/9364
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -584,12 +584,2 @@
+ ifndef DEBUG
+-	-@$(PRINTF) "\r\t%s\t%42s\n" "mkdir:" "/var/tmp/vi.recover"
+-endif # DEBUG
+-	@$(VERBOSE); $(TEST) -d "/var/tmp/vi.recover" ||  \
+-          {                                               \
+-            $(MKDIR) "/var/tmp/vi.recover" &&             \
+-            $(TEST) -d "/var/tmp/vi.recover" &&           \
+-            $(CHOWN) "$(IUSGR)" "/var/tmp/vi.recover" &&  \
+-            $(CHMOD) "1777" "/var/tmp/vi.recover";        \
+-          }
+-ifndef DEBUG
+ 	-@$(PRINTF) "\r\t%s\t%42s\n" "mkdir:" "$(PREFIX)/bin"
diff --git a/testing/openvi/unbreak-install.patch b/testing/openvi/unbreak-install.patch
deleted file mode 100644
index 21ebcc1d356..00000000000
--- a/testing/openvi/unbreak-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-this creates a /var/tmp/vi.recover on the *host* during packaging,
-which does not actually do anything for the package itself, but
-does create a useless directory on the host itself and fail when
-var/tmp is readonly.
---
-diff --git a/GNUmakefile b/GNUmakefile
-index 97f34e5..022565e 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -584,13 +584,6 @@ install: bin/vi bin/ex bin/view docs/USD.doc/vi.man/vi.1  \
- ifndef DEBUG
- 	-@$(PRINTF) "\r\t%s\t%42s\n" "mkdir:" "/var/tmp/vi.recover"
- endif # DEBUG
--	@$(VERBOSE); $(TEST) -d "/var/tmp/vi.recover" ||  \
--          {                                               \
--            $(MKDIR) "/var/tmp/vi.recover" &&             \
--            $(TEST) -d "/var/tmp/vi.recover" &&           \
--            $(CHOWN) "$(IUSGR)" "/var/tmp/vi.recover" &&  \
--            $(CHMOD) "1777" "/var/tmp/vi.recover";        \
--          }
- ifndef DEBUG
- 	-@$(PRINTF) "\r\t%s\t%42s\n" "mkdir:" "$(PREFIX)/bin"
- endif # DEBUG