Skip to content

Commit d37893d

Browse files
Alexey DokuchaevAlexey Dokuchaev
authored andcommitted
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
1 parent 8197a73 commit d37893d

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

misc/mc/Makefile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
PORTNAME= mc
44
PORTVERSION= 4.8.27
5+
PORTREVISION= 1
56
CATEGORIES= misc shells
67
MASTER_SITES= http://ftp.midnight-commander.org/ \
78
https://ftp.osuosl.org/pub/midnightcommander/
@@ -24,18 +25,22 @@ CONFIGURE_ENV= ZIP=${LOCALBASE}/bin/zip UNZIP=${UNZIP_NATIVE_CMD}
2425

2526
PORTDOCS= AUTHORS FAQ HACKING MAINTAINERS NEWS README *.txt
2627

27-
OPTIONS_DEFINE= DOCS EDITOR EXTATTR ICONV NLS SFTP SMB SUBSHELL X11
28+
OPTIONS_DEFINE= ASPELL DOCS EDITOR EXTATTR ICONV NLS SFTP SMB SUBSHELL X11
2829
OPTIONS_DEFAULT= EDITOR ICONV SFTP SLANG SMB SUBSHELL X11
2930
OPTIONS_SINGLE= SCREEN
3031
OPTIONS_SINGLE_SCREEN= SLANG NCURSES
3132
OPTIONS_SUB= yes
3233

34+
ASPELL_DESC= Aspell support for internal editor
3335
EDITOR_DESC= Build with internal editor
3436
EXTATTR_DESC= Extended attributes support
3537
SCREEN_DESC= Screen library
3638
SFTP_DESC= Support for SFTP (via libssh)
3739
SUBSHELL_DESC= Build with subshell support
3840

41+
ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell
42+
ASPELL_CONFIGURE_ENABLE=aspell
43+
3944
EDITOR_CONFIGURE_WITH= internal-edit
4045

4146
EXTATTR_LIB_DEPENDS= libe2p.so:sysutils/e2fsprogs
@@ -58,13 +63,13 @@ SLANG_LIB_DEPENDS= libslang.so:devel/libslang2
5863
SLANG_CONFIGURE_ON= --with-screen=slang --with-slang-includes=${LOCALBASE}/include
5964

6065
SMB_CONFIGURE_ENABLE= vfs-smb
61-
SMB_CONFIGURE_WITH= smb-configdir=${LOCALBASE}/etc \
62-
smb-codepagedir=${LOCALBASE}/etc/codepages
66+
SMB_CONFIGURE_ON= --with-smb-configdir=${LOCALBASE}/etc \
67+
--with-smb-codepagedir=${LOCALBASE}/etc/codepages
6368

6469
SUBSHELL_CONFIGURE_WITH=subshell
6570
SUBSHELL_SUB_FILES= pkg-message
6671

67-
X11_CONFIGURE_ENABLE= x
72+
X11_CONFIGURE_WITH= x
6873
X11_USES= xorg
6974
X11_USE= xorg=x11,xext
7075
X11_VARS= CONFLICTS_INSTALL+="mc-nox11-[0-9]*"

0 commit comments

Comments
 (0)