Date: Mon, 29 Apr 2024 11:42:55 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8098125aa6ff - main - misc/far2l: update Far2L to version 2.6.1 (on the edge) + hotfix Message-ID: <202404291142.43TBgtEM089781@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=8098125aa6ffd3ad095059d83b65f0a516925849 commit 8098125aa6ffd3ad095059d83b65f0a516925849 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2024-04-29 11:41:52 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404291142.43TBgtEM089781>