diff options
| -rw-r--r-- | textproc/saxon-he/Makefile | 10 | ||||
| -rw-r--r-- | textproc/saxon-he/files/saxon.sh.in | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/textproc/saxon-he/Makefile b/textproc/saxon-he/Makefile index decab80302cb..b2ef13b8f515 100644 --- a/textproc/saxon-he/Makefile +++ b/textproc/saxon-he/Makefile @@ -1,5 +1,6 @@ PORTNAME= saxon-he DISTVERSION= 12-8 +PORTREVISION= 1 CATEGORIES= textproc java MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/SaxonHE-${DISTVERSION}/ DISTNAME= SaxonHE${DISTVERSION}J @@ -32,20 +33,21 @@ JARFILES2= jline-2.14.6.jar \ PLIST_FILES= ${JARFILES:S,^,%%JAVAJARDIR%%/,} ${SCRIPTFILES} SUB_FILES= saxon.sh -SUB_LIST= SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,}" +SUB_LIST= SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,:ts:}" SCRIPTFILES= bin/saxon bin/saxon-xquery do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR} ${INSTALL_DATA} ${JARFILES1:S,^,${WRKSRC}/,} ${STAGEDIR}${JAVAJARDIR} ${INSTALL_DATA} ${JARFILES2:S,^,${WRKSRC}/lib/,} ${STAGEDIR}${JAVAJARDIR} -.for scriptfile in ${SCRIPTFILES} - ${INSTALL_SCRIPT} ${WRKDIR}/saxon.sh ${STAGEDIR}${PREFIX}/${scriptfile} -.endfor + ${INSTALL_SCRIPT} ${WRKDIR}/saxon.sh ${STAGEDIR}${PREFIX}/bin/saxon + ${RLN} ${STAGEDIR}${PREFIX}/bin/saxon ${STAGEDIR}${PREFIX}/bin/saxon-xquery post-stage: # smoke test so we're sure we can load all required classes # (12.0 and 12.6 didn't work with OpenJDK 8) + ${STAGEDIR}${PREFIX}/bin/saxon-xquery -? 2>&1 | ${HEAD} -n1 + ${STAGEDIR}${PREFIX}/bin/saxon -? 2>&1 | ${HEAD} -n1 ${JAVA} -cp '${STAGEDIR}${JAVAJARDIR}/*' net.sf.saxon.Transform -? 2>&1 \ | ${HEAD} -n1 diff --git a/textproc/saxon-he/files/saxon.sh.in b/textproc/saxon-he/files/saxon.sh.in index 3cb3014693c0..8371776b80f2 100644 --- a/textproc/saxon-he/files/saxon.sh.in +++ b/textproc/saxon-he/files/saxon.sh.in @@ -2,17 +2,11 @@ IAM="`basename "$0"`" -if [ "${IAM}" = "saxon-xquery" ] +if [ saxon-xquery = "${IAM}" ] then LAUNCHER_CLASS="net.sf.saxon.Query" else LAUNCHER_CLASS="net.sf.saxon.Transform" fi -SAXON_CLASSPATH="" -for jarfile in %%SAXON_JARS%% -do - SAXON_CLASSPATH="${SAXON_CLASSPATH}:${jarfile}" -done - -exec "%%LOCALBASE%%/bin/java" -classpath "${SAXON_CLASSPATH}" "${LAUNCHER_CLASS}" "$@" +exec "%%LOCALBASE%%/bin/java" -classpath "%%SAXON_JARS%%" "${LAUNCHER_CLASS}" "$@" |