- Set Java required version to 1.4+ (as specified on the main website)

- Use javavmwrapper to avoid hardcoding a particular JVM
- Use 'exec' in the launcher shell script
- Quote "$@" in launcher shell script
- Cleanup redundant SUB_LIST entries

PR:		96461
Approved by:	maintainer

3 files changed, 5 insertions, 3 deletions

diff --git a/graphics/mapyrus/Makefile b/graphics/mapyrus/Makefile
index 2730b98452ec..71b6ce07d3aa 100644
--- a/graphics/mapyrus/Makefile
+++ b/graphics/mapyrus/Makefile
@@ -18,11 +18,12 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 USE_JAVA=	yes
+JAVA_VERSION=	1.4+
 USE_ZIP=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 SUB_FILES=	${PORTNAME} pkg-message
-SUB_LIST=	JAVA=${JAVA} DATADIR=${DATADIR} MAPYRUSJAR=${MAPYRUSJAR}
+SUB_LIST=	MAPYRUSJAR=${MAPYRUSJAR}
 
 MAPYRUSJAR=	${PORTNAME}.jar
 MAPYRUSDOCS=	${PORTNAME}.pdf
diff --git a/graphics/mapyrus/files/mapyrus.in b/graphics/mapyrus/files/mapyrus.in
index b6088965ad3c..da1a60f328ff 100644
--- a/graphics/mapyrus/files/mapyrus.in
+++ b/graphics/mapyrus/files/mapyrus.in
@@ -1,3 +1,4 @@
 #!/bin/sh
 # $FreeBSD$
-%%JAVA%% -jar %%DATADIR%%/%%MAPYRUSJAR%% $@
+JAVA_VERSION="%%JAVA_VERSION%%" \
+	exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/%%MAPYRUSJAR%%" "$@"
diff --git a/graphics/mapyrus/files/pkg-message.in b/graphics/mapyrus/files/pkg-message.in
index 299fdf8536af..0c3c693dfb57 100644
--- a/graphics/mapyrus/files/pkg-message.in
+++ b/graphics/mapyrus/files/pkg-message.in
@@ -2,7 +2,7 @@
 
     Start Mapyrus from a terminal window with a command like:
 
-%%JAVA%% -classpath %%DATADIR%%/%%MAPYRUSJAR%% org.mapyrus.Mapyrus myfile.mapyrus
+java -classpath %%DATADIR%%/%%MAPYRUSJAR%% org.mapyrus.Mapyrus myfile.mapyrus
 
     or simply: