git: 4eb82883317e - main - misc/mc: the port had been improved (+)

[Alexey Dokuchaev]

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4eb82883317e97c3851e041c415fca854bf062fc

commit 4eb82883317e97c3851e041c415fca854bf062fc
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-06-24 08:02:58 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-06-24 08:03:15 +0000

    misc/mc: the port had been improved (+)
    
    - By popular demand, disable EXTATTR option by default: the benefits
      it provides are outweighed by having to pull `sysutils/e2fsprogs'
      port as dependency and various troubles people are having with it.
      While here, adjust the description as it was is a bit misleading:
      it is not limited exclusively to ext2fs, but can also manage UFS-
      specific flags like append-only, etc. [1]
    
    - Fix ZIP/UNZIP program detection and add missing dependency on the
      `archivers/zip' as FreeBSD does not provide native zip(1) program.
      This bug had been present since late 2014: when fixing PR 193766,
      an incomplete patch had been committed; it went unnoticed because
      apparently users rarely create ZIP archives, and extraction worked
      because `archivers/unzip' is very commonly installed package [2]
    
    PR:     249284, 256766 [1]
            256546, 193766 [2]
---
 misc/mc/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 781b68b1149f..87f5ef38bbe5 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	mc
 PORTVERSION=	4.8.26
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc shells
 MASTER_SITES=	http://ftp.midnight-commander.org/ \
 		https://ftp.osuosl.org/pub/midnightcommander/
@@ -13,24 +13,26 @@ COMMENT=	Midnight Commander, a free Norton Commander Clone
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+RUN_DEPENDS=	zip:archivers/zip
+
 USES=		gmake gnome libtool perl5 pkgconfig python shebangfix tar:xz
 SHEBANG_FILES=	${WRKSRC}/src/vfs/extfs/helpers/s3+.in \
 		${WRKSRC}/src/vfs/extfs/helpers/uc1541
 python_OLD_CMD=	@PYTHON@
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	ZIP=${ZIP_CMD} UNZIP=${UNZIP_CMD}
+CONFIGURE_ENV=	ZIP=${LOCALBASE}/bin/zip UNZIP=${UNZIP_NATIVE_CMD}
 
 PORTDOCS=	AUTHORS FAQ HACKING MAINTAINERS NEWS README *.txt
 
 OPTIONS_DEFINE=	DOCS EDITOR EXTATTR ICONV NLS SFTP SMB SUBSHELL X11
-OPTIONS_DEFAULT=	EDITOR EXTATTR ICONV SFTP SLANG SMB SUBSHELL X11
+OPTIONS_DEFAULT=	EDITOR ICONV SFTP SLANG SMB SUBSHELL X11
 OPTIONS_SINGLE=	SCREEN
 OPTIONS_SINGLE_SCREEN=	SLANG NCURSES
 OPTIONS_SUB=	yes
 
 EDITOR_DESC=	Build with internal editor
-EXTATTR_DESC=	Ext2fs extended attributes support
+EXTATTR_DESC=	Extended attributes support
 SCREEN_DESC=	Screen library
 SFTP_DESC=	Support for SFTP (via libssh)
 SUBSHELL_DESC=	Build with subshell support