From c3374b2b3d09a1f22634d06149d066e34f72e3ee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 12 Jan 2024 21:00:04 +0100
Subject: [PATCH] j: update to 9.5.1.

---
 srcpkgs/j/patches/fix-cip.c-includes.patch | 34 ----------------------
 srcpkgs/j/template                         | 26 ++++++++++-------
 srcpkgs/j/update                           |  1 -
 3 files changed, 16 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/j/patches/fix-cip.c-includes.patch
 delete mode 100644 srcpkgs/j/update

diff --git a/srcpkgs/j/patches/fix-cip.c-includes.patch b/srcpkgs/j/patches/fix-cip.c-includes.patch
deleted file mode 100644
index 7601d170062..00000000000
--- a/srcpkgs/j/patches/fix-cip.c-includes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/jsrc/cip.c	2020-01-30 13:31:22.463687182 +0900
-+++ b/jsrc/cip.c	2020-01-30 13:33:47.707458248 +0900
-@@ -3,9 +3,9 @@
- /*                                                                         */
- /* Conjunctions: Inner Product                                             */
- 
--#include "../../jsource/jsrc/j.h"
--#include "../../jsource/jsrc/vasm.h"
--#include "../../jsource/jsrc/gemm.h"
-+#include "j.h"
-+#include "vasm.h"
-+#include "gemm.h"
- 
- #define MAXAROWS 384  // max rows of a that we can process to stay in L2 cache   a strip is m*CACHEHEIGHT, z strip is m*CACHEWIDTH   this is wired to 128*3 - check if you chage
- 
-@@ -1057,15 +1057,15 @@
-  switch(c){
-   case CPLUSDOT:
- #define F |=
--#include "../../jsource/jsrc/cip_t.h"
-+#include "cip_t.h"
-    break;
-   case CSTARDOT:
- #define F &=
--#include "../../jsource/jsrc/cip_t.h"
-+#include "cip_t.h"
-    break;
-   case CNE:
- #define F ^=
--#include "../../jsource/jsrc/cip_t.h"
-+#include "cip_t.h"
-    break;
-  }
-  R z;
diff --git a/srcpkgs/j/template b/srcpkgs/j/template
index 95aa0710684..4f60a4d378c 100644
--- a/srcpkgs/j/template
+++ b/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,12 +130,11 @@ 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}"
@@ -138,4 +142,6 @@ do_install() {
 
 	_jconsole_wrapper_script >bin/jc.sh
 	vbin "bin/jc.sh" jc
+
+	rm -rf ${DESTDIR}/usr/lib/j/tools
 }
diff --git a/srcpkgs/j/update b/srcpkgs/j/update
deleted file mode 100644
index 5dbecfec6f3..00000000000
--- a/srcpkgs/j/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='refs/tags/j?\K[0-9]+-release(-[a-z])?(?=.tar.gz)'