j: update to 9.5.1.

srcpkgs/j/template

@@ -1,18 +1,19 @@
 # Template file for 'j'
 pkgname=j
-version=901.f
+reverts="807_1 901.c_1 901.d_1 901.e_1 901.f_1"
+version=9.5.1
 revision=1
 _vmaj="${version%.*}"
 _vmin="${version#${_vmaj}}"
 _vrel=${_vmaj}-release${_vmin:+-}${_vmin#.}
 archs="aarch64* armv[67]* i686* x86_64*"
-makedepends="libedit-devel libgomp-devel"
+makedepends="libgomp-devel"
 short_desc="Modern, high-performance, ASCII-based successor to APL"
 maintainer="B. Wilson <x@wilsonb.com>"
 license="GPL-3.0-or-later"
 homepage="https://jsoftware.com/"
-distfiles="https://github.com/jsoftware/jsource/archive/j${_vrel}.tar.gz"
-checksum=6b1cdcc1a0c3d955e400cf676f115de51ef9d1da495d08721ee999f48f6f9209
+distfiles="https://github.com/jsoftware/jsource/archive/${version}.tar.gz"
+checksum=593249894579af87b325833678dfe8a35c937fe344dcc954a0ad0e31f167497a
 
 _jsz="j${XBPS_TARGET_WORDSIZE}"
 _jtype="release"
@@ -23,8 +24,12 @@ _jetc="/etc/j"
 _juser=".j"
 
 case "${XBPS_TARGET_MACHINE}" in
-aarch64*|arm*) _jpl="raspberry";;
-*)             _jpl="linux";;
+	i686*|x86_64*) hostmakedepends+=" nasm";;
+esac
+
+case "${XBPS_TARGET_MACHINE}" in
+	aarch64*|arm*) _jpl="raspberry";;
+	*) _jpl="linux";;
 esac
 
 if [ "${XBPS_TARGET_LIBC}" = musl ]; then
@@ -125,17 +130,18 @@ JC
 }
 
 do_install() {
-	vmkdir "${_jshare}" 0755
-	vcopy jlibrary/system "${_jshare}"
-	vcopy jlibrary/tools "${_jshare}"
-
 	vmkdir "${_jlib}" 0755
 	vcopy "bin/${_jpl}/*" "${_jlib}"
+	vcopy jlibrary/system "${_jlib}"
+	vcopy jlibrary/tools "${_jlib}"
+	vcopy jlibrary/addons "${_jlib}"
 
 	vmkdir "${_jetc}" 0755
 	vinstall "${FILESDIR}/profilex_template.ijs" 644 "${_jetc}"
 	vinstall "jlibrary/bin/profile.ijs.new" 644 "${_jetc}" profile.ijs
 
 	_jconsole_wrapper_script >bin/jc.sh
 	vbin "bin/jc.sh" jc
+
+	rm -rf ${DESTDIR}/usr/lib/j/tools
 }