Omar Polo <[email protected]> writes:
> Omar Polo <[email protected]> writes:
>
>> Hello Jasper, ports@
>>
>> Please find attached a patch to update clojure to the latest release of
>> the 1.10.3 series.
>>
>> (there's a 1.11 but it's still in alpha stage)
>>
>> I needed the update in order to build clojure projects that are using
>> the -X or -T flags of clj(1).
>
> Sorry, in my tests I've only used clojure(1) and not clj(1). The
> following updated patch adjusts clj too.
let's try again without REVISION
I sincerely apologise for the email flood, this is the last try ^^"
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/lang/clojure/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile 19 May 2021 01:50:30 -0000 1.37
+++ Makefile 13 Oct 2021 10:24:47 -0000
@@ -2,10 +2,9 @@
COMMENT = Lisp-1 dialect for the Java Virtual Machine
-V = 1.10.1.469
+V = 1.10.3.986
DISTNAME = clojure-tools-$V
PKGNAME = clojure-$V
-REVISION = 0
PKG_ARCH = *
@@ -41,6 +40,7 @@ completions: install
pre-configure:
sed -i 's,PREFIX,${CLOJURE_HOME},' ${WRKSRC}/clojure
+ sed -i 's,BINDIR,${LOCALBASE}/bin,' ${WRKSRC}/clj
do-install:
${INSTALL_DATA_DIR} ${CLOJURE_HOME}/libexec/ ${PREFIX}/man/man1
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/lang/clojure/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 7 Nov 2019 09:39:15 -0000 1.11
+++ distinfo 13 Oct 2021 06:53:41 -0000
@@ -1,2 +1,2 @@
-SHA256 (clojure-tools-1.10.1.469.tar.gz) =
+L4/WddSBH9wwMvVTnoldetA1qU/0Z2M1pS+2mM260I=
-SIZE (clojure-tools-1.10.1.469.tar.gz) = 19750978
+SHA256 (clojure-tools-1.10.3.986.tar.gz) =
fahLaQjQDnSMLEatI+OD7eWc8YvzrkSbHDDNalC4DvY=
+SIZE (clojure-tools-1.10.3.986.tar.gz) = 14217156
Index: patches/patch-clojure
===================================================================
RCS file: /home/cvs/ports/lang/clojure/patches/patch-clojure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-clojure
--- patches/patch-clojure 24 Sep 2019 13:05:22 -0000 1.1
+++ patches/patch-clojure 13 Oct 2021 06:56:02 -0000
@@ -3,12 +3,12 @@ $OpenBSD: patch-clojure,v 1.1 2019/09/24
Index: clojure
--- clojure.orig
+++ clojure
-@@ -111,7 +111,7 @@ done
+@@ -178,7 +178,7 @@ done
# Find java executable
set +e
--JAVA_CMD=$(type -p java)
-+JAVA_CMD=$(javaPathHelper -c clojure)
+-JAVA_CMD=${JAVA_CMD:-$(type -p java)}
++JAVA_CMD=${JAVA_CMD:-$(javaPathHelper -c clojure)}
set -e
- if [[ ! -n "$JAVA_CMD" ]]; then
+ if [[ -z "$JAVA_CMD" ]]; then
if [[ -n "$JAVA_HOME" ]] && [[ -x "$JAVA_HOME/bin/java" ]]; then
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/lang/clojure/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 26 Apr 2018 12:44:52 -0000 1.9
+++ pkg/PLIST 13 Oct 2021 09:53:34 -0000
@@ -7,5 +7,7 @@ clojure/deps.edn
clojure/example-deps.edn
clojure/libexec/
clojure/libexec/clojure-tools-${V}.jar
+clojure/libexec/exec.jar
+clojure/tools.edn
@man man/man1/clj.1
@man man/man1/clojure.1
