Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Oct 2020 09:07:31 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r552954 - in head/misc/far2l: . files
Message-ID:  <202010220907.09M97VgF026574@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Thu Oct 22 09:07:31 2020
New Revision: 552954
URL: https://svnweb.freebsd.org/changeset/ports/552954

Log:
  - Update to the latest snapshot (still alpha quality)
  - Now compatible with wxWidgets version 3.0 and 3.1
  - Reformat port description for somewhat better looks

Deleted:
  head/misc/far2l/files/patch-WinPort_src_APIFSNotify.cpp
  head/misc/far2l/files/patch-cmake_modules_FindLibSSH.cmake
Modified:
  head/misc/far2l/Makefile
  head/misc/far2l/distinfo
  head/misc/far2l/files/patch-cmake_modules_FindLibsmbclient.cmake
  head/misc/far2l/pkg-descr
  head/misc/far2l/pkg-plist

Modified: head/misc/far2l/Makefile
==============================================================================
--- head/misc/far2l/Makefile	Thu Oct 22 08:51:14 2020	(r552953)
+++ head/misc/far2l/Makefile	Thu Oct 22 09:07:31 2020	(r552954)
@@ -2,19 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	far2l
-PORTVERSION=	g20200622
+PORTVERSION=	g20201021
 CATEGORIES=	misc
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Port of FAR v2 to Unix-like systems
 
-BUILD_DEPENDS=	gawk:lang/gawk gm4:devel/m4
-LIB_DEPENDS=	libpcre.so:devel/pcre
+BUILD_DEPENDS=	gawk:lang/gawk gm4:devel/m4 \
+		${LOCALBASE}/include/spdlog/spdlog.h:devel/spdlog
+LIB_DEPENDS=	libfmt.so:devel/libfmt \
+		libpcre.so:devel/pcre \
+		libuchardet.so:textproc/uchardet \
+		libxerces-c.so:textproc/xerces-c3
 RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	elfmz
-GH_TAGNAME=	43057bd
+GH_TAGNAME=	aee26c9
 
 USES=		cmake compiler:c++11-lang libarchive pkgconfig shebangfix ssl
 SHEBANG_FILES=	far2l/bootstrap/roots.sh
@@ -34,6 +38,10 @@ WEBDAV_DESC=	WebDav protocol support via libneon
 WEBDAV_LIB_DEPENDS=	libneon.so:www/neon
 
 WXGTK_CMAKE_OFF=	-DUSEWX:BOOL=OFF
-WXGTK_USE=	WX=3.0
+WXGTK_USE=	WX=3.0+
+
+post-patch:
+	@${GREP} -Rl --null --include=\*.cpp /bin/bash ${WRKSRC} | ${XARGS} \
+		-0 ${REINPLACE_CMD} -e 's,/bin/bash,${LOCALBASE}&,'
 
 .include <bsd.port.mk>

Modified: head/misc/far2l/distinfo
==============================================================================
--- head/misc/far2l/distinfo	Thu Oct 22 08:51:14 2020	(r552953)
+++ head/misc/far2l/distinfo	Thu Oct 22 09:07:31 2020	(r552954)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592869154
-SHA256 (elfmz-far2l-g20200622-43057bd_GH0.tar.gz) = 676f47878d22bd26faa728d2521742f54bc9f729bc83e33d3688fca633aa8bcb
-SIZE (elfmz-far2l-g20200622-43057bd_GH0.tar.gz) = 5487398
+TIMESTAMP = 1603319048
+SHA256 (elfmz-far2l-g20201021-aee26c9_GH0.tar.gz) = 99245d627065996d50cebd7134f2b6913be309345652a079774154b8424d3219
+SIZE (elfmz-far2l-g20201021-aee26c9_GH0.tar.gz) = 5217952

Modified: head/misc/far2l/files/patch-cmake_modules_FindLibsmbclient.cmake
==============================================================================
--- head/misc/far2l/files/patch-cmake_modules_FindLibsmbclient.cmake	Thu Oct 22 08:51:14 2020	(r552953)
+++ head/misc/far2l/files/patch-cmake_modules_FindLibsmbclient.cmake	Thu Oct 22 09:07:31 2020	(r552954)
@@ -1,6 +1,6 @@
---- cmake/modules/FindLibsmbclient.cmake.orig	2020-06-22 23:39:14 UTC
+--- cmake/modules/FindLibsmbclient.cmake.orig	2020-10-21 22:24:08 UTC
 +++ cmake/modules/FindLibsmbclient.cmake
-@@ -21,23 +21,17 @@ else (LIBSMBCLIENT_LIBRARIES AND LIBSMBCLIENT_INCLUDE_
+@@ -21,11 +21,6 @@ else (LIBSMBCLIENT_LIBRARIES AND LIBSMBCLIENT_INCLUDE_
    find_path(LIBSMBCLIENT_INCLUDE_DIR
      NAMES
        libsmbclient.h
@@ -11,20 +11,4 @@
 -      /sw/include
      PATH_SUFFIXES
        samba-4.0
-+      samba4
-   )
- 
-   find_library(SMBCLIENT_LIBRARY
-     NAMES
-       smbclient
--    PATHS
--      /usr/lib
--      /usr/local/lib
--      /opt/local/lib
--      /sw/lib
-+    PATH_SUFFIXES
-+      samba-4.0
-+      samba4
-   )
- 
-   if (SMBCLIENT_LIBRARY)
+       samba4

Modified: head/misc/far2l/pkg-descr
==============================================================================
--- head/misc/far2l/pkg-descr	Thu Oct 22 08:51:14 2020	(r552953)
+++ head/misc/far2l/pkg-descr	Thu Oct 22 09:07:31 2020	(r552954)
@@ -1,8 +1,9 @@
-Linux port of the FAR Manager v2 (http://farmanager.com/); also work on macOS
-and *BSD systems.  ALPHA VERSION.  Currently interesting only for enthusiasts!
+Linux port of the FAR Manager v2 (http://farmanager.com/); also works on
+macOS and *BSD systems.  ALPHA VERSION.  Currently interesting only for
+enthusiasts!
 
 Plugins that currently work: NetRocks (SFTP/SCP/FTP/FTPS/SMB/NFS/WebDAV),
-colorer, multiarc, tmppanel, align, autowrap, drawline, editcase, SimpleIndent,
-Python (optional scripting support).
+colorer, multiarc, tmppanel, align, autowrap, drawline, editcase,
+SimpleIndent, Python (optional scripting support).
 
 WWW: https://github.com/elfmz/far2l

Modified: head/misc/far2l/pkg-plist
==============================================================================
--- head/misc/far2l/pkg-plist	Thu Oct 22 08:51:14 2020	(r552953)
+++ head/misc/far2l/pkg-plist	Thu Oct 22 09:07:31 2020	(r552954)
@@ -54,6 +54,7 @@ share/applications/far2l.desktop
 %%DATADIR%%/Plugins/colorer/base/hrc/base/fsharp.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/gen/perl-brackets.ent.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/go.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/base/groovy.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/haxe.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/idl.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/base/java.hrc
@@ -109,6 +110,7 @@ share/applications/far2l.desktop
 %%DATADIR%%/Plugins/colorer/base/hrc/inet/gen/xhtml-frameset.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/inet/gen/xhtml-strict.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/inet/gen/xhtml-trans.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/inet/gsp.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/inet/haml.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/inet/html-css.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/inet/html.hrc
@@ -278,6 +280,9 @@ share/applications/far2l.desktop
 %%DATADIR%%/Plugins/colorer/base/hrc/scripts/avisynth.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/scripts/awk.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/scripts/batch.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/cmake/cmake-auto.ent.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/cmake/cmake.ent.hrc
+%%DATADIR%%/Plugins/colorer/base/hrc/scripts/cmake/cmake.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/scripts/colorer/bkt.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/scripts/colorer/colorer5catalog.hrc
 %%DATADIR%%/Plugins/colorer/base/hrc/scripts/colorer/ent.hrc.hrc
@@ -370,6 +375,7 @@ share/applications/far2l.desktop
 %%DATADIR%%/Plugins/colorer/base/hrd/catalog-console.xml
 %%DATADIR%%/Plugins/colorer/base/hrd/catalog-rgb.xml
 %%DATADIR%%/Plugins/colorer/base/hrd/catalog-text.xml
+%%DATADIR%%/Plugins/colorer/base/hrd/catalog-user.xml
 %%DATADIR%%/Plugins/colorer/base/hrd/console/black.hrd
 %%DATADIR%%/Plugins/colorer/base/hrd/console/blue.hrd
 %%DATADIR%%/Plugins/colorer/base/hrd/console/contrib/black_ay.hrd
@@ -423,7 +429,6 @@ share/applications/far2l.desktop
 %%DATADIR%%/Plugins/colorer/base/hrd/rgb/white.hrd
 %%DATADIR%%/Plugins/colorer/base/hrd/text/htmlcss.hrd
 %%DATADIR%%/Plugins/colorer/base/hrd/text/tags.hrd
-%%DATADIR%%/Plugins/colorer/plug/Plugin.Colorer.lua
 %%DATADIR%%/Plugins/colorer/plug/colorere.hlf
 %%DATADIR%%/Plugins/colorer/plug/colorere.lng
 %%DATADIR%%/Plugins/colorer/plug/colorerr.hlf
@@ -464,6 +469,7 @@ share/applications/far2l.desktop
 %%DATADIR%%/Plugins/tmppanel/plug/TmpRus.lng
 %%DATADIR%%/notify.sh
 %%DATADIR%%/open.sh
+%%DATADIR%%/ps.sh
 %%DATADIR%%/roots.sh
 %%DATADIR%%/trash.sh
 share/icons/far2l.svg



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010220907.09M97VgF026574>