ports/96461: [MAINTAINER] graphics/mapyrus: fix SUB_PLIST, javawrapper usage

[Nicola Vitale]

>Number:         96461
>Category:       ports
>Synopsis:       [MAINTAINER] graphics/mapyrus: fix SUB_PLIST, javawrapper usage
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 28 11:50:11 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Nicola Vitale
>Release:        FreeBSD 6.1-RC i386
>Organization:
>Environment:
System: FreeBSD arancino.domo.sva 6.1-RC FreeBSD 6.1-RC #4: Sat Apr 15 10:17:24 CEST 2006
>Description:

Fix SUB_PLIST and javawrapper usage (thanks to H. Quiroz for these suggestions)

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- mapyrus-0.606.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/mapyrus/Makefile /usr/ports/graphics/mapyrus.fix.javawrapper/Makefile
--- /usr/ports/graphics/mapyrus/Makefile	Fri Apr 28 05:16:02 2006
+++ /usr/ports/graphics/mapyrus.fix.javawrapper/Makefile	Fri Apr 28 13:23:22 2006
@@ -18,11 +18,12 @@
 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 -ruN --exclude=CVS /usr/ports/graphics/mapyrus/files/mapyrus.in /usr/ports/graphics/mapyrus.fix.javawrapper/files/mapyrus.in
--- /usr/ports/graphics/mapyrus/files/mapyrus.in	Fri Apr 28 05:16:02 2006
+++ /usr/ports/graphics/mapyrus.fix.javawrapper/files/mapyrus.in	Fri Apr 28 13:20:08 2006
@@ -1,3 +1,5 @@
 #!/bin/sh
 # $FreeBSD: ports/graphics/mapyrus/files/mapyrus.in,v 1.1 2006/04/28 03:16:02 ijliao Exp $
-%%JAVA%% -jar %%DATADIR%%/%%MAPYRUSJAR%% $@
+JAVA_VERSION="%%JAVA_VERSION%%" \
+	exec "%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/%%MAPYRUSJAR%%" "$@"
+
diff -ruN --exclude=CVS /usr/ports/graphics/mapyrus/files/pkg-message.in /usr/ports/graphics/mapyrus.fix.javawrapper/files/pkg-message.in
--- /usr/ports/graphics/mapyrus/files/pkg-message.in	Tue Apr 25 15:04:25 2006
+++ /usr/ports/graphics/mapyrus.fix.javawrapper/files/pkg-message.in	Fri Apr 28 12:58:06 2006
@@ -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:
 
--- mapyrus-0.606.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: