svn commit: r553098 - in head/cad/sweethome3d: . files

[Alexey Dokuchaev]

Author: danfe
Date: Fri Oct 23 08:23:22 2020
New Revision: 553098
URL: https://svnweb.freebsd.org/changeset/ports/553098

Log:
  - Enforce JAVA_VERSION when launching javavm(1), otherwise the program
    crashes when several JDK versions are installed and javawm(1) picks
    higher version (happens when /usr/ports/Mk/bsd.java.mk is absent,
    contrary to documented selection process which is designed to behave
    almost identically WRT presence/absence of /usr/ports/Mk/bsd.java.mk
  - While here, simplify the script a bit and remove keywords and their
    expansion, they are useless for wrapper scripts
  
  PR:		250268
  Submitted by:	rodrigo

Modified:
  head/cad/sweethome3d/Makefile
  head/cad/sweethome3d/files/sweethome3d.sh.in   (contents, props changed)

Modified: head/cad/sweethome3d/Makefile
==============================================================================
--- head/cad/sweethome3d/Makefile	Fri Oct 23 08:15:18 2020	(r553097)
+++ head/cad/sweethome3d/Makefile	Fri Oct 23 08:23:22 2020	(r553098)
@@ -3,6 +3,7 @@
 
 PORTNAME=	sweethome3d
 PORTVERSION=	6.4.2
+PORTREVISION=	1
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
 DISTNAME=	SweetHome3D-${PORTVERSION}-src

Modified: head/cad/sweethome3d/files/sweethome3d.sh.in
==============================================================================
--- head/cad/sweethome3d/files/sweethome3d.sh.in	Fri Oct 23 08:15:18 2020	(r553097)
+++ head/cad/sweethome3d/files/sweethome3d.sh.in	Fri Oct 23 08:23:22 2020	(r553098)
@@ -1,8 +1,6 @@
 #!/bin/sh
-#
-# $FreeBSD$
 
 JAVA="%%LOCALBASE%%/bin/java"
-JARPATH="%%JAVALIBDIR%%"
+SH3D_JAR="%%JAVALIBDIR%%/%%JARNAME%%"
 
-exec "${JAVA}" -Xmx1024m -jar "${JARPATH}/%%JARNAME%%" "$@"
+JAVA_VERSION=%%JAVA_VERSION%% exec "${JAVA}" -Xmx1024m -jar "${SH3D_JAR}" "$@"