From owner-dev-commits-ports-all@freebsd.org  Mon May  3 13:01:07 2021
Return-Path: <owner-dev-commits-ports-all@freebsd.org>
Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id C2194632A16;
 Mon,  3 May 2021 13:01:07 +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 4FYjlR5D61z4nwG;
 Mon,  3 May 2021 13:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 A6C041E5F3;
 Mon,  3 May 2021 13:01:07 +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 143D17UC058192;
 Mon, 3 May 2021 13:01:07 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
 by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 143D17ah058191;
 Mon, 3 May 2021 13:01:07 GMT (envelope-from git)
Date: Mon, 3 May 2021 13:01:07 GMT
Message-Id: <202105031301.143D17ah058191@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
 dev-commits-ports-main@FreeBSD.org
From: Mathieu Arnold <mat@FreeBSD.org>
Subject: git: 614b5da0cb87 - main - Ports should not change their names
 depending on options.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: mat
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 614b5da0cb87aff908ea93228dffe59f4ef81caf
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the ports repository
 <dev-commits-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-ports-all>, 
 <mailto:dev-commits-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-ports-all/>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Help: <mailto:dev-commits-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-all>, 
 <mailto:dev-commits-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 May 2021 13:01:07 -0000

The branch main has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=614b5da0cb87aff908ea93228dffe59f4ef81caf

commit 614b5da0cb87aff908ea93228dffe59f4ef81caf
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2021-05-03 13:00:24 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2021-05-03 13:00:24 +0000

    Ports should not change their names depending on options.
    
    Reported by:    tech-lists zyxst net
---
 misc/mc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 23849f0745d3..a14aaafed058 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -61,7 +61,7 @@ X11_CONFIGURE_ENABLE=	x
 X11_USES=		xorg
 X11_USE=		xorg=x11,xext
 X11_VARS=		CONFLICTS_INSTALL+="mc-nox11-[0-9]*"
-X11_VARS_OFF=		CONFLICTS_INSTALL+="mc-[0-9]*" PKGNAMESUFFIX=-nox11
+X11_VARS_OFF=		CONFLICTS_INSTALL+="mc-[0-9]*"
 
 PORTDOCS=	*