From nobody Fri Feb 27 18:45:48 2026 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 4fMy2N3Grgz6Sy1M for ; Fri, 27 Feb 2026 18:45:48 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMy2N2d8Yz3Jnt for ; Fri, 27 Feb 2026 18:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772217948; 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=FJCxq8QngRxJZq2eByEgm8wC471NNifobw2zDsMEmLQ=; b=m+9b0n22EJmLhAmFb5pYhKQbuhdhmbREF57gkqK2idQZ5+9f+6fnV29yv1McUzYfv9wQRZ iM8FOF8bFiqf0OFDm18qqDvwS77JD5eJRk9AZw1F3+LE1KOGKvXjQk6jW8dOH6J62WR5xp qVvnj91CIBeYTwLII770P/OHFsZZ8YPdr1U4JhSN/OtKlYlUGLqp+7wVJmIix1m05kiAyR ujs+N9K8NkDZmQcP6Tu0dHvCWjapJJC6TDyQMCNfU/PbcGKM1qKN29KBH8ALZjrSwHayYJ tYe9gdgZrsUQ0ftXa7DzDuy7YaLGHjA1maB3r41RddvjSgMIg494DHB1yKm+4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772217948; a=rsa-sha256; cv=none; b=gGGUTd+v37ajIHD64onVwfnrv8sDxYbEX2/ri3Jfs7nq7lN82d+JVbq5CowrBaiVrDNpXP nQoOoE9cEmHT/MyWHDIUqcoYWaWyQdDnX04JV+N6x2KVUZdmVEJbYYDM0zSYJ7eRrfcmYN Xv1N9WNrxIkWl1hsKoHBRdRh5uGOX6I7UiuxPnReeCshQGcceCnmMZXruIt3XZMbt4eXxx RIsH8BAvofRB4c0DzMOTGqc1edfHOIln0sK0srZk43PVHCCZvTn6oEHq5JhBhqj8NnxqfG AcbyDBSPojjmuuCJCxR//e/KLeymHveE5P0QWddl2/nBQ8xgi4QVOKuSSD1cuA== 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=1772217948; 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=FJCxq8QngRxJZq2eByEgm8wC471NNifobw2zDsMEmLQ=; b=xTYGP0CFoZ9ObefI8yjIKZ4na8VZuP1oV2B5lWAR06s9i94qtEsnc+RZSX0pKw1dD4PGGy Eta+ZTUY+u/YsVEAp/DexXq8wxw/5rS4XoMT7vCs/bQihtJMtYB8CFNOQcwtZMTCWB6ZO4 WD0+2+KnDTriqjsKsuAJeybcxkocJfO5Q0ZGEeV/rZuJHNQh3BfyKL5Bc4fn9xqhrQhwSl ymq3x5+U1W3ccOiI3RuAJSgj41Yp+jYJiDzSqP7eiV2pXt0XeT2L1240aegKQHB/82WYuJ rxOLDa/RyY+4amraEpfUlyiC6SCcKT7wEWHCSllYdUEfTRdD6EbgkGLz71Q5QQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMy2N2DbCzCb7 for ; Fri, 27 Feb 2026 18:45:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1889b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 18:45:48 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 640802444aac - main - shells/ksh-devel: Fixup conflict with ksh93 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 640802444aac631cbc0755389f412abfceb4e13b Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 18:45:48 +0000 Message-Id: <69a1e65c.1889b.2e9ebb42@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=640802444aac631cbc0755389f412abfceb4e13b commit 640802444aac631cbc0755389f412abfceb4e13b Author: Cy Schubert AuthorDate: 2026-02-27 18:45:01 +0000 Commit: Cy Schubert CommitDate: 2026-02-27 18:45:01 +0000 shells/ksh-devel: Fixup conflict with ksh93 ksh-devel only conflicts with ksh93 when it installs the same binary. --- shells/ksh-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shells/ksh-devel/Makefile b/shells/ksh-devel/Makefile index 5783f67a977d..5ed155352059 100644 --- a/shells/ksh-devel/Makefile +++ b/shells/ksh-devel/Makefile @@ -34,7 +34,7 @@ GH_TAGNAME= ${HASH} # $PATH. KSH_CONFLICTS= pdksh KSH93_CONFLICTS= ksh93 ast-ksh -KSH93D_CONFLICTS= ksh93 ast-ksh +KSH93D_CONFLICTS= ast-ksh OPTIONS_DEFAULT= KSH93 EXAMPLES OPTIONS_DEFINE= EXAMPLES STATIC