Index: branches/2017Q3/misc/mc/Makefile =================================================================== --- branches/2017Q3/misc/mc/Makefile (revision 446489) +++ branches/2017Q3/misc/mc/Makefile (revision 446490) @@ -1,101 +1,101 @@ # Created by: torstenb@FreeBSD.org # $FreeBSD$ PORTNAME= mc PORTVERSION= 4.8.19 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc shells MASTER_SITES= http://ftp.midnight-commander.org/ \ http://ftp.osuosl.org/pub/midnightcommander/ MAINTAINER= woodsb02@FreeBSD.org COMMENT= Midnight Commander, a free Norton Commander Clone LICENSE= GPLv3 CONFLICTS= mc-light-4* USES= gmake shebangfix perl5 pkgconfig tar:xz libtool SHEBANG_FILES= misc/mcedit.menu.in configure configure.ac \ ${WRKSRC}/src/vfs/extfs/helpers/Makefile.in \ ${WRKSRC}/src/vfs/extfs/helpers/s3+.in \ ${WRKSRC}/src/vfs/extfs/helpers/uc1541.in python_CMD= ${LOCALBASE}/bin/python2 python_OLD_CMD= @PYTHON@ USE_GNOME= glib20 GNU_CONFIGURE= yes CONFIGURE_ENV= ZIP=${ZIP_CMD} UNZIP=${UNZIP_CMD} OPTIONS_DEFINE= DOCS EDITOR ICONV NLS SFTP SMB SUBSHELL X11 OPTIONS_SINGLE= SCREEN OPTIONS_SINGLE_SCREEN= SLANG NCURSES OPTIONS_DEFAULT=EDITOR ICONV SFTP SLANG SMB SUBSHELL X11 EDITOR_DESC= Build with internal editor SFTP_DESC= Support for SFTP (via libssh) SUBSHELL_DESC= Build with subshell support OPTIONS_SUB= yes EDITOR_CONFIGURE_WITH= internal-edit 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 SFTP_LIB_DEPENDS= libssh2.so:security/libssh2 SFTP_CONFIGURE_ENABLE= vfs-sftp SLANG_LIB_DEPENDS= libslang.so:devel/libslang2 SLANG_CONFIGURE_ON= --with-screen=slang --with-slang-includes=${LOCALBASE}/include SMB_CONFIGURE_ENABLE= vfs-smb SMB_CONFIGURE_WITH= smb-configdir=${LOCALBASE}/etc \ smb-codepagedir=${LOCALBASE}/etc/codepages SUBSHELL_CONFIGURE_WITH=subshell X11_CONFIGURE_ENABLE= x X11_USE= xorg=x11,xext PORTDOCS= * DOCSRCDIR1= ${WRKSRC} DOC_FILES1= AUTHORS NEWS README DOCSRCDIR2= ${WRKSRC}/doc DOCSDIR2= ${DOCSDIR}/doc DOC_FILES2= FAQ HACKING MAINTAINERS *.txt post-patch: @${REINPLACE_CMD} -e 's|missing-parameter-type|unused-variable|; \ s|but-set-variable|variable|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|SUBDIRS = intl|SUBDIRS =|' ${WRKSRC}/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR2} ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} post-install-X11-on: ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200030 EXTRA_PATCHES= ${FILESDIR}/extra-patch-src_diffviewer_ydiff.c RUN_DEPENDS= gdiff:textproc/diffutils .endif .include Index: branches/2017Q3/misc/mc/files/patch-src_filemanager_midnight.c =================================================================== --- branches/2017Q3/misc/mc/files/patch-src_filemanager_midnight.c (nonexistent) +++ branches/2017Q3/misc/mc/files/patch-src_filemanager_midnight.c (revision 446490) @@ -0,0 +1,11 @@ +--- src/filemanager/midnight.c.orig 2017-03-04 17:51:38 UTC ++++ src/filemanager/midnight.c +@@ -879,7 +879,7 @@ setup_mc (void) + add_select_channel (mc_global.tty.subshell_pty, load_prompt, 0); + #endif /* !ENABLE_SUBSHELL */ + +- if ((tty_baudrate () < 9600) || mc_global.tty.slow_terminal) ++ if ((tty_baudrate () > 0 && tty_baudrate () < 9600) || mc_global.tty.slow_terminal) + verbose = FALSE; + } + Property changes on: branches/2017Q3/misc/mc/files/patch-src_filemanager_midnight.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q3 =================================================================== --- branches/2017Q3 (revision 446489) +++ branches/2017Q3 (revision 446490) Property changes on: branches/2017Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r446488