Index: misc/mc/Makefile
===================================================================
--- misc/mc/Makefile	(revision 402164)
+++ misc/mc/Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mc
-PORTVERSION=	4.8.14
-PORTREVISION=	1
+PORTVERSION=	4.8.15
 CATEGORIES=	misc shells
 MASTER_SITES=	http://ftp.midnight-commander.org/ \
 		http://ftp.osuosl.org/pub/midnightcommander/ \
@@ -48,18 +47,24 @@
 ICONV_USES=		iconv
 ICONV_CONFIGURE_ENABLE=	charset
 
+NCURSES_CONFIGURE_ON=	--with-screen=ncurses
+
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
+NLS_CPPFLAGS=		-I${LOCALBASE}/include
+NLS_LDFLAGS=		-L${LOCALBASE}/lib
 
 SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_CONFIGURE_ON=	--with-screen=slang --with-slang-includes=${LOCALBASE}/include
 
 SMB_CONFIGURE_ENABLE=	vfs-smb
-SMB_CONFIGURE_ON=	--with-smb-configdir=${LOCALBASE}/etc \
-			--with-smb-codepagedir=${LOCALBASE}/etc/codepages
+SMB_CONFIGURE_WITH=	smb-configdir=${LOCALBASE}/etc \
+			smb-codepagedir=${LOCALBASE}/etc/codepages
 
-SUBSHELL_CONFIGURE_WITH=	subshell
+SUBSHELL_CONFIGURE_WITH=subshell
 
 X11_CONFIGURE_ENABLE=	x
+X11_USE=		xorg=x11,xext
 
 PORTDOCS=	*
 
@@ -70,25 +75,6 @@
 DOCSDIR2=	${DOCSDIR}/doc
 DOC_FILES2=	FAQ HACKING MAINTAINERS *.txt
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-.endif
-
-.if${PORT_OPTIONS:MX11}
-USE_XORG=	x11 xext
-.endif
-
-.if ${PORT_OPTIONS:MSLANG}
-CONFIGURE_ARGS+=--with-screen=slang --with-slang-includes=${LOCALBASE}/include
-.endif
-
-.if ${PORT_OPTIONS:MNCURSES}
-CONFIGURE_ARGS+=--with-screen=ncurses
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e 's|missing-parameter-type|unused-variable|; \
 		s|but-set-variable|variable|' \
Index: misc/mc/distinfo
===================================================================
--- misc/mc/distinfo	(revision 402164)
+++ misc/mc/distinfo	(working copy)
@@ -1,4 +1,4 @@
-SHA256 (mc-4.8.14.tar.xz) = 6b1f74efbdf394bfab084f4d2ea2e72173de5f12cd42be2533ca2c3b72edb8e6
-SIZE (mc-4.8.14.tar.xz) = 2305788
+SHA256 (mc-4.8.15.tar.xz) = cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16
+SIZE (mc-4.8.15.tar.xz) = 2304812
 SHA256 (mc.png) = 6bd935ea11c45da5c11e60542e30b4a05396d75b81401f28b3a68a82cafbf8fe
 SIZE (mc.png) = 6466
Index: misc/mc/files/patch-lib_utilunix.c
===================================================================
--- misc/mc/files/patch-lib_utilunix.c	(revision 402164)
+++ misc/mc/files/patch-lib_utilunix.c	(nonexistent)
@@ -1,11 +0,0 @@
---- lib/utilunix.c.orig	2015-04-12 03:04:27 UTC
-+++ lib/utilunix.c
-@@ -528,7 +528,7 @@ mc_popen (const char *command, GError **
-         goto ret_err;
-     }
- 
--    if (!g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL,
-+    if (!g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL,
-                                    &p->child_pid, NULL, &p->out.fd, &p->err.fd, error))
-     {
-         mc_replace_error (error, MC_PIPE_ERROR_CREATE_PIPE_STREAM, "%s",

Property changes on: misc/mc/files/patch-lib_utilunix.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: misc/mc/pkg-plist
===================================================================
--- misc/mc/pkg-plist	(revision 402164)
+++ misc/mc/pkg-plist	(working copy)
@@ -103,8 +103,8 @@
 %%NLS%%share/locale/eu/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/fa/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/mc.mo
-%%NLS%%share/locale/fi_FI/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/fr_CA/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/mc.mo
@@ -129,9 +129,9 @@
 %%NLS%%share/locale/sl/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/mc.mo
-%%NLS%%share/locale/sv_SE/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/szl/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/ta/LC_MESSAGES/mc.mo
+%%NLS%%share/locale/te/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/mc.mo
@@ -153,6 +153,7 @@
 %%NLS%%%%DATADIR%%/help/mc.hlp.ru
 %%NLS%%%%DATADIR%%/help/mc.hlp.sr
 %%DATADIR%%/hints/mc.hint
+%%DATADIR%%/hints/mc.hint.ar
 %%NLS%%%%DATADIR%%/hints/mc.hint.az
 %%NLS%%%%DATADIR%%/hints/mc.hint.be
 %%NLS%%%%DATADIR%%/hints/mc.hint.bg