local/vile: rework subpackage splits

1 files changed, 42 insertions, 40 deletions

diff --git a/vile/APKBUILD b/vile/APKBUILD
index c024533..5cea3b2 100644
--- a/vile/APKBUILD
+++ b/vile/APKBUILD
@@ -1,23 +1,21 @@
-# Maintainer: John Vogel <jvogel4@stny.rr.com>
+# Contributor: Vlad Glagolev <scm@vaygr.net>
+# Maintainer: John Vogel <jvogel@stygian.me>
 pkgname=vile
-pkgver=9.8z
+pkgver=9.8z_p1
+# MAJOR . MINOR _p PATCHLEVEL
+# patch level converts like this a..z (1-26), but after z then za (27)
+_pkgver=9.8za
 pkgrel=0
 pkgdesc="Vi Like Emacs"
 url="https://invisible-island.net/vile"
 arch="all"
 license="GPL-2.0-only"
 makedepends="flex ncurses-dev perl-dev freetype-dev libx11-dev libxaw-dev libxft-dev libxpm-dev perl"
-# order matters! doc must come before the sub doc pkgs
-subpackages="
-	$pkgname-common::noarch
-	$pkgname-doc
-	$pkgname-curses-doc:curses_doc
-	$pkgname-x11-doc:x11_doc
-	$pkgname-curses
-	$pkgname-x11
-	"
-source="https://invisible-island.net/archives/vile/current/vile-$pkgver.tgz"
+subpackages="$pkgname-common $pkgname-doc $pkgname-x11"
+#subpackages="$pkgname-common $pkgname-doc $pkgname-curses $pkgname-x11"
+source="https://invisible-island.net/archives/vile/current/vile-$_pkgver.tgz"
 options="!check"
+builddir="$srcdir/$pkgname-$_pkgver"
 
 prepare() {
 	default_prepare
@@ -76,56 +74,60 @@ build() {
 }
 
 package() {
-	make -C "$builddir"/build_term DESTDIR="$pkgdir" install
+	pkgdesc="Vi Like Emacs, for Terminal (vile)"
+	depends="perl $pkgname-common=$pkgver-r$pkgrel"
+
+	make -C "$builddir"/build_term DESTDIR="$pkgdir" \
+		install install-doc install-help
 	make -C "$builddir"/build_x11 DESTDIR="$pkgdir" install
+	rm -rf "$pkgdir"/usr/bin/xvile-libdir-path
+	rm -rf "$pkgdir"/usr/bin/xvile-to-html
+	rm -rf "$pkgdir"/usr/libexec/xvile
+	rm "$pkgdir"/usr/share/man/man1/xvile.1
+	ln -s vile.1 "$pkgdir"/usr/share/man/man1/xvile.1
+	install -Dm644 -t "$pkgdir"/usr/share/licenses/"$pkgname" COPYING
+	install -Dm644 -t "$pkgdir"/usr/share/doc/"$pkgname" \
+		AUTHORS CHANGES* README
 }
 
 common() {
 	pkgdesc="Vi Like Emacs, common files for vile and xvile"
-	depends="!$pkgname"
-	amove usr/share/vile
-	amove usr/bin/vileget
-}
-
-curses_doc() {
-	pkgdesc="Vi Like Emacs (vile) Documentation)"
-	install_if="$pkgname-curses=$pkgver-r$pkgrel docs"
-	pkgdir="$pkgdir-doc" amove usr/share/man/man1/vile*
-}
+	depends="perl"
 
-x11_doc() {
-	pkgdesc="Vi Like Emacs, with GUI (xvile) Documentation)"
-	install_if="$pkgname-x11=$pkgver-r$pkgrel docs"
-	pkgdir="$pkgdir-doc" amove usr/share/man/man1/xvile*
-}
-
-curses() {
-	pkgdesc="Vi Like Emacs (vile)"
-	depends="perl $pkgname-common=$pkgver-r$pkgrel"
 	amove \
-		usr/bin/vile \
+		usr/bin/vileget \
 		usr/bin/vile-libdir-path \
-		usr/bin/vile-pager \
 		usr/bin/vile-to-html \
-		usr/libexec/vile
+		usr/libexec/vile \
+		usr/share/vile
+	ln -s vile-libdir-path "$subpkgdir"/usr/bin/xvile-libdir-path
+	ln -s vile-to-html-path "$subpkgdir"/usr/bin/xvile-to-html
+	ln -s vile "$subpkgdir"/usr/libexec/xvile
 }
 
+#curses() {
+#	pkgdesc="Vi Like Emacs, for Terminal (vile)"
+#	depends="perl $pkgname-common=$pkgver-r$pkgrel"
+#
+#	amove \
+#		usr/bin/vile \
+#		usr/bin/vile-pager
+#}
+
 x11() {
-	pkgdesc="Vi Like Emacs, with GUI (xvile)"
+	pkgdesc="Vi Like Emacs, for GUI (xvile)"
 	depends="perl $pkgname-common=$pkgver-r$pkgrel"
+
 	amove \
 		usr/bin/lxvile \
 		usr/bin/lxvile-fonts \
 		usr/bin/uxvile \
 		usr/bin/xshell.sh \
 		usr/bin/xvile \
-		usr/bin/xvile-libdir-path \
 		usr/bin/xvile-pager \
-		usr/bin/xvile-to-html \
-		usr/libexec/xvile \
 		usr/lib/X11
 }
 
 sha512sums="
-f5ff6f3d239f993d7b060e89650567e1c622cec1a024901e29d15cd9a588e8603097e12087d54e88beca91a3a7cd7328a541bac62889368da6636f143d6380ff  vile-9.8z.tgz
+0a3cda7e30b4df24d234c5e6db7ba26f50b1b101ca8f1e700872169e158aa42d6f25ae6243a9671badbdcb8359d3e430f658407470fc1bd70e166f17d1c2c261  vile-9.8za.tgz
 "