CVS commit: pkgsrc/cad/diylc

["David Sainty" <dsainty%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dsainty
Date:           Sun Apr 26 01:05:15 UTC 2020

Modified Files:
        pkgsrc/cad/diylc: Makefile

Log Message:
There are two common ways to select the "java" executable in Pkgsrc.
One is via "${JAVA_BINPREFIX}-java", and one is via
"${PKG_JAVA_HOME}/bin/java".

The "${JAVA_BINPREFIX}-java" way relies on an appropriately named
executable being present in the built-in JRE if you are using the
built-in - something with a "-java" suffix.  That just doesn't exist
in either the MacOS Oracle JRE install or the JDK install.  So switch
to "${PKG_JAVA_HOME}/bin/java" instead, which works (but does require
careful quoting to allow for spaces under MacOS).

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/cad/diylc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/cad/diylc/Makefile
diff -u pkgsrc/cad/diylc/Makefile:1.3 pkgsrc/cad/diylc/Makefile:1.4
--- pkgsrc/cad/diylc/Makefile:1.3       Mon Sep 11 07:51:44 2017
+++ pkgsrc/cad/diylc/Makefile   Sun Apr 26 01:05:15 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2017/09/11 07:51:44 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2020/04/26 01:05:15 dsainty Exp $
 
 DISTNAME=      diylc-3.28.0
+PKGREVISION=   1
 CATEGORIES=    cad java
 MASTER_SITES=  http://diy-layout-creator.googlecode.com/files/
 EXTRACT_SUFX=  .zip
@@ -23,7 +24,7 @@ do-build:
          for jar in diylc.jar main.jar *.jar; do \
            cp="$${cp}$${cp+:}${PREFIX}/lib/java/diylc/$${jar}"; \
          done; \
-         ${ECHO} "#!${SH}"; ${ECHO} "exec ${JAVA_BINPREFIX}-java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -cp \"$${cp}\" org.diylc.DIYLCStarter \"\$$@\"" \
+         ${ECHO} "#!${SH}"; ${ECHO} "exec "${PKG_JAVA_HOME:Q:Q}"/bin/java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -cp \"$${cp}\" org.diylc.DIYLCStarter \"\$$@\"" \
        ) > ${WRKSRC}/diylc.sh
 
 do-install: