From: Stuart Henderson <stu@spacehopper.org>
Subject: Re: geo/josm: Update to rev 19439 and use jdk 17+
To: Kurt Miller <kurt@intricatesoftware.com>
Cc: holger@mikolon.com, ports@openbsd.org
Date: Thu, 18 Dec 2025 21:56:10 +0000

On 2025/12/18 19:53, Kurt Miller wrote:
> Update to revision 19439. Initially I had set MODJAVA_VER to 11+
> per-upstream, but when I ran it I got a warning that soon they
> will be switching to jdk 17, so we might as well update there now
> and sqash that warning too.
> 
> I only tested it launches ok. ok?

pretty similar to 19423 that I tested and sent in August, but I managed
to miss Holger's reply (lost in my inbox) - slight differences are that
I switched HOMEPAGE (and thus SITES) to https (please add that then it's
ok sthen), and split JAVA_OPTIONS among multiple lines and zapped
whitespace at eol in the #! line (don't mind either way about that)

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/geo/josm/Makefile,v
> diff -u -p -u -r1.51 Makefile
> --- Makefile	26 Sep 2023 10:52:58 -0000	1.51
> +++ Makefile	18 Dec 2025 19:47:58 -0000
> @@ -1,6 +1,6 @@
>  COMMENT=		OpenStreetMap map editor
>  
> -SVN_REV=		14824
> +SVN_REV=		19439
>  DISTNAME=		josm-snapshot-${SVN_REV}
>  EXTRACT_SUFX =		.jar
>  EXTRACT_CASES+=		*.jar) unzip -qa ${FULLDISTDIR}/$$archive -d ${WRKDIST};;
> @@ -21,7 +21,7 @@ PERMIT_PACKAGE=	Yes
>  
>  MODULES=		java \
>  			textproc/intltool
> -MODJAVA_VER=		1.8+
> +MODJAVA_VER=		17+
>  BUILD_DEPENDS =		archivers/unzip
>  RUN_DEPENDS=		java/javaPathHelper \
>  			devel/desktop-file-utils
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/geo/josm/distinfo,v
> diff -u -p -u -r1.29 distinfo
> --- distinfo	8 Mar 2019 11:52:58 -0000	1.29
> +++ distinfo	18 Dec 2025 19:47:58 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (josm-snapshot-14824.jar) = mmJk7QfpEUxMza9Kr2Ydn2KkXbu8tYsdL8L+n84r+58=
> -SIZE (josm-snapshot-14824.jar) = 13565003
> +SHA256 (josm-snapshot-19439.jar) = m+nkBq7uerDhT70kGqd8oZzOKulqZfPDPnq1usN/vTw=
> +SIZE (josm-snapshot-19439.jar) = 19265757
> Index: files/josm.sh
> ===================================================================
> RCS file: /cvs/ports/geo/josm/files/josm.sh,v
> diff -u -p -u -r1.2 josm.sh
> --- files/josm.sh	20 Apr 2014 06:49:10 -0000	1.2
> +++ files/josm.sh	18 Dec 2025 19:47:58 -0000
> @@ -1,6 +1,6 @@
>  #!/bin/ksh 
>  
>  JAVA_CMD=$(javaPathHelper -c josm)
> -JAVA_OPTIONS=-Xmx256M
> +JAVA_OPTIONS="-Xmx256M --add-exports=java.base/sun.security.action=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED"
>  
>  ${JAVA_CMD} ${JAVA_OPTIONS} -jar ${TRUEPREFIX}/share/josm/josm-latest.jar $*
>