The shell script to launch jbrickshooter depends on having the JRE 
installed and fails if only the JDK is available.

# jbrickshooter
/usr/local/bin/jbrickshooter[2]: /usr/local/jre-1.7.0/bin/java: not found

The patch below fixes things to use javaPathHelper which is more robust 
and will work if either the JDK or the JRE are available. While at it, 
also update to jbrickshooter 1.4.1.


Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/games/jbrickshooter/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile    11 Oct 2009 18:47:35 -0000      1.1.1.1
+++ Makefile    3 Mar 2010 23:19:51 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =      brick shooter reflexion game
 
-V=             1.4.0
+V=             1.4.1
 DISTNAME=      JBrickShooter_v${V}
 PKGNAME=       jbrickshooter-${V}
 CATEGORIES=    games java
@@ -24,6 +24,8 @@
 MODJAVA_VER=   1.7
 MODJAVA_JRERUN= Yes
 
+RUN_DEPENDS=   ::java/javaPathHelper
+
 NO_REGRESS=    Yes
 NO_BUILD=      Yes
 
@@ -31,7 +33,9 @@
 PKG_ARCH=      *
 
 do-install:
-       @echo "#!/bin/sh\n${LOCALBASE}/jre-1.7.0/bin/java -jar 
${TRUEPREFIX}/share/jbrickshooter/jbrickshooter.jar" > ${WRKSRC}/jbrickshooter
+       @sed -e 's,%%TRUEPREFIX%%,${TRUEPREFIX},' \
+                < ${FILESDIR}/jbrickshooter \
+                > ${WRKSRC}/jbrickshooter
        ${INSTALL_DATA_DIR} ${PREFIX}/share/jbrickshooter
        cp ${WRKSRC}/jbrickshooter.jar ${PREFIX}/share/jbrickshooter
        chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/jbrickshooter
Index: distinfo
===================================================================
RCS file: /usr/cvs/ports/games/jbrickshooter/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo    11 Oct 2009 18:47:35 -0000      1.1.1.1
+++ distinfo    3 Mar 2010 23:06:10 -0000
@@ -1,5 +1,5 @@
-MD5 (JBrickShooter_v1.4.0.zip) = 69c9K5JqiDSYrJi37mUL+A==
-RMD160 (JBrickShooter_v1.4.0.zip) = HMKkNWSdgTDnfJ5XfGBQh0m8IQ4=
-SHA1 (JBrickShooter_v1.4.0.zip) = 5jIvX0jskMK97M5ORmfRqOO9XP8=
-SHA256 (JBrickShooter_v1.4.0.zip) = 
RCiE5KPPrwX3NGDr0Qek+3E5SHH8Yf6R9JDb+LzbFGo=
-SIZE (JBrickShooter_v1.4.0.zip) = 106583
+MD5 (JBrickShooter_v1.4.1.zip) = ehYMWQw3dHeQrmZY9U4dng==
+RMD160 (JBrickShooter_v1.4.1.zip) = MZhb4GR7wXVt0Qtxmr8OrN5mMbU=
+SHA1 (JBrickShooter_v1.4.1.zip) = YZjD/6f8huWPmduDkF/sUNuCv6g=
+SHA256 (JBrickShooter_v1.4.1.zip) = 
KNVe0hn1mwq5CGvFT36DHDk0Io8dEF8XpcdvfVXgSdY=
+SIZE (JBrickShooter_v1.4.1.zip) = 112497
Index: files/jbrickshooter
===================================================================
RCS file: files/jbrickshooter
diff -N files/jbrickshooter
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ files/jbrickshooter 3 Mar 2010 22:47:43 -0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+`javaPathHelper -c jbrickshooter` -jar 
%%TRUEPREFIX%%/share/jbrickshooter/jbrickshooter.jar

Reply via email to