From nobody Mon Apr 29 11:42:55 2024 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 4VShKC48Ctz5J9Fb; Mon, 29 Apr 2024 11:42:55 +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 4VShKC3gTlz3x7V; Mon, 29 Apr 2024 11:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714390975; 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=rVsJkJeJBF1nu13f85L8Csgdg+KBYn5lalaefOFZ3QU=; b=kb9ubODU/ALghDqq3iD6MZRAK14hcq2mJAmXTHAzSB5yX6OgTg6UOGssvUvIBvSeO2+1a8 dTCXiQ1T0UMZP6dB8EqjUUI6AnSa8oXoMbxDfXWImAv9pEDIDWfxBdI2VWFSMlMHFdN0aX A8BwZPcuZUD6YWA8SN72y0nr9cf/ewDlFXocdh7Fjy9xFNc/SOlsOp+L7noRk81MylrjhC WCRZ9QbLWo2JKI1IHr6rhunaQQ9ony9abWxYk0YiEptwnN7G66SE2YiqWnFQTwaXUnA1j3 mzxGe/vThAPtno7YzKcQoldK9c5YwnBdLWvMaIrx8Oxeg02y7atGi7NgC+n4DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714390975; a=rsa-sha256; cv=none; b=gQKW+VZEM92Vfky7ClcTSrtB2r/P/ZNHVwLO8D/uJumj7wU0eLVNu4UE/Mf92kANwKzPOq HaZ2mrz0kYWxI1WPLXbcgkK+1itMhx2kNcx6FkDEL8r1CFuB18UHqkuvcTRXPtpJnsZ3Y7 ztpgCQGqBmjFutrs5tGQcwCrxJ8cMOBHBJqoqQS3a3WuFPDKqu9oARfbpQnqs47Wd8J1tf efbAcORL3/l2meLZrDaEq4++5yIXkRVFzGjxZNzxhnes7lTP6SqRwO2i+/55TeD6qCpF7r hjBoOrivOwXEY/Euy3A2ks21z2vV7vtUofK+8f/dZ3rw2oaWAlKICqIkbj4vrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714390975; 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=rVsJkJeJBF1nu13f85L8Csgdg+KBYn5lalaefOFZ3QU=; b=jZjYuEtrP0Ev8LaJMA5+sKQM2gGfSD/HNbqhbxZzB9KhH8fAo6bUcsyvUsTk3pOYwMuYmI Y7/nwaW+FqR5CU7/NcLuDlB/tNwhSIsFD+/WnNM+ga3P9J63+Fhu5meCxfXLm7kG77yRyZ 6XOamM+o3pjodegiTZn8cGT1yrIpoAz60Fthjpvv8NUT7SRzcxICnY9qLBedZh5ft6SU1W f/2NpB2qfgXZJ209tZrNOCqKsz8JrajC1+OkI21buqkQMVuBB/5s6SJUkw92bR3o0lvwMN /9t4qZ7cK6bQ7K8FOi7qOaxoALtHkbVMnX5xheAnXvGBWLIfpMDvZtFkBSTchw== 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 4VShKC3GrYz1750; Mon, 29 Apr 2024 11:42:55 +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 43TBgt8l089784; Mon, 29 Apr 2024 11:42:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43TBgtEM089781; Mon, 29 Apr 2024 11:42:55 GMT (envelope-from git) Date: Mon, 29 Apr 2024 11:42:55 GMT Message-Id: <202404291142.43TBgtEM089781@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: 8098125aa6ff - main - misc/far2l: update Far2L to version 2.6.1 (on the edge) + hotfix 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 8098125aa6ffd3ad095059d83b65f0a516925849 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=8098125aa6ffd3ad095059d83b65f0a516925849 commit 8098125aa6ffd3ad095059d83b65f0a516925849 Author: Alexey Dokuchaev AuthorDate: 2024-04-29 11:41:52 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-04-29 11:41:52 +0000 misc/far2l: update Far2L to version 2.6.1 (on the edge) + hotfix Apparently, regardless of the search method, when LibArchive is installed from ports, it would be picked over the base version, so put `libarchive' on the USES list unconditionally, to avoid unregistered dependency when building in an unclean environment. Prefer find_package() vs. pkg_search_module() because the former prints explicit "found" status message with the library path and version, if available, which makes more informative build logs. Reported by: portscout --- misc/far2l/Makefile | 10 ++++++---- misc/far2l/distinfo | 6 +++--- misc/far2l/pkg-plist | 4 ++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/misc/far2l/Makefile b/misc/far2l/Makefile index f50d9a83374b..9c99091b25d0 100644 --- a/misc/far2l/Makefile +++ b/misc/far2l/Makefile @@ -1,6 +1,7 @@ PORTNAME= far2l -PORTVERSION= 2.6.0 +PORTVERSION= 2.6.1 DISTVERSIONPREFIX= v_ +DISTVERSIONSUFFIX= _hotfix1 CATEGORIES= misc MAINTAINER= danfe@FreeBSD.org @@ -17,7 +18,8 @@ RUN_DEPENDS= bash:shells/bash USE_GITHUB= yes GH_ACCOUNT= elfmz -USES= cmake compiler:c++11-lang perl5 pkgconfig shebangfix ssl +USES= cmake compiler:c++11-lang libarchive perl5 pkgconfig \ + shebangfix ssl USE_PERL5= build SHEBANG_FILES= far2l/bootstrap/view.sh @@ -32,7 +34,7 @@ NFS_LIB_DEPENDS= libnfs.so:net/libnfs SFTP_DESC= SFTP file transfer support SFTP_LIB_DEPENDS= libssh.so:security/libssh -SMB_USES= libarchive samba:lib +SMB_USES= samba:lib WEBDAV_DESC= WebDav protocol support via libneon WEBDAV_LIB_DEPENDS= libneon.so:www/neon @@ -48,7 +50,7 @@ X11_USE= XORG=ice,sm,x11,xext,xi post-patch: @${REINPLACE_CMD} -e \ - 's,pkg_search_module\((LibArchive\)[^)]*,find_package\1,' \ + 's,pkg_search_module\(([[:alpha:]]*\)[^)]*,find_package\1,' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's,^if (fmt_FOUND,& AND FALSE,' \ ${WRKSRC}/colorer/CMakeLists.txt diff --git a/misc/far2l/distinfo b/misc/far2l/distinfo index a9156182abef..6e8e0e26afea 100644 --- a/misc/far2l/distinfo +++ b/misc/far2l/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1708371139 -SHA256 (elfmz-far2l-v_2.6.0_GH0.tar.gz) = 3d1c0c0a1dd4b899afd659876c9e636dbc5920cbce514dbfe9c0f6843ec2baee -SIZE (elfmz-far2l-v_2.6.0_GH0.tar.gz) = 6555743 +TIMESTAMP = 1713305256 +SHA256 (elfmz-far2l-v_2.6.1_hotfix1_GH0.tar.gz) = 44dd597a2f572b273cc44c5feb01c15522a20b4b6a2e5450b016ec9c6abc2c7e +SIZE (elfmz-far2l-v_2.6.1_hotfix1_GH0.tar.gz) = 6605861 diff --git a/misc/far2l/pkg-plist b/misc/far2l/pkg-plist index a102ee59386c..12f363a5c123 100644 --- a/misc/far2l/pkg-plist +++ b/misc/far2l/pkg-plist @@ -380,6 +380,8 @@ share/applications/far2l.desktop %%DATADIR%%/Plugins/colorer/base/hrc/scripts/scons.hrc %%DATADIR%%/Plugins/colorer/base/hrc/scripts/sh-keywords.ent.hrc %%DATADIR%%/Plugins/colorer/base/hrc/scripts/sh.hrc +%%DATADIR%%/Plugins/colorer/base/hrc/scripts/shell-bash.hrc +%%DATADIR%%/Plugins/colorer/base/hrc/scripts/shell-posix.hrc %%DATADIR%%/Plugins/colorer/base/hrc/scripts/solution.hrc %%DATADIR%%/Plugins/colorer/base/hrc/scripts/squirrel.hrc %%DATADIR%%/Plugins/colorer/base/hrc/scripts/tex.hrc @@ -521,6 +523,8 @@ share/applications/far2l.desktop %%DATADIR%%/trash.sh %%DATADIR%%/unmount.sh %%DATADIR%%/view.sh +%%DATADIR%%/wslgclip.sh +%%DATADIR%%/wslgclip.vbs %%DATADIR%%/xlats.ini share/icons/far2l.svg share/icons/hicolor/1024x1024/apps/far2l.svg