From nobody Fri Jan 19 17:08:14 2024 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 4TGmKB6nSFz56wGW; Fri, 19 Jan 2024 17:08:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TGmKB6G3yz4JNt; Fri, 19 Jan 2024 17:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705684094; 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=TlkixGMwYvnitoKDYvfDwlB6CzZu9sr3YU0mOXq0unA=; b=TpG0Xv1vSyke2CIWwd1wjg8+wtnq0g/+ztLnQC/KJKbtJROiYA6iYMCvNU8ti5/zmQ1DK5 PEQEXWcinBIXvHJ42aPODA/eJBREoKsKq2dcBdU06z1t0OuPnGRR+bBERPNuae+K8QXiHZ Ela+9+xNexobCoARqAvwwhhWDT4lRrwnAlkcz9T6uOpjPvNlSXpcEuCilNROgEu6C0MN8S KNzs+nS2BtAT0+WbhtOpzqIzbcZ0T5QDGNrMg1Fc68LaA2cYKFnt73WYT3zG4PaCgtKrk7 kcV+4Oq29NjVKVKLRowuhV3PEEAKbkcnK9J2xgyw43jmGAVR4C1Ua085xHCIwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705684094; 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=TlkixGMwYvnitoKDYvfDwlB6CzZu9sr3YU0mOXq0unA=; b=mjfmznZnTVI3Fc76umovANeRK3w+S1+gV2tAVfAgr6K/F1wRaMYY07i81LsKfauZJ3OxNH JtMfgH8lZS3mQ/FV/BX8+peEazmEHoC9Ff9sQbVUIB2Hnih1b97re3XBVcZlQjGnkZlzhy 80jT9Y2hE/TzACy2vRpz+jbICKF8u9LQ1d73S0PDiQUyURA2nLWbeSjccYhRBmmOMPq1fH KxbKTRWA9+RtMrKYYHtldaFldphV+jVNLTtUOrsn3gXpcuu/JTKoAixgt8M8E2gonj2770 VA/WyTDh6LA9MfUHJho/Ec9vt4/5jO2j9FCFp0jG27iBGjTFZpAoIjFola0ysQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705684094; a=rsa-sha256; cv=none; b=JJt0B6YcDxAh2iyKk1Ll1NWogKcGkYZFMnUoAR53vJbnI5etbk4UGM06jiCTinTb0m1rmu rsavVk6NJreWl+K65UQew4E0cYBofaQY4sOPn8GjUNrgXtzy90eV+x29pMB8VTF1lIvUmc wqrqK50t6dgt0XM4MMxU3/CRAT8ewoggYQlk4NW5Lmj7R1zQz9yJY1vzBMJVSRDi/r201a G4U1AoQkmu6FuCW/lY6h0+UVqGFMIRUVFYwqK/YJNJxKlD5KXurulM8SglMtKMFxRX2P9D q6/8kLKIuxGtQEuNrR0MraMAqJvyKdSbDwhN12XgLyK+CKvpx9YVl/yPR97IHQ== 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 4TGmKB51qDz10QB; Fri, 19 Jan 2024 17:08:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40JH8Eku079154; Fri, 19 Jan 2024 17:08:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40JH8Eb2079151; Fri, 19 Jan 2024 17:08:14 GMT (envelope-from git) Date: Fri, 19 Jan 2024 17:08:14 GMT Message-Id: <202401191708.40JH8Eb2079151@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kyle Evans Subject: git: 3a26999f32da - main - sysutils/orch: pull in some patches following portability testing 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a26999f32da393ccb6e26d3f13dc475857d727c Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a26999f32da393ccb6e26d3f13dc475857d727c commit 3a26999f32da393ccb6e26d3f13dc475857d727c Author: Kyle Evans AuthorDate: 2024-01-19 17:04:38 +0000 Commit: Kyle Evans CommitDate: 2024-01-19 17:07:56 +0000 sysutils/orch: pull in some patches following portability testing These were deemed critcial enough to be worth backporting: the first issue affects spawn() of paths that look relative; these are now just using $PATH, and the script's directory is prepended to $PATH. The other is that the tests weren't easily runnable, so it's gained some bits to improve that and we hook up TEST_TARGET in the ports tree here. --- sysutils/orch/Makefile | 15 +++++++++++++++ sysutils/orch/distinfo | 6 +++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/sysutils/orch/Makefile b/sysutils/orch/Makefile index 34e68d19500b..c599ec9e4dd2 100644 --- a/sysutils/orch/Makefile +++ b/sysutils/orch/Makefile @@ -1,5 +1,6 @@ PORTNAME= orch PORTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://git.kevans.dev/kevans/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/ @@ -12,6 +13,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= lua:52-54 uidfix +PATCH_DIST_STRIP= -p1 +PATCH_SITES= https://git.kevans.dev/kevans/orch/commit/ +# Add script dir to $PATH rather than some custom searching +PATCHFILES+= b18ce0c42fc62e0e74a05cfd3286f664889b27d3.patch +# Add a `make check` target for easier testing +PATCHFILES+= 4d7797a706e57d1c7c6e0ed63c7bd86d4b0f2d71.patch + WRKSRC= ${WRKDIR}/${PORTNAME} ORCHLUA_PATH= ${PREFIX}/share/${PORTNAME} @@ -22,6 +30,7 @@ MAKE_ENV+= BINDIR="${PREFIX}/bin" \ LUA_INCDIR="${LUA_INCDIR}" \ LUA_LIB="-L${LUA_LIBDIR} -llua-${LUA_VER}" \ ORCHLUA_PATH="${ORCHLUA_PATH}" +TEST_TARGET= check .include @@ -31,6 +40,12 @@ MAKE_ENV+= FILESDIR_OWN=${UID} FILESDIR_GRP=${GID} MAKE_ENV+= EXAMPLESDIR_OWN=${UID} EXAMPLESDIR_GRP=${GID} .endif +post-patch: + # XXX This can go away in the next version; patch(1) won't take the hint of + # the file mode from the patch, so we just fix it here in case one wants to + # run the tests + @${CHMOD} +x ${WRKSRC}/tests/my_cat + pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/share/man/man1 diff --git a/sysutils/orch/distinfo b/sysutils/orch/distinfo index 52af1438de94..b7e9e5a50cfc 100644 --- a/sysutils/orch/distinfo +++ b/sysutils/orch/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1705544817 +TIMESTAMP = 1705682998 SHA256 (orch-0.1.tar.gz) = c4c058f73324f883c9b823639664a97380bd041dbc4dfd646be325a99305aa64 SIZE (orch-0.1.tar.gz) = 20134 +SHA256 (b18ce0c42fc62e0e74a05cfd3286f664889b27d3.patch) = 15ee1c5192b1336edfef0974ac8c3e5943a08e8049dba32b4547890595186e01 +SIZE (b18ce0c42fc62e0e74a05cfd3286f664889b27d3.patch) = 6865 +SHA256 (4d7797a706e57d1c7c6e0ed63c7bd86d4b0f2d71.patch) = c6577dae7b4c9e0dd2bf1e35a1a2c424cd7a1a5123dc09de3ccbafa7f5eec9f4 +SIZE (4d7797a706e57d1c7c6e0ed63c7bd86d4b0f2d71.patch) = 3320