From nobody Mon Jul 14 11:38:26 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bggLW0pgYz61dTX; Mon, 14 Jul 2025 11:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bggLV6Kwkz3RYc; Mon, 14 Jul 2025 11:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752493106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qhr8NfTWyshdAZqUz6vHnSpG1yLgAfwwZA/LTeL3o3A=; b=noRU8kszsFQWfVyihY2MYGq+Sy5A5/6C1TFaSEs39tubVZi3F7eEt8wSnoqGcphMySsoQ7 meTSq8nyKw5n7sdRyI20Cx4JWKAgil8JLPdcfA0MyQBvJmq140q4RS2RG9fdSnxjZ07J3n F+vypvA9OT/bLfWKBZ+7PW0HOmTULaGsnOFAaVPYYB1zUQ6ME/UWKumq6cSrQhZvs7jp1Y GKSHiJMbHs2NGUS0uP7EUXIXvyHpWTFfbWgdmbuQUkzAAxc4jVoZkwW46MeTPoUgEVTvrI U7kABimnWH/FK++DAu+XX+Nrv9KJ2iAotlbMSJKKIjqeav8HEH+hDVG49Uj9IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752493106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Qhr8NfTWyshdAZqUz6vHnSpG1yLgAfwwZA/LTeL3o3A=; b=CypR7MHuzoo1Pc6BztOCFlrG4o9klTe/oRy3vSFoVOE+fc4VWJ7qFv+eE3UUtRv3Yff7Om OB+ooBvPb46A3vV1C7YguuUYUivQQgOnQ+1GMe1nxJYfF/z1s3n7Lg7GZp0eTUvX/JjkGr dWOxYVHpXiUbuz1D+EeZYQE692hQODHV9unb1gI+fnhdPvAHJl0nbqJtCK/ZLfrGXA4VmV KWE1vFt538xtmF6xudx8PJalmRVL3DzfmPMkJh7OENoDjmkAptkD8Psjhvpna0PhoOV6nD t9c/uPoRQ+XwYDEumkcpd4zFW3hwGLJM2gxJB6P/tC3DRNYKIOc8avFWblqAKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752493106; a=rsa-sha256; cv=none; b=SimfR5XiwANkXTGHrUqJrjHXn9ghIS4jmXOb8Vt/WTVbLZIIEpuA24DXDSfZWEfTgzBajI d+oiO+QrrLLcXPIQIn9EepwRfY4UIMgHSjz40AHgFEIHqq0zRcMLIQb4usrr1WoFh/g1Ni NEf0BiqRY6vEt9EEiLPP5WuymBLrFwlF861Qj/O/dRZmJx6WyistBJiyJpUcOjK+Gcs+5R LNNtycWh/CRaI2Lalq3qhH7DSkfqN+laDdMBiv/Kg7gqz81s7Q6IIYLVpjuzTcFbvn6F7D Y4OoClKrOnG/X6zQYCdfcFC2A5lcyvtq0DmyzeiJAqJglKsLMeyP1lrA3kYMlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bggLV5j8vzsYl; Mon, 14 Jul 2025 11:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56EBcQD7081054; Mon, 14 Jul 2025 11:38:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EBcQpO081051; Mon, 14 Jul 2025 11:38:26 GMT (envelope-from git) Date: Mon, 14 Jul 2025 11:38:26 GMT Message-Id: <202507141138.56EBcQpO081051@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 814f2b31f3b1 - main - textproc/saxon-he: Improve wrapper scripts List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 814f2b31f3b1bbbc86db6d29cfa58b65185f50fc Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=814f2b31f3b1bbbc86db6d29cfa58b65185f50fc commit 814f2b31f3b1bbbc86db6d29cfa58b65185f50fc Author: Matthias Andree AuthorDate: 2025-07-14 11:23:40 +0000 Commit: Matthias Andree CommitDate: 2025-07-14 11:38:18 +0000 textproc/saxon-he: Improve wrapper scripts - make robust and put the literal string first in the script's IAM comparison so that in no case can it start with a dash - make efficient and use Makefile's :tsc (:ts:) transform to get classpath-ready colon-separated jars list without assembling it in the script each time. Else you could avoid adding the leading colon like so: SAXON_CLASSPATH="${SAXON_CLASSPATH}${SAXON_CLASSPATH:+:}${jarfile}" - install saxon-xquery as symlink instead of a copy - add saxon and saxon-xquery scripts to post-stage smoke test - bump PORTREVISION which was deferred from prior commit PR: 286764 --- textproc/saxon-he/Makefile | 10 ++++++---- 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}" "$@"