Download raw body.
sysutils/ec2-api-tools: Use jdk 11+ to run
Update to use jdk 11+ to run:
* Use javaPathHelper to set default value for JAVA_HOME and remove
requirement that this be pre-set in the environment.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ec2-api-tools/Makefile,v
diff -u -p -u -r1.11 Makefile
--- Makefile 27 Sep 2023 17:16:25 -0000 1.11
+++ Makefile 22 Dec 2025 23:18:50 -0000
@@ -1,7 +1,7 @@
COMMENT= API tools for Amazon EC2 web service
DISTNAME= ec2-api-tools-1.7.5.1
-REVISION= 6
+REVISION= 7
EXTRACT_SUFX= .zip
@@ -18,7 +18,7 @@ PERMIT_PACKAGE= Yes
SITES= http://s3.amazonaws.com/ec2-downloads/
MODULES= java
-MODJAVA_VER= 1.8+
+MODJAVA_VER= 11+
RUN_DEPENDS= java/javaPathHelper \
shells/bash
Index: patches/patch-bin_ec2-cmd
===================================================================
RCS file: patches/patch-bin_ec2-cmd
diff -N patches/patch-bin_ec2-cmd
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bin_ec2-cmd 22 Dec 2025 23:18:50 -0000
@@ -0,0 +1,14 @@
+Use javaPathHelper for JAVA_HOME default value
+
+Index: bin/ec2-cmd
+--- bin/ec2-cmd.orig
++++ bin/ec2-cmd
+@@ -15,7 +15,7 @@ __RPM_PREFIX__EC2_HOME=/usr/local/aes/cmdline
+ LIBDIR="${EC2_HOME}/lib"
+
+ # Check our Java env
+-JAVA_HOME=${JAVA_HOME:?JAVA_HOME is not set}
++JAVA_HOME=$(javaPathHelper -h ec2-api-tools)
+
+ # If a classpath exists preserve it
+ CP="${CLASSPATH}"
Index: pkg/README
===================================================================
RCS file: /cvs/ports/sysutils/ec2-api-tools/pkg/README,v
diff -u -p -u -r1.3 README
--- pkg/README 11 Mar 2022 19:57:23 -0000 1.3
+++ pkg/README 22 Dec 2025 23:18:50 -0000
@@ -4,5 +4,4 @@
Running the EC2 API tools requires the following to be set in the environment:
export EC2_HOME=${TRUEPREFIX}/ec2-api-tools
- export JAVA_HOME=$(javaPathHelper -h ec2-api-tools)
export PATH=${PATH}:${EC2_HOME}/bin
sysutils/ec2-api-tools: Use jdk 11+ to run