From f4d6ff7e72abd784a1ae144e82b01bbd21301614 Mon Sep 17 00:00:00 2001 From: dsainty Date: Sun, 26 Apr 2020 01:05:15 +0000 Subject: 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. --- cad/diylc/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cad/diylc/Makefile b/cad/diylc/Makefile index 8f0164599b2..62c6c033495 100644 --- a/cad/diylc/Makefile +++ b/cad/diylc/Makefile @@ -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: -- cgit v1.2.3