From owner-dev-commits-ports-all@freebsd.org Wed Sep 22 06:32:43 2021 Return-Path: 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 1191C6AC989; Wed, 22 Sep 2021 06:32:43 +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 4HDpPk6tbDz4RXZ; Wed, 22 Sep 2021 06:32:42 +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 C215B12FAD; Wed, 22 Sep 2021 06:32:42 +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 18M6Wgjj092519; Wed, 22 Sep 2021 06:32:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18M6Wg62092518; Wed, 22 Sep 2021 06:32:42 GMT (envelope-from git) Date: Wed, 22 Sep 2021 06:32:42 GMT Message-Id: <202109220632.18M6Wg62092518@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: d37893d25e54 - main - misc/mc: handling of the port's options had been improved (+) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d37893d25e54a580b0c7f9ceaef3f6a3814815da 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Sep 2021 06:32:43 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=d37893d25e54a580b0c7f9ceaef3f6a3814815da commit d37893d25e54a580b0c7f9ceaef3f6a3814815da Author: Alexey Dokuchaev AuthorDate: 2021-09-22 06:26:32 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-09-22 06:29:22 +0000 misc/mc: handling of the port's options had been improved (+) - Use correct helper for X11 option, which is --with-x, not --enable-x - Do not pass bogus --without-smb-foobar=... options when SMB support is disabled - Allow to build with Aspell support in the internal editor while here PR: 258632 --- misc/mc/Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/misc/mc/Makefile b/misc/mc/Makefile index 60fe6d95024e..ea04ec6871d2 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -2,6 +2,7 @@ PORTNAME= mc PORTVERSION= 4.8.27 +PORTREVISION= 1 CATEGORIES= misc shells MASTER_SITES= http://ftp.midnight-commander.org/ \ https://ftp.osuosl.org/pub/midnightcommander/ @@ -24,18 +25,22 @@ 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_DEFINE= ASPELL DOCS EDITOR EXTATTR ICONV NLS SFTP SMB SUBSHELL X11 OPTIONS_DEFAULT= EDITOR ICONV SFTP SLANG SMB SUBSHELL X11 OPTIONS_SINGLE= SCREEN OPTIONS_SINGLE_SCREEN= SLANG NCURSES OPTIONS_SUB= yes +ASPELL_DESC= Aspell support for internal editor EDITOR_DESC= Build with internal editor EXTATTR_DESC= Extended attributes support SCREEN_DESC= Screen library SFTP_DESC= Support for SFTP (via libssh) SUBSHELL_DESC= Build with subshell support +ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_CONFIGURE_ENABLE=aspell + EDITOR_CONFIGURE_WITH= internal-edit EXTATTR_LIB_DEPENDS= libe2p.so:sysutils/e2fsprogs @@ -58,13 +63,13 @@ 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 +SMB_CONFIGURE_ON= --with-smb-configdir=${LOCALBASE}/etc \ + --with-smb-codepagedir=${LOCALBASE}/etc/codepages SUBSHELL_CONFIGURE_WITH=subshell SUBSHELL_SUB_FILES= pkg-message -X11_CONFIGURE_ENABLE= x +X11_CONFIGURE_WITH= x X11_USES= xorg X11_USE= xorg=x11,xext X11_VARS= CONFLICTS_INSTALL+="mc-nox11-[0-9]*"