From: Rafael Sadowski <rafael@sizeofvoid.org>
Subject: Re: update josm, switch to newer jdk
To: Holger Mikolon <holger@mikolon.com>, ports <ports@openbsd.org>
Date: Sun, 3 Aug 2025 11:12:30 +0200

On Fri Aug 01, 2025 at 01:27:33PM +0100, Stuart Henderson wrote:
> We're moving ports away from JDK 1.8, and it seems that josm is a little
> behind on updates too, so here's a diff to update to the latest stable.
> Upstream permits 11+ but warns for <17 so let's just go straight to 17
> for this.
> 
> ok?
> 

Tested and it runs. OK rsadowski

> 
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/geo/josm/Makefile,v
> diff -u -p -r1.51 Makefile
> --- Makefile	26 Sep 2023 10:52:58 -0000	1.51
> +++ Makefile	1 Aug 2025 12:26:07 -0000
> @@ -1,17 +1,16 @@
>  COMMENT=		OpenStreetMap map editor
> 
> -SVN_REV=		14824
> +SVN_REV=		19423
>  DISTNAME=		josm-snapshot-${SVN_REV}
>  EXTRACT_SUFX =		.jar
>  EXTRACT_CASES+=		*.jar) unzip -qa ${FULLDISTDIR}/$$archive -d ${WRKDIST};;
>  PKGNAME=		josm-${SVN_REV}
> -REVISION=		1
> 
>  PKG_ARCH=		*
> 
>  CATEGORIES=		geo
> 
> -HOMEPAGE=		http://josm.openstreetmap.de/
> +HOMEPAGE=		https://josm.openstreetmap.de/
>  SITES=			${HOMEPAGE}/download/
> 
>  MAINTAINER=		Holger Mikolon <holger@mikolon.com>
> @@ -21,7 +20,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 -r1.29 distinfo
> --- distinfo	8 Mar 2019 11:52:58 -0000	1.29
> +++ distinfo	1 Aug 2025 12:26:07 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (josm-snapshot-14824.jar) = mmJk7QfpEUxMza9Kr2Ydn2KkXbu8tYsdL8L+n84r+58=
> -SIZE (josm-snapshot-14824.jar) = 13565003
> +SHA256 (josm-snapshot-19423.jar) = s8aMV31NsDFE5XLP523PH3RNvq78eTAa+UvmjyY5a+E=
> +SIZE (josm-snapshot-19423.jar) = 19256265
> Index: files/josm.sh
> ===================================================================
> RCS file: /cvs/ports/geo/josm/files/josm.sh,v
> diff -u -p -r1.2 josm.sh
> --- files/josm.sh	20 Apr 2014 06:49:10 -0000	1.2
> +++ files/josm.sh	1 Aug 2025 12:26:07 -0000
> @@ -1,6 +1,9 @@
> -#!/bin/ksh
> +#!/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 $*
>