Updated the PKGBUILD with various improvements

- The documentation for libast and libshell is now installed to
  /usr/share/man/man3ast (to avoid filename conflicts with other
  packages).
- The COPYRIGHT file from the repository is now also installed
  to the license folder alongside LICENSE.md.
- Reorganized the PKGBUILD with comment updates.

2 files changed, 22 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f23bd31f4d25..bff3576e2cdc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ksh93-git
 	pkgdesc = KornShell 93u+m, fork based on ksh 93u+
-	pkgver = r1436.a5cfb049
+	pkgver = r1496.4dacec27
 	pkgrel = 1
 	url = https://github.com/ksh93/ksh/
 	install = ksh93.install
diff --git a/PKGBUILD b/PKGBUILD
index 99f5947b4497..33f0c3e25f33 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 _pkgname='ksh93'
 pkgname="${_pkgname}-git"
-pkgver=r1436.a5cfb049
+pkgver=r1496.4dacec27
 pkgrel=1
 pkgdesc="KornShell 93u+m, fork based on ksh 93u+"
 arch=('x86_64')
@@ -33,25 +33,39 @@ build() {
 
 package() {
 	cd "${srcdir}"
-	install -dm0755 "${pkgdir}/usr/share/ksh"
+	# Folder creation in ${pkgdir}
 	install -dm0755 "${pkgdir}/usr/share/ksh/functions"
 	install -dm0755 "${pkgdir}/usr/share/doc/ksh"
 	install -dm0755 "${pkgdir}/usr/share/licenses/ksh"
+	install -dm0755 "${pkgdir}/usr/share/man/man3ast"
+	# Install the example kshrc
 	install -Dm0644 sample.kshrc "${pkgdir}/etc/skel/.kshrc"
+
 	cd "${srcdir}/$_pkgname"
+	# Install license files and documentation
 	install -Dm0644 LICENSE.md "${pkgdir}/usr/share/licenses/ksh/LICENSE.md"
-	install -Dm0644 "src/cmd/${_pkgname}/nval.3" "${pkgdir}/usr/share/man/man3/nval.3"
-	install -Dm0644 "src/cmd/${_pkgname}/shell.3" "${pkgdir}/usr/share/man/man3/shell.3"
+	install -Dm0644 COPYRIGHT "${pkgdir}/usr/share/licenses/ksh/COPYRIGHT"
 	install -Dm0644 "src/cmd/${_pkgname}/sh.1" "${pkgdir}/usr/share/man/man1/ksh.1"
 	for _man in 'ksh93' 'rksh' 'rksh93'; do
 		ln -srf "${pkgdir}/usr/share/man/man1/ksh.1" "${pkgdir}/usr/share/man/man1/${_man}.1"
 	done
-	for _fun in 'autocd' 'man' 'dirs' 'popd' 'pushd'; do
-		install -Dm0644 "src/cmd/${_pkgname}/fun/${_fun}" "${pkgdir}/usr/share/ksh/functions/${_fun}"
+	for _astdoc in ./arch/linux.i386-64/man/man3/*; do
+		# To avoid clashes with man pages from other packages, the libast and libshell
+		# man pages are installed to a '3ast' section. The default filenames in the
+		# repo only have a .3 filename extension, so this is changed to .3ast.
+		install -Dm0644 "${_astdoc}" "${pkgdir}/usr/share/man/man3ast/$(basename ${_astdoc})ast"
 	done
-	for _doc in 'COMPATIBILITY' 'DESIGN' 'OBSOLETE' 'PROMO.mm' 'README' 'README-AUDIT.md' 'RELEASE' 'RELEASE88' 'RELEASE93' 'TYPES'; do
+	for _doc in 'builtins.mm' 'COMPATIBILITY' 'DESIGN' 'OBSOLETE' 'PROMO.mm' 'README' 'README-AUDIT.md' \
+			'RELEASE' 'RELEASE88' 'RELEASE93' 'sh.memo' 'TYPES'; do
 		install -Dm0644 "src/cmd/${_pkgname}/${_doc}" "${pkgdir}/usr/share/doc/ksh/${_doc}"
 	done
+
+	# Install various ksh functions like autocd
+	for _fun in 'autocd' 'man' 'dirs' 'popd' 'pushd'; do
+		install -Dm0644 "src/cmd/${_pkgname}/fun/${_fun}" "${pkgdir}/usr/share/ksh/functions/${_fun}"
+	done
+
+	# Install the ksh and shcomp binaries
 	install -Dm0755 "arch/linux.i386-64/bin/ksh" "${pkgdir}/usr/bin/ksh"
 	for _exe in 'ksh93' 'rksh' 'rksh93'; do
 		ln -srf "${pkgdir}/usr/bin/ksh" "${pkgdir}/usr/bin/${_exe}"