From nobody Tue Mar 29 17:06:36 2022 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 C32001A4910B; Tue, 29 Mar 2022 17:06:36 +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 4KSbZN56lgz4d78; Tue, 29 Mar 2022 17:06:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648573596; 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=RIJRcT1BftnSDDcK5RcfA0xiNTGd9JNOayV09mB+e/I=; b=blYOjp9+ebzpv/S9cjMtmeMDkPIQDRywvOEHf/oygdJnir8HDOles7/1/yKq3Np7hM3mgZ TTzct108FlBoGOqmGHvVIt29r/RSDckgSp6GWtu3NcnymOtOIXgHcp+DPCgRzUxA34NZ/B 3Y6483RAWkiyFMVR87r2rR5BrTDWsYzKUjTAqwmLVWOqT1SB5m+k6jeCqEv7EQDfLLbEof Q2JMqUxMyDcbLIrhuf3ye5elyJ8S3x2tq+yjG0WuZIWN3sfhxd6kmHMfljzN+o3vcN5nr+ Vh6uunObeqTr9+3m2MWaKrUUYEWnVOLGsHJiNZdbe9/Pphqhm12+SPjbVXllHw== 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 8FA98225C1; Tue, 29 Mar 2022 17:06:36 +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 22TH6a80067291; Tue, 29 Mar 2022 17:06:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22TH6aKt067290; Tue, 29 Mar 2022 17:06:36 GMT (envelope-from git) Date: Tue, 29 Mar 2022 17:06:36 GMT Message-Id: <202203291706.22TH6aKt067290@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 36f516ad2ae4 - main - sysutils/screen: Fix plist 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36f516ad2ae4fe01c51f8055c87491d0dd2605e9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648573596; 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=RIJRcT1BftnSDDcK5RcfA0xiNTGd9JNOayV09mB+e/I=; b=dwktm80ZxVt1a72DXSzKrY4H3A+5pn25MHx/GsT1QPTn0wK3tX8XT4lydW9dS4gztuPw6q Tg3Qc8einnetSOmqu25glbi+Oib7AX2EqugmYzoxOrISBOoJmPRLcm2Qt3PkaICXcgvES/ AYMBA53f7OA530TO84Tj+4VqbpKBBGSHArRT8aPP7UbiFQINqTBiG09lNLHpyGyRNLzhov AF+mtI2Ne06LQxDXSQsxsTpiY25WK0IMNABQ7TeLJz4WePmfkxPFHFzoHMlMFoWEOwf4y3 AZHddQpf0wFCnWnLfKUy0+PJR8ok7D/kZ/Ou3EQaLI+SNvB+8N3o40/6JwtozA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648573596; a=rsa-sha256; cv=none; b=d0NHDy8ihb3siDFwPqAupLgj9rBgf17JWDomQD4Ekryl4LJKU8PkQ26fdXj6qmcslduc5I PmtktL8yvB3ZEqd7gtdQmSebjILFNJTndk5R/7CC36SXgjNqYslUWIBhezPi9/bJxDFHft sbNcMHE/WoD5ngVKFptKSbjPAW4czSc8J68vmyloDUBGVOs7FD/ybfMioltVQ42xUH6LNn wswsK1Ayllng/z/L7inWeuOIZhzqriwL6gSTawIBB2xyfPTR5UPI23m1FRPutho/F/30wD llUf1fmDFFg8AnV+6Qo1xBqEZl25I9WVFlo41JTF89vCk94SD1FJe2b33YeQhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=36f516ad2ae4fe01c51f8055c87491d0dd2605e9 commit 36f516ad2ae4fe01c51f8055c87491d0dd2605e9 Author: Cy Schubert AuthorDate: 2022-03-29 17:03:35 +0000 Commit: Cy Schubert CommitDate: 2022-03-29 17:06:34 +0000 sysutils/screen: Fix plist PLIST doesn't like "_" in variable names. Fix by renaming MULTIUSER_SCREEN to MULTIUSER. PR: 262903 Reported by: sunpoet, Michael Butler Fixes: 8f528507e9ca Pointy hat to: cy --- sysutils/screen/Makefile | 4 ++-- sysutils/screen/pkg-plist | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index 664bc585e091..9cbb1c74af4d 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -30,8 +30,8 @@ SOCKETS_DESC= Use new (4.2.1+) sockets for IPC (default) NAMED_PIPES_DESC= Use legacy (4.0.3) named pipes for IPC (override) SYSTEM_SCREENRC_DESC= Install system screenrc with helpful status line MULTIUSER_DESC= Install setuid-root screen to support multiuser -MULTIUSER_PLIST_SUB= MULTIUSER_SCREEN="@(,,4755) " -MULTUSER_PLIST_SUB_OFF= MULTIUSER_SCREEN="@(,,0755) " +MULTIUSER_PLIST_SUB= MULTIUSER="@(,,4755) " +MULTUSER_PLIST_SUB_OFF= MULTIUSER="@(,,0755) " NCURSES_DEFAULT_DESC= Depend on ncurses (ports if installed, otherwise base) NCURSES_BASE_DESC= Depend on ncurses in base NCURSES_PORT_DESC= Depend on devel/ncurses in ports diff --git a/sysutils/screen/pkg-plist b/sysutils/screen/pkg-plist index e1afe2d637e4..9d8d35c8a19e 100644 --- a/sysutils/screen/pkg-plist +++ b/sysutils/screen/pkg-plist @@ -1,5 +1,5 @@ bin/screen -%%MULTIUSER_SCREEN%%bin/screen-4.9.0 +%%MULTIUSER%%bin/screen-4.9.0 man/man1/screen.1.gz %%DATADIR%%/utf8encodings/01 %%DATADIR%%/utf8encodings/02