testing/nvi: modernize

testing/nvi/APKBUILD

@@ -2,17 +2,14 @@
 # Maintainer:
 pkgname=nvi
 pkgver=1.81.6
-pkgrel=2
+pkgrel=3
 pkgdesc="Re-implementation of the vi editor"
 url="http://www.bostic.com/vi"
 arch="all"
-license="BSD"
-depends=""
-depends_dev=""
+license="BSD-3-Clause"
 makedepends="db-dev ncurses-dev"
-install=""
-subpackages="$pkgname-doc $pkgname-catalog"
-source="http://ftp.debian.org/debian/pool/main/n/$pkgname/${pkgname}_${pkgver}.orig.tar.gz
+subpackages="$pkgname-doc $pkgname-catalog::noarch"
+source="http://ftp.debian.org/debian/pool/main/n/nvi/nvi_$pkgver.orig.tar.gz
 	01additional_upstream_data.patch
 	03db4.patch
 	04confdefs.patch
@@ -39,20 +36,13 @@ source="http://ftp.debian.org/debian/pool/main/n/$pkgname/${pkgname}_${pkgver}.o
 	27support_C_locale.patch
 	29file_backup.patch"
 
-_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"/dist
+	cd "$builddir"/dist
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -62,15 +52,14 @@ build() {
 		--localstatedir=/var \
 		--program-prefix=n \
 		--enable-widechar \
-		--disable-threads \
-		|| return 1
-	make || return 1
+		--disable-threads
+	make
 }
 
 package() {
-	mkdir -p "$pkgdir"/usr/bin || return 1
+	mkdir -p "$pkgdir"/usr/bin
 	make -j1 PREFIX=/usr DESTDIR="$pkgdir" \
-		install -C "$_builddir"/dist || return 1
+		install -C "$builddir"/dist
 
 	# Remove tcl and perl scripts.
 	rm -rf "$pkgdir"/usr/share/vi/tcl
@@ -84,13 +73,12 @@ package() {
 }
 
 catalog() {
-	pkgdesc="$pkgdesc (catalog files)"
 	depends=""
-	arch="noarch"
+	pkgdesc="$pkgdesc (catalog files)"
 
 	mkdir -p "$subpkgdir"/usr/share/vi/
 	mv "$pkgdir"/usr/share/vi/catalog/ \
-		"$subpkgdir"/usr/share/vi/ || return 1
+		"$subpkgdir"/usr/share/vi/
 }
 
 sha512sums="1be798daf0cd05010ddaf0aa0510dc799708fd79d4b243e2700adff18e931ddd9d11621796fa8086088c3e93ba20f15ab86783732665169c52b73eaf587ff0b3  nvi_1.81.6.orig.tar.gz