From nobody Thu Jan 25 04:46:53 2024 X-Original-To: dev-commits-ports-main@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 4TL7b22H1Mz57hvm; Thu, 25 Jan 2024 04:46:54 +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 4TL7b21LHVz4Sxv; Thu, 25 Jan 2024 04:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706158014; 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=ZmI+0YQsx2uP8KjgVGKMdEgoTlqMrey3/pU/DE7XHak=; b=g1RcivXUxgaPORri3tnbQqB+hiv+njKTi7azIa8GykroYcsSTcWMcJBHdTr34IHXGVMu4G /EIl8bMeZIqMNEwYOv9WdFWS8NdgSg7fprW5t0sPdHDLZaWOGVItFOcSYnlfQ3dZl4jpWz f8E2yuuogFSVvvSwSNvI5KtOcNfVpzBM+IPnEN4sd5Qjvy3p26Pa4sFAZtuTkpHXFjkgox mFW53ctl2yXObkPNINMFklvua6gxUni5h4lbkGa4POJu321fbn/BUa8/hLO7UYKhoyBOOr WV0mWbNMxc9j8Wp9IUJPTb3fkkcI1/RrJMTeGXMQgLPfotnFOrRW5O3imxz38g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706158014; 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=ZmI+0YQsx2uP8KjgVGKMdEgoTlqMrey3/pU/DE7XHak=; b=x62MrTQrBgTmWNslTME+jaIbkg+atpHa0LlZVpREe6Ggj8B9dW3ThpLbZeVoH6aw5VPaKn RJTmQKmAZK0gyob3eqX+IKkecxppxNgEFWqMRt93NJXcNZ0Mgrb53W56lxPzvSBYa+hnWl RB9WAGm89Kc0qkA2bP9ZsZ6u3Vm5Ynqj6QTW4GO9FWegEOIioKZvK4zxJc/iA/7Ts7bTPf Mo7+n3TT44TABzDA+TBLZ2zlSO7iaSWiXyPlwJoMGF70wNcXfde8OWZ5Y3VEl9JjXvowi5 y8LW2cZ1kk7ShIVJf5kyuemdquXykjaT+iX4C4s11WZRmFqUXwXK6jqoaDHl/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706158014; a=rsa-sha256; cv=none; b=mZ4c7xSoNlMIRLrZVY8PLhRUgVwXOQhpn4b6XL6Dk8RQHGt23o9OmNqO+mfMvSCHQ1jxAM aS09hjFjNz/htiVzToyKCOb+zsrfz9kp7/rztPJnwn++CZHB5C3wJbUF9B5ZP092HkS2fN C/J8n/YYIwrptkxUlspJ6ggjsUUwrWqgeOToISulU5/nJll8TSql+yVPWviD4+72tE5Xvj N+FJ1XosgTcaiPPLh+m8nkvtfg6teX5vJwlfgPCIGvUWGKlvUFHyVXVulDgtwkIf8qlWPc tyZF4kwfvu/QyjOdjAIDa9pt47dZzIx90ZDgpIBjdybCaT8IjnUT98LmnhKeig== 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 4TL7b204dzzkgQ; Thu, 25 Jan 2024 04:46:54 +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 40P4krXr014865; Thu, 25 Jan 2024 04:46:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40P4krpB014862; Thu, 25 Jan 2024 04:46:53 GMT (envelope-from git) Date: Thu, 25 Jan 2024 04:46:53 GMT Message-Id: <202401250446.40P4krpB014862@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: 0932dd4166fd - main - sysutils/orch: update to v0.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 0932dd4166fdb17c0049a389e856352e5515b827 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/ports/commit/?id=0932dd4166fdb17c0049a389e856352e5515b827 commit 0932dd4166fdb17c0049a389e856352e5515b827 Author: Kyle Evans AuthorDate: 2024-01-25 04:41:27 +0000 Commit: Kyle Evans CommitDate: 2024-01-25 04:41:27 +0000 sysutils/orch: update to v0.2 Highlights: - Support for other platforms (Linux, macOS, NetBSD, OpenBSD) - Functionality pushed into lua modules, orch(1) is now a light driver on top of the library. The library's intended to be installed for use by other Lua scripts if desired, and exports `env` and `run_script(scriptfile, cfg)`. - More bits imported into the .orch script environment - stty() support to change some flags on the termios of the child - Support for Lua 5.2 was dropped The build system was rewritten in the interim to use cmake instead of bmake directly, so uidfix and related hacks have now disappeared. Makefile restructured slightly to appease portlint, and both EXAMPLES and MANPAGES options added to be able to disable those. --- sysutils/orch/Makefile | 47 ++++++++++++----------------------------------- sysutils/orch/distinfo | 10 +++------- sysutils/orch/pkg-plist | 10 ++++++---- 3 files changed, 21 insertions(+), 46 deletions(-) diff --git a/sysutils/orch/Makefile b/sysutils/orch/Makefile index c599ec9e4dd2..eafd184730c6 100644 --- a/sysutils/orch/Makefile +++ b/sysutils/orch/Makefile @@ -1,9 +1,11 @@ PORTNAME= orch -PORTVERSION= 0.1 -PORTREVISION= 1 +PORTVERSION= 0.2 CATEGORIES= sysutils MASTER_SITES= https://git.kevans.dev/kevans/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/ +PATCH_DIST_STRIP= -p1 +PATCH_SITES= https://git.kevans.dev/kevans/orch/commit/ + MAINTAINER= kevans@FreeBSD.org COMMENT= Program orchestration tool scripted with lua WWW= https://git.kevans.dev/kevans/orch @@ -11,42 +13,17 @@ WWW= https://git.kevans.dev/kevans/orch LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= lua:52-54 uidfix +USES= cmake lua:53-54 -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 +OPTIONS_DEFINE= EXAMPLES MANPAGES +OPTIONS_DEFAULT= EXAMPLES MANPAGES +OPTIONS_SUB= yes -WRKSRC= ${WRKDIR}/${PORTNAME} +EXAMPLES_CMAKE_BOOL= EXAMPLES +MANPAGES_CMAKE_BOOL= MANPAGES -ORCHLUA_PATH= ${PREFIX}/share/${PORTNAME} +WRKSRC= ${WRKDIR}/${PORTNAME} -MAKE_ENV+= BINDIR="${PREFIX}/bin" \ - EXAMPLESDIR="${ORCHLUA_PATH}/examples" \ - MANDIR="${PREFIX}/share/man/man" \ - LUA_INCDIR="${LUA_INCDIR}" \ - LUA_LIB="-L${LUA_LIBDIR} -llua-${LUA_VER}" \ - ORCHLUA_PATH="${ORCHLUA_PATH}" TEST_TARGET= check -.include - -# uidfix won't cover custom directories like this, so we'll hit it ourselves. -.if ${UID} != 0 -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 - -.include +.include diff --git a/sysutils/orch/distinfo b/sysutils/orch/distinfo index b7e9e5a50cfc..c54ce89aa79a 100644 --- a/sysutils/orch/distinfo +++ b/sysutils/orch/distinfo @@ -1,7 +1,3 @@ -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 +TIMESTAMP = 1706157383 +SHA256 (orch-0.2.tar.gz) = f08a375e7d610aad5b6c6fd4321492d546ae74cc27c37bbeeca5fe7268bbf8c9 +SIZE (orch-0.2.tar.gz) = 31909 diff --git a/sysutils/orch/pkg-plist b/sysutils/orch/pkg-plist index 6fda20d6d435..1ed8bb0f16b2 100644 --- a/sysutils/orch/pkg-plist +++ b/sysutils/orch/pkg-plist @@ -1,5 +1,7 @@ bin/orch -share/orch/examples/cat.orch -share/orch/examples/nc.orch -share/orch/orch.lua -share/man/man1/orch.1.gz +%%LUA_MODLIBDIR%%/orch/core.so +%%LUA_MODSHAREDIR%%/orch.lua +%%EXAMPLES%%%%EXAMPLESDIR%%/cat.orch +%%EXAMPLES%%%%EXAMPLESDIR%%/nc.orch +%%MANPAGES%%share/man/man1/orch.1.gz +%%MANPAGES%%share/man/man5/orch.5.gz