From nobody Wed Apr 3 18:43:01 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 4V8tsx4tStz5Fc0k; Wed, 3 Apr 2024 18:43:01 +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 4V8tsx49kKz4F42; Wed, 3 Apr 2024 18:43:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712169781; 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=3fzyxi2yE+R2ELXDYROoXBRS8Ww1U/RFLFHs8tAuEjQ=; b=SMuQ9Iid8+ZYfkkOELmKj+FhXTmIWMKuLTYM4eL9xLL8FQ50dF31vWiOb31ZA1Vk3d5+BE Ao73UmL5OIkAOPHv2wu/eAZ0P6en7LyGLy1KHxR8AnLaG9cGT2T99TzgAlM3ysAQz/z8RB uIsq4QwYSrXzocT4UT482heVl7xPnmK3Eaplxtf9YXfS86LEIX8u9Q+sr/2FhEF7g4kWAx 3qj/XlXudVnpeSQ5HQgHgE08IGizzwVf2axPYrXA/Zfpbmo6ypQ+iP+KUxs5GYdachkrha yZH2Djfc/XqxUD1VlmQATDgOuXNg3qzuIdeXp8S4IlYT3EZiWDmATxc8GrQZHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712169781; a=rsa-sha256; cv=none; b=orr1Cg2NCNG4SbCBQI6y/8vWBNtujEghwZmjfSxkhBiWka1PVd+s3857CChiEaH4CWm5tb HNcCF+6Ygveap5UUT84ef9hgetci1+qOFAvyWtLlX6wPiJYay0EP9FQwaM0y88LsfCpcoj gwgFKh/kQTIKl8XtsC1+zlzbZJm53tJbjo2KUeoGk+fENTYHs+kgsS5wBUmRlv+oWt3gLI V8DeGc82wB7cwXIpAM+3bzIfgMugwPFFUsm57l2sAkn6tNRC+VNgKR37FZS5NacxdpvsyV WzWq5ky3eU2KWCt8A5xBeFyOtSy3TrxbO2i3mAT9n29dkEHtnr23Er6Lt8al2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712169781; 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=3fzyxi2yE+R2ELXDYROoXBRS8Ww1U/RFLFHs8tAuEjQ=; b=Gwy5YZ/HFQ20UeMVEd9LlG4vTudTMDPvOLkBiVAhH2QxLfTL2WqgOWYldCbkLukcuPwDsK 9sGSYz1y6+fDmYichOvxc6udE76jsFSFqKbOR0sfUmiku5YmiPN1q9ejZ1zMDhZCNlsXfY R+jD/g1zSodQYVAc9FTJJzBSVl3yMujCV4iwcbO6Qvwr2NVmzVR0iLsRgqS+oG8o2VprjT 3AHXakqcg4mwlywp5FKbcAyujyZzRkW1ynaCyMeF1dF/5jTWRvDNx2MJn6cM+y/cS0tBz6 wLxZfd04Q2zrr+XF2b9ZBRQavFmJcvmrkzHG2nCFrSJqE6lnExJachPzdn/chA== 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 4V8tsx3JswzkbR; Wed, 3 Apr 2024 18:43:01 +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 433Ih1fT050316; Wed, 3 Apr 2024 18:43:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 433Ih1IV050313; Wed, 3 Apr 2024 18:43:01 GMT (envelope-from git) Date: Wed, 3 Apr 2024 18:43:01 GMT Message-Id: <202404031843.433Ih1IV050313@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: bf782a93382e - main - sysutils/screen: Register conflict with sysutils/screen-devel 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf782a93382e1f781b5faaacfbd44fec6bfe9df7 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=bf782a93382e1f781b5faaacfbd44fec6bfe9df7 commit bf782a93382e1f781b5faaacfbd44fec6bfe9df7 Author: Cy Schubert AuthorDate: 2024-04-03 18:42:22 +0000 Commit: Cy Schubert CommitDate: 2024-04-03 18:42:51 +0000 sysutils/screen: Register conflict with sysutils/screen-devel --- sysutils/screen/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index 096ab65941bc..7d4d8e4167ac 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -15,6 +15,8 @@ MAINTAINER= cy@FreeBSD.org COMMENT= Multi-screen window manager WWW= https://www.gnu.org/software/screen/ +CONFLICTS= screen-devel* + LICENSE= GPLv3 OPTIONS_DEFINE= INFO NETHACK XTERM_256 SYSTEM_SCREENRC MULTIUSER \