From nobody Wed Aug 10 11:20:30 2022 X-Original-To: dev-commits-ports-main@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 4M2nYC23gvz4Xy55; Wed, 10 Aug 2022 11:20:31 +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 4M2nYC1XJSz3N5F; Wed, 10 Aug 2022 11:20:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660130431; 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=0r3Umkxh4LZrXFMpxwsmrdz4MN4+1yI7+QJu1gHi8YU=; b=YSsr/bFZwAe3fUFwRQZm6nLG3leqAVT9zkzlNBx+/XX5S8Nc34L2ijB0yY0ILB9SvYOk0M GV0rXYgaFB7TVP0CPKXHbt0GjaTAqKdzGFJn4tWXYgLeaa5Txs/yU+tZfHqD1dUEW/23ke n2Df/IxI1W4Fi5vAMIY7bW1fPETl+eL+02Zwi/hxCKibJszR12hate54k+utMNXtwEQdWR /r8l/m8KfItleX+yJ4Lrqmn8WAFH2YcEEjB1urUrp9heEcHstZ7Lp33WJeaBjcI/SLlBh1 BIM1aBVKE8/OO6fDX61EIK4buYUvmI8qR0X3LbhTPwJRWKlkx9mHmwzOJe8O9g== 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 4M2nYC0LnZz18bS; Wed, 10 Aug 2022 11:20:31 +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 27ABKUjK085008; Wed, 10 Aug 2022 11:20:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27ABKUsj085007; Wed, 10 Aug 2022 11:20:30 GMT (envelope-from git) Date: Wed, 10 Aug 2022 11:20:30 GMT Message-Id: <202208101120.27ABKUsj085007@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: 20c44243c483 - main - misc/mc{,-nox11}: slightly improve the ports' Makefiles (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 20c44243c483cda921aba0a776c90ab3f3a284b0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660130431; 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=0r3Umkxh4LZrXFMpxwsmrdz4MN4+1yI7+QJu1gHi8YU=; b=otxp+3nUzabEQvPqGxe8jFatRDKh+TcM3qlqciLRACqJH+WR/Hfy43v33aeCM/Y+N+Yj0d AezATrDZMyPxpJo8C2idujAmCUrnuKTAe/5DpOTCu+xcGt1nKk5YsebS1ili2swkXrG9jx SAZJKcAhbDMpzTx4gMv68YJ6r2WbZnOGAHSbEA0czPWcGcgbW64252NK4jalGMs5vDtghK ViZyA1h6m8HKN9HrUILjhvhm+nSOGa9tMFjQFERet6wa7Zp2ep/2GNq3zsjZ1NAhVAnzBx yLQktHPdsUPRjDXF6XrvWlaxcC4B/PSteuAu/EFoFNSPnXNCDrypiCum1KKaTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660130431; a=rsa-sha256; cv=none; b=WREaCWvIjCAjTm1J58yV+mnfDAzyL8k9aIPGDG8FHLN5xEeHXOzJVQx8KECEwpc8e/1eAn M5LpJ2qKqO3aKRa7CPVn+YB5KV+9kCBPZgN+ef+w4OS5642IUUgpChViKAgrLzaPl818/g qlCMyqvTqBDQHf6z6KJPX0Jg+IKaqo4YVCmzTZcA+VA+W4Vjlh1GPulkIKtbBlfbIEvYOO /w6OJDguZunnErZ/tsGJ1YSyBRkDECdR7VSU9hrn36BdC/7YN1s4PLK9bavqwI1ajmRdea CeYyCMGmwgZq/Mbc8LjdcEVDXJAXsiw6pl8ogUHXko3F3KK1idyn0MDEnnG81w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=20c44243c483cda921aba0a776c90ab3f3a284b0 commit 20c44243c483cda921aba0a776c90ab3f3a284b0 Author: Alexey Dokuchaev AuthorDate: 2022-08-10 11:19:00 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-08-10 11:19:00 +0000 misc/mc{,-nox11}: slightly improve the ports' Makefiles (+) - Do not globally pollute -I/-L with ${LOCALBASE} when handling the NLS option and pass it as the --with-libintl-prefix instead - Drop no longer supported --with-slang-includes configure switch, correct paths are obtained via pkgconf(1) these days - Set PKGNAMESUFFIX together with CONFLICTS_INSTALL in the master so they are always coherent (previously, when the main port is built with X11 option unset it would conflict with itself) --- misc/mc-nox11/Makefile | 1 - misc/mc/Makefile | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/misc/mc-nox11/Makefile b/misc/mc-nox11/Makefile index 1a74dea58767..6f1710a2814a 100644 --- a/misc/mc-nox11/Makefile +++ b/misc/mc-nox11/Makefile @@ -1,5 +1,4 @@ MASTERDIR= ${.CURDIR}/../mc -PKGNAMESUFFIX= -nox11 OPTIONS_EXCLUDE= X11 .include "${MASTERDIR}/Makefile" diff --git a/misc/mc/Makefile b/misc/mc/Makefile index 5e3d88d214c6..1bee416199cd 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -53,16 +53,15 @@ ICONV_CONFIGURE_ENABLE= charset NCURSES_CONFIGURE_ON= --with-screen=ncurses NCURSES_CFLAGS+= -DNCURSES_WIDECHAR -NLS_CONFIGURE_ENABLE= nls +NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE} +NLS_CONFIGURE_OFF= --disable-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 +SLANG_CONFIGURE_ON= --with-screen=slang SUBSHELL_CONFIGURE_WITH=subshell SUBSHELL_SUB_FILES= pkg-message @@ -70,8 +69,8 @@ SUBSHELL_SUB_FILES= pkg-message X11_CONFIGURE_WITH= x X11_USES= xorg X11_USE= xorg=x11,xext -X11_VARS= CONFLICTS_INSTALL+="mc-nox11" -X11_VARS_OFF= CONFLICTS_INSTALL+="mc" +X11_VARS= CONFLICTS_INSTALL=mc-nox11 +X11_VARS_OFF= CONFLICTS_INSTALL=mc PKGNAMESUFFIX=-nox11 post-patch: @${REINPLACE_CMD} -e 's|clang||' ${WRKSRC}/configure