From nobody Mon Jan 15 10:39:10 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TD7t65ZCYz56bBR; Mon, 15 Jan 2024 10:39:10 +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 4TD7t655c4z48Td; Mon, 15 Jan 2024 10:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705315150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Awa/zGyNny3m0t2be2HMr8TjucrcMzuxUJY+gyu1vcw=; b=Q23bhmo2bi6jsg6AvC0x4oZ0I2m0yGfH0xUU4Z5IQBFFM+JzWSWRfp1jM/5dhClJA8xMSs OoLzrD2umB6+V5mvfFgxg4gp26spPqihVesYgl0WAHkSOPjibYLjlUS+7xxPx8psv/NT7b PWDtxRGieubxt8l3LzvVWq7MzCOGnECkSJMUAOVllshGtZQ7rOFFzrb87JESP3+zhOsJT+ rfkwg+P9CmP2aY3c2+4SdAmaL4xFMl3Tz19QyRpOziORtLW7WjZVQTndFnnc+ghYo10Ceu h3qEQhAR/c6op26mRmuqB5MrIfEBQJKFakITqI9l42DMVOoQhNpSjLIaLkRJ2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705315150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Awa/zGyNny3m0t2be2HMr8TjucrcMzuxUJY+gyu1vcw=; b=xKmk7va5kZH+A8E4EWyNioxK22lZ+sNma6iSIqbMy7lP5N7S5ZCwN2Dlyge/19wN8nbrkm JLqMH/Q8TjMQl5RUn6nuMAOYO2rbzA8auSiYNZKZy0YhSR81c2ns+AOCjMdLOi8c2L5mOI NNoduraSOS/6FpL+O3bWKPrXfvIIRNZKxwucPAXOjtZf1Eq1Kfegq4j1L6gAr7pHxAuEyR ugEeWYoIhDMHjAV17sokB23ipxbbDfkCbV8Etwg/AGHvekfr6TUn/GPasBbi9RXq1sk4AF oCDZ3dK4CnX134ueXISZryqB8GkdFHJliJZH/QhsTbc7JyZZihAFIeAbpZFipQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705315150; a=rsa-sha256; cv=none; b=RWFPIiUb+DiPYM88QFVQL6EClUHwnLhClukWB6lmjcOheQeLSLQJuPa9kreLQlw0gue5Fe ukSduPAahhPvqhRXOAjWg3qIvelTDWzQfqBaqj0BjF4XkvJhT8ikB2b5rzb0UJu9IK9BX2 ZQiCwObly0lVKu+D2TmoMm9ywoFpYBsslWWlW/pyBRLv/b0mxU+6uC+lWwPMvxXPu4ZknZ DCfdgYA/E+L/IGXKRlwamneuJZh5H5BlHoMhA4d0cXGj4WDknc61aXKbSfAc6YpHRfWhHo ZSMSb3cjDZoKKgvv7jLu/5SGNoeP8MBNUomq3FgRfC0ci+qhpUD72IA/NleP8A== 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 4TD7t6497lzskv; Mon, 15 Jan 2024 10:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40FAdAqr021555; Mon, 15 Jan 2024 10:39:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40FAdAJM021552; Mon, 15 Jan 2024 10:39:10 GMT (envelope-from git) Date: Mon, 15 Jan 2024 10:39:10 GMT Message-Id: <202401151039.40FAdAJM021552@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: a5ade24bb0d7 - main - misc/mc: drop needless run-time dependencies on Aspell and Xlib List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: a5ade24bb0d77d5ca30a27dc33748ff644a09588 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5ade24bb0d77d5ca30a27dc33748ff644a09588 commit a5ade24bb0d77d5ca30a27dc33748ff644a09588 Author: Alexey Dokuchaev AuthorDate: 2024-01-15 10:38:18 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-01-15 10:38:18 +0000 misc/mc: drop needless run-time dependencies on Aspell and Xlib Yury V. Zaytsev points out that for X11 and Aspell support, header files and are only needed during the build, while their corresponding libraries would be loaded dynamically if available; if not, mc(1) would still work fine, just without those features. The source code and ldd(1) output confirm his findings: % cd $WRKDIR/mc-4.8.30 && grep -R -A1 g_module_build_path * lib/tty/x11conn.c: x11_module_fname = g_module_build_path (NULL, "X11"); lib/tty/x11conn.c- x11_module = g_module_open (x11_module_fname, G_MODULE_BIND_LAZY); -- src/editor/spell.c: spell_module_fname = g_module_build_path (NULL, "libaspell"); src/editor/spell.c- spell_module = g_module_open (spell_module_fname, G_MODULE_BIND_LAZY); This allows to enable Aspell support by default and drop X11-less slave port now that both of these dependencies are build-time only yet still can be completely disabled via options. PR: 269120 --- MOVED | 1 + misc/Makefile | 1 - misc/mc-nox11/Makefile | 4 ---- misc/mc/Makefile | 11 +++++------ 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/MOVED b/MOVED index 2baed981019d..5a8c9bae5153 100644 --- a/MOVED +++ b/MOVED @@ -2933,3 +2933,4 @@ net-im/libaccounts-qt5|net-im/libaccounts-qt|2024-01-05|Renamed to support flavo devel/py-pygithub|devel/py-PyGithub|2024-01-06|Rename port match upstream devel/freebsd-gcc9||2024-01-09|No longer able to build base system, use GCC 12 or later instead net/downzemall|net/arrowdl|2024-01-11|Project was renamed upstream +misc/mc-nox11|misc/mc|2023-01-15|No longer useful (misc/mc does not require Xlib at runtime) diff --git a/misc/Makefile b/misc/Makefile index 219cd07ac295..7c358530f4bb 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -259,7 +259,6 @@ SUBDIR += mate-user-guide SUBDIR += mbuffer SUBDIR += mc - SUBDIR += mc-nox11 SUBDIR += mdp SUBDIR += meshoptimizer SUBDIR += metalink-checker diff --git a/misc/mc-nox11/Makefile b/misc/mc-nox11/Makefile deleted file mode 100644 index 6f1710a2814a..000000000000 --- a/misc/mc-nox11/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -MASTERDIR= ${.CURDIR}/../mc -OPTIONS_EXCLUDE= X11 - -.include "${MASTERDIR}/Makefile" diff --git a/misc/mc/Makefile b/misc/mc/Makefile index d7f41964a223..b6e0f887b391 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -1,5 +1,6 @@ PORTNAME= mc PORTVERSION= 4.8.30 +PORTREVISION= 1 CATEGORIES= misc shells MASTER_SITES= http://ftp.midnight-commander.org/ \ https://ftp.osuosl.org/pub/midnightcommander/ @@ -29,7 +30,7 @@ CONFIGURE_ENV= ZIP=${LOCALBASE}/bin/zip UNZIP=${UNZIP_NATIVE_CMD} PORTDOCS= AUTHORS FAQ HACKING MAINTAINERS NEWS README *.txt OPTIONS_DEFINE= ASPELL DOCS EDITOR EXTATTR ICONV NLS PCRE2 SFTP SUBSHELL X11 -OPTIONS_DEFAULT= EDITOR ICONV SFTP SLANG SUBSHELL X11 +OPTIONS_DEFAULT= ASPELL EDITOR ICONV SFTP SLANG SUBSHELL X11 OPTIONS_SINGLE= SCREEN OPTIONS_SINGLE_SCREEN= SLANG NCURSES OPTIONS_SUB= yes @@ -41,8 +42,9 @@ PCRE2_DESC= Use PCRE2 as low-level search engine SCREEN_DESC= Screen library SFTP_DESC= Support for SFTP (via libssh) SUBSHELL_DESC= Build with subshell support +X11_DESC= X11 events support (if available) -ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_BUILD_DEPENDS= ${LOCALBASE}/include/aspell.h:textproc/aspell ASPELL_CONFIGURE_ENABLE=aspell EDITOR_CONFIGURE_WITH= internal-edit @@ -71,11 +73,8 @@ SLANG_CONFIGURE_ON= --with-screen=slang SUBSHELL_CONFIGURE_WITH=subshell SUBSHELL_SUB_FILES= pkg-message +X11_BUILD_DEPENDS= ${LOCALBASE}/include/X11/Xlib.h:x11/libX11 X11_CONFIGURE_WITH= x -X11_USES= xorg -X11_USE= xorg=x11,xext -X11_VARS= CONFLICTS_INSTALL=mc-nox11 -X11_VARS_OFF= CONFLICTS_INSTALL=mc PKGNAMESUFFIX=-nox11 post-patch: @${REINPLACE_CMD} -e 's|clang\*)|*)|' ${WRKSRC}/configure