git: cd2c0be63ba9 - main - astro/josm: update 18543 → 18565

From: Dmitry Marakasov <amdmi3_at_FreeBSD.org>
Date: Fri, 30 Sep 2022 18:24:12 UTC
The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cd2c0be63ba991f77e45a4fb49a71993daf60824

commit cd2c0be63ba991f77e45a4fb49a71993daf60824
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-09-30 18:18:13 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-09-30 18:18:44 +0000

    astro/josm: update 18543 → 18565
    
    - Remove unnecessary hardcoded memory limit
---
 astro/josm/Makefile         | 10 ++--------
 astro/josm/distinfo         |  6 +++---
 astro/josm/files/josm.sh.in |  2 +-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/astro/josm/Makefile b/astro/josm/Makefile
index 6539675d7c3a..f5cff9f2976a 100644
--- a/astro/josm/Makefile
+++ b/astro/josm/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	josm
-PORTVERSION=	18543
+PORTVERSION=	18565
 CATEGORIES=	astro java
 MASTER_SITES=	https://josm.openstreetmap.de/download/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION}.jar
@@ -19,13 +19,11 @@ USES=		zip:infozip
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 
-JOSM_MEMORY_LIMIT?=1024
-
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 SUB_FILES=	josm.sh
-SUB_LIST=	JARNAME=${DISTNAME} JOSM_MEMORY_LIMIT=${JOSM_MEMORY_LIMIT}
+SUB_LIST=	JARNAME=${DISTNAME}
 
 PLIST_FILES=	bin/josm \
 		${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME} \
@@ -38,10 +36,6 @@ DESKTOP_ENTRIES="JOSM" \
 		"Education;Geoscience;Maps;" \
 		true
 
-pre-everything::
-	@${ECHO_CMD} "You can change limit of memory available to josm by defining"
-	@${ECHO_CMD} "JOSM_MEMORY_LIMIT variable in /etc/make.conf. Default is 1024 (MB)."
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}/
 	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${JAVAJARDIR}/
diff --git a/astro/josm/distinfo b/astro/josm/distinfo
index 93fee2225979..b0473ffe46a0 100644
--- a/astro/josm/distinfo
+++ b/astro/josm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661890859
-SHA256 (josm-snapshot-18543.jar) = 01099d07080e570b3c303017f22dcfedbb24debebd83bc778e10031b04566b67
-SIZE (josm-snapshot-18543.jar) = 16226510
+TIMESTAMP = 1664557171
+SHA256 (josm-snapshot-18565.jar) = b0bd2efe55f19891a7d11076ffa565d262cee45c8bad42244570f84ef649a7f6
+SIZE (josm-snapshot-18565.jar) = 16252369
diff --git a/astro/josm/files/josm.sh.in b/astro/josm/files/josm.sh.in
index c8af5c76d34d..b3705ab2d572 100644
--- a/astro/josm/files/josm.sh.in
+++ b/astro/josm/files/josm.sh.in
@@ -4,4 +4,4 @@ JAVA="%%LOCALBASE%%/bin/java"
 JARPATH="%%JAVALIBDIR%%"
 export JAVA_VERSION="%%JAVA_VERSION%%"
 
-exec "${JAVA}" -Xmx%%JOSM_MEMORY_LIMIT%%m -jar "${JARPATH}/%%JARNAME%%" "$@"
+exec "${JAVA}" -jar "${JARPATH}/%%JARNAME%%" "$@"