From nobody Thu Apr 06 13:10:52 2023 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 4PshhF0S8hz44L0c; Thu, 6 Apr 2023 13:10:53 +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 4PshhD6WZ8z3x17; Thu, 6 Apr 2023 13:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680786652; 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=ufEgskq+FkC2txCCrjjCt4S/gKbaW4KNKl4gZMHPXXM=; b=uvinaSs/8+wme3jlGYZQULR99MrTqoBDea1hu/s2UuLae2spZEPoPf9Qv1Iz6ekEl+7TEg kglcr6COAmid3i86uAjsylFviw+KBRYs9ix8FcIZK0Fs0XT64+/bca09mdeba/xLLiwkU1 Yx+c6rMnJEbq++Io/oOLgJ4XhmhvvaHf1hMWSw+tY+0e1G+4+3YNhr0N9+KtRD1ousNh7P 0+88jq7GulRYe8BzMLEzqF8zcLf4ip/b3gr8kRtCRTeqLLiWhthtajijplXuURIyMvXGHR u1ef0etnJpMs/izPX3+4sJrBQ9sd7xQlFE9XSTkjC68QOhSJtFtnuk8j+pV4dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680786652; 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=ufEgskq+FkC2txCCrjjCt4S/gKbaW4KNKl4gZMHPXXM=; b=jA44vIlD6aFimeYMh0PwF2JxWvfmf0LFnqnCs7dFb35aRGJ6t1vldpwapp1icHyKK9FGBo F7Mn+Z1bkLHqoRiykcUhq+4tezZXqbdoouWFgSElaG6Q/6J6bmFsoPE23UDMkYpGWx6Ic/ P9+aHkEBbc3gA14LRcOnMUo8XF5CBbHjBffi/uSYpZC0HszznUEE6YBEJVW1rmcVU8pHR2 LEXq8eNSKnZfHeOe1qeyJzg6TV6p1ExlGBiJppHqsoKBQvXxUv1Q+OIbjMX9VEk47fIxxF w7z1v6F0uCEDmPXJu7m0pAGUnCHKgxut25SIMDZYCs3lYLcUSB4cRxx68+q1uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680786652; a=rsa-sha256; cv=none; b=FoS7PvChluHXQn0IIY5US4fvqE6SLWYE2suSuQLorfsHK3m0mmvkZ318nunGNw6SXAfYb8 nq6UWi/i1h8mwQsIBH/C/6/SuIKPZidZQoHzUDTZ0DHseIkK1CULWvAm94ZHx6GVqdBm+e 7vjuWZGKbe1ncRXdMSEyftAAc2i6PmbnE7qXvhbYxRYF8NbVkOSVyVY9215QGOpvYKf/fB NMoaE8wnPSHHDhZBPQvgoDBTbvI7+X7ek2XT8ENG2xg4oCvrCl2A7+d4mF4cDDVeYyEExR ndDcZEgVBaFoxbCZIIgui/QHKqNL97np/yVQ4vV7cOTMCChIlZNBdZ/zj4ydpw== 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 4PshhD5RdWz14vf; Thu, 6 Apr 2023 13:10:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 336DAqDI027780; Thu, 6 Apr 2023 13:10:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 336DAq38027779; Thu, 6 Apr 2023 13:10:52 GMT (envelope-from git) Date: Thu, 6 Apr 2023 13:10:52 GMT Message-Id: <202304061310.336DAq38027779@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: ea5eba5c4dac - main - shells/zsh: cache the utx.active location 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea5eba5c4dace0b04f8f6bb3d1bc697f03bacc79 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=ea5eba5c4dace0b04f8f6bb3d1bc697f03bacc79 commit ea5eba5c4dace0b04f8f6bb3d1bc697f03bacc79 Author: Baptiste Daroussin AuthorDate: 2023-04-06 13:07:15 +0000 Commit: Baptiste Daroussin CommitDate: 2023-04-06 13:10:43 +0000 shells/zsh: cache the utx.active location On fresh jails or chroot the /var/run/utx.active might not exist (like in poudriere for example) but configure script is looking for its existance to determine its existance and activate the build of the utmx logging feature internally. Caching it makes the configure script always build the logging features. While here, make ZSH_VER use the distversion, which fixes the usecase of building snapshots of zsh via the port. PR: 268714 Reported by: okiddle@yahoo.co.uk --- shells/zsh/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index c5c96d432069..57c3ba91ad30 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -1,6 +1,6 @@ PORTNAME= zsh DISTVERSION= 5.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= shells MASTER_SITES= https://www.zsh.org/pub/ \ SF \ @@ -39,7 +39,8 @@ CONFIGURE_ARGS+=--disable-site-fndir \ --enable-additional-fpath=${DATADIR}/site-functions CONFIGURE_ENV+= zsh_cv_sys_path_dev_fd=no \ - ac_cv_header_sys_capability_h=no + ac_cv_header_sys_capability_h=no \ + zsh_cv_path_utmpx=/var/run/utx.active GNU_CONFIGURE= yes CPPFLAGS+= -DBOOL_DEFINED @@ -76,7 +77,7 @@ DOCS_DISTFILES= ${DISTNAME}-doc${EXTRACT_SUFX}:doc PORTDOCS= * PORTEXAMPLES= zlogin zshenv zshrc -ZSH_VER= ${PORTVERSION} +ZSH_VER= ${DISTVERSION} PLIST_SUB+= ZSH_VER="${ZSH_VER}" SUB_FILES= pkg-message