--- misc/Makefile	(revision 503721)
+++ misc/Makefile	(working copy)
@@ -247,6 +247,7 @@ 
     SUBDIR += mbuffer
     SUBDIR += mc
     SUBDIR += mc-light
+    SUBDIR += mc-nox11
     SUBDIR += mdp
     SUBDIR += metalink-checker
     SUBDIR += metalink-editor
--- misc/mc/Makefile	(revision 503721)
+++ misc/mc/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	mc
 PORTVERSION=	4.8.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc shells
 MASTER_SITES=	http://ftp.midnight-commander.org/ \
 		https://ftp.osuosl.org/pub/midnightcommander/
@@ -60,6 +60,8 @@ 
 
 X11_CONFIGURE_ENABLE=	x
 X11_USE=		xorg=x11,xext
+X11_VARS=		CONFLICTS_INSTALL+="mc-nox11-[0-9]*"
+X11_VARS_OFF=		CONFLICTS_INSTALL+="mc-[0-9]*" PKGNAMESUFFIX=-nox11
 
 PORTDOCS=	*
 
--- misc/mc-nox11/Makefile	(nonexistent)
+++ misc/mc-nox11/Makefile	(working copy)
@@ -0,0 +1,7 @@ 
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../mc
+PKGNAMESUFFIX=	-nox11
+OPTIONS_EXCLUDE=	X11
+
+.include "${MASTERDIR}/Makefile"